From d64c26e6f216526c2aa34d8783c0e407fc7389c5 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 13 Oct 2015 12:34:34 +0300 Subject: [PATCH 0001/1463] travis: commit and push only if GH_TOKEN is set This allows to enable travis build for a pull request without failing it. This is useful to check at leat that Makefile syntax is correct. --- .travis.yml | 10 +--------- tools/travis-push.sh | 13 +++++++++++++ 2 files changed, 14 insertions(+), 9 deletions(-) create mode 100755 tools/travis-push.sh diff --git a/.travis.yml b/.travis.yml index 50f05cd4..d6024c31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,15 +3,7 @@ sudo: false script: - make versions.json - - git config --global user.email 'mxebot@gmail.com' - - git config --global user.name 'MXEBot as Travis CI' - - git config --global push.default simple - - git config credential.helper "store --file=.git/credentials" - - echo "https://${GH_TOKEN}:@github.com" > .git/credentials - - git remote set-url origin 'https://github.com/mxe/mxe.git' - - git commit -a -m 'Update versions.json' || true - - git push origin HEAD:master - - git push origin HEAD:gh-pages + - if [ "$GH_TOKEN" != "" ]; then ./tools/travis-push.sh; fi env: global: diff --git a/tools/travis-push.sh b/tools/travis-push.sh new file mode 100755 index 00000000..8aa02c06 --- /dev/null +++ b/tools/travis-push.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +set -ue + +git config --global user.email 'mxebot@gmail.com' +git config --global user.name 'MXEBot as Travis CI' +git config --global push.default simple +git config credential.helper "store --file=.git/credentials" +echo "https://${GH_TOKEN}:@github.com" > .git/credentials +git remote set-url origin 'https://github.com/mxe/mxe.git' +git commit -a -m 'Update versions.json' || true +git push origin HEAD:master +git push origin HEAD:gh-pages From d57e5c58c8cbb37e810be438c11fb681321de35f Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 13 Oct 2015 12:36:23 +0300 Subject: [PATCH 0002/1463] travis-push: make sure "git commit" succeeded --- tools/travis-push.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/travis-push.sh b/tools/travis-push.sh index 8aa02c06..e7aef3b3 100755 --- a/tools/travis-push.sh +++ b/tools/travis-push.sh @@ -8,6 +8,6 @@ git config --global push.default simple git config credential.helper "store --file=.git/credentials" echo "https://${GH_TOKEN}:@github.com" > .git/credentials git remote set-url origin 'https://github.com/mxe/mxe.git' -git commit -a -m 'Update versions.json' || true +git commit -a -m 'Update versions.json' git push origin HEAD:master git push origin HEAD:gh-pages From bf6aa9b5502b37defe8ed7809d2c0370f77e97fa Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 4 Nov 2015 15:03:42 +0100 Subject: [PATCH 0003/1463] build-pkg: typo --- tools/build-pkg.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index 63452c80..dd081807 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -43,7 +43,7 @@ local GIT = 'git --work-tree=./usr/ --git-dir=./usr/.git ' local BLACKLIST = { '^usr/installed/check%-requirements$', - -- usr/share/cmake if useful + -- usr/share/cmake is useful '^usr/share/doc/', '^usr/share/info/', '^usr/share/man/', From 718b89a06e8d76960ceb6f5cb6b44eac5bb2132f Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 4 Nov 2015 17:28:00 +0100 Subject: [PATCH 0004/1463] build-pkg: report shared items installing no .dll Report only if the item installs .a See https://github.com/mxe/mxe/pull/966#issuecomment-153712570 --- tools/build-pkg.lua | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index dd081807..9ddeeb08 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -112,6 +112,16 @@ local function sliceArray(list, nelements) return new_list end +local function concatArrays(...) + local result = {} + for _, array in ipairs({...}) do + for _, elem in ipairs(array) do + table.insert(result, elem) + end + end + return result +end + local function isInString(substring, string) return string:find(substring, 1, true) end @@ -352,6 +362,26 @@ local function checkFile(file, item) end end +local function checkFileList(files, item) + local target, _ = parseItem(item) + if target:match('shared') then + local has_a, has_dll + for _, file in ipairs(files) do + file = file:lower() + if file:match('%.a') then + has_a = true + end + if file:match('%.dll') then + has_dll = true + end + end + if has_a and not has_dll then + log('Shared item %s installs .a file ' .. + 'but no .dll', item) + end + end +end + -- builds package, returns list of new files local function buildItem(item, item2deps, file2item) local target, pkg = parseItem(item) @@ -374,6 +404,7 @@ local function buildItem(item, item2deps, file2item) log('Item %s changes %s, created by %s', item, file, creator_item) end + checkFileList(concatArrays(new_files, changed_files), item) return new_files end From c2c0c26761808c5778c243cd337d8961a81a7672 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 4 Nov 2015 18:46:59 +0100 Subject: [PATCH 0005/1463] build-pkg: do not pack empty packages see #968 --- tools/build-pkg.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index 9ddeeb08..c8d0e858 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -521,6 +521,10 @@ local function isBuilt(item, files) return false end +local function isEmpty(item, files) + return #files == 1 +end + -- build all packages, save filelist to list file local function buildPackages(items, item2deps) local broken = {} @@ -560,7 +564,9 @@ local function makeDebs(items, item2deps, item2ver, item2files) local deps = assert(item2deps[item], item) local ver = assert(item2ver[item], item) local files = assert(item2files[item], item) - makeDeb(item, files, deps, ver) + if not isEmpty(item, files) then + makeDeb(item, files, deps, ver) + end end end From 3fc69a3a39ce90fa77fa26f3f30f424b0a57c3d7 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 4 Nov 2015 18:48:08 +0100 Subject: [PATCH 0006/1463] build-pkg: report non-empty depending on empty fix #968 --- tools/build-pkg.lua | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index c8d0e858..c8067770 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -565,6 +565,13 @@ local function makeDebs(items, item2deps, item2ver, item2files) local ver = assert(item2ver[item], item) local files = assert(item2files[item], item) if not isEmpty(item, files) then + for _, dep in ipairs(deps) do + local dep_files = assert(item2files[dep], dep) + if isEmpty(dep, dep_files) then + log('Non-empty item %s depends on ' .. + 'empty item %s', item, dep) + end + end makeDeb(item, files, deps, ver) end end From 8448d43531bd8002204521c75c6a49c8a0082574 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 10 Nov 2015 02:38:46 +0300 Subject: [PATCH 0007/1463] disable networking with LD_PRELOAD when build see #969 --- Makefile | 11 ++++++++--- tools/nonetwork.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 3 deletions(-) create mode 100644 tools/nonetwork.c diff --git a/Makefile b/Makefile index 10757ee2..73dabb84 100644 --- a/Makefile +++ b/Makefile @@ -144,7 +144,7 @@ define MXE_GET_GITHUB_TAGS endef # use a minimal whitelist of safe environment variables -ENV_WHITELIST := PATH LANG MAKE% MXE% %PROXY %proxy LD_LIBRARY_PATH ACLOCAL_PATH +ENV_WHITELIST := PATH LANG MAKE% MXE% %PROXY %proxy LD_LIBRARY_PATH LD_PRELOAD ACLOCAL_PATH unexport $(filter-out $(ENV_WHITELIST),$(shell env | cut -d '=' -f1)) # disable wine with readonly directory (created by mxe-conf) @@ -406,6 +406,10 @@ download-only-$(1): endef $(foreach PKG,$(PKGS),$(eval $(call PKG_RULE,$(PKG)))) +$(PREFIX)/lib/nonetwork.so: $(TOP_DIR)/tools/nonetwork.c + mkdir -p $(dir $@) + $(BUILD_CC) -shared -fPIC -o $@ $< + define PKG_TARGET_RULE .PHONY: $(1) $(1): $(PREFIX)/$(3)/installed/$(1) @@ -416,7 +420,8 @@ $(PREFIX)/$(3)/installed/$(1): $(TOP_DIR)/src/$(1).mk \ $(and $($(3)_DEPS),$(addprefix $(PREFIX)/$($(3)_DEPS)/installed/,$(filter-out $(MXE_CONF_PKGS),$($($(3)_DEPS)_PKGS)))) \ | $(if $(DONT_CHECK_REQUIREMENTS),,check-requirements) \ $(if $(value $(call LOOKUP_PKG_RULE,$(1),URL,$(3))),download-only-$(1)) \ - $(addprefix $(PREFIX)/$(3)/installed/,$(if $(call set_is_not_member,$(1),$(MXE_CONF_PKGS)),$(MXE_CONF_PKGS))) + $(addprefix $(PREFIX)/$(3)/installed/,$(if $(call set_is_not_member,$(1),$(MXE_CONF_PKGS)),$(MXE_CONF_PKGS))) \ + $(PREFIX)/lib/nonetwork.so @[ -d '$(LOG_DIR)/$(TIMESTAMP)' ] || mkdir -p '$(LOG_DIR)/$(TIMESTAMP)' $(if $(value $(call LOOKUP_PKG_RULE,$(1),BUILD,$(3))), @$(PRINTF_FMT) '[build]' '$(1)' '$(3)', @@ -425,7 +430,7 @@ $(PREFIX)/$(3)/installed/$(1): $(TOP_DIR)/src/$(1).mk \ @$(PRINTF_FMT) '[message]' '$(1)' '$(3) $($(call LOOKUP_PKG_RULE,$(1),MESSAGE,$(3)))') @touch '$(LOG_DIR)/$(TIMESTAMP)/$(1)_$(3)' @ln -sf '$(TIMESTAMP)/$(1)_$(3)' '$(LOG_DIR)/$(1)_$(3)' - @if ! (time $(MAKE) -f '$(MAKEFILE)' 'build-only-$(1)_$(3)') &> '$(LOG_DIR)/$(TIMESTAMP)/$(1)_$(3)'; then \ + @if ! (time LD_PRELOAD="$(PREFIX)/lib/nonetwork.so" $(MAKE) -f '$(MAKEFILE)' 'build-only-$(1)_$(3)') &> '$(LOG_DIR)/$(TIMESTAMP)/$(1)_$(3)'; then \ echo; \ echo 'Failed to build package $(1) for target $(3)!'; \ echo '------------------------------------------------------------'; \ diff --git a/tools/nonetwork.c b/tools/nonetwork.c new file mode 100644 index 00000000..d203fb2d --- /dev/null +++ b/tools/nonetwork.c @@ -0,0 +1,36 @@ +// nonetwork, break standard network functions using LD_PRELOAD +// Source: https://github.com/starius/nonetwork +// Copyright (C) 2015 Boris Nagaev +// License: MIT + +#include + +int connect(int sock, const void *addr, unsigned int len) { + errno = 13; // EACCES, Permission denied + return -1; +} + +void *gethostbyname(const char *name) { + return 0; +} + +int getaddrinfo(const char *node, const char *service, + const void *hints, + void **res) { + return -4; // EAI_FAIL +} + +void freeaddrinfo(void *res) { +} + +int getnameinfo(const void * sa, + unsigned int salen, char * host, + unsigned int hostlen, char * serv, + unsigned int servlen, int flags) { + return -4; // EAI_FAIL +} + +struct hostent *gethostbyaddr(const void *addr, unsigned int len, + int type) { + return 0; +} From 66514d4c962f2c28ab08c58ef13e9775eebe26f1 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 10 Nov 2015 02:42:37 +0300 Subject: [PATCH 0008/1463] set WGET=false when build Prevent $(WGET) from downloading on platforms not supporting LD_PRELOAD. fix #969 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 73dabb84..090caa98 100644 --- a/Makefile +++ b/Makefile @@ -430,7 +430,7 @@ $(PREFIX)/$(3)/installed/$(1): $(TOP_DIR)/src/$(1).mk \ @$(PRINTF_FMT) '[message]' '$(1)' '$(3) $($(call LOOKUP_PKG_RULE,$(1),MESSAGE,$(3)))') @touch '$(LOG_DIR)/$(TIMESTAMP)/$(1)_$(3)' @ln -sf '$(TIMESTAMP)/$(1)_$(3)' '$(LOG_DIR)/$(1)_$(3)' - @if ! (time LD_PRELOAD="$(PREFIX)/lib/nonetwork.so" $(MAKE) -f '$(MAKEFILE)' 'build-only-$(1)_$(3)') &> '$(LOG_DIR)/$(TIMESTAMP)/$(1)_$(3)'; then \ + @if ! (time LD_PRELOAD="$(PREFIX)/lib/nonetwork.so" $(MAKE) -f '$(MAKEFILE)' 'build-only-$(1)_$(3)' WGET=false) &> '$(LOG_DIR)/$(TIMESTAMP)/$(1)_$(3)'; then \ echo; \ echo 'Failed to build package $(1) for target $(3)!'; \ echo '------------------------------------------------------------'; \ From 68f74e9651898c6f084ce6feb0d772c6dfae7087 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 10 Nov 2015 02:52:56 +0300 Subject: [PATCH 0009/1463] build-pkg: blacklist nonetwork.so --- tools/build-pkg.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index d39dec11..f18f241a 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -48,6 +48,7 @@ local BLACKLIST = { '^usr/share/info/', '^usr/share/man/', '^usr/share/gcc', + '^usr/lib/nonetwork.so', '^usr/[^/]+/share/doc/', '^usr/[^/]+/share/info/', } From cae2328ca96ea36f98bb081ac629a095a6381986 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 10 Nov 2015 10:33:06 +0300 Subject: [PATCH 0010/1463] index.html: add a dot at the end of the sentence --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index d34ec60e..27e9ff96 100644 --- a/index.html +++ b/index.html @@ -2749,7 +2749,7 @@ local-pkg-list: $(LOCAL_PKG_LIST)

or:

openssl sha256 pkg/gettext-x.y.z.tar.gz

- if you have already downloaded the package + if you have already downloaded the package.

From b4b5e471cd7aa7811b7f088d6a75fa9ae9738c7b Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 10 Nov 2015 10:34:03 +0300 Subject: [PATCH 0011/1463] new package howto: add not-to-do rules --- index.html | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/index.html b/index.html index 27e9ff96..bac012ad 100644 --- a/index.html +++ b/index.html @@ -2765,6 +2765,28 @@ local-pkg-list: $(LOCAL_PKG_LIST) Always list the dependency on gcc explicitly: 

$(PKG)_DEPS     := gcc ...
+ +

+ Things not to do: +

+
    +
  • + do not run target executables with Wine, as Wine is + not guaranteed to be installed. Instead build the needed tool + natively or (if it is too huge to build one more time) add + to MXE's dependencies. This policy is forced by setting + WINEPREFIX to an empty directory, which breaks Wine; +
    • + +
  • + do not download anything while building, as all files + downloaded should be verified by checksums. Instead create a + package which installs the needed file. This policy is forced + on Linux by LD_PRELOAD trick, breaking network functions. +
    • +
+
  • From 18b8aa1c9cd924828fe7a252021b07570c08d0fc Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 11 Nov 2015 03:32:27 +0300 Subject: [PATCH 0012/1463] build-pkg: add EOL after last line in *.list file fix #979 --- tools/build-pkg.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index d39dec11..f609b6b4 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -432,7 +432,7 @@ local function makePackage(name, files, deps, ver, d1, d2, dst) protectVersion(ver)) -- make .list file local list_path = ('%s/%s.list'):format(dst, name) - writeFile(list_path, table.concat(files, "\n")) + writeFile(list_path, table.concat(files, "\n") .. "\n") -- make .tar.xz file local tar_name = dirname .. '.tar.xz' local cmd = '%s -T %s --owner=root --group=root -cJf %s' From 6bfaad27b8f3cf2ca9792c756e7a4d5a80f85153 Mon Sep 17 00:00:00 2001 From: gcoco Date: Wed, 11 Nov 2015 01:50:26 -0500 Subject: [PATCH 0013/1463] gdk-pixbuf2-devel not gdk-pixbuf-devel This is to provide gdk-pixbuf-csource. --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index d34ec60e..f370597f 100644 --- a/index.html +++ b/index.html @@ -648,7 +648,7 @@ USE_OSGPLUGIN(<plugin2>) 
    yum install \
     autoconf automake bash bison bzip2 cmake flex gcc-c++ \
-    gdk-pixbuf-devel gettext git gperf intltool make sed libffi-devel \
+    gdk-pixbuf2-devel gettext git gperf intltool make sed libffi-devel \
     libtool openssl-devel p7zip patch perl pkgconfig \
     python ruby scons unzip wget xz
    From 12ef7af27fecb3172d825245d3d0e158b6615b6d Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sat, 31 Oct 2015 14:02:41 +0000 Subject: [PATCH 0014/1463] Revert "gcc: cleanup lib installation" This reverts commit c96a007c6a4b03ca8d43c2ed848c47832f9e2baf. This commit is not applicable to gcc 4.9. --- src/gcc.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/gcc.mk b/src/gcc.mk index 4e7bbf7d..ee57ffde 100644 --- a/src/gcc.mk +++ b/src/gcc.mk @@ -55,11 +55,8 @@ define $(PKG)_POST_BUILD rm -f $(addprefix $(PREFIX)/$(TARGET)/bin/, c++ g++ gcc gfortran) -mv '$(PREFIX)/lib/gcc/$(TARGET)/lib/'* '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/' -mv '$(PREFIX)/lib/gcc/$(TARGET)/'*.dll '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/' - -mv '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/'*.dll '$(PREFIX)/$(TARGET)/bin/' + -cp '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/'*.dll '$(PREFIX)/$(TARGET)/bin/' -cp '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/'*.dll.a '$(PREFIX)/$(TARGET)/lib/' - - # remove incorrectly installed libcc1 - rm -f '$(PREFIX)/lib/'libcc1* endef define $(PKG)_BUILD_mingw-w64 @@ -97,9 +94,6 @@ define $(PKG)_BUILD_mingw-w64 # build rest of gcc cd '$(1).build' $(MAKE) -C '$(1).build' -j '$(JOBS)' - - # cc1libdir isn't passed to subdirs so install correctly and rm later - $(MAKE) -C '$(1).build/libcc1' -j 1 install cc1libdir='$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)' $(MAKE) -C '$(1).build' -j 1 install $($(PKG)_POST_BUILD) From 1cbb56bd03dac9e107cafacfdbd18b4d85b8af1f Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sat, 31 Oct 2015 14:11:26 +0000 Subject: [PATCH 0015/1463] isl: downgrade 0.14 -> 0.12.2 cloog is not compatible with isl 0.14 --- src/isl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/isl.mk b/src/isl.mk index 348ea331..3fe3b763 100644 --- a/src/isl.mk +++ b/src/isl.mk @@ -3,8 +3,8 @@ PKG := isl $(PKG)_IGNORE := -$(PKG)_VERSION := 0.14 -$(PKG)_CHECKSUM := 7e3c02ff52f8540f6a85534f54158968417fd676001651c8289c705bd0228f36 +$(PKG)_VERSION := 0.12.2 +$(PKG)_CHECKSUM := f4b3dbee9712850006e44f0db2103441ab3d13b406f77996d1df19ee89d11fb4 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://isl.gforge.inria.fr/$($(PKG)_FILE) From cafa1734c52ad1a9e7dddded63af23990219378a Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sat, 31 Oct 2015 14:04:21 +0000 Subject: [PATCH 0016/1463] add package cloog This package was removed as a part of da82d07dbeca23087aa4351914cf4b890c1d3972 File src/cloog.mk differs from its copy before da82d07dbec [1] * sha1 -> sha256 * toolchain reorg reapplied: * $(PKG)_TARGETS * $(PKG)_DEPS_$(BUILD) * define $(PKG)_BUILD -> define $(PKG)_BUILD_$(BUILD) * $(MXE_CONFIGURE_OPTS) [1] https://raw.githubusercontent.com/mxe/mxe/6947d3245f9c76d9124a4c4f3c164154a75f3f62/src/cloog.mk --- index.html | 4 ++++ src/cloog.mk | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 src/cloog.mk diff --git a/index.html b/index.html index d34ec60e..6585088b 100644 --- a/index.html +++ b/index.html @@ -1154,6 +1154,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) chromaprint Chromaprint + + cloog + CLooG Code Generator + cimg CImg Library diff --git a/src/cloog.mk b/src/cloog.mk new file mode 100644 index 00000000..40d4c8b7 --- /dev/null +++ b/src/cloog.mk @@ -0,0 +1,34 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := cloog +$(PKG)_IGNORE := +$(PKG)_VERSION := 0.18.1 +$(PKG)_CHECKSUM := 02500a4edd14875f94fe84cbeda4290425cb0c1c2474c6f75d75a303d64b4196 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://www.bastoul.net/cloog/pages/download/$($(PKG)_FILE) +$(PKG)_URL_2 := ftp://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE) +$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) +$(PKG)_DEPS := gcc gmp isl + +$(PKG)_DEPS_$(BUILD) := gmp isl + +# stick to tested versions from gcc +define $(PKG)_UPDATE + $(WGET) -q -O- 'ftp://gcc.gnu.org/pub/gcc/infrastructure/' | \ + $(SED) -n 's,.*cloog-\([0-9][^>]*\)\.tar.*,\1,p' | \ + $(SORT) -V | + tail -1 +endef + +define $(PKG)_BUILD_$(BUILD) + cd '$(1)' && ./configure \ + $(MXE_CONFIGURE_OPTS) \ + --with-gmp-prefix='$(PREFIX)/$(TARGET)' \ + --with-isl-prefix='$(PREFIX)/$(TARGET)' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j '$(JOBS)' install +endef + +$(PKG)_BUILD_SHARED = From db513d58428993eac76f76bd1608ae89d438cdc1 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sat, 31 Oct 2015 14:12:26 +0000 Subject: [PATCH 0017/1463] gcc: enable cloog --- src/gcc.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gcc.mk b/src/gcc.mk index ee57ffde..4355f736 100644 --- a/src/gcc.mk +++ b/src/gcc.mk @@ -44,6 +44,7 @@ define $(PKG)_CONFIGURE --with-isl='$(PREFIX)/$(BUILD)' \ --with-mpc='$(PREFIX)/$(BUILD)' \ --with-mpfr='$(PREFIX)/$(BUILD)' \ + --with-cloog='$(PREFIX)/$(BUILD)' \ --with-as='$(PREFIX)/bin/$(TARGET)-as' \ --with-ld='$(PREFIX)/bin/$(TARGET)-ld' \ --with-nm='$(PREFIX)/bin/$(TARGET)-nm' \ From 8efddcb4b5f70cbfeaa4c024c0cfd219e27eace3 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sat, 31 Oct 2015 14:12:58 +0000 Subject: [PATCH 0018/1463] gcc: downgrade 5.2.0 -> 4.9.2 Revert da82d07dbeca23087aa4351914cf4b890c1d3972 and consequent changes of gcc version. close #964 --- src/gcc.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gcc.mk b/src/gcc.mk index 4355f736..71720aad 100644 --- a/src/gcc.mk +++ b/src/gcc.mk @@ -3,8 +3,8 @@ PKG := gcc $(PKG)_IGNORE := -$(PKG)_VERSION := 5.2.0 -$(PKG)_CHECKSUM := 5f835b04b5f7dd4f4d2dc96190ec1621b8d89f2dc6f638f9f8bc1b1014ba8cad +$(PKG)_VERSION := 4.9.2 +$(PKG)_CHECKSUM := 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd $(PKG)_SUBDIR := gcc-$($(PKG)_VERSION) $(PKG)_FILE := gcc-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE) From 39aafb3a6b8bc864463ac9c93e3eaf2add29bee2 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sat, 31 Oct 2015 14:20:33 +0000 Subject: [PATCH 0019/1463] update gcc from 4.9.2 to 4.9.3 --- src/gcc.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gcc.mk b/src/gcc.mk index 71720aad..9ac33c66 100644 --- a/src/gcc.mk +++ b/src/gcc.mk @@ -3,8 +3,8 @@ PKG := gcc $(PKG)_IGNORE := -$(PKG)_VERSION := 4.9.2 -$(PKG)_CHECKSUM := 2020c98295856aa13fda0f2f3a4794490757fc24bcca918d52cc8b4917b972dd +$(PKG)_VERSION := 4.9.3 +$(PKG)_CHECKSUM := 2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e $(PKG)_SUBDIR := gcc-$($(PKG)_VERSION) $(PKG)_FILE := gcc-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE) From b83d6e94ab1fb0625107b9039cb232b952fdc178 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 11 Nov 2015 16:55:32 +0000 Subject: [PATCH 0020/1463] fix libmysqlclient See https://github.com/mxe/mxe/pull/965#issuecomment-152884126 --- src/libmysqlclient-1-fixes.patch | 34 ++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/src/libmysqlclient-1-fixes.patch b/src/libmysqlclient-1-fixes.patch index 73611b47..5a6287e4 100644 --- a/src/libmysqlclient-1-fixes.patch +++ b/src/libmysqlclient-1-fixes.patch @@ -337,3 +337,37 @@ index 69d19b8..738563b 100644 -- 2.3.8 (Apple Git-58) + +From eb38e04f41ac341b162cfa0e97aa3ee1ce783777 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Wed, 11 Nov 2015 07:44:44 +0000 +Subject: [PATCH] add 'static' to some inline functions + +Fix https://gist.github.com/starius/71d5f276d62e58f36d2f +See also http://stackoverflow.com/a/8502046 + +diff --git a/include/my_global.h b/include/my_global.h +index 8c3c3cd..3cb24f6 100644 +--- a/include/my_global.h ++++ b/include/my_global.h +@@ -340,7 +340,7 @@ typedef socket_len_t SOCKET_SIZE_TYPE; /* Used by NDB */ + + #if (_WIN32) + #if !defined(_WIN64) +-inline double my_ulonglong2double(unsigned long long value) ++static inline double my_ulonglong2double(unsigned long long value) + { + long long nr=(long long) value; + if (nr >= 0) +@@ -350,7 +350,7 @@ inline double my_ulonglong2double(unsigned long long value) + #define ulonglong2double my_ulonglong2double + #define my_off_t2double my_ulonglong2double + #endif /* _WIN64 */ +-inline unsigned long long my_double2ulonglong(double d) ++static inline unsigned long long my_double2ulonglong(double d) + { + double t= d - (double) 0x8000000000000000ULL; + +-- +2.1.4 + From 9020e9e0e53cd249a96fc48ee801dce6c28c9316 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 12 Nov 2015 17:40:24 +1100 Subject: [PATCH 0021/1463] gcc: cleanup lib installation --- src/gcc.mk | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/src/gcc.mk b/src/gcc.mk index 9ac33c66..be8d5f6c 100644 --- a/src/gcc.mk +++ b/src/gcc.mk @@ -53,11 +53,13 @@ endef define $(PKG)_POST_BUILD # TODO: find a way to configure the installation of these correctly - rm -f $(addprefix $(PREFIX)/$(TARGET)/bin/, c++ g++ gcc gfortran) - -mv '$(PREFIX)/lib/gcc/$(TARGET)/lib/'* '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/' - -mv '$(PREFIX)/lib/gcc/$(TARGET)/'*.dll '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/' - -cp '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/'*.dll '$(PREFIX)/$(TARGET)/bin/' - -cp '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/'*.dll.a '$(PREFIX)/$(TARGET)/lib/' + # ignore rm failure as parallel build may have cleaned up, but + # don't wildcard all libs so future additions will be detected + $(and $(BUILD_SHARED), + mv -v '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/'*.dll '$(PREFIX)/$(TARGET)/bin/gcc-$($(PKG)_VERSION)/' + -rm -v '$(PREFIX)/lib/gcc/$(TARGET)/'libgcc_s*.dll + -rm -v '$(PREFIX)/lib/gcc/$(TARGET)/lib/'libgcc_s*.a + -rmdir '$(PREFIX)/lib/gcc/$(TARGET)/lib/') endef define $(PKG)_BUILD_mingw-w64 @@ -97,6 +99,14 @@ define $(PKG)_BUILD_mingw-w64 $(MAKE) -C '$(1).build' -j '$(JOBS)' $(MAKE) -C '$(1).build' -j 1 install + # shared libgcc isn't installed to version-specific locations + # so install correctly to avoid clobbering with multiple versions + $(and $(BUILD_SHARED), + $(MAKE) -C '$(1).build/$(TARGET)/libgcc' -j 1 \ + toolexecdir='$(PREFIX)/$(TARGET)/bin/gcc-$($(PKG)_VERSION)' \ + SHLIB_SLIBDIR_QUAL= \ + install-shared) + $($(PKG)_POST_BUILD) endef From 9b90e8a6f95fb7c8486bcaace84688d65184f02a Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 14 Nov 2015 14:54:12 +0100 Subject: [PATCH 0022/1463] libpng: update --- src/libpng.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libpng.mk b/src/libpng.mk index 37de5fc2..cd80af77 100644 --- a/src/libpng.mk +++ b/src/libpng.mk @@ -3,8 +3,8 @@ PKG := libpng $(PKG)_IGNORE := -$(PKG)_VERSION := 1.6.18 -$(PKG)_CHECKSUM := 2e10c13b7949883ac961db6177c516d778184432d440317e9f0391305c360963 +$(PKG)_VERSION := 1.6.19 +$(PKG)_CHECKSUM := 311c5657f53516986c67713c946f616483e3cdb52b8b2ee26711be74e8ac35e8 $(PKG)_SUBDIR := libpng-$($(PKG)_VERSION) $(PKG)_FILE := libpng-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/libpng/libpng16/$($(PKG)_VERSION)/$($(PKG)_FILE) From 242138008f80097dba5fb5e67e7b04f77b4b414e Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sat, 14 Nov 2015 13:54:37 +0000 Subject: [PATCH 0023/1463] Update versions.json --- versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.json b/versions.json index 1a5c859b..e2be61dc 100644 --- a/versions.json +++ b/versions.json @@ -181,7 +181,7 @@ "libpano13": "2.9.18", "libpaper": "1.1.24+nmu4", "libplist": "1.12", - "libpng": "1.6.18", + "libpng": "1.6.19", "librsvg": "2.40.5", "librtmp": "a1900c3", "libsamplerate": "0.1.8", From 7875b279d9586a0d2ec4e8fcdc276f8abe1f54e9 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 16 Nov 2015 00:04:59 +1100 Subject: [PATCH 0024/1463] Makefile: don't echo nonetwork.so recipe --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 090caa98..2966dec1 100644 --- a/Makefile +++ b/Makefile @@ -407,8 +407,8 @@ endef $(foreach PKG,$(PKGS),$(eval $(call PKG_RULE,$(PKG)))) $(PREFIX)/lib/nonetwork.so: $(TOP_DIR)/tools/nonetwork.c - mkdir -p $(dir $@) - $(BUILD_CC) -shared -fPIC -o $@ $< + @mkdir -p $(dir $@) + @$(BUILD_CC) -shared -fPIC -o $@ $< define PKG_TARGET_RULE .PHONY: $(1) From be0cb48a88174c28c664e3527773213894f9e173 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 15 Nov 2015 13:18:44 +0000 Subject: [PATCH 0025/1463] dlfcn-win32: build test files Remove the comment about MXE not supporting shared target. --- src/dlfcn-win32.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/dlfcn-win32.mk b/src/dlfcn-win32.mk index ffac1fd0..2daaea5e 100644 --- a/src/dlfcn-win32.mk +++ b/src/dlfcn-win32.mk @@ -25,6 +25,5 @@ define $(PKG)_BUILD --disable-static --enable-shared ) $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install - - # No test avalable temprorarily because MXE doesn't support shared build yet + $(MAKE) -C '$(1)' -j '$(JOBS)' test.exe testdll.dll endef From 7c5cf02139cf5a10fe5a2accb52878be442827f6 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 15 Nov 2015 13:27:36 +0000 Subject: [PATCH 0026/1463] dlfcn-win32: remove /tmp/test.{c,dll} fix #994 --- src/dlfcn-win32-1.fixes.patch | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 src/dlfcn-win32-1.fixes.patch diff --git a/src/dlfcn-win32-1.fixes.patch b/src/dlfcn-win32-1.fixes.patch new file mode 100644 index 00000000..fca8b886 --- /dev/null +++ b/src/dlfcn-win32-1.fixes.patch @@ -0,0 +1,25 @@ +This file is part of MXE. +See index.html for further information. + +From f46d92e319ba2ce4d5fe46e4293a7f7fbb67935e Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Sun, 15 Nov 2015 13:23:50 +0000 +Subject: [PATCH] configure: remove /tmp/test.dll /tmp/test.c + + +diff --git a/configure b/configure +index 91f7d07..e3473fe 100755 +--- a/configure ++++ b/configure +@@ -160,7 +160,7 @@ void function(void) + { LoadLibrary(NULL); } + EOF + echo testing compiler: $cc -shared -o /tmp/test.dll /tmp/test.c +-$cc -shared -o /tmp/test.dll /tmp/test.c ++$cc -shared -o /tmp/test.dll /tmp/test.c && rm /tmp/test.dll /tmp/test.c + + test "$?" != 0 && { + echo "$cc could not create shared file with Windows API functions."; +-- +2.1.4 + From b28501f0315674266082a060e80f419f4590645c Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 15 Nov 2015 14:09:56 +0000 Subject: [PATCH 0027/1463] MXE_GET_GITHUB_TAGS: new argument, stripped prefix --- Makefile | 1 + src/muparser.mk | 3 +-- src/pire.mk | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 2966dec1..1d703148 100644 --- a/Makefile +++ b/Makefile @@ -139,6 +139,7 @@ endef define MXE_GET_GITHUB_TAGS $(WGET) -q -O- 'https://api.github.com/repos/$(strip $(1))/git/refs/tags/' \ | $(SED) -n 's#.*"ref": "refs/tags/\([^"]*\).*#\1#p' \ + | $(SED) 's,^$(strip $(2)),,g' \ | $(SORT) -V \ | tail -1 endef diff --git a/src/muparser.mk b/src/muparser.mk index 3783074c..ecfe1272 100644 --- a/src/muparser.mk +++ b/src/muparser.mk @@ -11,8 +11,7 @@ $(PKG)_URL := https://github.com/beltoforion/$(PKG)/archive/v$($(PKG)_VERSI $(PKG)_DEPS := gcc define $(PKG)_UPDATE - $(call MXE_GET_GITHUB_TAGS, beltoforion/muparser) | \ - $(SED) 's,^v,,g' + $(call MXE_GET_GITHUB_TAGS, beltoforion/muparser, v) endef define $(PKG)_BUILD diff --git a/src/pire.mk b/src/pire.mk index a9b8dfcc..49b87a26 100644 --- a/src/pire.mk +++ b/src/pire.mk @@ -11,8 +11,7 @@ $(PKG)_URL := https://github.com/yandex/pire/archive/release-$($(PKG)_VERSI $(PKG)_DEPS := gcc define $(PKG)_UPDATE - $(call MXE_GET_GITHUB_TAGS, yandex/pire) | \ - $(SED) 's,^release-,,g' + $(call MXE_GET_GITHUB_TAGS, yandex/pire, release-) endef define $(PKG)_BUILD From fa46375662c896d47325a6dc6f7066996cb5e957 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 15 Nov 2015 19:04:11 +0300 Subject: [PATCH 0028/1463] [style] remove empty line between related commands --- src/mxe-conf.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/src/mxe-conf.mk b/src/mxe-conf.mk index 558d3070..6a746d80 100644 --- a/src/mxe-conf.mk +++ b/src/mxe-conf.mk @@ -72,7 +72,6 @@ define $(PKG)_BUILD echo 'Description: OpenGL'; \ echo 'Libs: -lopengl32';) \ > '$(PREFIX)/$(TARGET)/lib/pkgconfig/gl.pc' - (echo 'Name: glu'; \ echo 'Version: 0'; \ echo 'Description: OpenGL'; \ From 047efe0f21eb7dd48ed28d4b56cecca669c417fd Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 15 Nov 2015 19:05:18 +0300 Subject: [PATCH 0029/1463] mxe-conf: create readonly dir in _BUILD_$(BUILD) This directory (WINEPREFIX=$(PREFIX)/readonly) is not target specific. It is created once instead of being created for each target. --- src/mxe-conf.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mxe-conf.mk b/src/mxe-conf.mk index 6a746d80..77e28e34 100644 --- a/src/mxe-conf.mk +++ b/src/mxe-conf.mk @@ -62,9 +62,6 @@ define $(PKG)_BUILD > '$(PREFIX)/bin/$(TARGET)-cmake' chmod 0755 '$(PREFIX)/bin/$(TARGET)-cmake' - #create readonly directory to force wine to fail - $(INSTALL) -m444 -d "$$WINEPREFIX" - # create pkg-config files for OpenGL/GLU $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig' (echo 'Name: gl'; \ @@ -100,4 +97,7 @@ define $(PKG)_BUILD_$(BUILD) > '$(1)/configure.ac' cd '$(1)' && autoreconf -fiv cd '$(1)' && ./configure + + #create readonly directory to force wine to fail + $(INSTALL) -m444 -d "$$WINEPREFIX" endef From f49967131808d2066b162c5033271e79d06e0bdc Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 15 Nov 2015 19:07:38 +0300 Subject: [PATCH 0030/1463] mxe-conf: create always failing wine dummy Now dlfcn-win32 can't detect wine. From log/dlfcn-win32_i686-w64-mingw32.static: static: yes shared: no wine: Previously wine was set to "yes wine". fix #995 --- src/mxe-conf.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/mxe-conf.mk b/src/mxe-conf.mk index 77e28e34..9adc6856 100644 --- a/src/mxe-conf.mk +++ b/src/mxe-conf.mk @@ -100,4 +100,12 @@ define $(PKG)_BUILD_$(BUILD) #create readonly directory to force wine to fail $(INSTALL) -m444 -d "$$WINEPREFIX" + + #create script "wine" in a directory which is in PATH + mkdir -p '$(PREFIX)/$(BUILD)/bin/' + (echo '#!/usr/bin/env bash'; \ + echo 'exit 1'; \ + ) \ + > '$(PREFIX)/$(BUILD)/bin/wine' + chmod 0755 '$(PREFIX)/$(BUILD)/bin/wine' endef From 51f6aef1f79e24e9042c34f71929b7b1703c7642 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 16 Nov 2015 13:33:02 +1100 Subject: [PATCH 0031/1463] update requirement versions fixes #978 --- Makefile | 2 +- index.html | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 2966dec1..adaf5dce 100644 --- a/Makefile +++ b/Makefile @@ -311,7 +311,7 @@ check-requirements: $(PREFIX)/installed/check-requirements $(PREFIX)/installed/check-requirements: $(MAKEFILE) @echo '[check requirements]' $(foreach REQUIREMENT,$(REQUIREMENTS),$(call CHECK_REQUIREMENT,$(REQUIREMENT))) - $(call CHECK_REQUIREMENT_VERSION,autoconf,2\.6[7-9]\|2\.[7-9][0-9]) + $(call CHECK_REQUIREMENT_VERSION,autoconf,2\.6[8-9]\|2\.[7-9][0-9]) $(call CHECK_REQUIREMENT_VERSION,automake,1\.11\.[3-9]\|1\.[1-9][2-9]\(\.[0-9]\+\)\?) @if [ -e check-requirements-failed ]; then \ echo; \ diff --git a/index.html b/index.html index d76712c9..dcac198e 100644 --- a/index.html +++ b/index.html @@ -494,7 +494,7 @@ USE_OSGPLUGIN(<plugin2>) - + @@ -524,6 +524,10 @@ USE_OSGPLUGIN(<plugin2>) + + + + @@ -566,7 +570,7 @@ USE_OSGPLUGIN(<plugin2>) - + @@ -613,8 +617,8 @@ USE_OSGPLUGIN(<plugin2>) - - + +
    Autoconf≥ 2.67≥ 2.68
    AutomakeGCC (gcc, g++)
    gdk-pixbuf
    Git ≥ 1.7
    OpenSSL-dev≥ 1.01
    p7zip (7-Zip)
    gdk-pixbufzlib≥ 1.20
    From 5f26c231eab428b7d302c35113cb5b221937916f Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 16 Nov 2015 20:45:11 +1100 Subject: [PATCH 0032/1463] build-pkg: round argument of os.date fixes #1001 --- tools/build-pkg.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index 04c0d0d7..eaacb93c 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -571,7 +571,7 @@ local function progressPrinter(items) local spent = now - started_at local predicted_duration = spent * total_time / time_done local predicted_end = started_at + predicted_duration - local predicted_end_str = os.date("%c", predicted_end) + local predicted_end_str = os.date("%c", math.floor(predicted_end + 0.5)) local predicted_wait = predicted_end - now local predicted_wait_hours = predicted_wait / 3600.0 return PROGRESS:format(pkgs_done, #items, From c62bcdbee56e87c81f1faa105b8777a5879d4e2e Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Tue, 17 Nov 2015 10:36:08 +0000 Subject: [PATCH 0033/1463] Update versions.json --- versions.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/versions.json b/versions.json index e2be61dc..82ec5d30 100644 --- a/versions.json +++ b/versions.json @@ -31,6 +31,7 @@ "chipmunk": "6.2.2", "chromaprint": "1.1", "cimg": "1.6.3", + "cloog": "0.18.1", "cmake": "3.0.2", "cminpack": "1.3.4", "coreutils": "8.23", @@ -64,7 +65,7 @@ "fribidi": "0.19.6", "ftgl": "2.1.3~rc5", "gc": "7.2e", - "gcc": "5.2.0", + "gcc": "4.9.3", "gd": "2.1.0", "gdal": "1.11.2", "gdb": "7.9.1", @@ -108,7 +109,7 @@ "ilmbase": "2.2.0", "imagemagick": "6.9.0-0", "intltool": "0.50.2", - "isl": "0.14", + "isl": "0.12.2", "itk": "4.4.1", "jack": "1.9.10", "jansson": "2.7", From 1118024f45c5e274bc1a82d0b14f25293302b809 Mon Sep 17 00:00:00 2001 From: Christoph Weiss Date: Tue, 3 Nov 2015 14:16:31 +0100 Subject: [PATCH 0034/1463] Add Coin3D 3.1.3 (https://bitbucket.org/Coin3D/coin/wiki/Home) --- index.html | 4 ++ src/coin-1-fixes.patch | 153 +++++++++++++++++++++++++++++++++++++++++ src/coin-test.cpp | 24 +++++++ src/coin.mk | 46 +++++++++++++ 4 files changed, 227 insertions(+) create mode 100644 src/coin-1-fixes.patch create mode 100644 src/coin-test.cpp create mode 100644 src/coin.mk diff --git a/index.html b/index.html index 0541cfe4..ebd9f288 100644 --- a/index.html +++ b/index.html @@ -1174,6 +1174,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) cminpack cminpack + + coin + Coin3D + coreutils GNU Core Utilities diff --git a/src/coin-1-fixes.patch b/src/coin-1-fixes.patch new file mode 100644 index 00000000..cb5ced13 --- /dev/null +++ b/src/coin-1-fixes.patch @@ -0,0 +1,153 @@ +This file is part of MXE. +See index.html for further information. + +This patch has been taken from: https://bitbucket.org/msys2/coin/commits/69e9990b05cee506f5fa16c6edad02a7808bc610/raw/ + +It was modified to work with Coin 3.1.3. +(The order of the template arguments of SbHash was switched.) + +diff --git a/include/Inventor/C/glue/spidermonkey.h b/include/Inventor/C/glue/spidermonkey.h +--- a/include/Inventor/C/glue/spidermonkey.h ++++ b/include/Inventor/C/glue/spidermonkey.h +@@ -56,7 +56,7 @@ + Structs and defines. + */ + typedef int JSBool; +-typedef long jsword; ++typedef intmax_t jsword; + typedef jsword jsval; + typedef jsword jsid; + typedef int intN; +diff --git a/src/foreignfiles/SoSTLFileKit.cpp b/src/foreignfiles/SoSTLFileKit.cpp +--- a/src/foreignfiles/SoSTLFileKit.cpp ++++ b/src/foreignfiles/SoSTLFileKit.cpp +@@ -566,14 +566,14 @@ + SO_GET_ANY_PART(this, "facets", SoIndexedFaceSet); + + // find existing indexes if any +- long v1idx = PRIVATE(this)->points->findPoint(v1), v1new = (v1idx == -1); +- long v2idx = PRIVATE(this)->points->findPoint(v2), v2new = (v2idx == -1); +- long v3idx = PRIVATE(this)->points->findPoint(v3), v3new = (v3idx == -1); +- if (!v1new) { v1idx = (long) PRIVATE(this)->points->getUserData(v1idx); } +- if (!v2new) { v2idx = (long) PRIVATE(this)->points->getUserData(v2idx); } +- if (!v3new) { v3idx = (long) PRIVATE(this)->points->getUserData(v3idx); } +- long nidx = PRIVATE(this)->normals->findPoint(n); +- if (nidx != -1) { nidx = (long) PRIVATE(this)->normals->getUserData(nidx); } ++ intmax_t v1idx = PRIVATE(this)->points->findPoint(v1), v1new = (v1idx == -1); ++ intmax_t v2idx = PRIVATE(this)->points->findPoint(v2), v2new = (v2idx == -1); ++ intmax_t v3idx = PRIVATE(this)->points->findPoint(v3), v3new = (v3idx == -1); ++ if (!v1new) { v1idx = (intmax_t) PRIVATE(this)->points->getUserData(v1idx); } ++ if (!v2new) { v2idx = (intmax_t) PRIVATE(this)->points->getUserData(v2idx); } ++ if (!v3new) { v3idx = (intmax_t) PRIVATE(this)->points->getUserData(v3idx); } ++ intmax_t nidx = PRIVATE(this)->normals->findPoint(n); ++ if (nidx != -1) { nidx = (intmax_t) PRIVATE(this)->normals->getUserData(nidx); } + + // toss out invalid facets - facets where two or more points are in + // the same location. what are these - are they lines and points or +diff --git a/src/threads/thread.cpp b/src/threads/thread.cpp +--- a/src/threads/thread.cpp ++++ b/src/threads/thread.cpp +@@ -130,7 +130,7 @@ + void + cc_sleep(float seconds) + { +-#ifndef _WIN32 ++#if !defined(_WIN32) || defined(__MINGW32__) + /* FIXME: 20011107, thammer: create a configure macro to detect + * which sleep function is available */ + sleep(floor(seconds)); +@@ -164,7 +164,7 @@ + assert(0 && "unexpected failure"); + } + } +- return (unsigned long) val; ++ return static_cast(reinterpret_cast(val)); + } + + static void +diff --git a/src/threads/thread_win32.icc b/src/threads/thread_win32.icc +--- a/src/threads/thread_win32.icc ++++ b/src/threads/thread_win32.icc +@@ -38,7 +38,7 @@ + cc_w32thread_thread_proc(LPVOID lpParameter) + { + cc_thread *thread = (cc_thread *)lpParameter; +- return (DWORD) thread->func(thread->closure); ++ return static_cast(reinterpret_cast(thread->func(thread->closure))); + } + + static int +diff --git a/src/vrml97/JS_VRMLClasses.cpp b/src/vrml97/JS_VRMLClasses.cpp +--- a/src/vrml97/JS_VRMLClasses.cpp ++++ b/src/vrml97/JS_VRMLClasses.cpp +@@ -110,8 +110,11 @@ + struct CoinVrmlJs_SensorInfo { + SbList objects; + }; ++#if defined(_WIN64) ++SbHash * CoinVrmlJs_sensorinfohash = NULL; ++#else + SbHash * CoinVrmlJs_sensorinfohash = NULL; +- ++#endif + + const char * CoinVrmlJs_SFColorAliases[] = {"r", "g", "b"}; + const char * CoinVrmlJs_SFRotationAliases[] = {"x", "y", "z", "angle"}; +@@ -674,7 +677,11 @@ + { + SoNode * node = ((SoNodeSensor *) sensor)->getAttachedNode(); + void * tmp; ++#if defined(_WIN64) ++ if(!CoinVrmlJs_sensorinfohash->get((unsigned long long) node, tmp)) { ++#else + if(!CoinVrmlJs_sensorinfohash->get((unsigned long) node, tmp)) { ++#endif + assert(FALSE && "Trying to delete an unregistered SoNodeSensor. Internal error."); + return; + } +@@ -690,7 +697,11 @@ + + // Store the sensor-pointer so that it can be properly deleted later + nodesensorstobedeleted->append((SoNodeSensor *) sensor); ++#if defined(_WIN64) ++ CoinVrmlJs_sensorinfohash->remove((unsigned long long) node); ++#else + CoinVrmlJs_sensorinfohash->remove((unsigned long) node); ++#endif + delete si; + } + +@@ -1428,13 +1439,21 @@ + { + // Has the hash-table been initialized? + if (!CoinVrmlJs_sensorinfohash) { ++#if defined(_WIN64) ++ CoinVrmlJs_sensorinfohash = new SbHash ; ++#else + CoinVrmlJs_sensorinfohash = new SbHash ; ++#endif + coin_atexit(deleteSensorInfoHash, CC_ATEXIT_NORMAL); + } + + // Is a sensor already attached to this SoNode? + void * tmp; ++#if defined(_WIN64) ++ if (CoinVrmlJs_sensorinfohash->get((unsigned long long) node, tmp)) { ++#else + if (CoinVrmlJs_sensorinfohash->get((unsigned long) node, tmp)) { ++#endif + CoinVrmlJs_SensorInfo * si = (CoinVrmlJs_SensorInfo *) tmp; + si->objects.append(obj); + } +@@ -1444,7 +1463,11 @@ + ns->attach(node); + CoinVrmlJs_SensorInfo * si = new CoinVrmlJs_SensorInfo; + si->objects.append(obj); ++#if defined(_WIN64) ++ CoinVrmlJs_sensorinfohash->put((unsigned long long) node, si); ++#else + CoinVrmlJs_sensorinfohash->put((unsigned long) node, si); ++#endif + } + } + diff --git a/src/coin-test.cpp b/src/coin-test.cpp new file mode 100644 index 00000000..0974407e --- /dev/null +++ b/src/coin-test.cpp @@ -0,0 +1,24 @@ +/* + * This file is part of MXE. + * See index.html for further information. + */ + +#include +#include +#include +#include +#include +#include + +int main() +{ + SoSeparator *root = new SoSeparator; + SoPerspectiveCamera *myCamera = new SoPerspectiveCamera; + SoMaterial *myMaterial = new SoMaterial; + root->ref(); + root->addChild(myCamera); + root->addChild(new SoDirectionalLight); + myMaterial->diffuseColor.setValue(1.0, 0.0, 0.0); + root->addChild(myMaterial); + root->addChild(new SoCone); +} diff --git a/src/coin.mk b/src/coin.mk new file mode 100644 index 00000000..c903777e --- /dev/null +++ b/src/coin.mk @@ -0,0 +1,46 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := coin +$(PKG)_IGNORE := +$(PKG)_VERSION := 3.1.3 +$(PKG)_CHECKSUM := 583478c581317862aa03a19f14c527c3888478a06284b9a46a0155fa5886d417 +$(PKG)_SUBDIR := Coin-$($(PKG)_VERSION) +$(PKG)_FILE := Coin-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://bitbucket.org/Coin3D/coin/downloads/$($(PKG)_FILE) +$(PKG)_DEPS := gcc + +define $(PKG)_UPDATE + $(WGET) -q -O- 'https://bitbucket.org/Coin3D/coin/downloads' | \ + $(SED) -n 's,.*Coin-\([0-9.]*\).tar.gz.*,\1,p' | \ + $(SORT) -V | \ + $(TAIL) -n1 +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + $(MXE_CONFIGURE_OPTS) \ + --disable-debug \ + --disable-symbols \ + --enable-compact \ + --without-openal \ + --without-fontconfig \ + --without-spidermonkey \ + --without-freetype \ + --without-zlib \ + --without-bzip2 \ + --without-x \ + $(if $(BUILD_STATIC), \ + --enable-static=yes --enable-shared=no, \ + --enable-static=no --enable-shared=yes) + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install + '$(TARGET)-g++' \ + -W -Wall -pedantic '$(2).cpp' \ + $(if $(BUILD_STATIC), \ + -DCOIN_NOT_DLL, \ + -DCOIN_DLL) \ + -o '$(PREFIX)/$(TARGET)/bin/test-coin.exe' \ + `'$(PREFIX)/$(TARGET)/bin/coin-config' --libs` \ + -I`'$(PREFIX)/$(TARGET)/bin/coin-config' --includedir` +endef From 19c405a5795a22f9cc9dfecde63e925f63a913cd Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 18 Nov 2015 18:54:42 +1100 Subject: [PATCH 0035/1463] coin: fix shared build and use pkg-config for test --- src/coin.mk | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/coin.mk b/src/coin.mk index c903777e..f9b760c4 100644 --- a/src/coin.mk +++ b/src/coin.mk @@ -30,17 +30,16 @@ define $(PKG)_BUILD --without-zlib \ --without-bzip2 \ --without-x \ - $(if $(BUILD_STATIC), \ - --enable-static=yes --enable-shared=no, \ - --enable-static=no --enable-shared=yes) + COIN_STATIC=$(if $(BUILD_STATIC),true,false) + + # libtool misses some dependency libs and there's no lt_cv* etc. options + $(SED) -i 's,^postdeps="-,postdeps="-lopengl32 -lgdi32 -lwinmm -,g' '$(1)/libtool' + $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install + '$(TARGET)-g++' \ - -W -Wall -pedantic '$(2).cpp' \ - $(if $(BUILD_STATIC), \ - -DCOIN_NOT_DLL, \ - -DCOIN_DLL) \ - -o '$(PREFIX)/$(TARGET)/bin/test-coin.exe' \ - `'$(PREFIX)/$(TARGET)/bin/coin-config' --libs` \ - -I`'$(PREFIX)/$(TARGET)/bin/coin-config' --includedir` + -W -Wall -pedantic \ + '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-coin.exe' \ + `'$(TARGET)-pkg-config' Coin --cflags --libs` endef From 060a29cc883c0ab1b41749005348c9f0366f1d66 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Wed, 18 Nov 2015 08:31:55 +0000 Subject: [PATCH 0036/1463] Update versions.json --- versions.json | 1 + 1 file changed, 1 insertion(+) diff --git a/versions.json b/versions.json index 82ec5d30..5102a7dd 100644 --- a/versions.json +++ b/versions.json @@ -34,6 +34,7 @@ "cloog": "0.18.1", "cmake": "3.0.2", "cminpack": "1.3.4", + "coin": "3.1.3", "coreutils": "8.23", "cppunit": "1.13.2", "crystalhd": "1", From a3bd06e847ceed74e22a3e590c656fdb70145a82 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 18 Nov 2015 09:30:25 +0100 Subject: [PATCH 0037/1463] dbus: update --- src/dbus.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dbus.mk b/src/dbus.mk index 105da1e0..158d0a31 100644 --- a/src/dbus.mk +++ b/src/dbus.mk @@ -3,8 +3,8 @@ PKG := dbus $(PKG)_IGNORE := -$(PKG)_VERSION := 1.10.2 -$(PKG)_CHECKSUM := aef3f49595df09b0824433ee993cda748ede93693a719a831562ae1616b6bb9e +$(PKG)_VERSION := 1.10.4 +$(PKG)_CHECKSUM := ad7dcad73ad9b0ff55819985d354eacfffe07e2eb8c763e155efc21d6001084b $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://$(PKG).freedesktop.org/releases/$(PKG)/$($(PKG)_FILE) From c823457b228036ec1d6e3a7342a764ba772a77cb Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Wed, 18 Nov 2015 08:48:31 +0000 Subject: [PATCH 0038/1463] Update versions.json --- versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.json b/versions.json index 5102a7dd..8d1724fe 100644 --- a/versions.json +++ b/versions.json @@ -41,7 +41,7 @@ "cunit": "2.1-3", "curl": "7.45.0", "db": "6.1.26", - "dbus": "1.10.2", + "dbus": "1.10.4", "dcmtk": "3.6.0", "devil": "1.7.8", "dlfcn-win32": "1.0.0", From 0438b8627cc0a5d55dcfeab0d17fff2308bc6eda Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Thu, 19 Nov 2015 09:39:39 +0300 Subject: [PATCH 0039/1463] suppress git commit error in Travis See #924 See https://travis-ci.org/mxe/mxe/builds/91781012#L99 --- tools/travis-push.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/travis-push.sh b/tools/travis-push.sh index e7aef3b3..8aa02c06 100755 --- a/tools/travis-push.sh +++ b/tools/travis-push.sh @@ -8,6 +8,6 @@ git config --global push.default simple git config credential.helper "store --file=.git/credentials" echo "https://${GH_TOKEN}:@github.com" > .git/credentials git remote set-url origin 'https://github.com/mxe/mxe.git' -git commit -a -m 'Update versions.json' +git commit -a -m 'Update versions.json' || true git push origin HEAD:master git push origin HEAD:gh-pages From 2c4bdf6e7c952ed37cb5ad50a97e65f6f90d238e Mon Sep 17 00:00:00 2001 From: Christoph Weiss Date: Thu, 19 Nov 2015 10:05:17 +0100 Subject: [PATCH 0040/1463] Coin3D: do not disable features by default --- src/coin.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/coin.mk b/src/coin.mk index f9b760c4..d7f52b85 100644 --- a/src/coin.mk +++ b/src/coin.mk @@ -23,12 +23,6 @@ define $(PKG)_BUILD --disable-debug \ --disable-symbols \ --enable-compact \ - --without-openal \ - --without-fontconfig \ - --without-spidermonkey \ - --without-freetype \ - --without-zlib \ - --without-bzip2 \ --without-x \ COIN_STATIC=$(if $(BUILD_STATIC),true,false) From d0d26186dc799b9f7d2bec0bd4a0e7f19ebaf3e2 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 21 Nov 2015 02:14:26 +0100 Subject: [PATCH 0041/1463] harfbuzz, vmime: update --- src/harfbuzz.mk | 4 ++-- src/vmime.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/harfbuzz.mk b/src/harfbuzz.mk index f5b3bcc8..b655ca44 100644 --- a/src/harfbuzz.mk +++ b/src/harfbuzz.mk @@ -3,8 +3,8 @@ PKG := harfbuzz $(PKG)_IGNORE := -$(PKG)_VERSION := 1.0.6 -$(PKG)_CHECKSUM := f616a7fbdc78a627043f9029000bf08c0c71df59cde4143fc92a014f6a993b26 +$(PKG)_VERSION := 1.1.0 +$(PKG)_CHECKSUM := 0f584a5947e60ede565e7a4e122baa5e4b17a62eab872abf5f73d8552ceb716b $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://www.freedesktop.org/software/$(PKG)/release/$($(PKG)_FILE) diff --git a/src/vmime.mk b/src/vmime.mk index 247dc68e..0eb7b362 100644 --- a/src/vmime.mk +++ b/src/vmime.mk @@ -3,8 +3,8 @@ PKG := vmime $(PKG)_IGNORE := -$(PKG)_VERSION := 7e36a74 -$(PKG)_CHECKSUM := 4b73f0f30e37f9134fb5157aca3576ca29036262d379aaffcce3a443a2f271ee +$(PKG)_VERSION := b0c8d21 +$(PKG)_CHECKSUM := b436d2dd7c5c2b6948db3d8cbaa0f0868e0550808446c9a9bb131b54738b2bab $(PKG)_SUBDIR := kisli-vmime-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/kisli/vmime/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE) From 54c8dffbc60df9b9e6ce00aa0cd9e33e0908ea57 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sat, 21 Nov 2015 01:15:38 +0000 Subject: [PATCH 0042/1463] Update versions.json --- versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions.json b/versions.json index 8d1724fe..b4921f58 100644 --- a/versions.json +++ b/versions.json @@ -101,7 +101,7 @@ "gtksourceview": "2.10.5", "gtksourceviewmm2": "2.10.3", "guile": "1.8.8", - "harfbuzz": "1.0.6", + "harfbuzz": "1.1.0", "hdf4": "4.2.10", "hdf5": "1.8.12", "hunspell": "1.3.3", @@ -364,7 +364,7 @@ "vcdimager": "0.7.24", "vidstab": "0.98b", "vigra": "1.9.0", - "vmime": "7e36a74", + "vmime": "b0c8d21", "vo-aacenc": "0.1.3", "vo-amrwbenc": "0.1.3", "vorbis": "1.3.5", From 9d7a8741a2fc06aab0926e1a05a1086597a25d63 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 21 Nov 2015 13:35:53 +1100 Subject: [PATCH 0043/1463] aspell: fix shared build for missing libtool deps fixes #989 --- src/aspell.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/aspell.mk b/src/aspell.mk index 1a6cb342..6e17adef 100644 --- a/src/aspell.mk +++ b/src/aspell.mk @@ -22,5 +22,10 @@ define $(PKG)_BUILD --enable-win32-relocatable \ --disable-curses \ --disable-nls + + # libtool misses some dependency libs and there's no lt_cv* etc. options + $(if $(BUILD_SHARED),\ + $(SED) -i 's#^postdeps="-#postdeps="-lpthread -#g' '$(1)/libtool') + $(MAKE) -C '$(1)' -j '$(JOBS)' install endef From 9c000cf49c3b5dfa784a84266d30df970b832908 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 21 Nov 2015 13:55:08 +1100 Subject: [PATCH 0044/1463] cleanup style --- src/gtk3-test.c | 2 +- src/widl.mk | 2 +- tools/travis-push.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gtk3-test.c b/src/gtk3-test.c index 74420343..3241fa43 100644 --- a/src/gtk3-test.c +++ b/src/gtk3-test.c @@ -14,7 +14,7 @@ static void activate(GtkApplication *app) button = gtk_button_new_with_label("Hello World"); g_signal_connect_swapped(button, "clicked", - G_CALLBACK(gtk_widget_destroy), window); + G_CALLBACK(gtk_widget_destroy), window); gtk_container_add(GTK_CONTAINER(window), button); gtk_widget_show_all(window); diff --git a/src/widl.mk b/src/widl.mk index 1c7375b1..c0ef1fa0 100644 --- a/src/widl.mk +++ b/src/widl.mk @@ -24,7 +24,7 @@ define $(PKG)_BUILD --prefix='$(PREFIX)' \ --target='$(TARGET)' $(MAKE) -C '$(1)/mingw-w64-tools/widl' -j '$(JOBS)' install - + # create cmake file echo 'set(CMAKE_WIDL $(PREFIX)/bin/$(TARGET)-$(PKG) CACHE PATH "widl executable")' \ > '$(CMAKE_TOOLCHAIN_DIR)/$(PKG).cmake' diff --git a/tools/travis-push.sh b/tools/travis-push.sh index 8aa02c06..998ddaee 100755 --- a/tools/travis-push.sh +++ b/tools/travis-push.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -ue From e8d882a99ea75d06a66a71da1db6bebbcdffb79f Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 21 Nov 2015 14:01:53 +1100 Subject: [PATCH 0045/1463] muparser: enable shared build --- src/muparser.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/muparser.mk b/src/muparser.mk index ecfe1272..747cc312 100644 --- a/src/muparser.mk +++ b/src/muparser.mk @@ -16,12 +16,8 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(MXE_CONFIGURE_OPTS) \ --disable-samples \ --disable-debug $(MAKE) -C '$(1)' -j '$(JOBS)' install endef - -$(PKG)_BUILD_SHARED = From bde17e08386c547bd026f32eada7896e70dafc33 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 21 Nov 2015 14:13:47 +1100 Subject: [PATCH 0046/1463] librtmp: update --- src/librtmp.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/librtmp.mk b/src/librtmp.mk index e7b1a35d..9f50d57c 100644 --- a/src/librtmp.mk +++ b/src/librtmp.mk @@ -3,8 +3,8 @@ PKG := librtmp $(PKG)_IGNORE := -$(PKG)_VERSION := a1900c3 -$(PKG)_CHECKSUM := fa4edd83cb6ed19d97f89a6d83aef6231c1bd8079aea5d33c083f827459a9ab2 +$(PKG)_VERSION := a107cef +$(PKG)_CHECKSUM := aea53f2a2c6596c93eeb288d97266e89a97b31795b678daccedc31d70dad28c4 $(PKG)_SUBDIR := mirror-rtmpdump-$($(PKG)_VERSION) $(PKG)_FILE := rtmpdump-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/mirror/rtmpdump/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE) From 061b6592dbd1bbfbcd96a38515117ebe8e572433 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sat, 21 Nov 2015 03:14:17 +0000 Subject: [PATCH 0047/1463] Update versions.json --- versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.json b/versions.json index b4921f58..70a751c4 100644 --- a/versions.json +++ b/versions.json @@ -185,7 +185,7 @@ "libplist": "1.12", "libpng": "1.6.19", "librsvg": "2.40.5", - "librtmp": "a1900c3", + "librtmp": "a107cef", "libsamplerate": "0.1.8", "libshout": "2.3.1", "libsigc++": "2.4.0", From 3465e4db8a5004569c0bfe9f58b82a3c34234eb0 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 21 Nov 2015 15:50:47 +1100 Subject: [PATCH 0048/1463] muparser: fix-dll-install-directory --- src/muparser-1-fixes.patch | 47 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 src/muparser-1-fixes.patch diff --git a/src/muparser-1-fixes.patch b/src/muparser-1-fixes.patch new file mode 100644 index 00000000..6a391607 --- /dev/null +++ b/src/muparser-1-fixes.patch @@ -0,0 +1,47 @@ +This file is part of MXE. +See index.html for further information. + +Taken from: +https://github.com/beltoforion/muparser/pull/17 + +From d70b948b5ef9c854ed253f01303480b85a7bd8bd Mon Sep 17 00:00:00 2001 +From: Tony Theodore +Date: Sat, 21 Nov 2015 15:38:02 +1100 +Subject: [PATCH] fix dll install directory + +--- + Makefile.in | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index 157be77..005ada6 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -29,6 +29,7 @@ BK_DEPS = @BK_DEPS@ + srcdir = @srcdir@ + top_builddir = @top_builddir@ + libdir = @libdir@ ++dlldir = @dlldir@ + DLLPREFIX = @DLLPREFIX@ + LIBS = @LIBS@ + AR = @AR@ +@@ -266,13 +267,14 @@ distclean: clean + + @COND_SHARED_1@install_muParser_dll: $(__muParser_dll___depname) + @COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(libdir) ++@COND_SHARED_1@ $(INSTALL_DIR) $(DESTDIR)$(dlldir) + @COND_SHARED_1@ $(INSTALL_DATA) $(top_builddir)/lib/$(LIBPREFIX)muparser$(DEBUG_BUILD_POSTFIX).$(DLLIMP_SUFFIX) $(DESTDIR)$(libdir) +-@COND_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)/lib/$(DLLPREFIX)muparser$(DEBUG_BUILD_POSTFIX)$(__muParser_dll___targetsuf3) $(DESTDIR)$(libdir) ++@COND_SHARED_1@ $(INSTALL_PROGRAM) $(top_builddir)/lib/$(DLLPREFIX)muparser$(DEBUG_BUILD_POSTFIX)$(__muParser_dll___targetsuf3) $(DESTDIR)$(dlldir) + @COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__muParser_dll___so_symlinks_inst_cmd)) + + @COND_SHARED_1@uninstall_muParser_dll: + @COND_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(LIBPREFIX)muparser$(DEBUG_BUILD_POSTFIX).$(DLLIMP_SUFFIX) +-@COND_SHARED_1@ rm -f $(DESTDIR)$(libdir)/$(DLLPREFIX)muparser$(DEBUG_BUILD_POSTFIX)$(__muParser_dll___targetsuf3) ++@COND_SHARED_1@ rm -f $(DESTDIR)$(dlldir)/$(DLLPREFIX)muparser$(DEBUG_BUILD_POSTFIX)$(__muParser_dll___targetsuf3) + @COND_SHARED_1@ (cd $(DESTDIR)$(libdir) ; $(__muParser_dll___so_symlinks_uninst_cmd)) + + @COND_SHARED_1@install_muParser_dll_headers: +-- +2.4.9 (Apple Git-60) + From f939f4a9b785277a24556584d302aa251e9e932c Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 21 Nov 2015 16:26:30 +1100 Subject: [PATCH 0049/1463] add package muparserx --- index.html | 6 +++++- src/muparserx-test.cpp | 48 ++++++++++++++++++++++++++++++++++++++++++ src/muparserx.mk | 26 +++++++++++++++++++++++ 3 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 src/muparserx-test.cpp create mode 100644 src/muparserx.mk diff --git a/index.html b/index.html index ebd9f288..4ccf9dc8 100644 --- a/index.html +++ b/index.html @@ -1920,7 +1920,11 @@ local-pkg-list: $(LOCAL_PKG_LIST) muparser - muParser + muParser + + + muparserx + muParserX mxml diff --git a/src/muparserx-test.cpp b/src/muparserx-test.cpp new file mode 100644 index 00000000..ebc67702 --- /dev/null +++ b/src/muparserx-test.cpp @@ -0,0 +1,48 @@ +/* + * This file is part of MXE. + * See index.html for further information. + * + * based on: + * http://articles.beltoforion.de/article.php?a=muparserx&hl=en&p=using&s=idInclude#idEval + */ + +#include "mpParser.h" + +using namespace mup; + +int main(int argc, char *argv[]) +{ + (void)argc; + (void)argv; + + // Create the parser instance + ParserX p; + + // Create an array of mixed type + Value arr(3, 0); + arr.At(0) = 2.0; + arr.At(1) = "this is a string"; + + // Create some basic values + Value cVal(cmplx_type(1, 1)); + Value sVal("Hello World"); + Value fVal(1.1); + + // Now add the variable to muParser + p.DefineVar("va", Variable(&arr)); + p.DefineVar("a", Variable(&cVal)); + p.DefineVar("b", Variable(&sVal)); + p.DefineVar("c", Variable(&fVal)); + + p.SetExpr("va[0]+a*strlen(b)-c"); + for (int i=0; i<<10; ++i) + { + // evaluate the expression and change the value of + // the variable c in each turn + cVal = 1.1 * i; + Value result = p.Eval(); + + // print the result + console() << result << "\n"; + } +} diff --git a/src/muparserx.mk b/src/muparserx.mk new file mode 100644 index 00000000..34f22b1f --- /dev/null +++ b/src/muparserx.mk @@ -0,0 +1,26 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := muparserx +$(PKG)_IGNORE := +$(PKG)_VERSION := 4.0.4 +$(PKG)_CHECKSUM := d7ebcab8cb1de88e6dcba21651db8f6055b3e904c45afc387b06b5f4218dda40 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz +$(PKG)_URL := https://github.com/beltoforion/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz +$(PKG)_DEPS := gcc + +define $(PKG)_UPDATE + $(call MXE_GET_GITHUB_TAGS, beltoforion/muparserx, v) +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(TARGET)-cmake' \ + -DBUILD_EXAMPLES=OFF + $(MAKE) -C '$(1)' -j '$(JOBS)' install + + '$(TARGET)-g++' \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \ + `'$(TARGET)-pkg-config' $(PKG) --cflags --libs` +endef From 2350956bbe9f14b685b25a36249c1958541e6318 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sat, 21 Nov 2015 05:26:54 +0000 Subject: [PATCH 0050/1463] Update versions.json --- versions.json | 1 + 1 file changed, 1 insertion(+) diff --git a/versions.json b/versions.json index 70a751c4..84ce2639 100644 --- a/versions.json +++ b/versions.json @@ -222,6 +222,7 @@ "mpfr": "3.1.3", "mpg123": "1.21.0", "muparser": "2.2.5", + "muparserx": "4.0.4", "mxml": "2.9", "ncurses": "e14300b", "netcdf": "4.3.0", From 7aa0098dbd56c92de904ba436695f1316f1ac787 Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Sat, 21 Nov 2015 10:54:57 -0500 Subject: [PATCH 0051/1463] Fix mysql posix build. The source redefines all of the pthread functions. Add some checks to see if pthreads is available on Windows. --- src/libmysqlclient-2-posix-fixes.patch | 86 ++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) create mode 100644 src/libmysqlclient-2-posix-fixes.patch diff --git a/src/libmysqlclient-2-posix-fixes.patch b/src/libmysqlclient-2-posix-fixes.patch new file mode 100644 index 00000000..51f9041e --- /dev/null +++ b/src/libmysqlclient-2-posix-fixes.patch @@ -0,0 +1,86 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 6721189cf5ceeb34f47cc228d9a5d8a9cf9dfdb8 Mon Sep 17 00:00:00 2001 +From: MXE +Date: Fri, 13 Nov 2015 10:22:12 -0500 +Subject: [PATCH] For Windows, check if POSIX thread model or win32 thread + model is being used. + + +diff --git a/configure.cmake b/configure.cmake +index a4f5e8f..8e623b8 100644 +--- a/configure.cmake ++++ b/configure.cmake +@@ -389,6 +389,7 @@ CHECK_INCLUDE_FILES (fnmatch.h HAVE_FNMATCH_H) + CHECK_INCLUDE_FILES (sys/un.h HAVE_SYS_UN_H) + CHECK_INCLUDE_FILES (vis.h HAVE_VIS_H) # Used by libedit + CHECK_INCLUDE_FILES (sasl/sasl.h HAVE_SASL_SASL_H) # Used by memcached ++CHECK_INCLUDE_FILES (pthread.h HAVE_PTHREAD_H) + + # For libevent + CHECK_INCLUDE_FILES(sys/devpoll.h HAVE_DEVPOLL) +diff --git a/include/my_pthread.h b/include/my_pthread.h +index 0a58cc0..abcffe8 100644 +--- a/include/my_pthread.h ++++ b/include/my_pthread.h +@@ -20,7 +20,7 @@ + + #include "my_global.h" /* myf */ + +-#if !defined(_WIN32) ++#if !(defined(_WIN32) && !defined(USING_PTHREADS)) + #include + #endif + +@@ -35,7 +35,7 @@ extern "C" { + #define EXTERNC + #endif /* __cplusplus */ + +-#if defined(_WIN32) ++#if defined(_WIN32) && !defined(__WINPTHREADS_VERSION) + typedef DWORD pthread_t; + #define pthread_self() GetCurrentThreadId() + #define pthread_handler_t EXTERNC void * __cdecl +@@ -51,7 +51,7 @@ typedef DWORD pthread_t; + #include "thr_cond.h" + #include "thr_rwlock.h" + +-#if defined(_WIN32) ++#if defined(_WIN32) && !defined(__WINPTHREADS_VERSION) + /* + Existing mysql_thread_create() or pthread_create() does not work well + in windows platform when threads are joined because +diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt +index e8e4972..322267c 100644 +--- a/mysys/CMakeLists.txt ++++ b/mysys/CMakeLists.txt +@@ -78,6 +78,10 @@ IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=") + TARGET_LINK_LIBRARIES(mysys pthread) + ENDIF() + ++IF(HAVE_PTHREAD_H) ++ ADD_DEFINITIONS(-DUSING_PTHREADS) ++ENDIF() ++ + IF(WITH_UNIT_TESTS) + + ADD_EXECUTABLE(thr_lock thr_lock.c) +diff --git a/mysys/my_winthread.c b/mysys/my_winthread.c +index 7924fe4..b364030 100644 +--- a/mysys/my_winthread.c ++++ b/mysys/my_winthread.c +@@ -16,7 +16,7 @@ + /***************************************************************************** + ** Simulation of posix threads calls for Windows + *****************************************************************************/ +-#if defined (_WIN32) ++#if defined (_WIN32) && !defined (USING_PTHREADS) + #include "mysys_priv.h" + #include + #include +-- +2.5.0 + From 07e675c9de43fcf255382f1b71327d6ea7df4c6a Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Sat, 21 Nov 2015 10:57:30 -0500 Subject: [PATCH 0052/1463] Fix postgresql posix build, which also assumes pthreads is not available on Windows. --- src/postgresql-4-posix-threads.patch | 68 ++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 src/postgresql-4-posix-threads.patch diff --git a/src/postgresql-4-posix-threads.patch b/src/postgresql-4-posix-threads.patch new file mode 100644 index 00000000..7991bc5f --- /dev/null +++ b/src/postgresql-4-posix-threads.patch @@ -0,0 +1,68 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From de18dd0d72cd44a132bd6e7852f461998aef3e5d Mon Sep 17 00:00:00 2001 +From: MXE +Date: Fri, 13 Nov 2015 18:15:26 -0500 +Subject: [PATCH] Windows POSIX threads build fixes. + + +diff --git a/configure.in b/configure.in +index 2f8bb3d..ed582e0 100644 +--- a/configure.in ++++ b/configure.in +@@ -1455,7 +1455,10 @@ fi + # libraries, and whether the normal C function names are thread-safe. + # See the comment at the top of src/port/thread.c for more information. + # WIN32 doesn't need the pthread tests; it always uses threads +-if test "$enable_thread_safety" = yes -a "$PORTNAME" != "win32"; then ++if test "$enable_thread_safety" = yes; then ++if test "$PORTNAME" = "win32"; then ++AC_CHECK_HEADER(pthread.h, [AC_SUBST(USING_WINDOWS_POSIX,yes)], [AC_SUBST(USING_WINDOWS_POSIX,no)]) ++else + ACX_PTHREAD # set thread flags + + # Some platforms use these, so just define them. They can't hurt if they +@@ -1492,6 +1495,7 @@ PGAC_FUNC_STRERROR_R_INT + CFLAGS="$_CFLAGS" + LIBS="$_LIBS" + ++fi + else + # do not use values from template file + PTHREAD_CFLAGS= +diff --git a/src/Makefile.global.in b/src/Makefile.global.in +index b10ce30..060457d 100644 +--- a/src/Makefile.global.in ++++ b/src/Makefile.global.in +@@ -366,6 +366,9 @@ WIN32_STACK_RLIMIT=4194304 + # Set if we have a working win32 crashdump header + have_win32_dbghelp = @have_win32_dbghelp@ + ++# Set if the win32 GCC is using the posix thread model ++USING_WINDOWS_POSIX = @USING_WINDOWS_POSIX@ ++ + # Pull in platform-specific magic + include $(top_builddir)/src/Makefile.port + +diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile +index b71b0c7..5d44f7a 100644 +--- a/src/interfaces/libpq/Makefile ++++ b/src/interfaces/libpq/Makefile +@@ -55,9 +55,11 @@ libpqrc.o: libpq.rc + $(WINDRES) -i $< -o $@ + + ifeq ($(enable_thread_safety), yes) ++ifneq ($(USING_WINDOWS_POSIX), yes) + OBJS += pthread-win32.o + endif + endif ++endif + + + # Add libraries that libpq depends (or might depend) on into the +-- +2.5.0 + From 4e479e917a6e205b3862705a93fad1890d91850c Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Wed, 25 Nov 2015 17:54:24 -0800 Subject: [PATCH 0053/1463] Update ffmpeg --- src/ffmpeg.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ffmpeg.mk b/src/ffmpeg.mk index f57fe8cc..79f256c1 100644 --- a/src/ffmpeg.mk +++ b/src/ffmpeg.mk @@ -3,8 +3,8 @@ PKG := ffmpeg $(PKG)_IGNORE := -$(PKG)_VERSION := 2.7.2 -$(PKG)_CHECKSUM := 7ceb7550ad628c526fa6c9ff23fdfb687a62f54d90c4a730998d8c2b417b9ef2 +$(PKG)_VERSION := 2.8.2 +$(PKG)_CHECKSUM := 830ec647f7ad774fc0caf17ba47774bf5dee7a89cbd65894f364a87ba3ad21b2 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://www.ffmpeg.org/releases/$($(PKG)_FILE) From 4e9319d42f4aab3037a1f86117e3911a17c3010a Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Thu, 26 Nov 2015 01:55:49 +0000 Subject: [PATCH 0054/1463] Update versions.json --- versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.json b/versions.json index 84ce2639..8d115cf3 100644 --- a/versions.json +++ b/versions.json @@ -50,7 +50,7 @@ "expat": "2.1.0", "faad2": "2.7", "fdk-aac": "0.1.4", - "ffmpeg": "2.7.2", + "ffmpeg": "2.8.2", "fftw": "3.3.4", "file": "5.24", "flac": "1.3.1", From 188a7757d9f546dffc5ae90de07d73a9f01a5438 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 26 Nov 2015 14:28:00 +1100 Subject: [PATCH 0055/1463] coin: fix update and detection of -ldl --- src/coin.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/coin.mk b/src/coin.mk index d7f52b85..c66791e8 100644 --- a/src/coin.mk +++ b/src/coin.mk @@ -8,13 +8,13 @@ $(PKG)_CHECKSUM := 583478c581317862aa03a19f14c527c3888478a06284b9a46a0155fa5886d $(PKG)_SUBDIR := Coin-$($(PKG)_VERSION) $(PKG)_FILE := Coin-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://bitbucket.org/Coin3D/coin/downloads/$($(PKG)_FILE) -$(PKG)_DEPS := gcc +$(PKG)_DEPS := gcc dlfcn-win32 define $(PKG)_UPDATE $(WGET) -q -O- 'https://bitbucket.org/Coin3D/coin/downloads' | \ $(SED) -n 's,.*Coin-\([0-9.]*\).tar.gz.*,\1,p' | \ $(SORT) -V | \ - $(TAIL) -n1 + tail -1 endef define $(PKG)_BUILD @@ -27,7 +27,7 @@ define $(PKG)_BUILD COIN_STATIC=$(if $(BUILD_STATIC),true,false) # libtool misses some dependency libs and there's no lt_cv* etc. options - $(SED) -i 's,^postdeps="-,postdeps="-lopengl32 -lgdi32 -lwinmm -,g' '$(1)/libtool' + $(SED) -i 's,^postdeps="-,postdeps="-ldl -lopengl32 -lgdi32 -lwinmm -,g' '$(1)/libtool' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install From d28c2c02270cf28ee3c59359ffaa5c3f0b78a7b6 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 26 Nov 2015 14:28:33 +1100 Subject: [PATCH 0056/1463] libjpeg-turbo: retry after parallel build failure --- src/libjpeg-turbo.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libjpeg-turbo.mk b/src/libjpeg-turbo.mk index c4157d97..59f7210d 100644 --- a/src/libjpeg-turbo.mk +++ b/src/libjpeg-turbo.mk @@ -22,7 +22,8 @@ define $(PKG)_BUILD --libdir='$(PREFIX)/$(TARGET)/lib/$(PKG)' \ --includedir='$(PREFIX)/$(TARGET)/include/$(PKG)' \ NASM=$(TARGET)-yasm - $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_CRUFT) + $(MAKE) -C '$(1)' -j '$(JOBS)' || $(MAKE) -C '$(1)' -j 1 + $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_CRUFT) # create pkg-config file $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig' From cdb7e99dd692025819f4b6cd63791e52f09d1db7 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 15 Oct 2015 20:49:11 +1100 Subject: [PATCH 0057/1463] remove optional native pkgs and build-requirements target --- Makefile | 13 ++------ index.html | 81 ++++++++++++++++-------------------------------- src/autoconf.mk | 27 ---------------- src/automake.mk | 27 ---------------- src/bison.mk | 27 ---------------- src/coreutils.mk | 27 ---------------- src/flex.mk | 27 ---------------- src/gperf.mk | 27 ---------------- src/intltool.mk | 25 --------------- src/libtool.mk | 10 +----- src/m4.mk | 29 ----------------- src/make.mk | 27 ---------------- src/sed.mk | 27 ---------------- 13 files changed, 29 insertions(+), 345 deletions(-) delete mode 100644 src/autoconf.mk delete mode 100644 src/automake.mk delete mode 100644 src/bison.mk delete mode 100644 src/coreutils.mk delete mode 100644 src/flex.mk delete mode 100644 src/gperf.mk delete mode 100644 src/intltool.mk delete mode 100644 src/m4.mk delete mode 100644 src/make.mk delete mode 100644 src/sed.mk diff --git a/Makefile b/Makefile index 5dbb519a..a502416c 100644 --- a/Makefile +++ b/Makefile @@ -326,11 +326,6 @@ $(PREFIX)/installed/check-requirements: $(MAKEFILE) include $(patsubst %,$(TOP_DIR)/src/%.mk,$(PKGS)) -BUILD_PKGS := $(call set_create, \ - $(foreach PKG, \ - $(shell grep -l 'BUILD_$$(BUILD)' '$(TOP_DIR)/src/'*.mk | \ - $(SED) -n 's,.*src/\(.*\)\.mk,\1,p'), \ - $(if $(value $(call LOOKUP_PKG_RULE,$(PKG),BUILD,$(BUILD))), $(PKG)))) # create target sets for PKG_TARGET_RULE loop to avoid creating empty rules # and having to explicitly disable $(BUILD) for most packages @@ -356,10 +351,6 @@ PRINTF_FMT := printf '%-11s %-$(PKG_COL_WIDTH)s %-$(TARGET_COL_WIDTH)s %-1 .PHONY: download download: $(addprefix download-,$(PKGS)) -.PHONY: build-requirements -build-requirements: - @$(MAKE) -f '$(MAKEFILE)' $(BUILD_PKGS) MXE_TARGETS=$(BUILD) DONT_CHECK_REQUIREMENTS=true - define TARGET_RULE $(if $(findstring i686-pc-mingw32,$(1)), $(error Deprecated target specified: "$(1)". Please use \ @@ -709,7 +700,7 @@ build-matrix.html: $(foreach PKG,$(PKGS), $(TOP_DIR)/src/$(PKG).mk) $(eval $(PKG)_BUILD_ONLY := $(false)) \ ✓, \ ✗)\n) \ - $(if $(call set_is_member,$(PKG),$(BUILD_PKGS)), \ + $(if $(call set_is_member,$(PKG),$($(BUILD)_PKGS)), \ $(eval $(PKG)_VIRTUAL := $(false)) \ ✓, \ ✗)\n \ @@ -731,7 +722,7 @@ build-matrix.html: $(foreach PKG,$(PKGS), $(TOP_DIR)/src/$(PKG).mk) @echo '' >> $@ @$(foreach TARGET,$(MXE_TARGET_LIST), \ echo '$(words $($(TARGET)_PKGCOUNT))' >> $@;) - @echo '$(words $(BUILD_PKGS))' >> $@ + @echo '$(words $($(BUILD)_PKGS))' >> $@ @echo '' >> $@ @echo '' >> $@ @echo '' >> $@ diff --git a/index.html b/index.html index 4ccf9dc8..7f1edb4e 100644 --- a/index.html +++ b/index.html @@ -732,9 +732,8 @@ USE_OSGPLUGIN(<plugin2>)

    Install - Xcode 5 + the latest Xcode

    -

    Step 1

    Method 1 - MacPorts

    Install MacPorts, @@ -742,31 +741,43 @@ USE_OSGPLUGIN(<plugin2>) 

    sudo port install \
-    gdk-pixbuf2 glib2 intltool p5-xml-parser p7zip gpatch scons wget xz
    + autoconf automake bison cmake coreutils flex gettext \ + gdk-pixbuf2 glib2 gsed intltool libffi libtool openssl \ + p5-xml-parser p7zip scons wget xz +
    Method 2 - Rudix

    - Install Rudix you can make it with following command -

    - 
    curl -s https://raw.githubusercontent.com/rudix-mac/rpm/2014.6/rudix.py \
-    | sudo python - install rudix
    -

    + Install Rudix, then run:

    - 
    sudo rudix install glib pkg-config scons wget xz
    - Note: gdk-pixbuf2 is not installed in method 2, - so you can not build gtk3. -

    Step 2

    + + 
    sudo rudix install \
+    autoconf automake cmake coreutils gettext glib intltool \
+    libtool p7zip scons sed wget xz

    - After installing pre-requirement run from within the mxe directory: + Note: gdk-pixbuf2 is not installed in method 2, + so you can not build gtk3. Other packages may be + missing on Rudix - please open an issue if you find any.

    - 
    make build-requirements

    You may be prompted to install a java runtime - this is not required.

    - Mac OS X versions ≤ 10.7 are no longer supported. + Mac OS X versions ≤ 10.9 are no longer tested.

    +

    +

    Certain packages have open issues on OS X
    +

    +

    + to build the remainder of MXE, run: +

    + 
    make EXCLUDE_PKGS='nsis ocaml%'
    +

    + to see a list of all dependent downstream packages that + will be excluded, run: +

    + 
    make show-downstream-deps-'nsis ocaml%'

    openSUSE

    @@ -1074,14 +1085,6 @@ local-pkg-list: $(LOCAL_PKG_LIST) aubio aubio - - autoconf - autoconf - - - automake - automake - db Oracle Berkeley DB @@ -1094,10 +1097,6 @@ local-pkg-list: $(LOCAL_PKG_LIST) binutils GNU Binutils - - bison - bison - blas blas @@ -1178,10 +1177,6 @@ local-pkg-list: $(LOCAL_PKG_LIST) coin Coin3D - - coreutils - GNU Core Utilities - cppunit CppUnit @@ -1254,10 +1249,6 @@ local-pkg-list: $(LOCAL_PKG_LIST) flann FLANN - - flex - flex - fltk FLTK @@ -1362,10 +1353,6 @@ local-pkg-list: $(LOCAL_PKG_LIST) gnutls GnuTLS - - gperf - GNU gperf - graphicsmagick GraphicsMagick @@ -1470,10 +1457,6 @@ local-pkg-list: $(LOCAL_PKG_LIST) imagemagick ImageMagick - - intltool - Intltool - isl Integer Set Library @@ -1878,14 +1861,6 @@ local-pkg-list: $(LOCAL_PKG_LIST) lzo lzo - - m4 - GNU M4 - - - make - GNU Make - matio matio @@ -2386,10 +2361,6 @@ local-pkg-list: $(LOCAL_PKG_LIST) sdl2_ttf SDL2_ttf - - sed - GNU sed - sfml SFML diff --git a/src/autoconf.mk b/src/autoconf.mk deleted file mode 100644 index 93c2ffbc..00000000 --- a/src/autoconf.mk +++ /dev/null @@ -1,27 +0,0 @@ -# This file is part of MXE. -# See index.html for further information. - -PKG := autoconf -$(PKG)_IGNORE := -$(PKG)_VERSION := 2.69 -$(PKG)_CHECKSUM := 64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684 -$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) -$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz -$(PKG)_URL := http://ftp.gnu.org/pub/gnu/autoconf/$($(PKG)_FILE) -$(PKG)_URL_2 := ftp://ftp.gnu.org/pub/gnu/autoconf/$($(PKG)_FILE) -$(PKG)_DEPS := m4 - -define $(PKG)_UPDATE - $(WGET) -q -O- 'http://ftp.gnu.org/gnu/autoconf/?C=M;O=D' | \ - $(SED) -n 's,.* Date: Thu, 26 Nov 2015 04:09:25 +0000 Subject: [PATCH 0058/1463] Update versions.json --- versions.json | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/versions.json b/versions.json index 8d115cf3..ce95c5e6 100644 --- a/versions.json +++ b/versions.json @@ -10,11 +10,8 @@ "atk": "2.16.0", "atkmm": "2.22.7", "aubio": "0.4.2", - "autoconf": "2.69", - "automake": "1.14.1", "bfd": "2.25.1", "binutils": "2.25.1", - "bison": "2.7.1", "blas": "3.5.0", "boost": "1.57.0", "box2d": "2.3.1", @@ -35,7 +32,6 @@ "cmake": "3.0.2", "cminpack": "1.3.4", "coin": "3.1.3", - "coreutils": "8.23", "cppunit": "1.13.2", "crystalhd": "1", "cunit": "2.1-3", @@ -55,7 +51,6 @@ "file": "5.24", "flac": "1.3.1", "flann": "1.8.4", - "flex": "2.5.39", "fltk": "1.3.3", "fontconfig": "2.11.1", "freeglut": "2.8.1", @@ -82,7 +77,6 @@ "glibmm": "2.42.0", "gmp": "6.1.0", "gnutls": "3.4.5", - "gperf": "3.0.4", "graphicsmagick": "1.3.21", "gsl": "1.16", "gsoap": "2.8.22", @@ -109,7 +103,6 @@ "id3lib": "3.8.3", "ilmbase": "2.2.0", "imagemagick": "6.9.0-0", - "intltool": "0.50.2", "isl": "0.12.2", "itk": "4.4.1", "jack": "1.9.10", @@ -211,8 +204,6 @@ "luajit": "2.0.4", "lzma": "920", "lzo": "2.08", - "m4": "1.4.17", - "make": "4.1", "matio": "1.5.2", "mdbtools": "0.7.1", "mingw-w64": "4.0.4", @@ -338,7 +329,6 @@ "sdl_rwhttp": "0.2.0", "sdl_sound": "1.0.3", "sdl_ttf": "2.0.11", - "sed": "4.2.2", "sfml": "2.3.1", "smpeg": "0.4.5+cvs20030824", "smpeg2": "2.0.0", From d6c4884455cec15d24fbdb5a07dd2ea68978bc14 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 15 Oct 2015 21:08:33 +1100 Subject: [PATCH 0059/1463] Makefile: add plugins functionality to include makefiles from MXE_PLUGIN_DIRS --- Makefile | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index a502416c..3e328ef7 100644 --- a/Makefile +++ b/Makefile @@ -170,12 +170,18 @@ UNPACK_ARCHIVE = \ UNPACK_PKG_ARCHIVE = \ $(call UNPACK_ARCHIVE,$(PKG_DIR)/$($(1)_FILE)) -PATCHES = $(sort $(wildcard $(TOP_DIR)/src/$(1)-[0-9]*.patch)) +# some shortcuts for awareness of MXE_PLUGIN_DIRS +# plugins will need to set their own $(PKG)_MAKEFILE for updates +# all files for extension plugins will be considered for outdated checks +PKG_MAKEFILE = $(realpath $(or $($(1)_MAKEFILE),$(TOP_DIR)/src/$(1).mk)) +PKG_MAKEFILES = $(realpath $(sort $(wildcard $(addsuffix /$(1).mk, $(TOP_DIR)/src $(MXE_PLUGIN_DIRS))))) +PKG_TESTFILES = $(realpath $(sort $(wildcard $(addsuffix /$(1)-test*, $(TOP_DIR)/src $(MXE_PLUGIN_DIRS))))) +PKG_PATCHES = $(realpath $(sort $(wildcard $(addsuffix /$(1)-[0-9]*.patch, $(TOP_DIR)/src $(MXE_PLUGIN_DIRS))))) define PREPARE_PKG_SOURCE cd '$(2)' && $(call UNPACK_PKG_ARCHIVE,$(1)) cd '$(2)/$($(1)_SUBDIR)' - $(foreach PKG_PATCH,$(PATCHES), + $(foreach PKG_PATCH,$(PKG_PATCHES), (cd '$(2)/$($(1)_SUBDIR)' && $(PATCH) -p1 -u) < $(PKG_PATCH)) endef @@ -326,6 +332,11 @@ $(PREFIX)/installed/check-requirements: $(MAKEFILE) include $(patsubst %,$(TOP_DIR)/src/%.mk,$(PKGS)) +# include files from MXE_PLUGIN_DIRS +PLUGIN_FILES := $(realpath $(wildcard $(addsuffix /*.mk,$(MXE_PLUGIN_DIRS)))) +PLUGIN_PKGS := $(basename $(notdir $(PLUGIN_FILES))) +include $(PLUGIN_FILES) +PKGS := $(sort $(PKGS) $(PLUGIN_PKGS)) # create target sets for PKG_TARGET_RULE loop to avoid creating empty rules # and having to explicitly disable $(BUILD) for most packages @@ -405,9 +416,9 @@ $(PREFIX)/lib/nonetwork.so: $(TOP_DIR)/tools/nonetwork.c define PKG_TARGET_RULE .PHONY: $(1) $(1): $(PREFIX)/$(3)/installed/$(1) -$(PREFIX)/$(3)/installed/$(1): $(TOP_DIR)/src/$(1).mk \ - $(PATCHES) \ - $(wildcard $(TOP_DIR)/src/$(1)-test*) \ +$(PREFIX)/$(3)/installed/$(1): $(PKG_MAKEFILES) \ + $(PKG_PATCHES) \ + $(PKG_TESTFILES) \ $(addprefix $(PREFIX)/$(3)/installed/,$(value $(call LOOKUP_PKG_RULE,$(1),DEPS,$(3)))) \ $(and $($(3)_DEPS),$(addprefix $(PREFIX)/$($(3)_DEPS)/installed/,$(filter-out $(MXE_CONF_PKGS),$($($(3)_DEPS)_PKGS)))) \ | $(if $(DONT_CHECK_REQUIREMENTS),,check-requirements) \ @@ -583,9 +594,9 @@ define UPDATE $(info OLD $(1) $($(1)_VERSION) --> $(2) ignoring)), $(info NEW $(1) $($(1)_VERSION) --> $(2)) $(if $(findstring undefined, $(origin UPDATE_DRYRUN)), - $(SED) -i 's/^\([^ ]*_VERSION *:=\).*/\1 $(2)/' '$(TOP_DIR)/src/$(1).mk' + $(SED) -i 's/^\([^ ]*_VERSION *:=\).*/\1 $(2)/' '$(PKG_MAKEFILE)' $(MAKE) -f '$(MAKEFILE)' 'update-checksum-$(1)' \ - || { $(SED) -i 's/^\([^ ]*_VERSION *:=\).*/\1 $($(1)_VERSION)/' '$(TOP_DIR)/src/$(1).mk'; \ + || { $(SED) -i 's/^\([^ ]*_VERSION *:=\).*/\1 $($(1)_VERSION)/' '$(PKG_MAKEFILE)'; \ exit 1; }))), $(info Unable to update version number of package $(1) \ $(newline)$(newline)$($(1)_UPDATE)$(newline))) @@ -602,7 +613,7 @@ update-package-%: update-checksum-%: $(if $(call set_is_member,$*,$(PKGS)), \ $(call DOWNLOAD_PKG_ARCHIVE,$*) && \ - $(SED) -i 's/^\([^ ]*_CHECKSUM *:=\).*/\1 '"`$(call PKG_CHECKSUM,$*)`"'/' '$(TOP_DIR)/src/$*.mk', \ + $(SED) -i 's/^\([^ ]*_CHECKSUM *:=\).*/\1 '"`$(call PKG_CHECKSUM,$*)`"'/' '$(call PKG_MAKEFILE,$*)', \ $(error Package $* not found in index.html)) .PHONY: cleanup-style From a6ba06c5260d26e805d9fdf54c587636bb861d4a Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 15 Oct 2015 21:12:17 +1100 Subject: [PATCH 0060/1463] add native and apps plugin packages --- plugins/README.md | 5 +++ ...-1-don-t-discard-config-set-by-qmake.patch | 27 +++++++++++++++ plugins/apps/keepassx.mk | 27 +++++++++++++++ plugins/native/autoconf.mk | 31 +++++++++++++++++ plugins/native/automake.mk | 31 +++++++++++++++++ plugins/native/bison.mk | 31 +++++++++++++++++ plugins/native/coreutils.mk | 32 ++++++++++++++++++ plugins/native/flex.mk | 31 +++++++++++++++++ plugins/native/gettext.mk | 14 ++++++++ plugins/native/gperf.mk | 31 +++++++++++++++++ plugins/native/intltool.mk | 30 +++++++++++++++++ plugins/native/libiconv.mk | 14 ++++++++ plugins/native/libtool.mk | 14 ++++++++ plugins/native/m4.mk | 33 +++++++++++++++++++ plugins/native/make.mk | 32 ++++++++++++++++++ plugins/native/sed.mk | 32 ++++++++++++++++++ 16 files changed, 415 insertions(+) create mode 100644 plugins/README.md create mode 100644 plugins/apps/keepassx-1-don-t-discard-config-set-by-qmake.patch create mode 100644 plugins/apps/keepassx.mk create mode 100644 plugins/native/autoconf.mk create mode 100644 plugins/native/automake.mk create mode 100644 plugins/native/bison.mk create mode 100644 plugins/native/coreutils.mk create mode 100644 plugins/native/flex.mk create mode 100644 plugins/native/gettext.mk create mode 100644 plugins/native/gperf.mk create mode 100644 plugins/native/intltool.mk create mode 100644 plugins/native/libiconv.mk create mode 100644 plugins/native/libtool.mk create mode 100644 plugins/native/m4.mk create mode 100644 plugins/native/make.mk create mode 100644 plugins/native/sed.mk diff --git a/plugins/README.md b/plugins/README.md new file mode 100644 index 00000000..785d1c36 --- /dev/null +++ b/plugins/README.md @@ -0,0 +1,5 @@ +### MXE Plugins + +A collection of unsupported examples, experiments, tools, and utilities. + +Enjoy! diff --git a/plugins/apps/keepassx-1-don-t-discard-config-set-by-qmake.patch b/plugins/apps/keepassx-1-don-t-discard-config-set-by-qmake.patch new file mode 100644 index 00000000..2962b639 --- /dev/null +++ b/plugins/apps/keepassx-1-don-t-discard-config-set-by-qmake.patch @@ -0,0 +1,27 @@ +This file is part of MXE. +See index.html for further information. + +From e941cfd42870fe214f8c44cd5e4d8ee6893b0904 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Fri, 25 Sep 2015 10:19:17 +0200 +Subject: [PATCH] don't discard CONFIG set by qmake + +See https://github.com/mxe/mxe/commit/6c561c5f3307944d7b6d7ec3de732b25bf69ed00 +--- + src/src.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/src.pro b/src/src.pro +index 7644b93..827741d 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -1,5 +1,5 @@ + +-CONFIG = qt uic resources thread stl warn_on ++CONFIG += qt uic resources thread stl warn_on + QT += xml + + *-g++ : QMAKE_CXXFLAGS_WARN_ON += -Wno-sign-compare +-- +1.7.10.4 + diff --git a/plugins/apps/keepassx.mk b/plugins/apps/keepassx.mk new file mode 100644 index 00000000..a05dc898 --- /dev/null +++ b/plugins/apps/keepassx.mk @@ -0,0 +1,27 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := keepassx +$(PKG)_IGNORE := +$(PKG)_VERSION := 0.4.3 +$(PKG)_CHECKSUM := cd901a0611ce57e62cf6df7eeeb1b690b5232302bdad8626994eb54adcfa1e85 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://www.keepassx.org/releases/$($(PKG)_FILE) +$(PKG)_WEBSITE := https://www.keepassx.org +$(PKG)_MAKEFILE := $(realpath $(lastword $(MAKEFILE_LIST))) +$(PKG)_OWNER := https://github.com/starius +$(PKG)_DEPS := gcc qt + +define $(PKG)_UPDATE +$(WGET) -q -O- 'https://www.keepassx.org/downloads/' | \ + $(SED) -n 's,.*keepassx-\([0-9][^"]*\)\.tar.*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && '$(TARGET)-qmake-qt4' \ + "PREFIX=$(PREFIX)/$(TARGET)/bin/" + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/plugins/native/autoconf.mk b/plugins/native/autoconf.mk new file mode 100644 index 00000000..7ef4b79b --- /dev/null +++ b/plugins/native/autoconf.mk @@ -0,0 +1,31 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := autoconf +$(PKG)_IGNORE := +$(PKG)_VERSION := 2.69 +$(PKG)_CHECKSUM := 64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz +$(PKG)_URL := http://ftp.gnu.org/pub/gnu/autoconf/$($(PKG)_FILE) +$(PKG)_URL_2 := ftp://ftp.gnu.org/pub/gnu/autoconf/$($(PKG)_FILE) +$(PKG)_WEBSITE := http://www.gnu.org/software/autoconf +$(PKG)_MAKEFILE := $(realpath $(lastword $(MAKEFILE_LIST))) +$(PKG)_OWNER := https://github.com/tonytheodore +$(PKG)_TARGETS := $(BUILD) +$(PKG)_DEPS := m4 + +define $(PKG)_UPDATE + $(WGET) -q -O- 'http://ftp.gnu.org/gnu/autoconf/?C=M;O=D' | \ + $(SED) -n 's,.* Date: Fri, 16 Oct 2015 03:57:00 +1100 Subject: [PATCH 0061/1463] plugins: add qt override example with minimal deps and custom cflags --- plugins/custom-qt-min/overrides.mk | 82 ++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 plugins/custom-qt-min/overrides.mk diff --git a/plugins/custom-qt-min/overrides.mk b/plugins/custom-qt-min/overrides.mk new file mode 100644 index 00000000..159e0dd8 --- /dev/null +++ b/plugins/custom-qt-min/overrides.mk @@ -0,0 +1,82 @@ +# This file is part of MXE. +# See index.html for further information. + +# MXE provides a fully featured build of Qt. Some users want more control... +# http://lists.nongnu.org/archive/html/mingw-cross-env-list/2013-08/msg00010.html +# http://lists.nongnu.org/archive/html/mingw-cross-env-list/2012-05/msg00019.html +# +# build of qt and deps is (say): 25 mins with 12.5 MB test program +# custom with minimal deps is: 4 mins with 7.6 MB test program +# custom min deps and cflags is: 4 mins with 5.9 MB test program +# +# make qt MXE_PLUGIN_DIRS='plugins/custom-qt-min' + +qt_DEPS := gcc + +define qt_BUILD + $(SED) -i 's,\(^QMAKE_CFLAGS_RELEASE\).*,\1 = -pipe -Os -fomit-frame-pointer -momit-leaf-frame-pointer -fdata-sections -ffunction-sections,g' '$(1)/mkspecs/win32-g++/qmake.conf' + cd '$(1)' && QTDIR='$(1)' ./bin/syncqt + cd '$(1)' && \ + ./configure \ + -opensource \ + -confirm-license \ + -fast \ + -xplatform win32-g++-4.6 \ + -device-option CROSS_COMPILE=$(TARGET)- \ + -device-option PKG_CONFIG='$(TARGET)-pkg-config' \ + -force-pkg-config \ + -release \ + -static \ + -prefix '$(PREFIX)/$(TARGET)/qt' \ + -prefix-install \ + -make libs \ + -nomake demos \ + -nomake docs \ + -nomake examples \ + -nomake tools \ + -nomake translations \ + -no-accessibility \ + -no-audio-backend \ + -no-dbus \ + -no-declarative \ + -no-exceptions \ + -no-gif \ + -no-glib \ + -no-gstreamer \ + -no-iconv \ + -no-libjpeg \ + -no-libmng \ + -no-libpng \ + -no-libtiff \ + -no-multimedia \ + -no-opengl \ + -no-openssl \ + -no-phonon \ + -no-phonon-backend \ + -no-qt3support \ + -no-reduce-exports \ + -no-rpath \ + -no-script \ + -no-scripttools \ + -no-sql-mysql \ + -no-sql-odbc \ + -no-sql-psql \ + -no-sql-sqlite \ + -no-sql-tds \ + -no-stl \ + -no-svg \ + -no-webkit \ + -no-xmlpatterns \ + -qt-zlib \ + -v + + $(MAKE) -C '$(1)' -j '$(JOBS)' + rm -rf '$(PREFIX)/$(TARGET)/qt' + $(MAKE) -C '$(1)' -j 1 install + + mkdir '$(1)/test-qt' + cd '$(1)/test-qt' && '$(PREFIX)/$(TARGET)/qt/bin/qmake' '$(PWD)/$(2).pro' + $(MAKE) -C '$(1)/test-qt' -j '$(JOBS)' + $(INSTALL) -m755 '$(1)/test-qt/release/test-qt.exe' '$(PREFIX)/$(TARGET)/bin/' + +endef From 5e63e416b166d4e7855e88176a21126bc381bb3d Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 26 Nov 2015 16:48:10 +1100 Subject: [PATCH 0062/1463] plugins: add gcc52 overlay --- plugins/gcc52/gcc52-overlay.mk | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 plugins/gcc52/gcc52-overlay.mk diff --git a/plugins/gcc52/gcc52-overlay.mk b/plugins/gcc52/gcc52-overlay.mk new file mode 100644 index 00000000..a3a14ab1 --- /dev/null +++ b/plugins/gcc52/gcc52-overlay.mk @@ -0,0 +1,25 @@ +# This file is part of MXE. +# See index.html for further information. + +# override relevant cloog, isl, and gcc variables changed in: +# https://github.com/mxe/mxe/pull/965 +# +# simply expanded variables (*_SUBDIR, *_FILE, etc.) need to be set +# libmysqlclient patch changes don't adversely affect 5.2 series + +PKG := cloog +$(PKG)_TARGETS := $(MXE_TARGETS) + +PKG := isl +$(PKG)_VERSION := 0.14 +$(PKG)_CHECKSUM := 7e3c02ff52f8540f6a85534f54158968417fd676001651c8289c705bd0228f36 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 +$(PKG)_URL := http://isl.gforge.inria.fr/$($(PKG)_FILE) + +PKG := gcc +$(PKG)_VERSION := 5.2.0 +$(PKG)_CHECKSUM := 5f835b04b5f7dd4f4d2dc96190ec1621b8d89f2dc6f638f9f8bc1b1014ba8cad +$(PKG)_SUBDIR := gcc-$($(PKG)_VERSION) +$(PKG)_FILE := gcc-$($(PKG)_VERSION).tar.bz2 +$(PKG)_URL := http://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE) From 0b6b2e6e95f7dc7ec5241bb94b3ecfd48c9205b8 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Thu, 26 Nov 2015 05:58:38 +0000 Subject: [PATCH 0063/1463] Update versions.json --- versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.json b/versions.json index ce95c5e6..06e07ddd 100644 --- a/versions.json +++ b/versions.json @@ -214,6 +214,7 @@ "mpg123": "1.21.0", "muparser": "2.2.5", "muparserx": "4.0.4", + "mxe-conf": "1", "mxml": "2.9", "ncurses": "e14300b", "netcdf": "4.3.0", @@ -379,6 +380,5 @@ "yasm": "1.3.0", "zlib": "1.2.8", "zziplib": "0.13.62", - "mxe-conf": "1", "": null } From 85f9305ab4efa0a39dcfb423ea7470b43e217303 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 26 Nov 2015 17:24:38 +1100 Subject: [PATCH 0064/1463] docs: add instructions for homebrew --- index.html | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/index.html b/index.html index 7f1edb4e..a7408eff 100644 --- a/index.html +++ b/index.html @@ -759,6 +759,21 @@ USE_OSGPLUGIN(<plugin2>) so you can not build gtk3. Other packages may be missing on Rudix - please open an issue if you find any.

    + +
    Method 3 - Homebrew
    +

    + Install Homebrew, + then run: +

    + + 
    brew install \
+    autoconf automake cmake coreutils gdk-pixbuf gettext \
+    gnu-sed intltool libtool p7zip wget xz
    +

    + and: +

    + 
    export PATH=${PATH}:/usr/local/opt/gettext/bin
    +

    You may be prompted to install a java runtime - this is not required. From 1a94ae0e6777c841e005366bf0f85b51a3c9f959 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 26 Nov 2015 21:26:50 +1100 Subject: [PATCH 0065/1463] Revert "Fix MySQL and PostgreSQL posix build" --- src/libmysqlclient-2-posix-fixes.patch | 86 -------------------------- src/postgresql-4-posix-threads.patch | 68 -------------------- 2 files changed, 154 deletions(-) delete mode 100644 src/libmysqlclient-2-posix-fixes.patch delete mode 100644 src/postgresql-4-posix-threads.patch diff --git a/src/libmysqlclient-2-posix-fixes.patch b/src/libmysqlclient-2-posix-fixes.patch deleted file mode 100644 index 51f9041e..00000000 --- a/src/libmysqlclient-2-posix-fixes.patch +++ /dev/null @@ -1,86 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Contains ad hoc patches for cross building. - -From 6721189cf5ceeb34f47cc228d9a5d8a9cf9dfdb8 Mon Sep 17 00:00:00 2001 -From: MXE -Date: Fri, 13 Nov 2015 10:22:12 -0500 -Subject: [PATCH] For Windows, check if POSIX thread model or win32 thread - model is being used. - - -diff --git a/configure.cmake b/configure.cmake -index a4f5e8f..8e623b8 100644 ---- a/configure.cmake -+++ b/configure.cmake -@@ -389,6 +389,7 @@ CHECK_INCLUDE_FILES (fnmatch.h HAVE_FNMATCH_H) - CHECK_INCLUDE_FILES (sys/un.h HAVE_SYS_UN_H) - CHECK_INCLUDE_FILES (vis.h HAVE_VIS_H) # Used by libedit - CHECK_INCLUDE_FILES (sasl/sasl.h HAVE_SASL_SASL_H) # Used by memcached -+CHECK_INCLUDE_FILES (pthread.h HAVE_PTHREAD_H) - - # For libevent - CHECK_INCLUDE_FILES(sys/devpoll.h HAVE_DEVPOLL) -diff --git a/include/my_pthread.h b/include/my_pthread.h -index 0a58cc0..abcffe8 100644 ---- a/include/my_pthread.h -+++ b/include/my_pthread.h -@@ -20,7 +20,7 @@ - - #include "my_global.h" /* myf */ - --#if !defined(_WIN32) -+#if !(defined(_WIN32) && !defined(USING_PTHREADS)) - #include - #endif - -@@ -35,7 +35,7 @@ extern "C" { - #define EXTERNC - #endif /* __cplusplus */ - --#if defined(_WIN32) -+#if defined(_WIN32) && !defined(__WINPTHREADS_VERSION) - typedef DWORD pthread_t; - #define pthread_self() GetCurrentThreadId() - #define pthread_handler_t EXTERNC void * __cdecl -@@ -51,7 +51,7 @@ typedef DWORD pthread_t; - #include "thr_cond.h" - #include "thr_rwlock.h" - --#if defined(_WIN32) -+#if defined(_WIN32) && !defined(__WINPTHREADS_VERSION) - /* - Existing mysql_thread_create() or pthread_create() does not work well - in windows platform when threads are joined because -diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt -index e8e4972..322267c 100644 ---- a/mysys/CMakeLists.txt -+++ b/mysys/CMakeLists.txt -@@ -78,6 +78,10 @@ IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_FLAGS MATCHES "-fsanitize=") - TARGET_LINK_LIBRARIES(mysys pthread) - ENDIF() - -+IF(HAVE_PTHREAD_H) -+ ADD_DEFINITIONS(-DUSING_PTHREADS) -+ENDIF() -+ - IF(WITH_UNIT_TESTS) - - ADD_EXECUTABLE(thr_lock thr_lock.c) -diff --git a/mysys/my_winthread.c b/mysys/my_winthread.c -index 7924fe4..b364030 100644 ---- a/mysys/my_winthread.c -+++ b/mysys/my_winthread.c -@@ -16,7 +16,7 @@ - /***************************************************************************** - ** Simulation of posix threads calls for Windows - *****************************************************************************/ --#if defined (_WIN32) -+#if defined (_WIN32) && !defined (USING_PTHREADS) - #include "mysys_priv.h" - #include - #include --- -2.5.0 - diff --git a/src/postgresql-4-posix-threads.patch b/src/postgresql-4-posix-threads.patch deleted file mode 100644 index 7991bc5f..00000000 --- a/src/postgresql-4-posix-threads.patch +++ /dev/null @@ -1,68 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Contains ad hoc patches for cross building. - -From de18dd0d72cd44a132bd6e7852f461998aef3e5d Mon Sep 17 00:00:00 2001 -From: MXE -Date: Fri, 13 Nov 2015 18:15:26 -0500 -Subject: [PATCH] Windows POSIX threads build fixes. - - -diff --git a/configure.in b/configure.in -index 2f8bb3d..ed582e0 100644 ---- a/configure.in -+++ b/configure.in -@@ -1455,7 +1455,10 @@ fi - # libraries, and whether the normal C function names are thread-safe. - # See the comment at the top of src/port/thread.c for more information. - # WIN32 doesn't need the pthread tests; it always uses threads --if test "$enable_thread_safety" = yes -a "$PORTNAME" != "win32"; then -+if test "$enable_thread_safety" = yes; then -+if test "$PORTNAME" = "win32"; then -+AC_CHECK_HEADER(pthread.h, [AC_SUBST(USING_WINDOWS_POSIX,yes)], [AC_SUBST(USING_WINDOWS_POSIX,no)]) -+else - ACX_PTHREAD # set thread flags - - # Some platforms use these, so just define them. They can't hurt if they -@@ -1492,6 +1495,7 @@ PGAC_FUNC_STRERROR_R_INT - CFLAGS="$_CFLAGS" - LIBS="$_LIBS" - -+fi - else - # do not use values from template file - PTHREAD_CFLAGS= -diff --git a/src/Makefile.global.in b/src/Makefile.global.in -index b10ce30..060457d 100644 ---- a/src/Makefile.global.in -+++ b/src/Makefile.global.in -@@ -366,6 +366,9 @@ WIN32_STACK_RLIMIT=4194304 - # Set if we have a working win32 crashdump header - have_win32_dbghelp = @have_win32_dbghelp@ - -+# Set if the win32 GCC is using the posix thread model -+USING_WINDOWS_POSIX = @USING_WINDOWS_POSIX@ -+ - # Pull in platform-specific magic - include $(top_builddir)/src/Makefile.port - -diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile -index b71b0c7..5d44f7a 100644 ---- a/src/interfaces/libpq/Makefile -+++ b/src/interfaces/libpq/Makefile -@@ -55,9 +55,11 @@ libpqrc.o: libpq.rc - $(WINDRES) -i $< -o $@ - - ifeq ($(enable_thread_safety), yes) -+ifneq ($(USING_WINDOWS_POSIX), yes) - OBJS += pthread-win32.o - endif - endif -+endif - - - # Add libraries that libpq depends (or might depend) on into the --- -2.5.0 - From 19d0acd474e39fbc2c2f7f136f9abaafdfcdc337 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 26 Nov 2015 22:27:06 +1100 Subject: [PATCH 0066/1463] qtwebkit: re-enable build --- src/qtwebkit-1-fixes.patch | 17 +++++++++++++++++ src/qtwebkit.mk | 6 ------ 2 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 src/qtwebkit-1-fixes.patch diff --git a/src/qtwebkit-1-fixes.patch b/src/qtwebkit-1-fixes.patch new file mode 100644 index 00000000..b9d88532 --- /dev/null +++ b/src/qtwebkit-1-fixes.patch @@ -0,0 +1,17 @@ +This file is part of MXE. +See index.html for further information. + +Taken from: +https://github.com/Alexpux/Qt-builds/blob/master/patches/qt/5.0.x/qt-5.0.0-fix-build-under-msys.patch + +--- a/Source/WebCore/DerivedSources.pri 2012-12-21 14:10:41 +0300 ++++ b/Source/WebCore/DerivedSources.pri 2012-12-21 14:12:19 +0300 +@@ -704,7 +704,7 @@ + preprocessIdls.input = IDL_ATTRIBUTES_FILE + preprocessIdls.script = $$PREPROCESS_IDLS_SCRIPT + # FIXME : We need to use only perl at some point. +-win_cmd_shell: preprocessIdls.commands = type nul > $$IDL_FILES_TMP $$EOC ++win_cmd_shell: preprocessIdls.commands = cat /dev/null > $$IDL_FILES_TMP $$EOC + else: preprocessIdls.commands = cat /dev/null > $$IDL_FILES_TMP $$EOC + for(binding, IDL_BINDINGS) { + # We need "$$binding" instead of "$$binding ", because Windows' echo writes trailing whitespaces. (http://wkb.ug/88304) diff --git a/src/qtwebkit.mk b/src/qtwebkit.mk index 2e8b4858..c502e197 100644 --- a/src/qtwebkit.mk +++ b/src/qtwebkit.mk @@ -10,17 +10,11 @@ $(PKG)_FILE = $(subst qtbase,qtwebkit,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtwebkit,$(qtbase_URL)) $(PKG)_DEPS := gcc qtbase qtmultimedia qtquick1 sqlite -$(PKG)_MESSAGE :=*** qtwebkit is deprecated in Qt 5.5 *** - define $(PKG)_UPDATE echo $(qtbase_VERSION) endef define $(PKG)_BUILD_SHARED - echo qtwebkit is deprecated in Qt 5.5 -endef - -define $(PKG)_BUILD_SHARED_DISABLED # looks for build tools with .exe suffix and tries to use win_flex $(SED) -i 's,\.exe,,' '$(1)/Tools/qmake/mkspecs/features/functions.prf' # invoke qmake with removed debug options as a workaround for From b4decd34e269c833726b6cf764cde7b443b0e5f3 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Fri, 27 Nov 2015 13:29:16 +1100 Subject: [PATCH 0067/1463] aspell: fix for -ldl detection fixes #1013 --- src/aspell.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/aspell.mk b/src/aspell.mk index 6e17adef..9074a601 100644 --- a/src/aspell.mk +++ b/src/aspell.mk @@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE) -$(PKG)_DEPS := gcc +$(PKG)_DEPS := gcc dlfcn-win32 define $(PKG)_UPDATE $(WGET) -q -O- 'http://ftp.gnu.org/gnu/aspell/' | \ @@ -24,8 +24,9 @@ define $(PKG)_BUILD --disable-nls # libtool misses some dependency libs and there's no lt_cv* etc. options + # can be removed after 0.60.6.1 if recent libtool et al. is used $(if $(BUILD_SHARED),\ - $(SED) -i 's#^postdeps="-#postdeps="-lpthread -#g' '$(1)/libtool') + $(SED) -i 's#^postdeps="-#postdeps="-ldl -lpthread -#g' '$(1)/libtool') $(MAKE) -C '$(1)' -j '$(JOBS)' install endef From 43317e6235723de79476609d99427868a5925927 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Fri, 27 Nov 2015 13:30:32 +1100 Subject: [PATCH 0068/1463] coin: add note about libtool workaround --- src/coin.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/src/coin.mk b/src/coin.mk index c66791e8..253bc5b4 100644 --- a/src/coin.mk +++ b/src/coin.mk @@ -27,6 +27,7 @@ define $(PKG)_BUILD COIN_STATIC=$(if $(BUILD_STATIC),true,false) # libtool misses some dependency libs and there's no lt_cv* etc. options + # can be removed after 3.1.3 if recent libtool et al. is used $(SED) -i 's,^postdeps="-,postdeps="-ldl -lopengl32 -lgdi32 -lwinmm -,g' '$(1)/libtool' $(MAKE) -C '$(1)' -j '$(JOBS)' From 9bd2349eebe5489a4712bb0678cdf4eb4a42f276 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Fri, 27 Nov 2015 14:11:14 +1100 Subject: [PATCH 0069/1463] Build native version of cmake * install in MXE native path so only visible to MXE sessions and wrapper scripts * remove from requirements * no MXE patches or pkg updates yet --- index.html | 60 ++++++++++++++++++++++++------------------------- src/cmake.mk | 1 + src/mxe-conf.mk | 4 ++-- 3 files changed, 33 insertions(+), 32 deletions(-) diff --git a/index.html b/index.html index a7408eff..46998e7a 100644 --- a/index.html +++ b/index.html @@ -345,9 +345,13 @@ If a cross compiler is detected then cross compile mode will be used.

    If you have a CMake project, - you can use the provided toolchain file: + you can use the provided cmake wrapper: +

    + 
    i686-w64-mingw32.static-cmake ...
    +

    + This will automatically use the MXE version of cmake + and locate the toolchain file.

    - 
    cmake ... -DCMAKE_TOOLCHAIN_FILE=/where MXE is installed/usr/i686-w64-mingw32.static/share/cmake/mxe-conf.cmake

    Step 5c: Cross compile your Project (Qt)

    @@ -512,10 +516,6 @@ USE_OSGPLUGIN(<plugin2>) Bzip2 - - CMake - ≥ 2.8.0 - Flex ≥ 2.5.31 @@ -626,11 +626,11 @@ USE_OSGPLUGIN(<plugin2>) 
    apt-get install \
-    autoconf automake autopoint bash bison bzip2 cmake flex \
-    gettext git g++ gperf intltool libffi-dev libgdk-pixbuf2.0-dev \
-    libtool libltdl-dev libssl-dev libxml-parser-perl make openssl \
-    p7zip-full patch perl pkg-config python ruby scons sed \
-    unzip wget xz-utils
    + autoconf automake autopoint bash bison bzip2 flex gettext\ + git g++ gperf intltool libffi-dev libgdk-pixbuf2.0-dev \ + libtool libltdl-dev libssl-dev libxml-parser-perl make \ + openssl p7zip-full patch perl pkg-config python ruby scons \ + sed unzip wget xz-utils

    On 64-bit Debian, install also: @@ -651,10 +651,10 @@ USE_OSGPLUGIN(<plugin2>) 

    yum install \
-    autoconf automake bash bison bzip2 cmake flex gcc-c++ \
-    gdk-pixbuf2-devel gettext git gperf intltool make sed libffi-devel \
-    libtool openssl-devel p7zip patch perl pkgconfig \
-    python ruby scons unzip wget xz
    + autoconf automake bash bison bzip2 flex gcc-c++ \ + gdk-pixbuf2-devel gettext git gperf intltool make \ + sed libffi-devel libtool openssl-devel p7zip patch \ + perl pkgconfig python ruby scons unzip wget xz

    On 64-bit Fedora, @@ -665,8 +665,8 @@ USE_OSGPLUGIN(<plugin2>) 

    pkg_add -r \
-    automake autoconf bash bison cmake coreutils flex \
-    gdk-pixbuf2 gettext git glib20 gmake gperf gsed intltool libffi \
+    automake autoconf bash bison coreutils flex gdk-pixbuf2 \
+    gettext git glib20 gmake gperf gsed intltool libffi \
     libtool openssl p5-XML-Parser p7zip patch perl \
     pkgconf python ruby scons unzip wget
    @@ -703,8 +703,8 @@ USE_OSGPLUGIN(<plugin2>) 
    pacman-g2 -S \
-    autoconf automake bash bzip2 bison cmake flex gcc \
-    gdk-pixbuf2 gettext git gperf intltool make sed libffi libtool \
+    autoconf automake bash bzip2 bison flex gcc gdk-pixbuf2\
+    gettext git gperf intltool make sed libffi libtool \
     openssl patch perl perl-xml-parser pkgconfig python \
     ruby scons unzip wget xz xz-lzma
    @@ -718,7 +718,7 @@ USE_OSGPLUGIN(<plugin2>) 
    emerge \
     sys-devel/autoconf sys-devel/automake app-shells/bash \
-    sys-devel/bison app-arch/bzip2 dev-util/cmake \
+    sys-devel/bison app-arch/bzip2 \
     sys-devel/flex sys-devel/gcc sys-devel/gettext \
     dev-vcs/git dev-util/gperf dev-util/intltool \
     sys-devel/make sys-apps/sed dev-libs/libffi \
@@ -741,9 +741,9 @@ USE_OSGPLUGIN(<plugin2>)
     
    
     
     
    sudo port install \
-    autoconf automake bison cmake coreutils flex gettext \
-    gdk-pixbuf2 glib2 gsed intltool libffi libtool openssl \
-    p5-xml-parser p7zip scons wget xz
    
+    autoconf automake bison coreutils flex gettext \
+    gdk-pixbuf2 glib2 gsed intltool libffi libtool \
+    openssl p5-xml-parser p7zip scons wget xz
    Method 2 - Rudix

    @@ -752,7 +752,7 @@ USE_OSGPLUGIN(<plugin2>) 

    sudo rudix install \
-    autoconf automake cmake coreutils gettext glib intltool \
+    autoconf automake coreutils gettext glib intltool \
     libtool p7zip scons sed wget xz

    Note: gdk-pixbuf2 is not installed in method 2, @@ -767,7 +767,7 @@ USE_OSGPLUGIN(<plugin2>) 

    brew install \
-    autoconf automake cmake coreutils gdk-pixbuf gettext \
+    autoconf automake coreutils gdk-pixbuf gettext \
     gnu-sed intltool libtool p7zip wget xz

    and: @@ -798,11 +798,11 @@ USE_OSGPLUGIN(<plugin2>) 

    zypper install -R \
-    autoconf automake bash bison bzip2 cmake flex gcc-c++ \
-    gdk-pixbuf-devel gettext-tools git gperf intltool libffi-devel libtool \
-    make openssl libopenssl-devel p7zip patch perl \
-    perl-XML-Parser pkg-config python ruby scons sed unzip \
-    wget xz
    + autoconf automake bash bison bzip2 flex gcc-c++ \ + gdk-pixbuf-devel gettext-tools git gperf intltool \ + libffi-devel libtool make openssl libopenssl-devel \ + p7zip patch perl perl-XML-Parser pkg-config python \ + ruby scons sed unzip wget xz

    On 64-bit openSUSE, install also: diff --git a/src/cmake.mk b/src/cmake.mk index 11c44efc..f99868e0 100644 --- a/src/cmake.mk +++ b/src/cmake.mk @@ -8,6 +8,7 @@ $(PKG)_CHECKSUM := 6b4ea61eadbbd9bec0ccb383c29d1f4496eacc121ef7acf37c7a247778056 $(PKG)_SUBDIR := cmake-$($(PKG)_VERSION) $(PKG)_FILE := cmake-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.cmake.org/files/v$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) +$(PKG)_TARGETS := $(BUILD) $(PKG)_DEPS := define $(PKG)_UPDATE diff --git a/src/mxe-conf.mk b/src/mxe-conf.mk index 9adc6856..082c0ade 100644 --- a/src/mxe-conf.mk +++ b/src/mxe-conf.mk @@ -53,10 +53,10 @@ define $(PKG)_BUILD echo 'if [[ "$$NO_MXE_TOOLCHAIN" == "1" ]]; then'; \ echo ' echo "== Skip using MXE toolchain: $(CMAKE_TOOLCHAIN_FILE)"'; \ echo ' # see https://github.com/mxe/mxe/issues/932'; \ - echo ' exec cmake "$$@"'; \ + echo ' exec "$(PREFIX)/$(BUILD)/bin/cmake" "$$@"'; \ echo 'else'; \ echo ' echo "== Using MXE toolchain: $(CMAKE_TOOLCHAIN_FILE)"'; \ - echo ' exec cmake -DCMAKE_TOOLCHAIN_FILE="$(CMAKE_TOOLCHAIN_FILE)" "$$@"'; \ + echo ' exec "$(PREFIX)/$(BUILD)/bin/cmake" -DCMAKE_TOOLCHAIN_FILE="$(CMAKE_TOOLCHAIN_FILE)" "$$@"'; \ echo 'fi'; \ ) \ > '$(PREFIX)/bin/$(TARGET)-cmake' From 87fbc776f7d77b6b8852bde3ce35b230da3ef043 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Fri, 27 Nov 2015 14:49:22 +1100 Subject: [PATCH 0070/1463] docs: update homebrew notes fixes #1010 --- index.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index a7408eff..a75f9cda 100644 --- a/index.html +++ b/index.html @@ -770,10 +770,12 @@ USE_OSGPLUGIN(<plugin2>) autoconf automake cmake coreutils gdk-pixbuf gettext \ gnu-sed intltool libtool p7zip wget xz

    - and: + Some formulae are + keg-only + and will need brew link to be found.

    - 
    export PATH=${PATH}:/usr/local/opt/gettext/bin
    +
    Genral Notes

    You may be prompted to install a java runtime - this is not required. From 8aebbd765ced5ce6e29ac7feb3b939e689cd95f2 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Fri, 27 Nov 2015 13:54:05 +0100 Subject: [PATCH 0071/1463] harfbuzz: update --- src/harfbuzz.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/harfbuzz.mk b/src/harfbuzz.mk index b655ca44..370ba425 100644 --- a/src/harfbuzz.mk +++ b/src/harfbuzz.mk @@ -3,8 +3,8 @@ PKG := harfbuzz $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1.0 -$(PKG)_CHECKSUM := 0f584a5947e60ede565e7a4e122baa5e4b17a62eab872abf5f73d8552ceb716b +$(PKG)_VERSION := 1.1.2 +$(PKG)_CHECKSUM := 4a2c5790bd3db7c3ca8c02e4858f2fd592df7932c1d2fa9f6b99acbce0f8461f $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://www.freedesktop.org/software/$(PKG)/release/$($(PKG)_FILE) From b5546cf2f5baa109ed4aae99884fff616c07c485 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Fri, 27 Nov 2015 13:00:41 +0000 Subject: [PATCH 0072/1463] Update versions.json --- versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.json b/versions.json index 06e07ddd..fcdff0d4 100644 --- a/versions.json +++ b/versions.json @@ -95,7 +95,7 @@ "gtksourceview": "2.10.5", "gtksourceviewmm2": "2.10.3", "guile": "1.8.8", - "harfbuzz": "1.1.0", + "harfbuzz": "1.1.2", "hdf4": "4.2.10", "hdf5": "1.8.12", "hunspell": "1.3.3", From 46baacbd2116380e67bb072730886140caf9d8d8 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 28 Nov 2015 20:07:29 +1100 Subject: [PATCH 0073/1463] hdf5: add cmake test --- src/hdf5-test.cmake | 14 ++++++++++++++ src/hdf5.mk | 8 ++++++++ 2 files changed, 22 insertions(+) create mode 100644 src/hdf5-test.cmake diff --git a/src/hdf5-test.cmake b/src/hdf5-test.cmake new file mode 100644 index 00000000..d2a1408f --- /dev/null +++ b/src/hdf5-test.cmake @@ -0,0 +1,14 @@ +# This file is part of MXE. +# See index.html for further information. + +# partial module - included by src/cmake/CMakeLists.txt + +set(TGT test-${PKG}-cmake) + +enable_language(CXX) +add_executable(${TGT} ${CMAKE_CURRENT_LIST_DIR}/${PKG}-test.cpp) + +find_package(HDF5 ${PKG_VERSION} EXACT REQUIRED) +target_link_libraries(${TGT} ${HDF5_LIBRARIES}) + +install(TARGETS ${TGT} DESTINATION bin) diff --git a/src/hdf5.mk b/src/hdf5.mk index de5d1607..56cd437f 100644 --- a/src/hdf5.mk +++ b/src/hdf5.mk @@ -69,4 +69,12 @@ define $(PKG)_BUILD -W -Wall -Werror -ansi -pedantic \ '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-hdf5.exe' \ -lhdf5_hl -lhdf5 -lz + + # test cmake can find hdf5 + mkdir '$(1).test-cmake' + cd '$(1).test-cmake' && '$(TARGET)-cmake' \ + -DPKG=$(PKG) \ + -DPKG_VERSION=$($(PKG)_VERSION) \ + '$(PWD)/src/cmake/test' + $(MAKE) -C '$(1).test-cmake' -j 1 install VERBOSE=ON endef From 9f0dbfafc60b725dc09c85059b5b58c3298e3319 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 28 Nov 2015 21:06:13 +1100 Subject: [PATCH 0074/1463] cgal:update 4.5-->4.6.3 and enable shared --- src/cgal-1-fixes.patch | 27 --------------------------- src/cgal.mk | 29 ++++++++++++----------------- 2 files changed, 12 insertions(+), 44 deletions(-) delete mode 100644 src/cgal-1-fixes.patch diff --git a/src/cgal-1-fixes.patch b/src/cgal-1-fixes.patch deleted file mode 100644 index f2a9b2a2..00000000 --- a/src/cgal-1-fixes.patch +++ /dev/null @@ -1,27 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Contains ad hoc patches for cross building. - -From 211217324f551479c15cdf77bac6c397112f3b3d Mon Sep 17 00:00:00 2001 -From: Timothy Gu -Subject: [PATCH] Fix GCC detection - -Signed-off-by: Timothy Gu - -diff --git a/include/CGAL/sse2.h b/include/CGAL/sse2.h -index acc7ece..3e8394d 100644 ---- a/include/CGAL/sse2.h -+++ b/include/CGAL/sse2.h -@@ -29,7 +29,7 @@ - - #if defined ( _MSC_VER ) - #define CGAL_ALIGN_16 __declspec(align(16)) --#elif defined( __GNU__ ) -+#elif defined( __GNUC__ ) - #define CGAL_ALIGN_16 __attribute__((aligned(16))) - #endif - --- -1.9.1 - diff --git a/src/cgal.mk b/src/cgal.mk index 6ef3e466..cae0b1ca 100644 --- a/src/cgal.mk +++ b/src/cgal.mk @@ -3,11 +3,11 @@ PKG := cgal $(PKG)_IGNORE := -$(PKG)_VERSION := 4.5 -$(PKG)_CHECKSUM := 799e8bb275033fbd6a7af015a178bc3371cb81b166e58669029ac0eb8b6e5003 +$(PKG)_VERSION := 4.6.3 +$(PKG)_CHECKSUM := e338027b8767c0a7a6e4fd8679182d1b83b5b1a0da0a1fe4546e7c0ca094fc21 $(PKG)_SUBDIR := CGAL-$($(PKG)_VERSION) $(PKG)_FILE := CGAL-$($(PKG)_VERSION).tar.xz -$(PKG)_URL := https://gforge.inria.fr/frs/download.php/34139/$($(PKG)_FILE) +$(PKG)_URL := https://gforge.inria.fr/frs/download.php/latestfile/2743/$($(PKG)_FILE) $(PKG)_DEPS := gcc boost gmp mpfr qt define $(PKG)_UPDATE @@ -18,39 +18,34 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && cmake \ + cd '$(1)' && '$(TARGET)-cmake' \ -DCGAL_INSTALL_CMAKE_DIR:STRING="lib/CGAL" \ -DCGAL_INSTALL_INC_DIR:STRING="include" \ -DCGAL_INSTALL_DOC_DIR:STRING="share/doc/CGAL-$($(PKG)_VERSION)" \ -DCGAL_INSTALL_BIN_DIR:STRING="bin" \ - -DCGAL_Boost_USE_STATIC_LIBS:BOOL=OFF \ + -DCGAL_BUILD_SHARED_LIBS=$(CMAKE_SHARED_BOOL) \ + -DCGAL_Boost_USE_STATIC_LIBS:BOOL=$(CMAKE_STATIC_BOOL) \ -DWITH_CGAL_Qt3:BOOL=OFF \ -DWITH_OpenGL:BOOL=ON \ -DWITH_ZLIB:BOOL=ON \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DBUILD_SHARED_LIBS=OFF \ -C '$(PWD)/src/cgal-TryRunResults.cmake' . $(MAKE) -C '$(1)' -j $(JOBS) $(MAKE) -C '$(1)' -j $(JOBS) install - cd '$(1)/examples/AABB_tree' && cmake \ + cd '$(1)/examples/AABB_tree' && '$(TARGET)-cmake' \ -DWITH_CGAL_Qt3:BOOL=OFF \ - -DCGAL_Boost_USE_STATIC_LIBS:BOOL=OFF \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DBUILD_SHARED_LIBS=OFF \ + -DCGAL_BUILD_SHARED_LIBS=$(CMAKE_SHARED_BOOL) \ + -DCGAL_Boost_USE_STATIC_LIBS:BOOL=$(CMAKE_STATIC_BOOL) \ -DCGAL_DIR:STRING="../.." . $(MAKE) -C '$(1)/examples/AABB_tree' -j $(JOBS) $(INSTALL) '$(1)/examples/AABB_tree/AABB_polyhedron_edge_example.exe' '$(PREFIX)/$(TARGET)/bin/test-cgal.exe' - cd '$(1)/examples/CGALimageIO' && cmake \ + cd '$(1)/examples/CGALimageIO' && '$(TARGET)-cmake' \ -DWITH_CGAL_Qt3:BOOL=OFF \ - -DCGAL_Boost_USE_STATIC_LIBS:BOOL=OFF \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DBUILD_SHARED_LIBS=OFF \ + -DCGAL_BUILD_SHARED_LIBS=$(CMAKE_SHARED_BOOL) \ + -DCGAL_Boost_USE_STATIC_LIBS:BOOL=$(CMAKE_STATIC_BOOL) \ -DCGAL_DIR:STRING="../.." . $(MAKE) -C '$(1)/examples/CGALimageIO' -j $(JOBS) $(INSTALL) '$(1)/examples/CGALimageIO/convert_raw_image_to_inr.exe' '$(PREFIX)/$(TARGET)/bin/test-cgalimgio.exe' endef - -$(PKG)_BUILD_SHARED = From 70fa458a6eac5429298074fbcc57789f7fddbfd9 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sat, 28 Nov 2015 10:06:41 +0000 Subject: [PATCH 0075/1463] Update versions.json --- versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.json b/versions.json index fcdff0d4..5849d108 100644 --- a/versions.json +++ b/versions.json @@ -23,7 +23,7 @@ "ccfits": "2.4", "cegui": "0.7.9", "cfitsio": "3370", - "cgal": "4.5", + "cgal": "4.6.3", "check": "0.9.14", "chipmunk": "6.2.2", "chromaprint": "1.1", From 91731fb08724e60f2769f71971ced4a59224e341 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 28 Nov 2015 22:14:05 +1100 Subject: [PATCH 0076/1463] gcc: ignore version 5 updates --- src/gcc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gcc.mk b/src/gcc.mk index be8d5f6c..70923e63 100644 --- a/src/gcc.mk +++ b/src/gcc.mk @@ -2,7 +2,7 @@ # See index.html for further information. PKG := gcc -$(PKG)_IGNORE := +$(PKG)_IGNORE := 5% $(PKG)_VERSION := 4.9.3 $(PKG)_CHECKSUM := 2332b2a5a321b57508b9031354a8503af6fdfb868b8c1748d33028d100a8b67e $(PKG)_SUBDIR := gcc-$($(PKG)_VERSION) From 702b214c8316c347fb2ee75e07d36af70a7e0c4e Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sun, 29 Nov 2015 01:56:57 +1100 Subject: [PATCH 0077/1463] hdf5: fix for static cmake test --- src/hdf5-test.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hdf5-test.cmake b/src/hdf5-test.cmake index d2a1408f..dc9c6912 100644 --- a/src/hdf5-test.cmake +++ b/src/hdf5-test.cmake @@ -8,7 +8,7 @@ set(TGT test-${PKG}-cmake) enable_language(CXX) add_executable(${TGT} ${CMAKE_CURRENT_LIST_DIR}/${PKG}-test.cpp) -find_package(HDF5 ${PKG_VERSION} EXACT REQUIRED) +find_package(HDF5 ${PKG_VERSION} EXACT REQUIRED COMPONENTS C HL) target_link_libraries(${TGT} ${HDF5_LIBRARIES}) install(TARGETS ${TGT} DESTINATION bin) From 499ae65452af1a6e8260aad561b63a3782fb59fe Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 29 Nov 2015 13:16:54 +0300 Subject: [PATCH 0078/1463] patch-tool-mxe: do not replace author with "MXE" Replace existing "From: MXE" with "From: fix@me". Authors of such patches can be found using git history. see #983 --- tools/patch-tool-mxe | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/tools/patch-tool-mxe b/tools/patch-tool-mxe index 1ba10c92..86326128 100755 --- a/tools/patch-tool-mxe +++ b/tools/patch-tool-mxe @@ -20,9 +20,6 @@ setupEnv() { mkdir -p ${gitsdir} - # John Doe - export author=`git var GIT_AUTHOR_IDENT | sed 's/^\(.* [<].*[>]\).*$/\1/'` - export pkg_version=`grep '^$(PKG)_VERSION' $mxedir/src/$pkg.mk | \ sed 's/.*:= \(.*\)/\1/'` @@ -100,8 +97,7 @@ function export_patch { echo '' echo 'Contains ad hoc patches for cross building.' echo '' - git format-patch -p --stdout dist..HEAD | \ - sed 's/^From: .*/From: MXE/g;' + git format-patch -p --stdout dist..HEAD ) > $mxedir/src/${pkg}-${patch_name}.patch && \ echo "Generated ${mxedir}/src/${pkg}-${patch_name}.patch" } @@ -117,7 +113,7 @@ function import_patch { cd $gitsdir/$pkg_subdir && \ cat ${mxedir}/src/${pkg}-${patch_name}.patch | \ sed '/^From/,$ !d' | \ - sed s/'^From: .*'/"From: $author"/'g;' | \ + sed s/'^From: MXE'/"From: fix@me"/'g;' | \ git am --keep-cr && \ echo "Imported ${mxedir}/src/${pkg}-${patch_name}.patch" else From baf62f66bb6ee991a3f3a9430842f5f9e9b0d697 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 29 Nov 2015 13:26:42 +0300 Subject: [PATCH 0079/1463] patch-tool-mxe: fix getting patch_name Previous implementation failed with "set -o nounset": ./tools/patch-tool-mxe: line 10: $3: unbound variable see #983 --- tools/patch-tool-mxe | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tools/patch-tool-mxe b/tools/patch-tool-mxe index 86326128..ceb3576b 100755 --- a/tools/patch-tool-mxe +++ b/tools/patch-tool-mxe @@ -5,10 +5,7 @@ cmd=$1 pkg=$2 -patch_name=$3 -if [ -z "$patch_name" ]; then - patch_name=1-fixes -fi +patch_name=${3:-1-fixes} setupEnv() { # MXE directory From cfb73654d34ea5c539e85490a88b658c33806d17 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 29 Nov 2015 13:33:11 +0300 Subject: [PATCH 0080/1463] fix "patch-tool-mxe init" for gcc gcc (and maybe other packages) has both $(PKG)_FILE and $(PKG)_FILE_$(BUILD). Previously the following error occurred: $ ./tools/patch-tool-mxe init gcc ./tools/patch-tool-mxe: line 57: [: too many arguments see #983 --- tools/patch-tool-mxe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/patch-tool-mxe b/tools/patch-tool-mxe index ceb3576b..ae9e6765 100755 --- a/tools/patch-tool-mxe +++ b/tools/patch-tool-mxe @@ -28,7 +28,7 @@ setupEnv() { sed s/'$(call SHORT_PKG_VERSION,$(PKG))'/$pkg_short_version/ | \ sed s/'$(PKG)'/$pkg/;` - export pkg_file=`grep '^$(PKG)_FILE' $mxedir/src/$pkg.mk | \ + export pkg_file=`grep '^$(PKG)_FILE\>' $mxedir/src/$pkg.mk | \ sed 's/.*:= \(.*\)/\1/' | \ sed s/'$($(PKG)_VERSION)'/$pkg_version/ | \ sed s/'$(call SHORT_PKG_VERSION,$(PKG))'/$pkg_short_version/ | \ From 80e603b1092cb7b5a78ce7096b1e035402e86f9a Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 29 Nov 2015 15:11:52 +0300 Subject: [PATCH 0081/1463] fix "git am" for gcc-1.patch _subborrow_u32 was replaced with _addcarryx_u32 patch tool is less verbose than "git am". see #983 --- src/gcc-1.patch | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/gcc-1.patch b/src/gcc-1.patch index a72269eb..ceeb45f2 100644 --- a/src/gcc-1.patch +++ b/src/gcc-1.patch @@ -48,7 +48,7 @@ diff --git a/gcc/config/i386/adxintrin.h b/gcc/config/i386/adxintrin.h index dd2a26c..2e680b3 100644 --- a/gcc/config/i386/adxintrin.h +++ b/gcc/config/i386/adxintrin.h -@@ -28,6 +28,10 @@ +@@ -28,5 +28,9 @@ #ifndef _ADXINTRIN_H_INCLUDED #define _ADXINTRIN_H_INCLUDED @@ -58,7 +58,6 @@ index dd2a26c..2e680b3 100644 + extern __inline unsigned char __attribute__((__gnu_inline__, __always_inline__, __artificial__)) - _subborrow_u32 (unsigned char __CF, unsigned int __X, @@ -78,4 +82,8 @@ _addcarryx_u64 (unsigned char __CF, unsigned long long __X, } #endif From eb332fde2e122bad9553f7db627e8440e56cd618 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 29 Nov 2015 15:14:34 +0300 Subject: [PATCH 0082/1463] patch-tool-mxe: git format-patch *--no-numbered* Decrease patch diff size. See #983 --- tools/patch-tool-mxe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/patch-tool-mxe b/tools/patch-tool-mxe index ae9e6765..f7ae75c8 100755 --- a/tools/patch-tool-mxe +++ b/tools/patch-tool-mxe @@ -94,7 +94,7 @@ function export_patch { echo '' echo 'Contains ad hoc patches for cross building.' echo '' - git format-patch -p --stdout dist..HEAD + git format-patch --no-numbered -p --stdout dist..HEAD ) > $mxedir/src/${pkg}-${patch_name}.patch && \ echo "Generated ${mxedir}/src/${pkg}-${patch_name}.patch" } From 06ff4c57b046fc5493694627ca73638c00116b71 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 29 Nov 2015 15:35:49 +0300 Subject: [PATCH 0083/1463] patch-tool-mxe: omit signature with git version Signature is a string like: -- 1.9.1 Decrease patch diff size. See #983 --- tools/patch-tool-mxe | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/patch-tool-mxe b/tools/patch-tool-mxe index f7ae75c8..a8277101 100755 --- a/tools/patch-tool-mxe +++ b/tools/patch-tool-mxe @@ -94,7 +94,12 @@ function export_patch { echo '' echo 'Contains ad hoc patches for cross building.' echo '' - git format-patch --no-numbered -p --stdout dist..HEAD + git format-patch \ + --no-numbered \ + -p \ + --no-signature \ + --stdout \ + dist..HEAD ) > $mxedir/src/${pkg}-${patch_name}.patch && \ echo "Generated ${mxedir}/src/${pkg}-${patch_name}.patch" } From 711a99a580c5c29a8255feaf051984ad99f1f76f Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 29 Nov 2015 15:43:30 +0300 Subject: [PATCH 0084/1463] patch-tool-mxe: replace object names with zeros Decrease patch diff size. See #983 --- tools/patch-tool-mxe | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/patch-tool-mxe b/tools/patch-tool-mxe index a8277101..2bbb64b5 100755 --- a/tools/patch-tool-mxe +++ b/tools/patch-tool-mxe @@ -99,7 +99,8 @@ function export_patch { -p \ --no-signature \ --stdout \ - dist..HEAD + dist..HEAD | \ + sed 's/^index .......\.\......../index 0000000..0000000/' ) > $mxedir/src/${pkg}-${patch_name}.patch && \ echo "Generated ${mxedir}/src/${pkg}-${patch_name}.patch" } From 8fe0680679e77738d1b30af417dcc2dce63ef67b Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 29 Nov 2015 15:44:07 +0300 Subject: [PATCH 0085/1463] patch-tool-mxe: replace commit hash with zeros Decrease patch diff size. See #983 --- tools/patch-tool-mxe | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/patch-tool-mxe b/tools/patch-tool-mxe index 2bbb64b5..09539abb 100755 --- a/tools/patch-tool-mxe +++ b/tools/patch-tool-mxe @@ -100,6 +100,7 @@ function export_patch { --no-signature \ --stdout \ dist..HEAD | \ + sed 's/^From [0-9a-f]\{40\} /From 0000000000000000000000000000000000000000 /' | \ sed 's/^index .......\.\......../index 0000000..0000000/' ) > $mxedir/src/${pkg}-${patch_name}.patch && \ echo "Generated ${mxedir}/src/${pkg}-${patch_name}.patch" From 641a250ce15baa6ca10c9d992306688a0f368218 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sun, 29 Nov 2015 13:59:50 +0100 Subject: [PATCH 0086/1463] freetype: update --- src/freetype.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/freetype.mk b/src/freetype.mk index 9b6ad4fa..c5ea74d5 100644 --- a/src/freetype.mk +++ b/src/freetype.mk @@ -3,8 +3,8 @@ PKG := freetype $(PKG)_IGNORE := -$(PKG)_VERSION := 2.6.1 -$(PKG)_CHECKSUM := 2f6e9a7de3ae8e85bdd2fe237e27d868d3ba7a27495e65906455c27722dd1a17 +$(PKG)_VERSION := 2.6.2 +$(PKG)_CHECKSUM := baf6bdef7cdcc12ac270583f76ef245efe936267dbecef835f02a3409fcbb892 $(PKG)_SUBDIR := freetype-$($(PKG)_VERSION) $(PKG)_FILE := freetype-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/freetype/freetype2/$(shell echo '$($(PKG)_VERSION)' | cut -d . -f 1,2,3)/$($(PKG)_FILE) From 42ee8895a958527c6f2c67a04bb2491646b56929 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sun, 29 Nov 2015 13:00:32 +0000 Subject: [PATCH 0087/1463] Update versions.json --- versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions.json b/versions.json index 5849d108..a57471bd 100644 --- a/versions.json +++ b/versions.json @@ -56,8 +56,8 @@ "freeglut": "2.8.1", "freeimage": "3.15.4", "freetds": "0.95.8", - "freetype": "2.6.1", - "freetype-bootstrap": "2.6.1", + "freetype": "2.6.2", + "freetype-bootstrap": "2.6.2", "fribidi": "0.19.6", "ftgl": "2.1.3~rc5", "gc": "7.2e", From d6e2ad38053a9c45c1f62094b63001a195103276 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 30 Nov 2015 14:50:10 +1100 Subject: [PATCH 0088/1463] Makefile: only call UPDATE if rule exists --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3e328ef7..85f8d529 100644 --- a/Makefile +++ b/Makefile @@ -603,11 +603,12 @@ define UPDATE endef update: - $(foreach PKG,$(PKGS),$(call UPDATE,$(PKG),$(shell $($(PKG)_UPDATE)))) + $(foreach PKG,$(PKGS),\ + $(and $($(PKG)_UPDATE),$(call UPDATE,$(PKG),$(shell $($(PKG)_UPDATE))))) update-package-%: $(if $(call set_is_member,$*,$(PKGS)), \ - $(call UPDATE,$*,$(shell $($*_UPDATE))), \ + $(and $($*_UPDATE),$(call UPDATE,$*,$(shell $($*_UPDATE)))), \ $(error Package $* not found in index.html)) update-checksum-%: From 88859e7a0f7c3e39a9ca85d386a85245ac95a0c3 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 30 Nov 2015 14:51:46 +1100 Subject: [PATCH 0089/1463] pthreads, qt5: remove unnecessary *_UPDATE boilerplate --- src/pthreads.mk | 4 ---- src/qt5.mk | 1 - 2 files changed, 5 deletions(-) diff --git a/src/pthreads.mk b/src/pthreads.mk index e8b1a89c..d69b3b9c 100644 --- a/src/pthreads.mk +++ b/src/pthreads.mk @@ -8,10 +8,6 @@ PKG := pthreads $(PKG)_VERSION := POSIX 1003.1-2001 $(PKG)_DEPS := gcc -define $(PKG)_UPDATE - echo $(pthreads_VERSION) -endef - define $(PKG)_BUILD # install and test pkg-config $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig' diff --git a/src/qt5.mk b/src/qt5.mk index 570c4226..d8389ed8 100644 --- a/src/qt5.mk +++ b/src/qt5.mk @@ -3,7 +3,6 @@ PKG := qt5 $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_UPDATE = echo $(qtbase_VERSION) $(PKG)_DEPS := $(patsubst $(TOP_DIR)/src/%.mk,%,\ $(shell grep -l 'DEPS.*qtbase' \ $(TOP_DIR)/src/qt*.mk \ From 70c4d91a07046a2117feb4a05b7665c39bbd1965 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 30 Nov 2015 15:05:00 +1100 Subject: [PATCH 0090/1463] Makefile: also disable networking during build on OSX closes #986 --- Makefile | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 85f8d529..3b3d7bb6 100644 --- a/Makefile +++ b/Makefile @@ -144,8 +144,11 @@ define MXE_GET_GITHUB_TAGS | tail -1 endef +# shared lib preload to disable networking, enable faketime etc +PRELOAD_VARS := LD_PRELOAD DYLD_FORCE_FLAT_NAMESPACE DYLD_INSERT_LIBRARIES + # use a minimal whitelist of safe environment variables -ENV_WHITELIST := PATH LANG MAKE% MXE% %PROXY %proxy LD_LIBRARY_PATH LD_PRELOAD ACLOCAL_PATH +ENV_WHITELIST := PATH LANG MAKE% MXE% %PROXY %proxy LD_LIBRARY_PATH $(PRELOAD_VARS) ACLOCAL_PATH unexport $(filter-out $(ENV_WHITELIST),$(shell env | cut -d '=' -f1)) # disable wine with readonly directory (created by mxe-conf) @@ -409,7 +412,16 @@ download-only-$(1): endef $(foreach PKG,$(PKGS),$(eval $(call PKG_RULE,$(PKG)))) -$(PREFIX)/lib/nonetwork.so: $(TOP_DIR)/tools/nonetwork.c +# disable networking during build-only rules for reproducibility +ifeq ($(findstring darwin,$(BUILD)),) + NONET_LIB := $(PREFIX)/lib/nonetwork.so + PRELOAD := LD_PRELOAD='$(NONET_LIB)' +else + NONET_LIB := $(PREFIX)/lib/nonetwork.dylib + PRELOAD := DYLD_FORCE_FLAT_NAMESPACE=1 DYLD_INSERT_LIBRARIES='$(NONET_LIB)' +endif + +$(NONET_LIB): $(TOP_DIR)/tools/nonetwork.c @mkdir -p $(dir $@) @$(BUILD_CC) -shared -fPIC -o $@ $< @@ -424,7 +436,7 @@ $(PREFIX)/$(3)/installed/$(1): $(PKG_MAKEFILES) \ | $(if $(DONT_CHECK_REQUIREMENTS),,check-requirements) \ $(if $(value $(call LOOKUP_PKG_RULE,$(1),URL,$(3))),download-only-$(1)) \ $(addprefix $(PREFIX)/$(3)/installed/,$(if $(call set_is_not_member,$(1),$(MXE_CONF_PKGS)),$(MXE_CONF_PKGS))) \ - $(PREFIX)/lib/nonetwork.so + $(NONET_LIB) @[ -d '$(LOG_DIR)/$(TIMESTAMP)' ] || mkdir -p '$(LOG_DIR)/$(TIMESTAMP)' $(if $(value $(call LOOKUP_PKG_RULE,$(1),BUILD,$(3))), @$(PRINTF_FMT) '[build]' '$(1)' '$(3)', @@ -433,7 +445,7 @@ $(PREFIX)/$(3)/installed/$(1): $(PKG_MAKEFILES) \ @$(PRINTF_FMT) '[message]' '$(1)' '$(3) $($(call LOOKUP_PKG_RULE,$(1),MESSAGE,$(3)))') @touch '$(LOG_DIR)/$(TIMESTAMP)/$(1)_$(3)' @ln -sf '$(TIMESTAMP)/$(1)_$(3)' '$(LOG_DIR)/$(1)_$(3)' - @if ! (time LD_PRELOAD="$(PREFIX)/lib/nonetwork.so" $(MAKE) -f '$(MAKEFILE)' 'build-only-$(1)_$(3)' WGET=false) &> '$(LOG_DIR)/$(TIMESTAMP)/$(1)_$(3)'; then \ + @if ! (time $(PRELOAD) $(MAKE) -f '$(MAKEFILE)' 'build-only-$(1)_$(3)' WGET=false) &> '$(LOG_DIR)/$(TIMESTAMP)/$(1)_$(3)'; then \ echo; \ echo 'Failed to build package $(1) for target $(3)!'; \ echo '------------------------------------------------------------'; \ From 710abc555975f2cde0b1ef303d43461004775b71 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 30 Nov 2015 16:47:41 +1100 Subject: [PATCH 0091/1463] gettext, libiconv, libtool native plugins: fix variable redefinition --- plugins/native/gettext.mk | 2 +- plugins/native/libiconv.mk | 2 +- plugins/native/libtool.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/native/gettext.mk b/plugins/native/gettext.mk index 4c4c2683..413671fa 100644 --- a/plugins/native/gettext.mk +++ b/plugins/native/gettext.mk @@ -2,7 +2,7 @@ # See index.html for further information. PKG := gettext -$(PKG)_TARGETS += $(BUILD) +$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) $(PKG)_DEPS_$(BUILD) := libiconv define $(PKG)_BUILD_$(BUILD) diff --git a/plugins/native/libiconv.mk b/plugins/native/libiconv.mk index f9ed4b5a..faadeed1 100644 --- a/plugins/native/libiconv.mk +++ b/plugins/native/libiconv.mk @@ -2,7 +2,7 @@ # See index.html for further information. PKG := libiconv -$(PKG)_TARGETS += $(BUILD) +$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) $(PKG)_DEPS_$(BUILD) := define $(PKG)_BUILD_$(BUILD) diff --git a/plugins/native/libtool.mk b/plugins/native/libtool.mk index aba72044..58769fa5 100644 --- a/plugins/native/libtool.mk +++ b/plugins/native/libtool.mk @@ -2,7 +2,7 @@ # See index.html for further information. PKG := libtool -$(PKG)_TARGETS += $(BUILD) +$(PKG)_TARGETS := $(BUILD) $(PKG)_DEPS_$(BUILD) := autoconf automake define $(PKG)_BUILD_$(BUILD) From 2944ccde5de26b062547ad87fb6354908f7aaf47 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 30 Nov 2015 16:49:34 +1100 Subject: [PATCH 0092/1463] Makefile: remove *_MAKEFILE boilerplate and enable all- target --- Makefile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 3b3d7bb6..03b42b84 100644 --- a/Makefile +++ b/Makefile @@ -174,9 +174,7 @@ UNPACK_PKG_ARCHIVE = \ $(call UNPACK_ARCHIVE,$(PKG_DIR)/$($(1)_FILE)) # some shortcuts for awareness of MXE_PLUGIN_DIRS -# plugins will need to set their own $(PKG)_MAKEFILE for updates # all files for extension plugins will be considered for outdated checks -PKG_MAKEFILE = $(realpath $(or $($(1)_MAKEFILE),$(TOP_DIR)/src/$(1).mk)) PKG_MAKEFILES = $(realpath $(sort $(wildcard $(addsuffix /$(1).mk, $(TOP_DIR)/src $(MXE_PLUGIN_DIRS))))) PKG_TESTFILES = $(realpath $(sort $(wildcard $(addsuffix /$(1)-test*, $(TOP_DIR)/src $(MXE_PLUGIN_DIRS))))) PKG_PATCHES = $(realpath $(sort $(wildcard $(addsuffix /$(1)-[0-9]*.patch, $(TOP_DIR)/src $(MXE_PLUGIN_DIRS))))) @@ -333,11 +331,17 @@ $(PREFIX)/installed/check-requirements: $(MAKEFILE) fi @touch '$@' +# include core MXE packages and set *_MAKEFILE include $(patsubst %,$(TOP_DIR)/src/%.mk,$(PKGS)) +$(foreach PKG,$(PKGS),\ + $(eval $(PKG)_MAKEFILE := $(realpath $(TOP_DIR)/src/$(PKG).mk))) -# include files from MXE_PLUGIN_DIRS +# include files from MXE_PLUGIN_DIRS, set *_MAKEFILE and `all-` target PLUGIN_FILES := $(realpath $(wildcard $(addsuffix /*.mk,$(MXE_PLUGIN_DIRS)))) PLUGIN_PKGS := $(basename $(notdir $(PLUGIN_FILES))) +$(foreach FILE,$(PLUGIN_FILES),\ + $(eval $(basename $(notdir $(FILE)))_MAKEFILE ?= $(FILE)) \ + $(eval all-$(lastword $(call split,/,$(dir $(FILE)))): $(basename $(notdir $(FILE))))) include $(PLUGIN_FILES) PKGS := $(sort $(PKGS) $(PLUGIN_PKGS)) @@ -606,9 +610,9 @@ define UPDATE $(info OLD $(1) $($(1)_VERSION) --> $(2) ignoring)), $(info NEW $(1) $($(1)_VERSION) --> $(2)) $(if $(findstring undefined, $(origin UPDATE_DRYRUN)), - $(SED) -i 's/^\([^ ]*_VERSION *:=\).*/\1 $(2)/' '$(PKG_MAKEFILE)' + $(SED) -i 's/^\([^ ]*_VERSION *:=\).*/\1 $(2)/' '$($(1)_MAKEFILE)' $(MAKE) -f '$(MAKEFILE)' 'update-checksum-$(1)' \ - || { $(SED) -i 's/^\([^ ]*_VERSION *:=\).*/\1 $($(1)_VERSION)/' '$(PKG_MAKEFILE)'; \ + || { $(SED) -i 's/^\([^ ]*_VERSION *:=\).*/\1 $($(1)_VERSION)/' '$($(1)_MAKEFILE)'; \ exit 1; }))), $(info Unable to update version number of package $(1) \ $(newline)$(newline)$($(1)_UPDATE)$(newline))) @@ -626,7 +630,7 @@ update-package-%: update-checksum-%: $(if $(call set_is_member,$*,$(PKGS)), \ $(call DOWNLOAD_PKG_ARCHIVE,$*) && \ - $(SED) -i 's/^\([^ ]*_CHECKSUM *:=\).*/\1 '"`$(call PKG_CHECKSUM,$*)`"'/' '$(call PKG_MAKEFILE,$*)', \ + $(SED) -i 's/^\([^ ]*_CHECKSUM *:=\).*/\1 '"`$(call PKG_CHECKSUM,$*)`"'/' '$($*_MAKEFILE)', \ $(error Package $* not found in index.html)) .PHONY: cleanup-style From ac63ff22c8277417caee2c246644626cdf0bbb9c Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 30 Nov 2015 16:50:24 +1100 Subject: [PATCH 0093/1463] plugins: remove *_MAKEFILE boilerplate --- plugins/apps/keepassx.mk | 1 - plugins/native/autoconf.mk | 1 - plugins/native/automake.mk | 1 - plugins/native/bison.mk | 1 - plugins/native/coreutils.mk | 1 - plugins/native/flex.mk | 1 - plugins/native/gperf.mk | 1 - plugins/native/intltool.mk | 1 - plugins/native/m4.mk | 1 - plugins/native/make.mk | 1 - plugins/native/sed.mk | 1 - 11 files changed, 11 deletions(-) diff --git a/plugins/apps/keepassx.mk b/plugins/apps/keepassx.mk index a05dc898..111bb0b3 100644 --- a/plugins/apps/keepassx.mk +++ b/plugins/apps/keepassx.mk @@ -9,7 +9,6 @@ $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://www.keepassx.org/releases/$($(PKG)_FILE) $(PKG)_WEBSITE := https://www.keepassx.org -$(PKG)_MAKEFILE := $(realpath $(lastword $(MAKEFILE_LIST))) $(PKG)_OWNER := https://github.com/starius $(PKG)_DEPS := gcc qt diff --git a/plugins/native/autoconf.mk b/plugins/native/autoconf.mk index 7ef4b79b..13c38028 100644 --- a/plugins/native/autoconf.mk +++ b/plugins/native/autoconf.mk @@ -10,7 +10,6 @@ $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://ftp.gnu.org/pub/gnu/autoconf/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.gnu.org/pub/gnu/autoconf/$($(PKG)_FILE) $(PKG)_WEBSITE := http://www.gnu.org/software/autoconf -$(PKG)_MAKEFILE := $(realpath $(lastword $(MAKEFILE_LIST))) $(PKG)_OWNER := https://github.com/tonytheodore $(PKG)_TARGETS := $(BUILD) $(PKG)_DEPS := m4 diff --git a/plugins/native/automake.mk b/plugins/native/automake.mk index 58ea842b..77e578db 100644 --- a/plugins/native/automake.mk +++ b/plugins/native/automake.mk @@ -10,7 +10,6 @@ $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://ftp.gnu.org/pub/gnu/automake/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.gnu.org/pub/gnu/automake/$($(PKG)_FILE) $(PKG)_WEBSITE := http://www.gnu.org/software/automake -$(PKG)_MAKEFILE := $(realpath $(lastword $(MAKEFILE_LIST))) $(PKG)_OWNER := https://github.com/tonytheodore $(PKG)_TARGETS := $(BUILD) $(PKG)_DEPS := autoconf diff --git a/plugins/native/bison.mk b/plugins/native/bison.mk index c637055a..3f64f6ca 100644 --- a/plugins/native/bison.mk +++ b/plugins/native/bison.mk @@ -10,7 +10,6 @@ $(PKG)_FILE := bison-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://ftp.gnu.org/pub/gnu/bison/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.gnu.org/pub/gnu/bison/$($(PKG)_FILE) $(PKG)_WEBSITE := http://www.gnu.org/software/bison -$(PKG)_MAKEFILE := $(realpath $(lastword $(MAKEFILE_LIST))) $(PKG)_OWNER := https://github.com/tonytheodore $(PKG)_TARGETS := $(BUILD) $(PKG)_DEPS := flex diff --git a/plugins/native/coreutils.mk b/plugins/native/coreutils.mk index d62fcccd..bc256924 100644 --- a/plugins/native/coreutils.mk +++ b/plugins/native/coreutils.mk @@ -10,7 +10,6 @@ $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE) $(PKG)_WEBSITE := https://www.gnu.org/software/coreutils -$(PKG)_MAKEFILE := $(realpath $(lastword $(MAKEFILE_LIST))) $(PKG)_OWNER := https://github.com/tonytheodore $(PKG)_TARGETS := $(BUILD) diff --git a/plugins/native/flex.mk b/plugins/native/flex.mk index 0d92373b..666573ce 100644 --- a/plugins/native/flex.mk +++ b/plugins/native/flex.mk @@ -9,7 +9,6 @@ $(PKG)_SUBDIR := flex-$($(PKG)_VERSION) $(PKG)_FILE := flex-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/flex/$($(PKG)_FILE) $(PKG)_WEBSITE := http://flex.sourceforge.net -$(PKG)_MAKEFILE := $(realpath $(lastword $(MAKEFILE_LIST))) $(PKG)_OWNER := https://github.com/tonytheodore $(PKG)_TARGETS := $(BUILD) $(PKG)_DEPS := diff --git a/plugins/native/gperf.mk b/plugins/native/gperf.mk index d796035f..102349ac 100644 --- a/plugins/native/gperf.mk +++ b/plugins/native/gperf.mk @@ -10,7 +10,6 @@ $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE) $(PKG)_WEBSITE := https://www.gnu.org/software/gperf -$(PKG)_MAKEFILE := $(realpath $(lastword $(MAKEFILE_LIST))) $(PKG)_OWNER := https://github.com/tonytheodore $(PKG)_TARGETS := $(BUILD) $(PKG)_DEPS := diff --git a/plugins/native/intltool.mk b/plugins/native/intltool.mk index 6c2faffe..c48a31e1 100644 --- a/plugins/native/intltool.mk +++ b/plugins/native/intltool.mk @@ -9,7 +9,6 @@ $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://launchpad.net/intltool/trunk/$($(PKG)_VERSION)/+download/$($(PKG)_FILE) $(PKG)_WEBSITE := http://freedesktop.org/wiki/Software/intltool -$(PKG)_MAKEFILE := $(realpath $(lastword $(MAKEFILE_LIST))) $(PKG)_OWNER := https://github.com/tonytheodore $(PKG)_TARGETS := $(BUILD) $(PKG)_DEPS := diff --git a/plugins/native/m4.mk b/plugins/native/m4.mk index eca4bed2..3aeb2581 100644 --- a/plugins/native/m4.mk +++ b/plugins/native/m4.mk @@ -10,7 +10,6 @@ $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://ftp.gnu.org/pub/gnu/m4/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.gnu.org/pub/gnu/m4/$($(PKG)_FILE) $(PKG)_WEBSITE := http://www.gnu.org/software/m4 -$(PKG)_MAKEFILE := $(realpath $(lastword $(MAKEFILE_LIST))) $(PKG)_OWNER := https://github.com/tonytheodore $(PKG)_TARGETS := $(BUILD) $(PKG)_DEPS := diff --git a/plugins/native/make.mk b/plugins/native/make.mk index b0ea9d25..1f6fb7c2 100644 --- a/plugins/native/make.mk +++ b/plugins/native/make.mk @@ -10,7 +10,6 @@ $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE) $(PKG)_WEBSITE := http://www.gnu.org/software/make -$(PKG)_MAKEFILE := $(realpath $(lastword $(MAKEFILE_LIST))) $(PKG)_OWNER := https://github.com/tonytheodore $(PKG)_TARGETS := $(BUILD) diff --git a/plugins/native/sed.mk b/plugins/native/sed.mk index bd0b76a4..75c86b7e 100644 --- a/plugins/native/sed.mk +++ b/plugins/native/sed.mk @@ -10,7 +10,6 @@ $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE) $(PKG)_WEBSITE := https://www.gnu.org/software/sed -$(PKG)_MAKEFILE := $(realpath $(lastword $(MAKEFILE_LIST))) $(PKG)_OWNER := https://github.com/tonytheodore $(PKG)_TARGETS := $(BUILD) From 8861c392ef94124d602d55b046af331d9b5d5d5f Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 30 Nov 2015 18:39:57 +1100 Subject: [PATCH 0094/1463] Makefile: fix nonetwork location and `make -t` --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 03b42b84..ef2ca963 100644 --- a/Makefile +++ b/Makefile @@ -418,13 +418,15 @@ $(foreach PKG,$(PKGS),$(eval $(call PKG_RULE,$(PKG)))) # disable networking during build-only rules for reproducibility ifeq ($(findstring darwin,$(BUILD)),) - NONET_LIB := $(PREFIX)/lib/nonetwork.so + NONET_LIB := $(PREFIX)/$(BUILD)/lib/nonetwork.so PRELOAD := LD_PRELOAD='$(NONET_LIB)' else - NONET_LIB := $(PREFIX)/lib/nonetwork.dylib + NONET_LIB := $(PREFIX)/$(BUILD)/lib/nonetwork.dylib PRELOAD := DYLD_FORCE_FLAT_NAMESPACE=1 DYLD_INSERT_LIBRARIES='$(NONET_LIB)' endif +$(shell [ -d '$(PREFIX)/$(BUILD)/lib' ] || mkdir -p '$(PREFIX)/$(BUILD)/lib') + $(NONET_LIB): $(TOP_DIR)/tools/nonetwork.c @mkdir -p $(dir $@) @$(BUILD_CC) -shared -fPIC -o $@ $< From 79f424fb2921f63579808cb307d9f9117bfaa6ff Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 30 Nov 2015 18:45:08 +1100 Subject: [PATCH 0095/1463] Makefile: echo nonetwork build and remove mkdir in recipe --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ef2ca963..2a3c37a7 100644 --- a/Makefile +++ b/Makefile @@ -428,7 +428,7 @@ endif $(shell [ -d '$(PREFIX)/$(BUILD)/lib' ] || mkdir -p '$(PREFIX)/$(BUILD)/lib') $(NONET_LIB): $(TOP_DIR)/tools/nonetwork.c - @mkdir -p $(dir $@) + @echo '[build nonetwork lib]' @$(BUILD_CC) -shared -fPIC -o $@ $< define PKG_TARGET_RULE From a51681924cbd1f28bdf6e2a713e000687b60341a Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Mon, 23 Feb 2015 09:38:47 -0800 Subject: [PATCH 0096/1463] Add cpp-netlib --- index.html | 4 ++++ src/cpp-netlib.mk | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 src/cpp-netlib.mk diff --git a/index.html b/index.html index a75f9cda..07bc957f 100644 --- a/index.html +++ b/index.html @@ -1194,6 +1194,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) coin Coin3D + + cpp-netlib + Boost C++ Networking Library + cppunit CppUnit diff --git a/src/cpp-netlib.mk b/src/cpp-netlib.mk new file mode 100644 index 00000000..739b5562 --- /dev/null +++ b/src/cpp-netlib.mk @@ -0,0 +1,24 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := cpp-netlib +$(PKG)_IGNORE := +$(PKG)_VERSION := 0.11.1 +$(PKG)_CHECKSUM := bd9b081686f1042fa53af7627d4552e039130ada0937ea081097439e3c015eec +$(PKG)_SUBDIR := cpp-netlib-$($(PKG)_VERSION)-final +$(PKG)_FILE := cpp-netlib-$($(PKG)_VERSION)-final.tar.gz +$(PKG)_URL := http://storage.googleapis.com/cpp-netlib-downloads/$($(PKG)_VERSION)/cpp-netlib-$($(PKG)_VERSION)-final.tar.gz +$(PKG)_DEPS := gcc boost + +define $(PKG)_UPDATE +endef + +define $(PKG)_BUILD + mkdir '$(1)/build' + cd '$(1)/build' && cmake .. \ + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + -DCPP-NETLIB_BUILD_EXAMPLES=OFF \ + -DCPP-NETLIB_BUILD_TESTS=OFF + + $(MAKE) -C '$(1)/build' -j '$(JOBS)' install +endef From 4f7169ae41977646ea3ec775e69a2126cd1cc6a3 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 30 Nov 2015 09:03:17 +0300 Subject: [PATCH 0097/1463] cpp-netlib: fix download URL --- src/cpp-netlib.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cpp-netlib.mk b/src/cpp-netlib.mk index 739b5562..fb7efac3 100644 --- a/src/cpp-netlib.mk +++ b/src/cpp-netlib.mk @@ -7,7 +7,7 @@ $(PKG)_VERSION := 0.11.1 $(PKG)_CHECKSUM := bd9b081686f1042fa53af7627d4552e039130ada0937ea081097439e3c015eec $(PKG)_SUBDIR := cpp-netlib-$($(PKG)_VERSION)-final $(PKG)_FILE := cpp-netlib-$($(PKG)_VERSION)-final.tar.gz -$(PKG)_URL := http://storage.googleapis.com/cpp-netlib-downloads/$($(PKG)_VERSION)/cpp-netlib-$($(PKG)_VERSION)-final.tar.gz +$(PKG)_URL := http://downloads.cpp-netlib.org/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc boost define $(PKG)_UPDATE From a5a7386b06c4aae7375f9421e16bbba44b8d3bc6 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 30 Nov 2015 09:03:49 +0300 Subject: [PATCH 0098/1463] cpp-netlib: add updater --- src/cpp-netlib.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/cpp-netlib.mk b/src/cpp-netlib.mk index fb7efac3..a202edbb 100644 --- a/src/cpp-netlib.mk +++ b/src/cpp-netlib.mk @@ -11,6 +11,10 @@ $(PKG)_URL := http://downloads.cpp-netlib.org/$($(PKG)_VERSION)/$($(PKG)_FI $(PKG)_DEPS := gcc boost define $(PKG)_UPDATE + $(WGET) -q -O- 'http://cpp-netlib.org/' | \ + $(SED) -n 's,.*cpp-netlib-\([0-9][^"]*\)-final.tar.gz.*,\1,p' | \ + $(SORT) -V | \ + tail -1 endef define $(PKG)_BUILD From 17c583f6651cab67d658c76cee15d911587d2b77 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 30 Nov 2015 09:04:46 +0300 Subject: [PATCH 0099/1463] cpp-netlib: update to version 0.11.2 --- src/cpp-netlib.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cpp-netlib.mk b/src/cpp-netlib.mk index a202edbb..4cafe1dc 100644 --- a/src/cpp-netlib.mk +++ b/src/cpp-netlib.mk @@ -3,8 +3,8 @@ PKG := cpp-netlib $(PKG)_IGNORE := -$(PKG)_VERSION := 0.11.1 -$(PKG)_CHECKSUM := bd9b081686f1042fa53af7627d4552e039130ada0937ea081097439e3c015eec +$(PKG)_VERSION := 0.11.2 +$(PKG)_CHECKSUM := 71953379c5a6fab618cbda9ac6639d87b35cab0600a4450a7392bc08c930f2b1 $(PKG)_SUBDIR := cpp-netlib-$($(PKG)_VERSION)-final $(PKG)_FILE := cpp-netlib-$($(PKG)_VERSION)-final.tar.gz $(PKG)_URL := http://downloads.cpp-netlib.org/$($(PKG)_VERSION)/$($(PKG)_FILE) From cebe9e985075912e45bb385fbb6a1505838036da Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 30 Nov 2015 20:36:36 +1100 Subject: [PATCH 0100/1463] cpp-netlib: enable openssl, fix ws2_32 linking, dll and *.cmake install --- src/cpp-netlib-1-fixes.patch | 47 ++++++++++++++++++++++++++++++++++++ src/cpp-netlib.mk | 3 ++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 src/cpp-netlib-1-fixes.patch diff --git a/src/cpp-netlib-1-fixes.patch b/src/cpp-netlib-1-fixes.patch new file mode 100644 index 00000000..67dc72fc --- /dev/null +++ b/src/cpp-netlib-1-fixes.patch @@ -0,0 +1,47 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 12d808cb5f167015b193f3a7f61f4414f93e3876 Mon Sep 17 00:00:00 2001 +From: MXE +Date: Mon, 30 Nov 2015 20:34:28 +1100 +Subject: [PATCH] fix dll installation and ws2_32 linking errors + + +diff --git a/libs/network/src/CMakeLists.txt b/libs/network/src/CMakeLists.txt +index 3f22165..baa70e4 100644 +--- a/libs/network/src/CMakeLists.txt ++++ b/libs/network/src/CMakeLists.txt +@@ -21,6 +21,7 @@ install(TARGETS cppnetlib-uri + EXPORT cppnetlibTargets + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}) + + set(CPP-NETLIB_HTTP_SERVER_SRCS server_request_parsers_impl.cpp) +@@ -33,6 +34,7 @@ install(TARGETS cppnetlib-server-parsers + EXPORT cppnetlibTargets + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}) + + set(CPP-NETLIB_HTTP_CLIENT_SRCS client.cpp) +@@ -47,8 +49,12 @@ endif () + if (Boost_FOUND) + target_link_libraries(cppnetlib-client-connections ${Boost_LIBRARIES}) + endif () ++if (WIN32) ++ target_link_libraries(cppnetlib-client-connections ws2_32) ++endif () + install(TARGETS cppnetlib-client-connections + EXPORT cppnetlibTargets + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} ++ RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}) +-- +2.4.9 (Apple Git-60) + diff --git a/src/cpp-netlib.mk b/src/cpp-netlib.mk index 4cafe1dc..69f1d2da 100644 --- a/src/cpp-netlib.mk +++ b/src/cpp-netlib.mk @@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := 71953379c5a6fab618cbda9ac6639d87b35cab0600a4450a7392bc08c930f $(PKG)_SUBDIR := cpp-netlib-$($(PKG)_VERSION)-final $(PKG)_FILE := cpp-netlib-$($(PKG)_VERSION)-final.tar.gz $(PKG)_URL := http://downloads.cpp-netlib.org/$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := gcc boost +$(PKG)_DEPS := gcc boost openssl define $(PKG)_UPDATE $(WGET) -q -O- 'http://cpp-netlib.org/' | \ @@ -21,6 +21,7 @@ define $(PKG)_BUILD mkdir '$(1)/build' cd '$(1)/build' && cmake .. \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + -DINSTALL_CMAKE_DIR='$(PREFIX)/$(TARGET)/cmake/$(PKG)' \ -DCPP-NETLIB_BUILD_EXAMPLES=OFF \ -DCPP-NETLIB_BUILD_TESTS=OFF From 7f069c9bdc6dafe007980c20868c5190e2ccd07b Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Mon, 30 Nov 2015 09:39:07 +0000 Subject: [PATCH 0101/1463] Update versions.json --- versions.json | 1 + 1 file changed, 1 insertion(+) diff --git a/versions.json b/versions.json index a57471bd..fb4116e4 100644 --- a/versions.json +++ b/versions.json @@ -32,6 +32,7 @@ "cmake": "3.0.2", "cminpack": "1.3.4", "coin": "3.1.3", + "cpp-netlib": "0.11.2", "cppunit": "1.13.2", "crystalhd": "1", "cunit": "2.1-3", From acf43d88efd39862d90b014ef4eaf6687baadd7b Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 30 Nov 2015 22:58:58 +1100 Subject: [PATCH 0102/1463] openssl: mv engines dll subdir from lib to bin --- src/openssl.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/openssl.mk b/src/openssl.mk index 72ff8de7..066093f3 100644 --- a/src/openssl.mk +++ b/src/openssl.mk @@ -30,6 +30,11 @@ define $(PKG)_BUILD RANLIB='$(TARGET)-ranlib' \ AR='$(TARGET)-ar rcu' \ CROSS_COMPILE='$(TARGET)-' + + # no way to configure engines subdir install + $(if $(BUILD_SHARED), + rm -rf '$(PREFIX)/$(TARGET)/bin/engines' && \ + mv -vf '$(PREFIX)/$(TARGET)/lib/engines' '$(PREFIX)/$(TARGET)/bin/') endef $(PKG)_BUILD_i686-w64-mingw32 = $(subst @openssl-target@,mingw,$($(PKG)_BUILD)) From 4d819ed28e91a567bc1897a018421b2ee68da934 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 1 Dec 2015 03:52:47 +1100 Subject: [PATCH 0103/1463] check: update 0.9.14 --> 0.10.0 and enable shared --- src/check.mk | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/check.mk b/src/check.mk index 1745d63d..855bd825 100644 --- a/src/check.mk +++ b/src/check.mk @@ -3,8 +3,8 @@ PKG := check $(PKG)_IGNORE := -$(PKG)_VERSION := 0.9.14 -$(PKG)_CHECKSUM := c272624645b1b738cf57fd5d81a3e4d9b722b99d6133ee3f3c4007d4d279840a +$(PKG)_VERSION := 0.10.0 +$(PKG)_CHECKSUM := f5f50766aa6f8fe5a2df752666ca01a950add45079aa06416b83765b1cf71052 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) @@ -18,12 +18,6 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --disable-shared \ - --enable-static \ - --prefix='$(PREFIX)/$(TARGET)' + $(MXE_CONFIGURE_OPTS) $(MAKE) -C '$(1)' -j '$(JOBS)' install endef - -$(PKG)_BUILD_SHARED = From 6456972138dad3654d010016352061b3e226c211 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Mon, 30 Nov 2015 16:53:38 +0000 Subject: [PATCH 0104/1463] Update versions.json --- versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.json b/versions.json index fb4116e4..c1f889a5 100644 --- a/versions.json +++ b/versions.json @@ -24,7 +24,7 @@ "cegui": "0.7.9", "cfitsio": "3370", "cgal": "4.6.3", - "check": "0.9.14", + "check": "0.10.0", "chipmunk": "6.2.2", "chromaprint": "1.1", "cimg": "1.6.3", From 03393209c52768bf0e163428a6c7614a2a8d20af Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 1 Dec 2015 04:11:55 +1100 Subject: [PATCH 0105/1463] exiv2: update 0.24 --> 0.25 --- src/exiv2-1-lpsapi.patch | 41 ---------------------------------------- src/exiv2.mk | 4 ++-- 2 files changed, 2 insertions(+), 43 deletions(-) delete mode 100644 src/exiv2-1-lpsapi.patch diff --git a/src/exiv2-1-lpsapi.patch b/src/exiv2-1-lpsapi.patch deleted file mode 100644 index 109f98af..00000000 --- a/src/exiv2-1-lpsapi.patch +++ /dev/null @@ -1,41 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -This patch is adapted from the Exiv2 svn trunk revision 3210. - -diff -ur a/config/exiv2.pc.in b/config/exiv2.pc.in ---- a/config/exiv2.pc.in 2011-07-29 14:11:16.000000000 +0200 -+++ b/config/exiv2.pc.in 2013-12-20 06:44:37.265187475 +0100 -@@ -7,5 +7,5 @@ - Description: Image metadata library and tools - Version: @PACKAGE_VERSION@ - Libs: -L${libdir} -lexiv2 @EXV_LIB_STATIC@ --Libs.private: @EXPAT_LDFLAGS@ @LTLIBINTL@ @LTLIBICONV@ @LIBS@ @EXPAT_LIBS@ -+Libs.private: @EXPAT_LDFLAGS@ @LTLIBINTL@ @LTLIBICONV@ @LIBS@ @EXPAT_LIBS@ @EXV_LIBPSAPI@ - Cflags: -I${includedir} -diff -ur a/configure b/configure ---- a/configure 2013-12-01 13:29:47.000000000 +0100 -+++ b/configure 2013-12-20 06:44:37.273191477 +0100 -@@ -774,6 +774,7 @@ - ac_header_list= - ac_subst_vars='LTLIBOBJS - LIBOBJS -+EXV_LIBPSAPI - EXV_LIB_STATIC - ENABLE_XMP - EXPAT_LIBS -@@ -17068,11 +17069,14 @@ - # version.cpp requires link to psapi/Windows and dl/Unix builds - case "$host_os" in - *mingw* | *cygwin*) -+ EXV_LIBPSAPI="-lpsapi" - LDFLAGS="$LDFLAGS -no-undefined -lpsapi" ;; - *) -+ EXV_LIBPSAPI= - LDFLAGS="$LDFLAGS -ldl" ;; - esac - -+ - # --------------------------------------------------------------------------- - # Create output files. - # --------------------------------------------------------------------------- diff --git a/src/exiv2.mk b/src/exiv2.mk index 26be6da3..5d4e2e81 100644 --- a/src/exiv2.mk +++ b/src/exiv2.mk @@ -3,8 +3,8 @@ PKG := exiv2 $(PKG)_IGNORE := -$(PKG)_VERSION := 0.24 -$(PKG)_CHECKSUM := f4a443e6c7fb9d9f5e787732f76969a64c72c4c04af69b10ed57f949c2dfef8e +$(PKG)_VERSION := 0.25 +$(PKG)_CHECKSUM := c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4 $(PKG)_SUBDIR := exiv2-$($(PKG)_VERSION) $(PKG)_FILE := exiv2-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.exiv2.org/$($(PKG)_FILE) From cc84b12e969def77f6e135ea93e02ee5f6326385 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Mon, 30 Nov 2015 17:12:41 +0000 Subject: [PATCH 0106/1463] Update versions.json --- versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.json b/versions.json index c1f889a5..ab0a1969 100644 --- a/versions.json +++ b/versions.json @@ -43,7 +43,7 @@ "devil": "1.7.8", "dlfcn-win32": "1.0.0", "eigen": "3.2.5", - "exiv2": "0.24", + "exiv2": "0.25", "expat": "2.1.0", "faad2": "2.7", "fdk-aac": "0.1.4", From ad55df265c30a259af30881a5b265550423d15c9 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 30 Nov 2015 23:33:58 +0300 Subject: [PATCH 0107/1463] update Lua to 5.3.2 --- src/lua.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lua.mk b/src/lua.mk index eadfa790..1fd4df96 100644 --- a/src/lua.mk +++ b/src/lua.mk @@ -3,10 +3,10 @@ PKG := lua $(PKG)_IGNORE := -$(PKG)_VERSION := 5.3.1 +$(PKG)_VERSION := 5.3.2 # Shared version $(PKG)_SOVERS := 53 -$(PKG)_CHECKSUM := 072767aad6cc2e62044a66e8562f51770d941e972dc1e4068ba719cd8bffac17 +$(PKG)_CHECKSUM := c740c7bb23a936944e1cc63b7c3c5351a8976d7867c5252c8854f7b2af9da68f $(PKG)_SUBDIR := lua-$($(PKG)_VERSION) $(PKG)_FILE := lua-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.lua.org/ftp/$($(PKG)_FILE) From 00234fd91a05f0bc33b14da412d0150f56aeedd7 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Tue, 1 Dec 2015 02:50:08 +0000 Subject: [PATCH 0108/1463] Update versions.json --- versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.json b/versions.json index ab0a1969..c9d75b6b 100644 --- a/versions.json +++ b/versions.json @@ -200,7 +200,7 @@ "libzip": "0.11.2", "llvm": "3.4", "log4cxx": "0.10.0", - "lua": "5.3.1", + "lua": "5.3.2", "luabind": "0.9.1", "luajit": "2.0.4", "lzma": "920", From 7696a567bf17c9c35cf162cef5905eadc99c9083 Mon Sep 17 00:00:00 2001 From: Myckel Habets Date: Mon, 27 Apr 2015 17:13:56 +0200 Subject: [PATCH 0109/1463] add package miniupnpc --- index.html | 4 ++++ src/miniupnpc-build-1.patch | 28 +++++++++++++++++++++++ src/miniupnpc.mk | 45 +++++++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+) create mode 100644 src/miniupnpc-build-1.patch create mode 100644 src/miniupnpc.mk diff --git a/index.html b/index.html index fafa38e3..e865488d 100644 --- a/index.html +++ b/index.html @@ -1890,6 +1890,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) mdbtools mdbtools + + miniupnpc + miniupnpc + minizip minizip diff --git a/src/miniupnpc-build-1.patch b/src/miniupnpc-build-1.patch new file mode 100644 index 00000000..08eff8ca --- /dev/null +++ b/src/miniupnpc-build-1.patch @@ -0,0 +1,28 @@ +--- ./Makefile.mingw 2014-01-31 14:18:56.000000000 +0100 ++++ ./Makefile.mingw.new 2015-04-27 15:44:59.548000000 +0200 +@@ -37,7 +37,7 @@ + $(PYTHON) setupmingw32.py install --skip-build + + miniupnpc.dll: libminiupnpc.a $(OBJSDLL) +- dllwrap -k --driver-name gcc \ ++ $(DLLWRAP) -k --driver-name $(CC) \ + --def miniupnpc.def \ + --output-def miniupnpc.dll.def \ + --implib miniupnpc.lib -o $@ \ +@@ -71,13 +71,13 @@ + miniupnpcstrings.h: miniupnpcstrings.h.in wingenminiupnpcstrings + wingenminiupnpcstrings $< $@ + +-minixml.o: minixml.c minixml.h miniupnpcstrings.h ++minixml.o: minixml.c minixml.h + + upnpc.o: upnpc.c miniwget.h minisoap.h miniupnpc.h igd_desc_parse.h upnpreplyparse.h upnpcommands.h upnperrors.h + +-miniwget.o: miniwget.c miniwget.h miniupnpcstrings.h connecthostport.h ++miniwget.o: miniwget.c miniwget.h connecthostport.h + +-minisoap.o: minisoap.c minisoap.h miniupnpcstrings.h ++minisoap.o: minisoap.c minisoap.h + + miniupnpc.o: miniupnpc.c miniupnpc.h minisoap.h miniwget.h minixml.h + diff --git a/src/miniupnpc.mk b/src/miniupnpc.mk new file mode 100644 index 00000000..3f956c23 --- /dev/null +++ b/src/miniupnpc.mk @@ -0,0 +1,45 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := miniupnpc +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.9 +$(PKG)_CHECKSUM := 643001d52e322c52a7c9fdc8f31a7920f4619fc0 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://miniupnp.free.fr/files/$($(PKG)_FILE) +$(PKG)_URL_2 := http://miniupnp.tuxfamily.org/files/$($(PKG)_FILE) +$(PKG)_DEPS := gcc + +define $(PKG)_UPDATE + echo 'TODO: write update script for $(PKG).' >&2; + echo $($(PKG)_VERSION) +endef + +# We can build the whole package, but only make libminiupnpc.a. Rest makes little sense. +define $(PKG)_BUILD + cd '$(1)' && $(SH) ./updateminiupnpcstrings.sh + $(MAKE) -C '$(1)' -f Makefile.mingw -j '$(JOBS)' \ + CC='$(TARGET)-gcc' \ + AR='$(TARGET)-ar' \ + RANLIB='$(TARGET)-ranlib' \ + DLLWRAP='$(TARGET)-dllwrap' \ + init libminiupnpc.a miniupnpc.dll + $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' + $(INSTALL) -m644 '$(1)/libminiupnpc.a' '$(PREFIX)/$(TARGET)/lib/' + $(INSTALL) -m644 '$(1)/miniupnpc.lib' '$(PREFIX)/$(TARGET)/lib/' + $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin' + $(INSTALL) -m755 '$(1)/miniupnpc.dll' '$(PREFIX)/$(TARGET)/bin/' + $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' + $(INSTALL) -d '$(PREFIX)/$(TARGET)/include/miniupnpc' + $(INSTALL) -m644 '$(1)/bsdqueue.h' '$(PREFIX)/$(TARGET)/include/' + $(INSTALL) -m644 '$(1)/declspec.h' '$(PREFIX)/$(TARGET)/include/miniupnpc/' + $(INSTALL) -m644 '$(1)/igd_desc_parse.h' '$(PREFIX)/$(TARGET)/include/miniupnpc/' + $(INSTALL) -m644 '$(1)/miniupnpc.h' '$(PREFIX)/$(TARGET)/include/miniupnpc/' + $(INSTALL) -m644 '$(1)/miniupnpctypes.h' '$(PREFIX)/$(TARGET)/include/miniupnpc/' + $(INSTALL) -m644 '$(1)/miniwget.h' '$(PREFIX)/$(TARGET)/include/miniupnpc/' + $(INSTALL) -m644 '$(1)/portlistingparse.h' '$(PREFIX)/$(TARGET)/include/miniupnpc/' + $(INSTALL) -m644 '$(1)/upnpcommands.h' '$(PREFIX)/$(TARGET)/include/miniupnpc/' + $(INSTALL) -m644 '$(1)/upnperrors.h' '$(PREFIX)/$(TARGET)/include/miniupnpc/' + $(INSTALL) -m644 '$(1)/upnpreplyparse.h' '$(PREFIX)/$(TARGET)/include/miniupnpc/' +endef From eb20723302ed656122ce326129c1347e03b0460d Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 1 Dec 2015 14:56:41 +1100 Subject: [PATCH 0110/1463] miniupnpc: switch to cmake and add updater --- src/miniupnpc.mk | 41 +++++++++++++---------------------------- 1 file changed, 13 insertions(+), 28 deletions(-) diff --git a/src/miniupnpc.mk b/src/miniupnpc.mk index 3f956c23..9e51ec66 100644 --- a/src/miniupnpc.mk +++ b/src/miniupnpc.mk @@ -4,7 +4,7 @@ PKG := miniupnpc $(PKG)_IGNORE := $(PKG)_VERSION := 1.9 -$(PKG)_CHECKSUM := 643001d52e322c52a7c9fdc8f31a7920f4619fc0 +$(PKG)_CHECKSUM := 2923e453e880bb949e3d4da9f83dd3cb6f08946d35de0b864d0339cf70934464 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://miniupnp.free.fr/files/$($(PKG)_FILE) @@ -12,34 +12,19 @@ $(PKG)_URL_2 := http://miniupnp.tuxfamily.org/files/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - echo 'TODO: write update script for $(PKG).' >&2; - echo $($(PKG)_VERSION) + $(WGET) -q -O- 'https://api.github.com/repos/miniupnp/miniupnp/git/refs/tags/' | \ + $(SED) -n 's#.*"ref": "refs/tags/miniupnpc_\([^"]*\).*#\1#p' | \ + $(SED) 's,_,.,g' | \ + $(SORT) -V | \ + tail -1 endef -# We can build the whole package, but only make libminiupnpc.a. Rest makes little sense. define $(PKG)_BUILD - cd '$(1)' && $(SH) ./updateminiupnpcstrings.sh - $(MAKE) -C '$(1)' -f Makefile.mingw -j '$(JOBS)' \ - CC='$(TARGET)-gcc' \ - AR='$(TARGET)-ar' \ - RANLIB='$(TARGET)-ranlib' \ - DLLWRAP='$(TARGET)-dllwrap' \ - init libminiupnpc.a miniupnpc.dll - $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' - $(INSTALL) -m644 '$(1)/libminiupnpc.a' '$(PREFIX)/$(TARGET)/lib/' - $(INSTALL) -m644 '$(1)/miniupnpc.lib' '$(PREFIX)/$(TARGET)/lib/' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/bin' - $(INSTALL) -m755 '$(1)/miniupnpc.dll' '$(PREFIX)/$(TARGET)/bin/' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/include' - $(INSTALL) -d '$(PREFIX)/$(TARGET)/include/miniupnpc' - $(INSTALL) -m644 '$(1)/bsdqueue.h' '$(PREFIX)/$(TARGET)/include/' - $(INSTALL) -m644 '$(1)/declspec.h' '$(PREFIX)/$(TARGET)/include/miniupnpc/' - $(INSTALL) -m644 '$(1)/igd_desc_parse.h' '$(PREFIX)/$(TARGET)/include/miniupnpc/' - $(INSTALL) -m644 '$(1)/miniupnpc.h' '$(PREFIX)/$(TARGET)/include/miniupnpc/' - $(INSTALL) -m644 '$(1)/miniupnpctypes.h' '$(PREFIX)/$(TARGET)/include/miniupnpc/' - $(INSTALL) -m644 '$(1)/miniwget.h' '$(PREFIX)/$(TARGET)/include/miniupnpc/' - $(INSTALL) -m644 '$(1)/portlistingparse.h' '$(PREFIX)/$(TARGET)/include/miniupnpc/' - $(INSTALL) -m644 '$(1)/upnpcommands.h' '$(PREFIX)/$(TARGET)/include/miniupnpc/' - $(INSTALL) -m644 '$(1)/upnperrors.h' '$(PREFIX)/$(TARGET)/include/miniupnpc/' - $(INSTALL) -m644 '$(1)/upnpreplyparse.h' '$(PREFIX)/$(TARGET)/include/miniupnpc/' + mkdir '$(1).build' + cd '$(1).build' && '$(TARGET)-cmake' '$(1)' \ + -DUPNPC_BUILD_STATIC=$(CMAKE_STATIC_BOOL) \ + -DUPNPC_BUILD_SHARED=$(CMAKE_SHARED_BOOL) \ + -DUPNPC_BUILD_TESTS=OFF + $(MAKE) -C '$(1).build' -j '$(JOBS)' + $(MAKE) -C '$(1).build' -j 1 install endef From 48334a4549ec355571b5e19d3bda37af7e696f4f Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Tue, 1 Dec 2015 03:58:50 +0000 Subject: [PATCH 0111/1463] Update versions.json --- versions.json | 1 + 1 file changed, 1 insertion(+) diff --git a/versions.json b/versions.json index c9d75b6b..47ab7573 100644 --- a/versions.json +++ b/versions.json @@ -208,6 +208,7 @@ "matio": "1.5.2", "mdbtools": "0.7.1", "mingw-w64": "4.0.4", + "miniupnpc": "1.9", "minizip": "0b46a2b", "mman-win32": "378ed6b69bb7220511dd9cd0973c22b3f6773ce7", "mpc": "1.0.2", From 60e944f6dedb7eba9cd5b05a752dc6df580e9199 Mon Sep 17 00:00:00 2001 From: Pavel Vatagin Date: Fri, 14 Aug 2015 15:45:24 +0300 Subject: [PATCH 0112/1463] add package libid3tag --- index.html | 4 ++++ src/libid3tag.mk | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 src/libid3tag.mk diff --git a/index.html b/index.html index e865488d..02e9e7c2 100644 --- a/index.html +++ b/index.html @@ -1686,6 +1686,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) libiconv libiconv + + libid3tag + libid3tag + libidn Libidn diff --git a/src/libid3tag.mk b/src/libid3tag.mk new file mode 100644 index 00000000..e9591e06 --- /dev/null +++ b/src/libid3tag.mk @@ -0,0 +1,26 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := libid3tag +$(PKG)_IGNORE := +$(PKG)_VERSION := 0.15.1b +$(PKG)_CHECKSUM := 63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/mad/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := gcc zlib + +define $(PKG)_UPDATE + $(WGET) -q -O- 'http://sourceforge.net/projects/mad/files/libid3tag/' | \ + $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + $(MXE_CONFIGURE_OPTS) \ + $(if $(BUILD_SHARED), \ + lt_cv_deplibs_check_method='file_magic file format (pe-i386|pe-x86-64)' \ + lt_cv_file_magic_cmd='$$OBJDUMP -f') + $(MAKE) -C '$(1)' -j '$(JOBS)' install LDFLAGS='-no-undefined' +endef From a92b70622596cea7da193be9d3a9ba2cd6fa2b63 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 1 Dec 2015 15:39:05 +1100 Subject: [PATCH 0113/1463] libid3tag: fix shared build for missing libtool deps --- src/libid3tag.mk | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/libid3tag.mk b/src/libid3tag.mk index e9591e06..6a204fa6 100644 --- a/src/libid3tag.mk +++ b/src/libid3tag.mk @@ -18,9 +18,12 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ - $(MXE_CONFIGURE_OPTS) \ - $(if $(BUILD_SHARED), \ - lt_cv_deplibs_check_method='file_magic file format (pe-i386|pe-x86-64)' \ - lt_cv_file_magic_cmd='$$OBJDUMP -f') + $(MXE_CONFIGURE_OPTS) + + # libtool misses some dependency libs and there's no lt_cv* etc. options + # can be removed after 0.15.1b if recent libtool et al. is used + $(if $(BUILD_SHARED),\ + $(SED) -i 's#^postdeps=""#postdeps="-lz"#g' '$(1)/libtool') + $(MAKE) -C '$(1)' -j '$(JOBS)' install LDFLAGS='-no-undefined' endef From a30470ec00934794a43cd893529eb7eb729a7ef5 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Tue, 1 Dec 2015 04:40:13 +0000 Subject: [PATCH 0114/1463] Update versions.json --- versions.json | 1 + 1 file changed, 1 insertion(+) diff --git a/versions.json b/versions.json index 47ab7573..01b55727 100644 --- a/versions.json +++ b/versions.json @@ -156,6 +156,7 @@ "libiberty": "2.25.1", "libical": "1.0.1", "libiconv": "1.14", + "libid3tag": "0.15.1b", "libidn": "1.32", "libircclient": "1.8", "libjpeg-turbo": "1.4.1", From 7f1f0e9e6fcfe9b4f1b922600b920d8147c176f3 Mon Sep 17 00:00:00 2001 From: Andre Heinecke Date: Mon, 7 Sep 2015 15:07:42 +0200 Subject: [PATCH 0115/1463] Add package json-glib --- index.html | 4 ++++ src/json-glib.mk | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 src/json-glib.mk diff --git a/index.html b/index.html index 02e9e7c2..62029aa2 100644 --- a/index.html +++ b/index.html @@ -1506,6 +1506,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) json-c json-c + + json-glib + JSON-Glib + json_spirit json_spirit diff --git a/src/json-glib.mk b/src/json-glib.mk new file mode 100644 index 00000000..7017f6c4 --- /dev/null +++ b/src/json-glib.mk @@ -0,0 +1,34 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := json-glib +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.0.4 +$(PKG)_CHECKSUM := efdf5a66d1d8fb504448a40ba2352bbfef301074 +$(PKG)_SUBDIR := json-glib-$($(PKG)_VERSION) +$(PKG)_FILE := json-glib-$($(PKG)_VERSION).tar.xz +$(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/json-glib/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) +$(PKG)_DEPS := gcc glib + +define $(PKG)_UPDATE + $(WGET) -q -O- 'http://git.gnome.org/browse/json-glib/refs/tags' | \ + grep ']*>\([0-9]*\.[0-9]*[02468]\.[^<]*\)<.*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + $(MXE_CONFIGURE_OPTS) \ + --enable-static \ + --disable-shared + $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= +endef + +define $(PKG)_BUILD_SHARED + cd '$(1)' && ./configure \ + $(MXE_CONFIGURE_OPTS) \ + --disable-static \ + --enable-shared + $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= +endef From a553236e91de7f9e710aa5dcfbbca2211612a9e1 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 1 Dec 2015 16:08:02 +1100 Subject: [PATCH 0116/1463] json-glib: unify rules, build only lib, use sha256 checksum --- src/json-glib.mk | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/json-glib.mk b/src/json-glib.mk index 7017f6c4..35c43120 100644 --- a/src/json-glib.mk +++ b/src/json-glib.mk @@ -4,7 +4,7 @@ PKG := json-glib $(PKG)_IGNORE := $(PKG)_VERSION := 1.0.4 -$(PKG)_CHECKSUM := efdf5a66d1d8fb504448a40ba2352bbfef301074 +$(PKG)_CHECKSUM := 80f3593cb6bd13f1465828e46a9f740e2e9bd3cd2257889442b3e62bd6de05cd $(PKG)_SUBDIR := json-glib-$($(PKG)_VERSION) $(PKG)_FILE := json-glib-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/json-glib/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) @@ -19,16 +19,6 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ - $(MXE_CONFIGURE_OPTS) \ - --enable-static \ - --disable-shared - $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= -endef - -define $(PKG)_BUILD_SHARED - cd '$(1)' && ./configure \ - $(MXE_CONFIGURE_OPTS) \ - --disable-static \ - --enable-shared - $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= + $(MXE_CONFIGURE_OPTS) + $(MAKE) -C '$(1)/json-glib' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef From c2043732132149db9bed2e88035aa10819c7de54 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Tue, 1 Dec 2015 05:09:15 +0000 Subject: [PATCH 0117/1463] Update versions.json --- versions.json | 1 + 1 file changed, 1 insertion(+) diff --git a/versions.json b/versions.json index 01b55727..ced6736f 100644 --- a/versions.json +++ b/versions.json @@ -111,6 +111,7 @@ "jasper": "1.900.1", "jpeg": "9a", "json-c": "0.12", + "json-glib": "1.0.4", "json_spirit": "4.08", "jsoncpp": "1.6.5", "lame": "3.99.5", From 768c11246eb7f8a5d64c3f27069dc0898f6c2fee Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 1 Dec 2015 20:31:10 +1100 Subject: [PATCH 0118/1463] cmake wrapper: use common TryRunResults.cmake --- Makefile | 1 + src/cmake/modules/TryRunResults.cmake | 156 ++++++++++++++++++++++++++ src/mxe-conf.mk | 5 +- 3 files changed, 161 insertions(+), 1 deletion(-) create mode 100644 src/cmake/modules/TryRunResults.cmake diff --git a/Makefile b/Makefile index 2a3c37a7..21e99194 100644 --- a/Makefile +++ b/Makefile @@ -474,6 +474,7 @@ build-only-$(1)_$(3): TARGET = $(3) build-only-$(1)_$(3): BUILD_$(if $(findstring shared,$(3)),SHARED,STATIC) = TRUE build-only-$(1)_$(3): LIB_SUFFIX = $(if $(findstring shared,$(3)),dll,a) build-only-$(1)_$(3): BITS = $(if $(findstring x86_64,$(3)),64,32) +build-only-$(1)_$(3): CMAKE_RUNRESULT_FILE = $(PREFIX)/share/cmake/modules/TryRunResults.cmake build-only-$(1)_$(3): CMAKE_TOOLCHAIN_FILE = $(PREFIX)/$(3)/share/cmake/mxe-conf.cmake build-only-$(1)_$(3): CMAKE_TOOLCHAIN_DIR = $(PREFIX)/$(3)/share/cmake/mxe-conf.d build-only-$(1)_$(3): CMAKE_STATIC_BOOL = $(if $(findstring shared,$(3)),OFF,ON) diff --git a/src/cmake/modules/TryRunResults.cmake b/src/cmake/modules/TryRunResults.cmake new file mode 100644 index 00000000..0b9516d9 --- /dev/null +++ b/src/cmake/modules/TryRunResults.cmake @@ -0,0 +1,156 @@ +SET( KWSYS_CHAR_IS_SIGNED + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +SET( KWSYS_CHAR_IS_SIGNED__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +SET( VCL_HAS_SLICED_DESTRUCTOR_BUG + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +SET( VCL_HAS_SLICED_DESTRUCTOR_BUG__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +SET( VCL_HAS_WORKING_STRINGSTREAM + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +SET( VCL_HAS_WORKING_STRINGSTREAM__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +SET( VCL_HAS_LFS + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +SET( VCL_HAS_LFS__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +SET( VXL_SSE2_HARDWARE_SUPPORT_POSSIBLE + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +SET( VXL_SSE2_HARDWARE_SUPPORT_POSSIBLE__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +SET( VCL_COMPLEX_POW_WORKS + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +SET( VCL_COMPLEX_POW_WORKS__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +SET( VCL_CHAR_IS_SIGNED + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +SET( VCL_CHAR_IS_SIGNED__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +SET( VCL_NUMERIC_LIMITS_HAS_INFINITY + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +SET( VCL_NUMERIC_LIMITS_HAS_INFINITY__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +SET( VCL_PROCESSOR_HAS_INFINITY + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +SET( VCL_PROCESSOR_HAS_INFINITY__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +SET( QNANHIBIT_VALUE + "1" + CACHE STRING "Result from TRY_RUN" FORCE) +SET( QNANHIBIT_VALUE__TRYRUN_OUTPUT + "-DTEEM_QNANHIBIT=1" + CACHE STRING "Output from TRY_RUN" FORCE) +SET( KWSYS_LFS_WORKS + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +SET( KWSYS_LFS_WORKS__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +SET( VXL_HAS_SSE2_HARDWARE_SUPPORT + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +SET( VXL_HAS_SSE2_HARDWARE_SUPPORT__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +set( DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS + "1" + CACHE STRING "Result from TRY_RUN" FORCE) +set( DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS__TRYRUN_OUTPUT + "89255.0/1e22 = 8.9255e-018" + CACHE STRING "Output from TRY_RUN" FORCE) +set( HDF5_PRINTF_LL_TEST_RUN + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +set( HDF5_PRINTF_LL_TEST_RUN__TRYRUN_OUTPUT + "PRINTF_LL_WIDTH=[I64]" + CACHE STRING "Output from TRY_RUN" FORCE) +set( H5_LDOUBLE_TO_INTEGER_WORKS_RUN + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +set( H5_LDOUBLE_TO_INTEGER_WORKS_RUN__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +set( H5_ULONG_TO_FLOAT_ACCURATE_RUN + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +set( H5_ULONG_TO_FLOAT_ACCURATE_RUN__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +set( H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE_RUN + "1" + CACHE STRING "Result from TRY_RUN" FORCE) +set( H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE_RUN__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +set( H5_FP_TO_ULLONG_ACCURATE_RUN + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +set( H5_FP_TO_ULLONG_ACCURATE_RUN__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +set( H5_FP_TO_ULLONG_RIGHT_MAXIMUM_RUN + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +set( H5_FP_TO_ULLONG_RIGHT_MAXIMUM_RUN__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +set( H5_LDOUBLE_TO_UINT_ACCURATE_RUN + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +set( H5_LDOUBLE_TO_UINT_ACCURATE_RUN__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +set( H5_ULLONG_TO_LDOUBLE_PRECISION_RUN + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +set( H5_ULLONG_TO_LDOUBLE_PRECISION_RUN__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +set( H5_FP_TO_INTEGER_OVERFLOW_WORKS_RUN + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +set( H5_FP_TO_INTEGER_OVERFLOW_WORKS_RUN__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +set( H5_LDOUBLE_TO_LLONG_ACCURATE_RUN + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +set( H5_LDOUBLE_TO_LLONG_ACCURATE_RUN__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +set( H5_LLONG_TO_LDOUBLE_CORRECT_RUN + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +set( H5_LLONG_TO_LDOUBLE_CORRECT_RUN__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +set( H5_NO_ALIGNMENT_RESTRICTIONS_RUN + "0" + CACHE STRING "Result from TRY_RUN" FORCE) +set( H5_NO_ALIGNMENT_RESTRICTIONS_RUN__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) +set( C_CHAR_SIGNED + "1" + CACHE STRING "Result from TRY_RUN" FORCE) +set( C_CHAR_SIGNED__TRYRUN_OUTPUT + "" + CACHE STRING "Output from TRY_RUN" FORCE) diff --git a/src/mxe-conf.mk b/src/mxe-conf.mk index 082c0ade..57fd890d 100644 --- a/src/mxe-conf.mk +++ b/src/mxe-conf.mk @@ -56,7 +56,10 @@ define $(PKG)_BUILD echo ' exec "$(PREFIX)/$(BUILD)/bin/cmake" "$$@"'; \ echo 'else'; \ echo ' echo "== Using MXE toolchain: $(CMAKE_TOOLCHAIN_FILE)"'; \ - echo ' exec "$(PREFIX)/$(BUILD)/bin/cmake" -DCMAKE_TOOLCHAIN_FILE="$(CMAKE_TOOLCHAIN_FILE)" "$$@"'; \ + echo ' echo "== Using MXE runresult: $(CMAKE_RUNRESULT_FILE)"'; \ + echo ' exec "$(PREFIX)/$(BUILD)/bin/cmake" \ + -DCMAKE_TOOLCHAIN_FILE="$(CMAKE_TOOLCHAIN_FILE)" \ + -C"$(CMAKE_RUNRESULT_FILE)" "$$@"'; \ echo 'fi'; \ ) \ > '$(PREFIX)/bin/$(TARGET)-cmake' From a542fd9d940a00b262ffc8cd5bd00b469985496d Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 1 Dec 2015 20:33:23 +1100 Subject: [PATCH 0119/1463] itk: add updater, update 4.4.1-->4.8.2, enable system libs, and use cmake wrapper --- src/itk-1-tryrun.patch | 79 ------------------------------------------ src/itk.mk | 27 ++++++++------- 2 files changed, 15 insertions(+), 91 deletions(-) delete mode 100644 src/itk-1-tryrun.patch diff --git a/src/itk-1-tryrun.patch b/src/itk-1-tryrun.patch deleted file mode 100644 index 0a19da4f..00000000 --- a/src/itk-1-tryrun.patch +++ /dev/null @@ -1,79 +0,0 @@ -# This file is part of MXE. -# See index.html for further information. - ---- blubb 1970-01-01 01:00:00.000000000 +0100 -+++ ITK/TryRunResults.cmake 2011-09-27 08:44:04.563613261 +0200 -@@ -0,0 +1,72 @@ -+SET( KWSYS_CHAR_IS_SIGNED -+ "0" -+ CACHE STRING "Result from TRY_RUN" FORCE) -+SET( KWSYS_CHAR_IS_SIGNED__TRYRUN_OUTPUT -+ "" -+ CACHE STRING "Output from TRY_RUN" FORCE) -+SET( VCL_HAS_SLICED_DESTRUCTOR_BUG -+ "0" -+ CACHE STRING "Result from TRY_RUN" FORCE) -+SET( VCL_HAS_SLICED_DESTRUCTOR_BUG__TRYRUN_OUTPUT -+ "" -+ CACHE STRING "Output from TRY_RUN" FORCE) -+SET( VCL_HAS_WORKING_STRINGSTREAM -+ "0" -+ CACHE STRING "Result from TRY_RUN" FORCE) -+SET( VCL_HAS_WORKING_STRINGSTREAM__TRYRUN_OUTPUT -+ "" -+ CACHE STRING "Output from TRY_RUN" FORCE) -+SET( VCL_HAS_LFS -+ "0" -+ CACHE STRING "Result from TRY_RUN" FORCE) -+SET( VCL_HAS_LFS__TRYRUN_OUTPUT -+ "" -+ CACHE STRING "Output from TRY_RUN" FORCE) -+SET( VXL_SSE2_HARDWARE_SUPPORT_POSSIBLE -+ "0" -+ CACHE STRING "Result from TRY_RUN" FORCE) -+SET( VXL_SSE2_HARDWARE_SUPPORT_POSSIBLE__TRYRUN_OUTPUT -+ "" -+ CACHE STRING "Output from TRY_RUN" FORCE) -+SET( VCL_COMPLEX_POW_WORKS -+ "0" -+ CACHE STRING "Result from TRY_RUN" FORCE) -+SET( VCL_COMPLEX_POW_WORKS__TRYRUN_OUTPUT -+ "" -+ CACHE STRING "Output from TRY_RUN" FORCE) -+SET( VCL_CHAR_IS_SIGNED -+ "0" -+ CACHE STRING "Result from TRY_RUN" FORCE) -+SET( VCL_CHAR_IS_SIGNED__TRYRUN_OUTPUT -+ "" -+ CACHE STRING "Output from TRY_RUN" FORCE) -+SET( VCL_NUMERIC_LIMITS_HAS_INFINITY -+ "0" -+ CACHE STRING "Result from TRY_RUN" FORCE) -+SET( VCL_NUMERIC_LIMITS_HAS_INFINITY__TRYRUN_OUTPUT -+ "" -+ CACHE STRING "Output from TRY_RUN" FORCE) -+SET( VCL_PROCESSOR_HAS_INFINITY -+ "0" -+ CACHE STRING "Result from TRY_RUN" FORCE) -+SET( VCL_PROCESSOR_HAS_INFINITY__TRYRUN_OUTPUT -+ "" -+ CACHE STRING "Output from TRY_RUN" FORCE) -+SET( QNANHIBIT_VALUE -+ "1" -+ CACHE STRING "Result from TRY_RUN" FORCE) -+SET( QNANHIBIT_VALUE__TRYRUN_OUTPUT -+ "-DTEEM_QNANHIBIT=1" -+ CACHE STRING "Output from TRY_RUN" FORCE) -+SET( KWSYS_LFS_WORKS -+ "0" -+ CACHE STRING "Result from TRY_RUN" FORCE) -+SET( KWSYS_LFS_WORKS__TRYRUN_OUTPUT -+ "" -+ CACHE STRING "Output from TRY_RUN" FORCE) -+SET( VXL_HAS_SSE2_HARDWARE_SUPPORT -+ "0" -+ CACHE STRING "Result from TRY_RUN" FORCE) -+SET( VXL_HAS_SSE2_HARDWARE_SUPPORT__TRYRUN_OUTPUT -+ "" -+ CACHE STRING "Output from TRY_RUN" FORCE) - diff --git a/src/itk.mk b/src/itk.mk index 21639799..3fa6bd5d 100644 --- a/src/itk.mk +++ b/src/itk.mk @@ -3,31 +3,34 @@ PKG := itk $(PKG)_IGNORE := -$(PKG)_VERSION := 4.4.1 -$(PKG)_CHECKSUM := 7d6f5d50b4689daf710933ef99ec8764e4b1700f636e90b7fa94aeb9f99247fd +$(PKG)_VERSION := 4.8.2 +$(PKG)_CHECKSUM := fec268ba180bdb78d760aa4f6f467d0a5fc71b3a34e3201d8425d0edfa23ef5f $(PKG)_SUBDIR := InsightToolkit-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.xz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) -$(PKG)_DEPS := gcc hdf5 +$(PKG)_DEPS := gcc expat hdf5 jpeg libpng tiff zlib define $(PKG)_UPDATE - echo 'TODO: Updates for package ITK need to be written.' >&2; - echo $(itk_VERSION) + $(WGET) -q -O- 'http://itk.org/ITK/resources/software.html' | \ + $(SED) -n 's,.*InsightToolkit-\([0-9][^>]*\)\.tar\.xz.*,\1,p' | \ + $(SORT) -V | + tail -1 endef define $(PKG)_BUILD - $(SED) -i 's^# error "Dunno about this gcc"^# warning "Dunno about this gcc"^;' \ - '$(1)/Modules/ThirdParty/VNL/src/vxl/vcl/vcl_compiler.h' mkdir '$(1).build' - cd '$(1).build' && cmake \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -C '$(1)/TryRunResults.cmake'\ - -DBUILD_SHARED_LIBS=FALSE \ + cd '$(1).build' && '$(TARGET)-cmake' \ + -DBUILD_SHARED_LIBS=$(CMAKE_SHARED_BOOL) \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \ + -DITK_FORBID_DOWNLOADS=TRUE \ -DBUILD_TESTING=FALSE \ -DBUILD_EXAMPLES=FALSE \ + -DITK_USE_SYSTEM_EXPAT=TRUE \ -DITK_USE_SYSTEM_HDF5=TRUE \ - -DCMAKE_C_FLAGS='-std=gnu89' \ + -DITK_USE_SYSTEM_JPEG=TRUE \ + -DITK_USE_SYSTEM_PNG=TRUE \ + -DITK_USE_SYSTEM_TIFF=TRUE \ + -DITK_USE_SYSTEM_ZLIB=TRUE \ '$(1)' $(MAKE) -C '$(1).build' -j '$(JOBS)' install VERBOSE=1 endef From 29bd9bc6663d6bc8ced0fa32e6f55a7feb413151 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Tue, 1 Dec 2015 09:35:07 +0000 Subject: [PATCH 0120/1463] Update versions.json --- versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.json b/versions.json index ced6736f..094c8df5 100644 --- a/versions.json +++ b/versions.json @@ -105,7 +105,7 @@ "ilmbase": "2.2.0", "imagemagick": "6.9.0-0", "isl": "0.12.2", - "itk": "4.4.1", + "itk": "4.8.2", "jack": "1.9.10", "jansson": "2.7", "jasper": "1.900.1", From c62b62966be738425096c981536ace5928e0ea7b Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 2 Dec 2015 00:20:11 +1100 Subject: [PATCH 0121/1463] Makefile: build universal nonetwork.dylib --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 21e99194..6e8de712 100644 --- a/Makefile +++ b/Makefile @@ -423,13 +423,14 @@ ifeq ($(findstring darwin,$(BUILD)),) else NONET_LIB := $(PREFIX)/$(BUILD)/lib/nonetwork.dylib PRELOAD := DYLD_FORCE_FLAT_NAMESPACE=1 DYLD_INSERT_LIBRARIES='$(NONET_LIB)' + NONET_CFLAGS := -arch i386 -arch x86_64 endif $(shell [ -d '$(PREFIX)/$(BUILD)/lib' ] || mkdir -p '$(PREFIX)/$(BUILD)/lib') $(NONET_LIB): $(TOP_DIR)/tools/nonetwork.c @echo '[build nonetwork lib]' - @$(BUILD_CC) -shared -fPIC -o $@ $< + @$(BUILD_CC) -shared -fPIC $(NONET_CFLAGS) -o $@ $< define PKG_TARGET_RULE .PHONY: $(1) From ba0e29e6c2af58a277e71f854eca156f82117a04 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 2 Dec 2015 02:15:48 +1100 Subject: [PATCH 0122/1463] test/CMakeLists.txt: use default C and CXX languages --- src/cmake/test/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cmake/test/CMakeLists.txt b/src/cmake/test/CMakeLists.txt index 864075cb..cd02c100 100644 --- a/src/cmake/test/CMakeLists.txt +++ b/src/cmake/test/CMakeLists.txt @@ -4,8 +4,8 @@ # 2.8.9 is Debian Wheezy version cmake_minimum_required(VERSION 2.8.9) -# set languages in individual modules -project(mxe NONE) +# use default C and CXX languages +project(mxe) # see cmake --help-policy for details cmake_policy(SET CMP0017 NEW) From 068e20243d2b531c032f04fcff07bd613594d9ce Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 2 Dec 2015 04:03:59 +1100 Subject: [PATCH 0123/1463] libxml2: add missing zlib dependency --- src/libxml2.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libxml2.mk b/src/libxml2.mk index b9cc8bbd..14a4dc9b 100644 --- a/src/libxml2.mk +++ b/src/libxml2.mk @@ -9,7 +9,7 @@ $(PKG)_SUBDIR := libxml2-$($(PKG)_VERSION) $(PKG)_FILE := libxml2-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://xmlsoft.org/sources/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://xmlsoft.org/libxml2/$($(PKG)_FILE) -$(PKG)_DEPS := gcc xz +$(PKG)_DEPS := gcc xz zlib define $(PKG)_UPDATE $(WGET) -q -O- 'http://git.gnome.org/browse/libxml2/refs/tags' | \ From 614341c4402c00c942e32a8ec8547a240f00c3b8 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 1 Dec 2015 19:58:04 +0100 Subject: [PATCH 0124/1463] vmime: update --- src/vmime.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vmime.mk b/src/vmime.mk index 0eb7b362..e06bb621 100644 --- a/src/vmime.mk +++ b/src/vmime.mk @@ -3,8 +3,8 @@ PKG := vmime $(PKG)_IGNORE := -$(PKG)_VERSION := b0c8d21 -$(PKG)_CHECKSUM := b436d2dd7c5c2b6948db3d8cbaa0f0868e0550808446c9a9bb131b54738b2bab +$(PKG)_VERSION := 156edf5 +$(PKG)_CHECKSUM := fc9342784ac660b6572a7cc2343e37293e59d499de4ccf141c947fbb732cee89 $(PKG)_SUBDIR := kisli-vmime-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/kisli/vmime/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE) From 45de2de3a9abcae9556a916a77d428d47fa9d7f0 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Tue, 1 Dec 2015 20:08:14 +0000 Subject: [PATCH 0125/1463] Update versions.json --- versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.json b/versions.json index 094c8df5..d65afc68 100644 --- a/versions.json +++ b/versions.json @@ -360,7 +360,7 @@ "vcdimager": "0.7.24", "vidstab": "0.98b", "vigra": "1.9.0", - "vmime": "b0c8d21", + "vmime": "156edf5", "vo-aacenc": "0.1.3", "vo-amrwbenc": "0.1.3", "vorbis": "1.3.5", From c20c88b578d8aa717383043d686df1ef5972b1a2 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 2 Dec 2015 13:07:32 +1100 Subject: [PATCH 0126/1463] libwebp: update 0.4.2 --> 0.4.4 --- src/libwebp.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libwebp.mk b/src/libwebp.mk index e9e5d88c..a487ebfc 100644 --- a/src/libwebp.mk +++ b/src/libwebp.mk @@ -3,8 +3,8 @@ PKG := libwebp $(PKG)_IGNORE := -$(PKG)_VERSION := 0.4.2 -$(PKG)_CHECKSUM := 14d825d7c2ef7d49621bcb6b83466be455585e671ae0a2ebc1f2e07775a1722d +$(PKG)_VERSION := 0.4.4 +$(PKG)_CHECKSUM := c65d34edb57338e331ba4d622227a2b3179444cfca17d02c34f1ead63f603e86 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://downloads.webmproject.org/releases/webp/$($(PKG)_FILE) From 7818886db421b0556a4ebad6072d7170fdc1cac3 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 2 Dec 2015 13:08:10 +1100 Subject: [PATCH 0127/1463] mpg123: update 1.21.0 --> 1.22.4 --- src/mpg123.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mpg123.mk b/src/mpg123.mk index 87b6a1c9..e0120d85 100644 --- a/src/mpg123.mk +++ b/src/mpg123.mk @@ -3,8 +3,8 @@ PKG := mpg123 $(PKG)_IGNORE := -$(PKG)_VERSION := 1.21.0 -$(PKG)_CHECKSUM := 3ad197f77c9ffdf3601e1c3183ae0709ccb3c3de68309527ce9375fcfb15dcba +$(PKG)_VERSION := 1.22.4 +$(PKG)_CHECKSUM := 5069e02e50138600f10cc5f7674e44e9bf6f1930af81d0e1d2f869b3c0ee40d2 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/mpg123/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) From a3b4f60c5495c86600ff69ca125d3c25bae29e5c Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 2 Dec 2015 13:08:48 +1100 Subject: [PATCH 0128/1463] openblas: update 0.2.12 --> 0.2.15 --- src/openblas.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openblas.mk b/src/openblas.mk index 89eb3ee3..209d187b 100644 --- a/src/openblas.mk +++ b/src/openblas.mk @@ -3,8 +3,8 @@ PKG := openblas $(PKG)_IGNORE := -$(PKG)_VERSION := 0.2.12 -$(PKG)_CHECKSUM := b41f71f46faab1215f6f6d17541113dc01fd4d8fee0694f3f459bc2e3c2aaaaf +$(PKG)_VERSION := 0.2.15 +$(PKG)_CHECKSUM := 73c40ace5978282224e5e122a41c8388c5a19e65a6f2329c2b7c0b61bacc9044 $(PKG)_SUBDIR := OpenBLAS-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_URL := http://github.com/xianyi/OpenBLAS/archive/v$($(PKG)_VERSION).tar.gz From cca04023d126a33f344cd64d5d377b43da5c750f Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 2 Dec 2015 13:09:23 +1100 Subject: [PATCH 0129/1463] opus: update 1.1 --> 1.1.1 --- src/opus.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/opus.mk b/src/opus.mk index bb499f0a..9fd4b3c5 100644 --- a/src/opus.mk +++ b/src/opus.mk @@ -3,8 +3,8 @@ PKG := opus $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1 -$(PKG)_CHECKSUM := b9727015a58affcf3db527322bf8c4d2fcf39f5f6b8f15dbceca20206cbe1d95 +$(PKG)_VERSION := 1.1.1 +$(PKG)_CHECKSUM := 9b84ff56bd7720d5554103c557664efac2b8b18acc4bbcc234cb881ab9a3371e $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://downloads.xiph.org/releases/$(PKG)/$($(PKG)_FILE) From dbc90c2ae85dca20237f1be811b90f60a9070058 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 2 Dec 2015 13:10:04 +1100 Subject: [PATCH 0130/1463] pfstools: update 2.0.0 --> 2.0.4 --- src/pfstools.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pfstools.mk b/src/pfstools.mk index 5e5ed02f..2979d4c4 100644 --- a/src/pfstools.mk +++ b/src/pfstools.mk @@ -3,8 +3,8 @@ PKG := pfstools $(PKG)_IGNORE := -$(PKG)_VERSION := 2.0.0 -$(PKG)_CHECKSUM := 5e109d09f0c02cebf6800e04fc56851975f5d5e92d5a4ae626e31b58b347ff71 +$(PKG)_VERSION := 2.0.4 +$(PKG)_CHECKSUM := 4a6c1880193d3d1924d98b8dc2d2fe25827e7b2508823dc38f535653a4fd9942 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tgz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) From e0f81b5cf7a17ec5d54dc9f7e833caaed6fbb327 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 2 Dec 2015 13:10:55 +1100 Subject: [PATCH 0131/1463] primesieve: update 5.4.1 --> 5.5.0 --- src/primesieve.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/primesieve.mk b/src/primesieve.mk index b42e594e..54a994b1 100644 --- a/src/primesieve.mk +++ b/src/primesieve.mk @@ -3,8 +3,8 @@ PKG := primesieve $(PKG)_IGNORE := -$(PKG)_VERSION := 5.4.1 -$(PKG)_CHECKSUM := e6cb1eee915ff50dbd01ed9c6f13324cde16002c7ac49bf29feea07e0f348fc5 +$(PKG)_VERSION := 5.5.0 +$(PKG)_CHECKSUM := f0f818902967ce7c911c330c578a52ec62dbbd9b12a68b8d3a3bc79b601e52b0 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://dl.bintray.com/kimwalisch/$(PKG)/$($(PKG)_FILE) @@ -24,7 +24,7 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_CRUFT) $(TARGET)-g++ -s -std=c++0x -fopenmp -o '$(1)/examples/test-primesieve.exe' \ - '$(1)/examples/count_primes.cpp' \ + '$(1)/examples/cpp/count_primes.cpp' \ '-lprimesieve' $(INSTALL) -m755 '$(1)/examples/test-primesieve.exe' '$(PREFIX)/$(TARGET)/bin/' From b2225115018036b6a0a74c06c98204c3a6c323ad Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 2 Dec 2015 13:11:25 +1100 Subject: [PATCH 0132/1463] proj: update 4.8.0 --> 4.9.1 --- src/proj.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/proj.mk b/src/proj.mk index ae53d099..5581ced0 100644 --- a/src/proj.mk +++ b/src/proj.mk @@ -3,8 +3,8 @@ PKG := proj $(PKG)_IGNORE := -$(PKG)_VERSION := 4.8.0 -$(PKG)_CHECKSUM := 2db2dbf0fece8d9880679154e0d6d1ce7c694dd8e08b4d091028093d87a9d1b5 +$(PKG)_VERSION := 4.9.1 +$(PKG)_CHECKSUM := fca0388f3f8bc5a1a803d2f6ff30017532367992b30cf144f2d39be88f36c319 $(PKG)_SUBDIR := proj-$($(PKG)_VERSION) $(PKG)_FILE := proj-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://download.osgeo.org/proj/$($(PKG)_FILE) From 0cfad4bdb70b1a2adf6c198e36c5bc77dab62c3e Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 2 Dec 2015 13:12:04 +1100 Subject: [PATCH 0133/1463] wavpack: update 4.75.0 --> 4.75.2 --- src/wavpack.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wavpack.mk b/src/wavpack.mk index e5a9a770..cfd784bd 100644 --- a/src/wavpack.mk +++ b/src/wavpack.mk @@ -3,8 +3,8 @@ PKG := wavpack $(PKG)_IGNORE := -$(PKG)_VERSION := 4.75.0 -$(PKG)_CHECKSUM := c63e5c2106749dc6b2fb4302f2260f4803a93dd6cadf337764920dc836e3af2e +$(PKG)_VERSION := 4.75.2 +$(PKG)_CHECKSUM := 7d31b34166c33c3109b45c6e4579b472fd05e3ee8ec6d728352961c5cdd1d6b0 $(PKG)_SUBDIR := wavpack-$($(PKG)_VERSION) $(PKG)_FILE := wavpack-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://www.wavpack.com/$($(PKG)_FILE) From a5f0c76dc64950d4112e592e45c88d1ee93b79ec Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 2 Dec 2015 13:13:03 +1100 Subject: [PATCH 0134/1463] x264: update 20141130 --> 20151011 --- src/x264.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/x264.mk b/src/x264.mk index 92fdab88..4c9d8c48 100644 --- a/src/x264.mk +++ b/src/x264.mk @@ -3,8 +3,8 @@ PKG := x264 $(PKG)_IGNORE := -$(PKG)_VERSION := 20141130-2245 -$(PKG)_CHECKSUM := c6fa87a3b68f4645dc2ef8b0f14e5fd49004ca2e604cffcb74be128c61616c88 +$(PKG)_VERSION := 20151011-2245 +$(PKG)_CHECKSUM := 80a4075ea12a81ec3b6c493e03529c5b7c1afb34c6e91d86bb078bc2ead2ccf0 $(PKG)_SUBDIR := $(PKG)-snapshot-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-snapshot-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://download.videolan.org/pub/videolan/$(PKG)/snapshots/$($(PKG)_FILE) From 3b8063e52c74d7b16c367013f09ac05e814c1169 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 2 Dec 2015 13:13:31 +1100 Subject: [PATCH 0135/1463] xvidcore: update 1.3.3 --> 1.3.4 --- src/xvidcore.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xvidcore.mk b/src/xvidcore.mk index 323fd5f4..3d8a4f29 100644 --- a/src/xvidcore.mk +++ b/src/xvidcore.mk @@ -3,8 +3,8 @@ PKG := xvidcore $(PKG)_IGNORE := -$(PKG)_VERSION := 1.3.3 -$(PKG)_CHECKSUM := 9e6bb7f7251bca4615c2221534d4699709765ff019ab0366609f219b0158499d +$(PKG)_VERSION := 1.3.4 +$(PKG)_CHECKSUM := 4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f $(PKG)_SUBDIR := xvidcore/build/generic $(PKG)_FILE := xvidcore-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://downloads.xvid.org/downloads/$($(PKG)_FILE) From df3e43f70dc51d81775df7c52b1b611c945de6c0 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Wed, 2 Dec 2015 02:14:22 +0000 Subject: [PATCH 0136/1463] Update versions.json --- versions.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/versions.json b/versions.json index d65afc68..860a19bd 100644 --- a/versions.json +++ b/versions.json @@ -194,7 +194,7 @@ "libusb": "1.2.6.0", "libusb1": "1.0.19", "libvpx": "1.4.0", - "libwebp": "0.4.2", + "libwebp": "0.4.4", "libwebsockets": "1.4-chrome43-firefox-36", "libxml++": "2.37.2", "libxml2": "2.9.2", @@ -215,7 +215,7 @@ "mman-win32": "378ed6b69bb7220511dd9cd0973c22b3f6773ce7", "mpc": "1.0.2", "mpfr": "3.1.3", - "mpg123": "1.21.0", + "mpg123": "1.22.4", "muparser": "2.2.5", "muparserx": "4.0.4", "mxe-conf": "1", @@ -239,7 +239,7 @@ "ogg": "1.3.2", "old": "0.17", "openal": "1.16.0", - "openblas": "0.2.12", + "openblas": "0.2.15", "opencore-amr": "0.1.3", "opencsg": "1.4.0", "opencv": "2.4.10", @@ -248,7 +248,7 @@ "openmp-validation": "3.1", "openscenegraph": "3.4.0", "openssl": "1.0.2d", - "opus": "1.1", + "opus": "1.1.1", "opusfile": "0.6", "ossim": "1.8.18", "pango": "1.37.4", @@ -257,7 +257,7 @@ "pcre": "8.37", "pdcurses": "3.4", "pdflib_lite": "7.0.5p3", - "pfstools": "2.0.0", + "pfstools": "2.0.4", "physfs": "2.0.3", "picomodel": "1142ad8", "pire": "0.0.5", @@ -275,8 +275,8 @@ "portaudio": "19_20140130", "portmidi": "217", "postgresql": "9.2.4", - "primesieve": "5.4.1", - "proj": "4.8.0", + "primesieve": "5.5.0", + "proj": "4.9.1", "protobuf": "2.5.0", "pthreads": "POSIX 1003.1-2001", "qdbm": "1.8.78", @@ -366,20 +366,20 @@ "vorbis": "1.3.5", "vtk": "5.8.0", "vtk6": "6.3.0", - "wavpack": "4.75.0", + "wavpack": "4.75.2", "wget": "1.16.3", "widl": "4.0.4", "winpcap": "4_1_3", "wt": "3.3.4", "wxwidgets": "3.0.2", - "x264": "20141130-2245", + "x264": "20151011-2245", "xapian-core": "1.2.21", "xerces": "3.1.2", "xine-lib": "1.2.6", "xmlrpc-c": "d4364f4", "xmlwrapp": "0.7.0", "xorg-macros": "1.19.0", - "xvidcore": "1.3.3", + "xvidcore": "1.3.4", "xz": "5.2.2", "yasm": "1.3.0", "zlib": "1.2.8", From 8451b93899cf2cbe3c01282610d52c49f63396ee Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 2 Dec 2015 17:29:58 +1100 Subject: [PATCH 0137/1463] libmng: really create .dll --- src/libmng.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libmng.mk b/src/libmng.mk index 6dd69e29..a4f248d1 100644 --- a/src/libmng.mk +++ b/src/libmng.mk @@ -20,5 +20,5 @@ define $(PKG)_BUILD echo 'Requires: zlib lcms2 jpeg' >> '$(1)/libmng.pc.in' cd '$(1)' && ./configure \ $(MXE_CONFIGURE_OPTS) - $(MAKE) -C '$(1)' -j '$(JOBS)' install + $(MAKE) -C '$(1)' -j '$(JOBS)' install LDFLAGS='-no-undefined' endef From ca5bba63af5e38972b5f1eba484d0754315eff21 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 2 Dec 2015 18:28:07 +1100 Subject: [PATCH 0138/1463] mman-win32: switch to cmake and really build .dll --- src/mman-win32.mk | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/mman-win32.mk b/src/mman-win32.mk index 1912ae14..5312f6a2 100644 --- a/src/mman-win32.mk +++ b/src/mman-win32.mk @@ -3,23 +3,23 @@ PKG := mman-win32 $(PKG)_IGNORE := -$(PKG)_VERSION := 378ed6b69bb7220511dd9cd0973c22b3f6773ce7 -$(PKG)_CHECKSUM := 93a4afbcf9664b2a644b4d45f4145f68a8f51865e8c1270f606d528690ddec52 -$(PKG)_SUBDIR := mman-win32-$($(PKG)_VERSION) -$(PKG)_FILE := mman-win32-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://github.com/witwall/mman-win32/archive/$($(PKG)_VERSION).tar.gz +$(PKG)_VERSION := b7ec370 +$(PKG)_CHECKSUM := 6f94db28ddf30711c7b227e97c5142f72f77aca2c5cc034a7d012db242cc2f7b +$(PKG)_SUBDIR := witwall-mman-win32-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://github.com/witwall/mman-win32/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc -$(PKG)_UPDATE = $(call MXE_GET_GITHUB_SHA, witwall/mman-win32, master) +$(PKG)_UPDATE = $(call MXE_GET_GITHUB_SHA, witwall/mman-win32, master) | $(SED) 's/^\(.......\).*/\1/;' define $(PKG)_BUILD - cd '$(1)' && chmod +x configure - cd '$(1)' && ./configure \ - --cross-prefix='$(TARGET)'- \ - $(if $(BUILD_STATIC),--enable-static ) \ - --prefix='$(PREFIX)/$(TARGET)' \ - --libdir='$(PREFIX)/$(TARGET)/lib' \ - --incdir='$(PREFIX)/$(TARGET)/include/sys' - $(MAKE) -C '$(1)' -j 1 - $(MAKE) -C '$(1)' -j 1 install + mkdir '$(1).build' + cd '$(1).build' && '$(TARGET)-cmake' '$(1)'\ + -DBUILD_TESTS=OFF + $(MAKE) -C '$(1).build' -j '$(JOBS)' + $(MAKE) -C '$(1).build' -j 1 install + + '$(TARGET)-gcc' -W -Wall \ + '$(1)/test.c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \ + -lmman endef From 199f9635585583e1bb1de0e4f11ed1203dd89688 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 2 Dec 2015 18:32:45 +1100 Subject: [PATCH 0139/1463] nlopt: really build .dll --- src/nlopt.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nlopt.mk b/src/nlopt.mk index 690bac01..16dd15ce 100644 --- a/src/nlopt.mk +++ b/src/nlopt.mk @@ -25,6 +25,6 @@ define $(PKG)_BUILD --without-matlab \ --without-octave \ --without-python - $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j '$(JOBS)' LDFLAGS='-no-undefined' $(MAKE) -C '$(1)' -j 1 install endef From a59294b1d1b8e3b8cb870a1ac1112afa83baa288 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 2 Dec 2015 18:57:00 +1100 Subject: [PATCH 0140/1463] polarssl: enable zlib and really build .dll --- src/polarssl-1-CVE20151182.patch | 20 ------------ src/polarssl-1-fixes.patch | 52 ++++++++++++++++++++++++++++++++ src/polarssl.mk | 9 ++++-- 3 files changed, 59 insertions(+), 22 deletions(-) delete mode 100644 src/polarssl-1-CVE20151182.patch create mode 100644 src/polarssl-1-fixes.patch diff --git a/src/polarssl-1-CVE20151182.patch b/src/polarssl-1-CVE20151182.patch deleted file mode 100644 index a5db4543..00000000 --- a/src/polarssl-1-CVE20151182.patch +++ /dev/null @@ -1,20 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Security fix for CVE-2015-1182 from: -https://polarssl.org/tech-updates/security-advisories/polarssl-security-advisory-2014-04 - - -diff --git a/library/asn1parse.c b/library/asn1parse.c -index a3a2b56..e2117bf 100644 ---- a/library/asn1parse.c -+++ b/library/asn1parse.c -@@ -278,6 +278,8 @@ int asn1_get_sequence_of( unsigned char **p, - if( cur->next == NULL ) - return( POLARSSL_ERR_ASN1_MALLOC_FAILED ); - -+ memset( cur->next, 0, sizeof( asn1_sequence ) ); -+ - cur = cur->next; - } - } diff --git a/src/polarssl-1-fixes.patch b/src/polarssl-1-fixes.patch new file mode 100644 index 00000000..1e2d42bd --- /dev/null +++ b/src/polarssl-1-fixes.patch @@ -0,0 +1,52 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 0516b3ebc54e3acdf3882b218e0f30133a23fa61 Mon Sep 17 00:00:00 2001 +From: MXE +Date: Wed, 2 Dec 2015 18:47:45 +1100 +Subject: [PATCH 1/2] Security fix for CVE-2015-1182 from: + +https://polarssl.org/tech-updates/security-advisories/polarssl-security-advisory-2014-04 + +diff --git a/library/asn1parse.c b/library/asn1parse.c +index a3a2b56..e2117bf 100644 +--- a/library/asn1parse.c ++++ b/library/asn1parse.c +@@ -278,6 +278,8 @@ int asn1_get_sequence_of( unsigned char **p, + if( cur->next == NULL ) + return( POLARSSL_ERR_ASN1_MALLOC_FAILED ); + ++ memset( cur->next, 0, sizeof( asn1_sequence ) ); ++ + cur = cur->next; + } + } +-- +2.4.9 (Apple Git-60) + + +From e13da28ce07af59a1ee9736d41fc80e7a2861e7b Mon Sep 17 00:00:00 2001 +From: MXE +Date: Wed, 2 Dec 2015 18:50:21 +1100 +Subject: [PATCH 2/2] fix shared lib install locations + + +diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt +index 33d96b4..262b463 100644 +--- a/library/CMakeLists.txt ++++ b/library/CMakeLists.txt +@@ -131,6 +131,8 @@ if(USE_SHARED_POLARSSL_LIBRARY) + endif() + + install(TARGETS polarssl +- DESTINATION ${LIB_INSTALL_DIR} ++ ARCHIVE DESTINATION ${LIB_INSTALL_DIR} ++ LIBRARY DESTINATION ${LIB_INSTALL_DIR} ++ RUNTIME DESTINATION bin + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) + endif(USE_SHARED_POLARSSL_LIBRARY) +-- +2.4.9 (Apple Git-60) + diff --git a/src/polarssl.mk b/src/polarssl.mk index 0c5107a6..630e53c3 100644 --- a/src/polarssl.mk +++ b/src/polarssl.mk @@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := d3605afc28ed4b7d1d9e3142d72e42855e4a23c07c951bbb0299556b02d36 $(PKG)_SUBDIR := polarssl-$($(PKG)_VERSION) $(PKG)_FILE := polarssl-$($(PKG)_VERSION)-gpl.tgz $(PKG)_URL := https://polarssl.org/download/$($(PKG)_FILE) -$(PKG)_DEPS := gcc +$(PKG)_DEPS := gcc zlib # Match lines like: # PolarSSL 1.3.4 released
    @@ -23,7 +23,12 @@ endef define $(PKG)_BUILD mkdir '$(1)/build' cd '$(1)/build' && cmake .. \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' + -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + -DUSE_STATIC_POLARSSL_LIBRARY=$(CMAKE_STATIC_BOOL) \ + -DUSE_SHARED_POLARSSL_LIBRARY=$(CMAKE_SHARED_BOOL) \ + -DENABLE_TESTING=OFF \ + -DENABLE_PROGRAMS=OFF \ + -DENABLE_ZLIB_SUPPORT=ON $(MAKE) -C '$(1)/build/library' -j '$(JOBS)' install $(MAKE) -C '$(1)/build/include' -j '$(JOBS)' install endef From 1db55636477322e6d38becd9bb788b2946b5f7ea Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Wed, 2 Dec 2015 07:59:08 +0000 Subject: [PATCH 0141/1463] Update versions.json --- versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.json b/versions.json index 860a19bd..d0971965 100644 --- a/versions.json +++ b/versions.json @@ -212,7 +212,7 @@ "mingw-w64": "4.0.4", "miniupnpc": "1.9", "minizip": "0b46a2b", - "mman-win32": "378ed6b69bb7220511dd9cd0973c22b3f6773ce7", + "mman-win32": "b7ec370", "mpc": "1.0.2", "mpfr": "3.1.3", "mpg123": "1.22.4", From c0b12c17f894a4596db450c562c2968191917bc9 Mon Sep 17 00:00:00 2001 From: MrMagne Date: Wed, 2 Dec 2015 20:33:51 +1100 Subject: [PATCH 0142/1463] libxml2: fix zlib detection --- src/libxml2.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libxml2.mk b/src/libxml2.mk index 14a4dc9b..47408af6 100644 --- a/src/libxml2.mk +++ b/src/libxml2.mk @@ -22,6 +22,7 @@ define $(PKG)_BUILD $(SED) -i 's,`uname`,MinGW,g' '$(1)/xml2-config.in' cd '$(1)' && ./configure \ $(MXE_CONFIGURE_OPTS) \ + --with-zlib='$(PREFIX)/$(TARGET)/lib' \ --without-debug \ --without-python \ --without-threads From ae8f6def5cd64988c8c25e48bb2d4698dab45d8a Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 2 Dec 2015 21:16:12 +1100 Subject: [PATCH 0143/1463] gcc: don't install *.dlls to version specific directory any side-by-side installs will use targets as a higher level directory separation, we don't want to mix libs built with different versions of the compiler. --- src/gcc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gcc.mk b/src/gcc.mk index 70923e63..40d33bf1 100644 --- a/src/gcc.mk +++ b/src/gcc.mk @@ -56,7 +56,7 @@ define $(PKG)_POST_BUILD # ignore rm failure as parallel build may have cleaned up, but # don't wildcard all libs so future additions will be detected $(and $(BUILD_SHARED), - mv -v '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/'*.dll '$(PREFIX)/$(TARGET)/bin/gcc-$($(PKG)_VERSION)/' + mv -v '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/'*.dll '$(PREFIX)/$(TARGET)/bin/' -rm -v '$(PREFIX)/lib/gcc/$(TARGET)/'libgcc_s*.dll -rm -v '$(PREFIX)/lib/gcc/$(TARGET)/lib/'libgcc_s*.a -rmdir '$(PREFIX)/lib/gcc/$(TARGET)/lib/') From ca2a7865c2aa61b851d88681c760775c92366bb0 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 2 Dec 2015 11:34:58 +0100 Subject: [PATCH 0144/1463] curl: update --- src/curl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/curl.mk b/src/curl.mk index 023964b7..de237430 100644 --- a/src/curl.mk +++ b/src/curl.mk @@ -3,8 +3,8 @@ PKG := curl $(PKG)_IGNORE := -$(PKG)_VERSION := 7.45.0 -$(PKG)_CHECKSUM := 96cd9711d8f38fa6f99af085a67ad1e0ebca339f2a9a00a2aa59c40a66c4552d +$(PKG)_VERSION := 7.46.0 +$(PKG)_CHECKSUM := fe854a0dedf0a89da72aa1725d8ff66285b613d366a88f14681dacd824024087 $(PKG)_SUBDIR := curl-$($(PKG)_VERSION) $(PKG)_FILE := curl-$($(PKG)_VERSION).tar.lzma $(PKG)_URL := http://curl.haxx.se/download/$($(PKG)_FILE) From b7e8885624c45fc55abdf78b00ad39288c6754c9 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 2 Dec 2015 11:35:11 +0100 Subject: [PATCH 0145/1463] dbus: update --- src/dbus.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dbus.mk b/src/dbus.mk index 158d0a31..b092d895 100644 --- a/src/dbus.mk +++ b/src/dbus.mk @@ -3,8 +3,8 @@ PKG := dbus $(PKG)_IGNORE := -$(PKG)_VERSION := 1.10.4 -$(PKG)_CHECKSUM := ad7dcad73ad9b0ff55819985d354eacfffe07e2eb8c763e155efc21d6001084b +$(PKG)_VERSION := 1.10.6 +$(PKG)_CHECKSUM := b5fefa08a77edd76cd64d872db949eebc02cf6f3f8be82e4bbc641742af5d35f $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://$(PKG).freedesktop.org/releases/$(PKG)/$($(PKG)_FILE) From 4c56cbd90543d34bb6b0bee9d757ebb4b9845f53 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Wed, 2 Dec 2015 11:01:13 +0000 Subject: [PATCH 0146/1463] Update versions.json --- versions.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions.json b/versions.json index d0971965..20e5bdb7 100644 --- a/versions.json +++ b/versions.json @@ -36,9 +36,9 @@ "cppunit": "1.13.2", "crystalhd": "1", "cunit": "2.1-3", - "curl": "7.45.0", + "curl": "7.46.0", "db": "6.1.26", - "dbus": "1.10.4", + "dbus": "1.10.6", "dcmtk": "3.6.0", "devil": "1.7.8", "dlfcn-win32": "1.0.0", From 38a9ead6238a2155c10b6a991729b23360baae42 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 2 Dec 2015 22:20:44 +1100 Subject: [PATCH 0147/1463] Revert "gcc: don't install *.dlls to version specific directory" This reverts commit ae8f6def5cd64988c8c25e48bb2d4698dab45d8a. --- src/gcc.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gcc.mk b/src/gcc.mk index 40d33bf1..70923e63 100644 --- a/src/gcc.mk +++ b/src/gcc.mk @@ -56,7 +56,7 @@ define $(PKG)_POST_BUILD # ignore rm failure as parallel build may have cleaned up, but # don't wildcard all libs so future additions will be detected $(and $(BUILD_SHARED), - mv -v '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/'*.dll '$(PREFIX)/$(TARGET)/bin/' + mv -v '$(PREFIX)/lib/gcc/$(TARGET)/$($(PKG)_VERSION)/'*.dll '$(PREFIX)/$(TARGET)/bin/gcc-$($(PKG)_VERSION)/' -rm -v '$(PREFIX)/lib/gcc/$(TARGET)/'libgcc_s*.dll -rm -v '$(PREFIX)/lib/gcc/$(TARGET)/lib/'libgcc_s*.a -rmdir '$(PREFIX)/lib/gcc/$(TARGET)/lib/') From cf5fb10422ddc6be4c9717fc08ccc98a093aaa8b Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 2 Dec 2015 22:44:15 +1100 Subject: [PATCH 0148/1463] freetds: add update macro See: * https://github.com/mxe/mxe/issues/770 * https://github.com/mxe/mxe/commit/746f4700152cc8a5aa945db8a3649a3d465d992a There's still no obvious way to determine revision tagging, so just use the published stable tarballs. --- src/freetds.mk | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/freetds.mk b/src/freetds.mk index d7dcf1c4..8213965f 100644 --- a/src/freetds.mk +++ b/src/freetds.mk @@ -11,15 +11,10 @@ $(PKG)_URL := ftp://ftp.freetds.org/pub/$(PKG)/stable/$($(PKG)_FILE) $(PKG)_DEPS := gcc gnutls libiconv define $(PKG)_UPDATE - echo 'Warning: Updates are temporarily disabled for package freetds.' >&2; - echo $(freetds_VERSION) -endef -define $(PKG)_UPDATE_orig - $(WGET) -q -O- 'http://freetds.cvs.sourceforge.net/viewvc/freetds/freetds/' | \ - grep '

    MXE Build Matrix

    +

    +This is a table of all supported package/target +matrix. Being supported means that this specific +combination is working to the best of our knowledge, +but does not mean that it is tested daily. +

    +

    +If you found that some package is not working properly, +please file a ticket on GitHub. If you figured out a +way to make the package work for unsupported targets, +feel free to submit a pull request. +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    PackageVersioni686-w64-mingw32x86_64-w64-mingw32Native
    staticsharedstaticshared
    a52dec0.7.4✓✓✓✓✗
    agg2.5✓✗✗✗✗
    alure1.2✓✗✓✗✗
    apr1.5.2✓✓✓✓✗
    apr-util1.5.4✓✓✓✓✗
    armadillo4.550.1✓✓✓✓✗
    aspell0.60.6.1✓✓✓✓✗
    assimp3.1.1✓✓✓✓✗
    atk2.16.0✓✓✓✓✗
    atkmm2.22.7✓✓✓✓✗
    aubio0.4.2✓✓✓✓✗
    bfd2.25.1✓✗✓✗✗
    binutils2.25.1✓✓✓✓✗
    blas3.5.0✓✓✓✓✗
    boost1.57.0✓✓✓✓✗
    box2d2.3.1✓✓✓✓✗
    bullet2.82-r2704✓✓✓✓✗
    bzip21.0.6✓✓✓✓✗
    cairo1.14.2✓✓✓✓✗
    cairomm1.11.2✓✓✓✓✗
    cblas1✓✓✓✓✗
    ccfits2.4✓✗✓✗✗
    cegui0.7.9✓✗✗✗✗
    cfitsio3370✓✗✓✗✗
    cgal4.6.3✓✓✓✓✗
    check0.10.0✓✓✓✓✗
    chipmunk6.2.2✓✓✓✓✗
    chromaprint1.1✓✓✓✓✗
    cimg1.6.3✓✓✓✓✗
    cloog0.18.1✗✗✗✗✓
    cmake3.0.2✗✗✗✗✓
    cminpack1.3.4✓✗✓✗✗
    coin3.1.3✓✓✓✓✗
    cpp-netlib0.11.2✓✓✓✓✗
    cppunit1.13.2✓✗✓✗✗
    cryptopp5.6.3✓✓✓✓✗
    crystalhd1✓✓✓✓✗
    cunit2.1-3✓✗✓✗✗
    curl7.46.0✓✓✓✓✗
    db6.1.26✓✓✓✓✗
    dbus1.10.6✓✓✓✓✗
    dcmtk3.6.0✓✗✓✗✗
    devil1.7.8✓✗✗✗✗
    dlfcn-win321.0.0✓✓✓✓✗
    eigen3.2.5✓✓✓✓✗
    exiv20.25✓✓✓✓✗
    expat2.1.0✓✓✓✓✗
    faad22.7✓✓✓✓✗
    fdk-aac0.1.4✓✓✓✓✗
    ffmpeg2.8.2✓✓✓✓✗
    fftw3.3.4✓✓✓✓✗
    file5.24✓✓✓✓✗
    flac1.3.1✓✓✓✓✗
    flann1.8.4✓✓✓✓✗
    fltk1.3.3✓✓✓✓✗
    fontconfig2.11.1✓✓✓✓✗
    freeglut2.8.1✓✓✓✓✗
    freeimage3.15.4✓✗✓✗✗
    freetds0.95.75✓✓✓✓✗
    freetype2.6.2✓✓✓✓✗
    freetype-bootstrap2.6.2✓✓✓✓✗
    fribidi0.19.6✓✓✓✓✗
    ftgl2.1.3~rc5✓✓✓✓✗
    gc7.2e✓✗✓✗✗
    gcc4.9.3✓✓✓✓✗
    gd2.1.0✓✗✓✗✗
    gdal2.0.1✓✓✓✓✗
    gdb7.10.1✓✓✓✓✗
    gdk-pixbuf2.30.8✓✓✓✓✗
    gendef4.0.4✓✓✓✓✗
    geoip-database20150317-1✗✗✗✗✓
    geos3.4.2✓✓✓✓✗
    gettext0.19.5.1✓✓✓✓✗
    giflib5.0.5✓✓✓✓✗
    glew1.12.0✓✓✓✓✗
    glfw22.7.9✓✓✓✓✗
    glfw33.1✓✓✓✓✗
    glib2.44.1✓✓✓✓✗
    glibmm2.42.0✓✓✓✓✗
    gmp6.1.0✓✓✓✓✓
    gnutls3.4.7✓✓✓✓✗
    graphicsmagick1.3.21✓✓✓✓✗
    gsl1.16✓✗✓✗✗
    gsoap2.8.22✓✗✓✗✗
    gst-plugins-base1.4.5✓✗✓✗✗
    gst-plugins-good1.4.5✓✗✓✗✗
    gstreamer1.4.5✓✗✓✗✗
    gta1.0.7✓✓✓✓✗
    gtk22.24.22✓✗✓✗✗
    gtk33.14.4✓✗✓✗✗
    gtkglarea2.0.1✓✗✓✗✗
    gtkglext1.2.0✓✗✓✗✗
    gtkglextmm1.2.0✓✗✓✗✗
    gtkimageview1.6.4✓✗✓✗✗
    gtkmm22.24.4✓✗✓✗✗
    gtkmm33.14.0✓✗✓✗✗
    gtksourceview2.10.5✓✗✓✗✗
    gtksourceviewmm22.10.3✓✗✓✗✗
    guile1.8.8✓✗✗✗✗
    harfbuzz1.1.2✓✓✓✓✗
    hdf44.2.10✓✓✓✓✗
    hdf51.8.12✓✓✓✓✗
    hunspell1.3.3✓✓✓✓✗
    icu4c54.1✓✓✓✓✗
    id3lib3.8.3✓✗✓✗✗
    ilmbase2.2.0✓✓✓✓✗
    imagemagick6.9.0-0✓✓✓✓✗
    isl0.12.2✓✗✓✗✓
    itk4.8.2✓✓✓✓✗
    jack1.9.10✓✓✓✓✗
    jansson2.7✓✓✓✓✗
    jasper1.900.1✓✓✓✓✗
    jpeg9a✓✓✓✓✗
    json-c0.12✓✓✓✓✗
    json-glib1.0.4✓✓✓✓✗
    json_spirit4.08✓✓✓✓✗
    jsoncpp1.6.5✓✓✓✓✗
    lame3.99.5✓✓✓✓✗
    lapack3.5.0✓✓✓✓✗
    lcms2.7✓✓✓✓✗
    lcms11.19✓✓✓✓✗
    lensfun0.3.0✓✓✓✓✗
    levmar2.6✓✗✓✗✗
    libaacs0.7.1✓✓✓✓✗
    libarchive3.1.2✓✓✓✓✗
    libass0.13.0✓✓✓✓✗
    libbluray0.7.0✓✓✓✓✗
    libbs2b3.1.0✓✓✓✓✗
    libcaca0.99.beta19✓✓✓✓✗
    libcdio0.93✓✓✓✓✗
    libcdio-paranoia10.2+0.93+1✓✓✓✓✗
    libcomm14cux2.1.0✓✓✓✓✗
    libcroco0.6.2✓✓✓✓✗
    libdca0.0.5✓✓✓✓✗
    libdnet1.11✓✗✓✗✗
    libdvbpsi1.2.0✓✓✓✓✗
    libdvdcss1.3.0✓✓✓✓✗
    libdvdnav5.0.1✓✓✓✓✗
    libdvdread5.0.0✓✓✓✓✗
    libepoxy1.3.1✓✓✓✓✗
    libevent2.0.21✓✓✓✓✗
    libf2c1✓✗✓✗✗
    libffi3.2.1✓✓✓✓✗
    libftdi0.20✗✗✗✗✗
    libftdi11.2✓✓✓✓✗
    libgcrypt1.6.4✓✓✓✓✗
    libgda4.2.13✓✗✓✗✗
    libgdamm4.1.3✓✗✓✗✗
    libgee0.5.0✓✗✓✗✗
    libgeotiff1.4.0✓✓✓✓✗
    libgit20.23.2✓✓✓✓✗
    libglade2.6.4✓✗✓✗✗
    libgnurx2.5.1✓✓✓✓✗
    libgpg_error1.21✓✓✓✓✗
    libgsasl1.8.0✓✓✓✓✗
    libgsf1.14.30✓✓✓✓✗
    libharu2.2.1✓✗✓✗✗
    libiberty2.25.1✓✗✓✗✗
    libical1.0.1✓✓✓✓✗
    libiconv1.14✓✓✓✓✗
    libid3tag0.15.1b✓✓✓✓✗
    libidn1.32✓✓✓✓✗
    libircclient1.8✓✗✓✗✗
    libjpeg-turbo1.4.1✓✓✓✓✗
    liblaxjson1.0.5✓✓✓✓✗
    liblo0.28rc✓✗✓✗✗
    liblqr-10.4.2✓✗✓✗✗
    libltdl2.4.4✓✓✓✓✗
    libmad0.15.1b✓✓✓✓✗
    libmicrohttpd0.9.38✓✗✗✗✗
    libmikmod3.3.7✓✓✓✓✗
    libmng2.0.3✓✓✓✓✗
    libmodplug0.8.8.4✓✓✓✓✗
    libmpcdec1.2.6✓✓✓✓✗
    libmysqlclient6.1.6✓✓✓✓✗
    libntlm1.4✓✓✓✓✗
    liboauth1.0.3✓✓✓✓✗
    libodbc++0.2.5✓✗✓✗✗
    liboil0.3.17✓✗✗✗✗
    libpano132.9.18✓✗✓✗✗
    libpaper1.1.24+nmu4✓✗✓✗✗
    libplist1.12✓✓✓✓✗
    libpng1.6.19✓✓✓✓✗
    librsvg2.40.5✓✓✓✓✗
    librtmpa107cef✓✓✓✓✗
    libsamplerate0.1.8✓✓✓✓✗
    libshout2.3.1✓✗✓✗✗
    libsigc++2.4.0✓✓✓✓✗
    libsndfile1.0.25✓✓✓✓✗
    libsodium1.0.6✓✓✓✓✗
    libssh21.6.0✓✓✓✓✗
    libsvm3.20✓✓✓✓✗
    libtool2.4.4✗✗✗✗✗
    libtorrent-rasterbar1.0.6✓✗✓✗✗
    libunistring0.9.4✓✓✓✓✗
    libusb1.2.6.0✗✗✗✗✗
    libusb11.0.19✓✓✓✓✗
    libvpx1.4.0✓✓✓✓✗
    libwebp0.4.4✓✓✓✓✗
    libwebsockets1.4-chrome43…✓✓✓✓✗
    libxml++2.37.2✓✓✓✓✗
    libxml22.9.2✓✓✓✓✗
    libxslt1.1.28✓✗✓✗✗
    libzip0.11.2✓✓✓✓✗
    llvm3.4✓✓✓✓✗
    log4cxx0.10.0✓✗✓✗✗
    lua5.3.2✓✓✓✓✗
    luabind0.9.1✓✗✓✗✗
    luajit2.0.4✓✗✓✗✗
    lzma920✓✓✓✓✗
    lzo2.08✓✓✓✓✗
    matio1.5.2✓✗✓✗✗
    mdbtools0.7.1✓✗✓✗✗
    mingw-w644.0.4✗✗✗✗✗
    miniupnpc1.9✓✓✓✓✗
    minizip0b46a2b✓✗✓✗✗
    mman-win32b7ec370✓✓✓✓✗
    mpc1.0.2✓✓✓✓✓
    mpfr3.1.3✓✓✓✓✓
    mpg1231.22.4✓✓✓✓✗
    muparser2.2.5✓✓✓✓✗
    muparserx4.0.4✓✓✓✓✗
    mxe-conf1✓✓✓✓✓
    mxml2.9✓✗✓✗✗
    ncursese14300b✓✓✓✓✗
    netcdf4.3.0✓✓✓✓✗
    netpbm10.35.96✓✗✓✗✗
    nettle3.1✓✓✓✓✗
    nlopt2.4.2✓✓✓✓✗
    nsis2.46✓✓✗✗✗
    ocaml-cairo1.2.0✓✗✗✗✗
    ocaml-camlimages4.0.1✓✗✗✗✗
    ocaml-core4.00.1✓✗✗✗✗
    ocaml-findlib1.4✓✗✗✗✗
    ocaml-flexdll0.31✓✗✗✗✗
    ocaml-lablgl1.05✓✗✗✗✗
    ocaml-lablgtk22.16.0✓✗✗✗✗
    ocaml-native4.00.1✓✗✗✗✗
    ocaml-xml-light2.2✓✗✗✗✗
    oce0.16.1✓✓✓✓✗
    ogg1.3.2✓✓✓✓✗
    old0.17✓✗✓✗✗
    openal1.16.0✓✓✓✓✗
    openblas0.2.15✓✓✓✓✗
    opencore-amr0.1.3✓✓✓✓✗
    opencsg1.4.0✓✗✓✗✗
    opencv2.4.10✓✓✓✓✗
    openexr2.2.0✓✓✓✓✗
    openjpeg2.1.0✓✓✓✓✗
    openmp-validation3.1✓✓✓✓✗
    openscenegraph3.4.0✓✓✓✓✗
    openssl1.0.2e✓✓✓✓✗
    openthreads3.4.0✓✓✓✓✗
    opus1.1.1✓✓✓✓✗
    opusfile0.6✓✓✓✓✗
    ossim1.8.20✓✓✓✓✗
    pango1.37.4✓✓✓✓✗
    pangomm2.34.0✓✗✓✗✗
    pcl1.7.2✓✗✓✗✗
    pcre8.37✓✓✓✓✗
    pdcurses3.4✓✓✓✓✗
    pdflib_lite7.0.5p3✓✗✓✗✗
    pfstools2.0.4✓✗✓✗✗
    physfs2.0.3✓✓✗✗✗
    picomodel1142ad8✓✗✓✗✗
    pire0.0.5✓✓✓✓✗
    pixman0.31.2✓✓✓✓✗
    pkgconfda179fd✓✓✓✓✓
    plib1.8.5-rc1✓✓✓✓✗
    plibccd7ed09✓✗✗✗✗
    plotmm0.1.2✓✗✓✗✗
    plotutils2.6✓✗✓✗✗
    poco1.4.7p1✓✗✓✗✗
    polarssl1.3.9✓✓✓✓✗
    poppler0.30.0✓✗✓✗✗
    popt1.16✓✓✓✓✗
    portablexdr4.9.1✓✓✓✓✗
    portaudio19_20140130✓✓✓✓✗
    portmidi217✓✓✓✓✗
    postgresql9.2.4✓✓✓✓✗
    primesieve5.5.0✓✓✓✓✗
    proj4.9.1✓✓✓✓✗
    protobuf2.5.0✓✓✓✓✗
    pthreadsPOSIX 1003.1…✓✓✓✓✗
    qdbm1.8.78✓✗✓✗✗
    qhttpengine0.1.0✓✓✓✓✗
    qjson0.8.1✓✓✓✓✗
    qscintilla22.8.4✓✓✓✓✗
    qt4.8.7✓✓✓✓✗
    qt3dbcdbf04b74cc…✓✓✓✓✗
    qt55.5.1✗✗✗✗✗
    qtactiveqt5.5.1✓✓✓✓✗
    qtbase5.5.1✓✓✓✓✗
    qtconnectivity5.5.1✓✓✓✓✗
    qtdeclarative5.5.1✓✓✓✓✗
    qtenginio5.5.1✓✓✓✓✗
    qtgraphicaleffects5.5.1✓✓✓✓✗
    qtimageformats5.5.1✓✓✓✓✗
    qtlocation5.5.1✓✓✓✓✗
    qtmultimedia5.5.1✓✓✓✓✗
    qtquick15.5.1✓✓✓✓✗
    qtquickcontrols5.5.1✓✓✓✓✗
    qtscript5.5.1✓✓✓✓✗
    qtsensors5.5.1✓✓✓✓✗
    qtserialport5.5.1✓✓✓✓✗
    qtserialport_qt45c3b6cc770✗✓✗✓✗
    qtservicead9bc46✓✓✓✓✗
    qtsvg5.5.1✓✓✓✓✗
    qtsystems4e3a7ed✓✓✓✓✗
    qttools5.5.1✓✓✓✓✗
    qttranslations5.5.1✓✓✓✓✗
    qtwebchannel5.5.1✓✓✓✓✗
    qtwebengine5.5.1✓✓✓✓✗
    qtwebkit5.5.1✗✓✗✓✗
    qtwebsockets5.5.1✓✓✓✓✗
    qtwinextras5.5.1✓✓✓✓✗
    qtxlsxwriterad90b6a2c21b…✓✓✓✓✗
    qtxmlpatterns5.5.1✓✓✓✓✗
    qwt6.1.1✓✓✓✓✗
    qwt_qt46.1.1✓✓✓✓✗
    qwtplot3d0.2.7✓✗✓✗✗
    readline6.3✓✓✓✓✗
    rubberband1.8.1✓✓✓✓✗
    rucksack3.1.0✓✗✓✗✗
    sdl1.2.15✓✓✓✓✗
    sdl22.0.3✓✓✓✓✗
    sdl2_gfx1.0.1✓✓✓✓✗
    sdl2_image2.0.0✓✓✓✓✗
    sdl2_mixer2.0.0✓✓✓✓✗
    sdl2_net2.0.0✓✓✓✓✗
    sdl2_ttf2.0.12✓✓✓✓✗
    sdl_gfx2.0.25✓✓✓✓✗
    sdl_image1.2.12✓✗✓✗✗
    sdl_mixer1.2.12✓✗✓✗✗
    sdl_net1.2.8✓✗✓✗✗
    sdl_pango0.1.2✓✗✓✗✗
    sdl_rwhttp0.2.0✓✗✓✗✗
    sdl_sound1.0.3✓✗✓✗✗
    sdl_ttf2.0.11✓✗✓✗✗
    sfml2.3.1✓✗✓✗✗
    smpeg0.4.5+cvs200…✓✗✓✗✗
    smpeg22.0.0✓✓✓✓✗
    sox14.4.2✓✗✓✗✗
    speex1.2rc2✓✓✓✓✗
    speexdsp1.2rc3✓✓✓✓✗
    sqlite3090200✓✓✓✓✗
    suitesparse4.2.1✓✗✓✗✗
    t4k_common0.1.1✓✗✓✗✗
    taglib1.7.2✓✗✓✗✗
    tclap1.2.1✓✓✓✓✗
    teem1.11.0✓✗✓✗✗
    termcap1.3.1✓✓✓✓✗
    theora1.1.1✓✓✓✓✗
    tiff4.0.6✓✓✓✓✗
    tinyxml2.6.2✓✓✓✓✗
    tinyxml23.0.0✓✓✓✓✗
    tre0.8.0✓✗✓✗✗
    twolame0.3.13✓✗✓✗✗
    ucl1.03✓✓✓✓✗
    unrtf0.21.9✓✓✓✓✗
    upx3.91✓✓✓✓✗
    vamp-plugin-sdk2.5✓✓✓✓✗
    vcdimager0.7.24✓✓✓✓✗
    vidstab0.98b✓✓✓✓✗
    vigra1.9.0✓✗✗✗✗
    vmime156edf5✓✓✓✓✗
    vo-aacenc0.1.3✓✓✓✓✗
    vo-amrwbenc0.1.3✓✓✓✓✗
    vorbis1.3.5✓✓✓✓✗
    vtk5.8.0✓✗✓✗✗
    vtk66.3.0✓✓✓✓✗
    wavpack4.75.2✓✓✓✓✗
    wget1.16.3✓✓✓✓✗
    widl4.0.4✓✓✓✓✗
    winpcap4_1_3✓✗✓✗✗
    wt3.3.4✓✓✓✓✗
    wxwidgets3.0.2✓✗✓✗✗
    x26420151011-224…✓✓✓✓✗
    xapian-core1.2.21✓✓✓✓✗
    xerces3.1.2✓✗✓✗✗
    xine-lib1.2.6✓✗✓✗✗
    xmlrpc-cd4364f4✓✗✓✗✗
    xmlwrapp0.7.0✓✗✓✗✗
    xorg-macros1.19.0✓✓✓✓✗
    xvidcore1.3.4✓✓✓✓✗
    xz5.2.2✓✓✓✓✗
    yasm1.3.0✓✓✓✓✓
    zlib1.2.8✓✓✓✓✗
    zziplib0.13.62✓✓✓✓✗
    +Total: 381 +
    (+5 virtual ++3 native-only) +    		37927336027110
    + + From abda01129c156b1a921d1a658a6d523cd2df3111 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Wed, 16 Dec 2015 23:04:15 -0800 Subject: [PATCH 0279/1463] Make Travis CI build build-matrix.html Fixes #1074. --- .travis.yml | 2 +- tools/travis-push.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d6024c31..d6c9eea9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: c sudo: false script: - - make versions.json + - make build-matrix.html versions.json - if [ "$GH_TOKEN" != "" ]; then ./tools/travis-push.sh; fi env: diff --git a/tools/travis-push.sh b/tools/travis-push.sh index 998ddaee..da77107d 100755 --- a/tools/travis-push.sh +++ b/tools/travis-push.sh @@ -8,6 +8,6 @@ git config --global push.default simple git config credential.helper "store --file=.git/credentials" echo "https://${GH_TOKEN}:@github.com" > .git/credentials git remote set-url origin 'https://github.com/mxe/mxe.git' -git commit -a -m 'Update versions.json' || true +git commit -a -m 'Update versions.json & build-matrix.html' || true git push origin HEAD:master git push origin HEAD:gh-pages From cbf681af25cfb389fa60dcc5dcad1202d9669b20 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sun, 3 Jan 2016 09:30:52 +0000 Subject: [PATCH 0280/1463] Update versions.json & build-matrix.html --- build-matrix.html | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 8657ec94..dacb65a0 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -89,7 +89,7 @@ feel free to submit a pull request. armadillo - 4.550.1 + 6.400.3 ✓ ✓ ✓ @@ -109,7 +109,7 @@ feel free to submit a pull request. assimp - 3.1.1 + 3.2 ✓ ✓ ✓ @@ -179,7 +179,7 @@ feel free to submit a pull request. boost - 1.57.0 + 1.60.0 ✓ ✓ ✓ @@ -919,7 +919,7 @@ feel free to submit a pull request. gtk2 - 2.24.22 + 2.24.29 ✓ ✗ ✓ @@ -1219,7 +1219,7 @@ feel free to submit a pull request. lapack - 3.5.0 + 3.6.0 ✓ ✓ ✓ @@ -1969,7 +1969,7 @@ feel free to submit a pull request. libtorrent-rasterbar - 1.0.6 + 1.0.7 ✓ ✗ ✓ @@ -3789,7 +3789,7 @@ feel free to submit a pull request. wt - 3.3.4 + 3.3.5 ✓ ✓ ✓ From d0f9a3df957857f2ffeb1e5f4caa77c69234ea49 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 3 Jan 2016 15:09:42 +0300 Subject: [PATCH 0281/1463] print Python version to log --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 6b2c78ed..41747d94 100644 --- a/Makefile +++ b/Makefile @@ -509,6 +509,7 @@ build-only-$(1)_$(3): lsb_release -a 2>/dev/null || sw_vers 2>/dev/null || true autoconf --version 2>/dev/null | head -1 automake --version 2>/dev/null | head -1 + python --version rm -rf '$(2)' mkdir -p '$(2)' $$(if $(value $(call LOOKUP_PKG_RULE,$(1),FILE,$(3))),\ From 444c8cf1967724a1f3642cc47bb5175b22315c3a Mon Sep 17 00:00:00 2001 From: Pavel Vatagin Date: Sun, 3 Jan 2016 15:28:36 +0300 Subject: [PATCH 0282/1463] add EiskaltDC++ to section "Projects which use MXE" --- index.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/index.html b/index.html index 9379f036..68249e2f 100644 --- a/index.html +++ b/index.html @@ -4204,6 +4204,9 @@ endef
  • DiffPDF
    • +
  • + EiskaltDC++ +
  • Eros
    • From 3560fdb16cde733356ec930a76a0f4577f37b1fb Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 3 Jan 2016 16:13:26 +0300 Subject: [PATCH 0283/1463] add package waf --- index.html | 4 ++++ src/waf.mk | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 src/waf.mk diff --git a/index.html b/index.html index 9379f036..6ac3fd2d 100644 --- a/index.html +++ b/index.html @@ -2550,6 +2550,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) vtk6 VTK6 + + waf + Waf: the meta build system + wavpack WavPack diff --git a/src/waf.mk b/src/waf.mk new file mode 100644 index 00000000..11d7b4c7 --- /dev/null +++ b/src/waf.mk @@ -0,0 +1,22 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := waf +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.8.17 +$(PKG)_CHECKSUM := 63c53b03dd23afde1008dced06a011dad581d24392818c8069a40af99f6ac2b6 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 +$(PKG)_URL := https://waf.io/$($(PKG)_FILE) +$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) + +define $(PKG)_UPDATE + $(WGET) -q -O- 'https://waf.io/' | \ + $(SED) -n 's,.*waf-\([0-9][^>]*\)\.tar.*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD_$(BUILD) + mkdir -p '$(PREFIX)/$(BUILD)/bin' + cp '$(1)/waf' '$(PREFIX)/$(BUILD)/bin/waf' +endef From 4dc528380c7873aec87a52656e88eec662a9dc81 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 3 Jan 2016 16:16:31 +0300 Subject: [PATCH 0284/1463] jack: use waf from package waf --- src/jack-1-fixes.patch | 264 +++++++++++++++++++++++++++++++++++------ src/jack.mk | 6 +- 2 files changed, 233 insertions(+), 37 deletions(-) diff --git a/src/jack-1-fixes.patch b/src/jack-1-fixes.patch index b19423dd..d7c21512 100644 --- a/src/jack-1-fixes.patch +++ b/src/jack-1-fixes.patch @@ -189,38 +189,232 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Nagaev -Date: Fri, 1 Jan 2016 15:21:46 +0300 -Subject: [PATCH] waf: disable function causing pickling errors - -According to Debian patch of py3cairo which also uses waf [1], - -80_fix pickle.patch: -> during the build process, a context instance is pickled, or at -> least attempted to be. This fails because self.node_class is assigned to a -> class which is nested inside the __init__() method. Because Python cannot -> find this class at unpickling time (i.e. it cannot be imported), Python -> refuses to pickle the Context instance, leading to a FTBFS. Since there's no -> obvious reason why the class has to be so nested, moving it to a module -> global solves the build failure. - -81_pickling again.patch: -> follow up to 80_fix-pickle.patch. just disable pickling -> altogether since the previous patch doesn't really fix the problem, and not -> storing the pickle seems to have no adverse effects on the build, while -> avoiding the observed traceback. - -[1] http://sources.debian.net/patches/summary/py3cairo/1.10.0+dfsg-5/ - -diff --git a/waf b/waf -index 1111111..2222222 100755 ---- a/waf -+++ b/waf -@@ -158,6 +158,8 @@ sys.path.insert(0, wafdir) - if __name__ == '__main__': - import waflib.extras.compat15 - from waflib import Scripting -+ from waflib import Build -+ Build.BuildContext.store = lambda self: True - Scripting.waf_entry_point(cwd, VERSION, wafdir) - - #==> +Date: Sun, 3 Jan 2016 16:56:19 +0100 +Subject: [PATCH] update wscript's for waf 1.8.17 + + * all waf modules are now submodules of waflib + * tool_options => load + * check_tool => load + * compiler_cc => compiler_c + * sub_options => recurse + * sub_config => recurse + * add_subdirs => recurse + +diff --git a/common/wscript b/common/wscript +index 1111111..2222222 100644 +--- a/common/wscript ++++ b/common/wscript +@@ -1,7 +1,7 @@ + #! /usr/bin/env python + # encoding: utf-8 + +-import Build ++from waflib import Build + import re + import os + +diff --git a/dbus/wscript b/dbus/wscript +index 1111111..2222222 100644 +--- a/dbus/wscript ++++ b/dbus/wscript +@@ -2,9 +2,9 @@ + # encoding: utf-8 + + import os.path +-import Options ++from waflib import Options + import re # subst_func +-import Logs ++from waflib import Logs + + def options(opt): + opt.add_option('--enable-pkg-config-dbus-service-dir', action='store_true', default=False, help='force D-Bus service install dir to be one returned by pkg-config') +diff --git a/man/wscript b/man/wscript +index 1111111..2222222 100644 +--- a/man/wscript ++++ b/man/wscript +@@ -1,7 +1,7 @@ + #! /usr/bin/env python + # encoding: utf-8 + +-import Build ++from waflib import Build + import re + import os + +diff --git a/wscript b/wscript +index 1111111..2222222 100644 +--- a/wscript ++++ b/wscript +@@ -3,14 +3,14 @@ + from __future__ import print_function + + import os +-import Utils +-import Options ++from waflib import Utils ++from waflib import Options + import subprocess + g_maxlen = 40 + import shutil +-import Task ++from waflib import Task + import re +-import Logs ++from waflib import Logs + import sys + + import waflib.Options +@@ -65,8 +65,8 @@ def create_svnversion_task(bld, header='svnversion.h', define=None): + + def options(opt): + # options provided by the modules +- opt.tool_options('compiler_cxx') +- opt.tool_options('compiler_cc') ++ opt.load('compiler_cxx') ++ opt.load('compiler_c') + + opt.add_option('--libdir', type='string', help="Library directory [Default: /lib]") + opt.add_option('--libdir32', type='string', help="32bit Library directory [Default: /lib32]") +@@ -87,11 +87,11 @@ def options(opt): + opt.add_option('--autostart', type='string', default="default", help='Autostart method. Possible values: "default", "classic", "dbus", "none"') + opt.add_option('--portaudio', action='store_true', default=False, help='Enable Portaudio driver') + opt.add_option('--winmme', action='store_true', default=False, help='Enable WinMME driver') +- opt.sub_options('dbus') ++ opt.recurse('dbus') + + def configure(conf): + conf.load('compiler_cxx') +- conf.load('compiler_cc') ++ conf.load('compiler_c') + if Options.options.dist_target == 'auto': + platform = sys.platform + conf.env['IS_MACOSX'] = platform == 'darwin' +@@ -116,34 +116,34 @@ def configure(conf): + Logs.pprint('CYAN', "Windows detected") + + if conf.env['IS_LINUX']: +- conf.check_tool('compiler_cxx') +- conf.check_tool('compiler_cc') ++ conf.load('compiler_cxx') ++ conf.load('compiler_c') + + if conf.env['IS_MACOSX']: +- conf.check_tool('compiler_cxx') +- conf.check_tool('compiler_cc') ++ conf.load('compiler_cxx') ++ conf.load('compiler_c') + +- # waf 1.5 : check_tool('compiler_cxx') and check_tool('compiler_cc') do not work correctly, so explicit use of gcc and g++ ++ # waf 1.5 : load('compiler_cxx') and load('compiler_c') do not work correctly, so explicit use of gcc and g++ + if conf.env['IS_SUN']: +- conf.check_tool('g++') +- conf.check_tool('gcc') ++ conf.load('g++') ++ conf.load('gcc') + + #if conf.env['IS_SUN']: +- # conf.check_tool('compiler_cxx') +- # conf.check_tool('compiler_cc') ++ # conf.load('compiler_cxx') ++ # conf.load('compiler_c') + + if conf.env['IS_WINDOWS']: +- conf.check_tool('compiler_cxx') +- conf.check_tool('compiler_cc') ++ conf.load('compiler_cxx') ++ conf.load('compiler_c') + conf.env.append_unique('CCDEFINES', '_POSIX') + conf.env.append_unique('CXXDEFINES', '_POSIX') + + conf.env.append_unique('CXXFLAGS', '-Wall') + conf.env.append_unique('CFLAGS', '-Wall') + +- conf.sub_config('common') ++ conf.recurse('common') + if conf.env['IS_LINUX']: +- conf.sub_config('linux') ++ conf.recurse('linux') + if Options.options.alsa and not conf.env['BUILD_DRIVER_ALSA']: + conf.fatal('ALSA driver was explicitly requested but cannot be built') + if Options.options.freebob and not conf.env['BUILD_DRIVER_FREEBOB']: +@@ -157,12 +157,12 @@ def configure(conf): + conf.env['BUILD_DRIVER_FREEBOB'] = Options.options.freebob + conf.env['BUILD_DRIVER_IIO'] = Options.options.iio + if conf.env['IS_WINDOWS']: +- conf.sub_config('windows') ++ conf.recurse('windows') + if Options.options.portaudio and not conf.env['BUILD_DRIVER_PORTAUDIO']: + conf.fatal('Portaudio driver was explicitly requested but cannot be built') + conf.env['BUILD_DRIVER_WINMME'] = Options.options.winmme + if Options.options.dbus: +- conf.sub_config('dbus') ++ conf.recurse('dbus') + if conf.env['BUILD_JACKDBUS'] != True: + conf.fatal('jackdbus was explicitly requested but cannot be built') + +@@ -171,7 +171,7 @@ def configure(conf): + if conf.is_defined('HAVE_SAMPLERATE'): + conf.env['LIB_SAMPLERATE'] = ['samplerate'] + +- conf.sub_config('example-clients') ++ conf.recurse('example-clients') + + if conf.check_cfg(package='celt', atleast_version='0.11.0', args='--cflags --libs', mandatory=False): + conf.define('HAVE_CELT', 1) +@@ -404,38 +404,38 @@ def build(bld): + waflib.Options.commands.append(bld.cmd + '_' + lib32) + + # process subfolders from here +- bld.add_subdirs('common') ++ bld.recurse('common') + + if bld.variant: + # only the wscript in common/ knows how to handle variants + return + + if bld.env['IS_LINUX']: +- bld.add_subdirs('linux') +- bld.add_subdirs('example-clients') +- bld.add_subdirs('tests') +- bld.add_subdirs('man') ++ bld.recurse('linux') ++ bld.recurse('example-clients') ++ bld.recurse('tests') ++ bld.recurse('man') + if bld.env['BUILD_JACKDBUS'] == True: +- bld.add_subdirs('dbus') ++ bld.recurse('dbus') + + if bld.env['IS_MACOSX']: +- bld.add_subdirs('macosx') +- bld.add_subdirs('example-clients') +- bld.add_subdirs('tests') ++ bld.recurse('macosx') ++ bld.recurse('example-clients') ++ bld.recurse('tests') + if bld.env['BUILD_JACKDBUS'] == True: +- bld.add_subdirs('dbus') ++ bld.recurse('dbus') + + if bld.env['IS_SUN']: +- bld.add_subdirs('solaris') +- bld.add_subdirs('example-clients') +- bld.add_subdirs('tests') ++ bld.recurse('solaris') ++ bld.recurse('example-clients') ++ bld.recurse('tests') + if bld.env['BUILD_JACKDBUS'] == True: +- bld.add_subdirs('dbus') ++ bld.recurse('dbus') + + if bld.env['IS_WINDOWS']: +- bld.add_subdirs('windows') +- bld.add_subdirs('example-clients') +- #bld.add_subdirs('tests') ++ bld.recurse('windows') ++ bld.recurse('example-clients') ++ #bld.recurse('tests') + + if bld.env['BUILD_DOXYGEN_DOCS'] == True: + html_docs_source_dir = "build/default/html" diff --git a/src/jack.mk b/src/jack.mk index b13afa9f..60bc3c9d 100644 --- a/src/jack.mk +++ b/src/jack.mk @@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := 5bc6336e6ac9799e3cb241915e2ba5d01b030589bbb2afae39579a59ef0f2 $(PKG)_SUBDIR := jack-$($(PKG)_VERSION) $(PKG)_FILE := jack-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := https://dl.dropboxusercontent.com/u/28869550/$($(PKG)_FILE) -$(PKG)_DEPS := gcc libgnurx libsamplerate libsndfile portaudio pthreads readline +$(PKG)_DEPS := gcc libgnurx libsamplerate libsndfile portaudio pthreads readline waf define $(PKG)_UPDATE $(WGET) -q -O- 'http://jackaudio.org/downloads/' | \ @@ -17,12 +17,14 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD + rm '$(1)/waf' cd '$(1)' && \ AR='$(TARGET)-ar' \ CC='$(TARGET)-gcc' \ CXX='$(TARGET)-g++' \ PKGCONFIG='$(TARGET)-pkg-config' \ - ./waf configure build install \ + '$(PREFIX)/$(BUILD)/bin/waf' \ + configure build install \ -j '$(JOBS)' \ --prefix='$(PREFIX)/$(TARGET)' \ --dist-target=mingw From e3cf5ab0fd8e8f7f5c065e35ebcfa1952be1a930 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 3 Jan 2016 16:18:11 +0300 Subject: [PATCH 0285/1463] aubio: use waf from package waf --- src/aubio.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/aubio.mk b/src/aubio.mk index 8c7adbe3..27f2f682 100644 --- a/src/aubio.mk +++ b/src/aubio.mk @@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := 1cc58e0fed2b9468305b198ad06b889f228b797a082c2ede716dc30fcb4f8 $(PKG)_SUBDIR := aubio-$($(PKG)_VERSION) $(PKG)_FILE := aubio-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://www.aubio.org/pub/$($(PKG)_FILE) -$(PKG)_DEPS := gcc ffmpeg fftw jack libsamplerate libsndfile +$(PKG)_DEPS := gcc ffmpeg fftw jack libsamplerate libsndfile waf define $(PKG)_UPDATE $(WGET) -q -O- 'http://www.aubio.org/download' | \ @@ -17,11 +17,13 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD + rm -rf '$(1)/waf' '$(1)/waflib' cd '$(1)' && \ AR='$(TARGET)-ar' \ CC='$(TARGET)-gcc' \ PKGCONFIG='$(TARGET)-pkg-config' \ - ./waf configure \ + '$(PREFIX)/$(BUILD)/bin/waf' \ + configure \ -j '$(JOBS)' \ --with-target-platform='win$(BITS)' \ --prefix='$(PREFIX)/$(TARGET)' \ @@ -33,7 +35,7 @@ define $(PKG)_BUILD # disable txt2man and doxygen $(SED) -i '/\(TXT2MAN\|DOXYGEN\)/d' '$(1)/build/c4che/_cache.py' - cd '$(1)' && ./waf build install + cd '$(1)' && '$(PREFIX)/$(BUILD)/bin/waf' build install # It is not trivial to adjust the installation in waf-based builds $(if $(BUILD_STATIC), \ From 0a01f4fc97ba08c322778bbf2eb891336dc621ee Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 3 Jan 2016 20:42:16 +0300 Subject: [PATCH 0286/1463] add a link to pkg.mxe.cc to index.html See https://github.com/mxe/mxe/issues/911#issuecomment-146791434 --- index.html | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 9379f036..f705780d 100644 --- a/index.html +++ b/index.html @@ -211,7 +211,7 @@ exit 

    cd /opt/mxe
    -

    Step 3: Build MXE

    +

    Step 3a: Build MXE

    Enter the directory where you've downloaded MXE. @@ -269,6 +269,15 @@ exit After you're done it just needs a little post-installation.

    +

    Step 3b: Install MXE from the binary distribution

    + +

    + Instead of building MXE packages from source, you can + download precompiled packages. There are two options: + tar archives and Debian packages. + See pkg.mxe.cc. +

    +

    Step 4: Environment Variables

    @@ -647,6 +656,11 @@ USE_OSGPLUGIN(<plugin2>) Only the latest Debian stable series is supported.

    +

    + You can install a precompiled MXE via Debian packages. + See pkg.mxe.cc. +

    +

    Fedora

    @@ -4082,6 +4096,9 @@ endef
  • Project on GitHub
    • +
  • + Binary distribution of packages +
  • Entry on Open Hub
    • From fcc5a2b60368174d02607862e62b00decb086baa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gl=C3=B6ckner?= Date: Sun, 3 Jan 2016 19:44:51 +0100 Subject: [PATCH 0287/1463] new package: libieee1284 --- index.html | 4 ++ src/libieee1284-1-ssize_t.patch | 80 ++++++++++++++++++++++ src/libieee1284-2-dll.patch | 25 +++++++ src/libieee1284-3-windows-header.patch | 91 ++++++++++++++++++++++++++ src/libieee1284-4-getversion.patch | 42 ++++++++++++ src/libieee1284-5-pkg-config.patch | 57 ++++++++++++++++ src/libieee1284.mk | 26 ++++++++ 7 files changed, 325 insertions(+) create mode 100644 src/libieee1284-1-ssize_t.patch create mode 100644 src/libieee1284-2-dll.patch create mode 100644 src/libieee1284-3-windows-header.patch create mode 100644 src/libieee1284-4-getversion.patch create mode 100644 src/libieee1284-5-pkg-config.patch create mode 100644 src/libieee1284.mk diff --git a/index.html b/index.html index 68249e2f..bebe2d0e 100644 --- a/index.html +++ b/index.html @@ -1718,6 +1718,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) libidn Libidn + + libieee1284 + libieee1284 + libircclient libircclient diff --git a/src/libieee1284-1-ssize_t.patch b/src/libieee1284-1-ssize_t.patch new file mode 100644 index 00000000..ce23384e --- /dev/null +++ b/src/libieee1284-1-ssize_t.patch @@ -0,0 +1,80 @@ +From 55a02d19ec885b2cc1d9c39813aa706bf68c122b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20Gl=C3=B6ckner?= +Date: Sun, 3 Jan 2016 05:48:59 +0100 +Subject: [PATCH] make configure determine if basetsd.h is needed for ssize_t + +The result is hardcoded in ieee1284.h. +Duplicate logic in detect.h is replaced by including that file. +--- + configure.in | 12 +++++++++++- + include/{ieee1284.h => ieee1284.h.in} | 2 +- + src/detect.h | 13 +------------ + 3 files changed, 13 insertions(+), 14 deletions(-) + rename include/{ieee1284.h => ieee1284.h.in} (99%) + +diff --git a/configure.in b/configure.in +index a22fe97..7cd9561 100644 +--- a/configure.in ++++ b/configure.in +@@ -72,7 +72,17 @@ if test $ac_cv_use_python = yes; then + AM_PATH_PYTHON + fi + ++AC_CHECK_TYPE([ssize_t],,,[#include ]) ++if test $ac_cv_type_ssize_t != yes; then ++ AC_CHECK_TYPE([SSIZE_T], ++ AC_SUBST([SSIZE_T_IN_BASETSD_H], 1), ++ AC_MSG_ERROR([No definition of ssize_t found.]), ++ [#include ]) ++else ++ AC_SUBST([SSIZE_T_IN_BASETSD_H], 0) ++fi ++ + dnl Checks for library functions. + +-AC_CONFIG_FILES(Makefile libieee1284.spec) ++AC_CONFIG_FILES([Makefile libieee1284.spec include/ieee1284.h]) + AC_OUTPUT +diff --git a/include/ieee1284.h b/include/ieee1284.h.in +similarity index 99% +rename from include/ieee1284.h +rename to include/ieee1284.h.in +index 03614cb..be02850 100644 +--- a/include/ieee1284.h ++++ b/include/ieee1284.h.in +@@ -27,7 +27,7 @@ + #include /* for struct timeval */ + #endif + +-#if (defined __MINGW32__ || defined _MSC_VER) && !defined OWN_SSIZE_T ++#if @SSIZE_T_IN_BASETSD_H@ && !defined OWN_SSIZE_T + #include /* for SSIZE_T */ + #define OWN_SSIZE_T + typedef SSIZE_T ssize_t; +diff --git a/src/detect.h b/src/detect.h +index 71e7d60..ab35f82 100644 +--- a/src/detect.h ++++ b/src/detect.h +@@ -24,18 +24,7 @@ + #ifndef _DETECT_H_ + #define _DETECT_H_ + +-#include +-#ifndef _MSC_VER +-#include +-#else +-#include +-#endif +- +-#if (defined __MINGW32__ || defined _MSC_VER) && !defined OWN_SSIZE_T +-#include /* for SSIZE_T */ +-#define OWN_SSIZE_T +-typedef SSIZE_T ssize_t; +-#endif ++#include "ieee1284.h" + + struct parport; + struct parport_internal; +-- +2.1.4 + diff --git a/src/libieee1284-2-dll.patch b/src/libieee1284-2-dll.patch new file mode 100644 index 00000000..1c75b79a --- /dev/null +++ b/src/libieee1284-2-dll.patch @@ -0,0 +1,25 @@ +From 9f599be4745f9e09741ba48a2af55d8d684b68db Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20Gl=C3=B6ckner?= +Date: Sun, 20 Sep 2015 19:14:18 +0200 +Subject: [PATCH] persuade libtool build a DLL on windows + +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 9fdaff5..2abe635 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -8,7 +8,7 @@ libieee1284_la_SOURCES = src/detect.c src/detect.h src/ports.c src/deviceid.c \ + src/par_nt.h src/io.h src/conf.h src/conf.c libieee1284.sym + # When rolling a release, remember to adjust the version info. + # It's current:release:age. +-libieee1284_la_LDFLAGS = -version-info 5:2:2 \ ++libieee1284_la_LDFLAGS = -version-info 5:2:2 -no-undefined \ + -export-symbols $(top_srcdir)/libieee1284.sym + include_HEADERS = include/ieee1284.h + INCLUDES = -I$(top_srcdir)/include +-- +2.1.4 + diff --git a/src/libieee1284-3-windows-header.patch b/src/libieee1284-3-windows-header.patch new file mode 100644 index 00000000..0d02c495 --- /dev/null +++ b/src/libieee1284-3-windows-header.patch @@ -0,0 +1,91 @@ +From d8da09469573051c2fb85da1048bef5a4742cb2f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20Gl=C3=B6ckner?= +Date: Sun, 20 Sep 2015 19:15:15 +0200 +Subject: [PATCH] search for windows.h + +instead of relying on the __CYGWIN__ macro +--- + configure.in | 25 ++++++++++--------------- + src/access_lpt.c | 2 +- + src/detect.c | 2 +- + src/ports.c | 2 +- + 4 files changed, 13 insertions(+), 18 deletions(-) + +diff --git a/configure.in b/configure.in +index 7cd9561..9b6b82a 100644 +--- a/configure.in ++++ b/configure.in +@@ -37,21 +37,16 @@ case "{$host}" in + AC_DEFINE(HAVE_SOLARIS,1,enable solaris iop access) + solaris_io=true + ;; +-*-*-cygwin*) +- dnl Strip version number from uname and make sure we're on NT not 9x +- case `uname -s | sed 's/-.*$//'` in +- CYGWIN_NT*) +- AC_CHECK_HEADER(w32api/windows.h, [ +- AC_DEFINE(HAVE_CYGWIN_NT,1,enable w32api access) +- ], AC_MSG_ERROR(You need the cygwin w32api files on NT)) +- ;; +- *) +- AC_DEFINE(HAVE_CYGWIN_9X,1,enable win95 access) +- ;; +- esac +-;; +-*-*-mingw*) +-dnl AC_DEFINE(HAVE_CYGWIN_9X,1,enable win95 access) ++*-*-cygwin* | *-*-mingw*) ++ windows_h_found=false ++ AC_CHECK_HEADERS([windows.h] [w32api/windows.h], [ ++ windows_h_found=true ++ break ++ ]) ++ AS_VAR_IF(windows_h_found, [false], [ ++ AC_MSG_ERROR(windows.h not found) ++ ]) ++ AC_DEFINE(HAVE_CYGWIN_9X,1,enable win95 access) + AC_DEFINE(HAVE_CYGWIN_NT,1,enable w32api access) + ;; + *) +diff --git a/src/access_lpt.c b/src/access_lpt.c +index ad210f4..8cda6cb 100644 +--- a/src/access_lpt.c ++++ b/src/access_lpt.c +@@ -51,7 +51,7 @@ + + #ifdef HAVE_CYGWIN_NT + +-#ifdef __CYGWIN__ ++#ifdef HAVE_W32API_WINDOWS_H + #include + #else + #include +diff --git a/src/detect.c b/src/detect.c +index a53ef19..ca7f85b 100644 +--- a/src/detect.c ++++ b/src/detect.c +@@ -50,7 +50,7 @@ + #include + #include + #elif defined(HAVE_CYGWIN_NT) +-#ifdef __CYGWIN__ ++#ifdef HAVE_W32API_WINDOWS_H + #include + #else + #include +diff --git a/src/ports.c b/src/ports.c +index f3c38f1..ebd5110 100644 +--- a/src/ports.c ++++ b/src/ports.c +@@ -36,7 +36,7 @@ + #include "detect.h" + + #ifdef HAVE_CYGWIN_NT +-#ifdef __CYGWIN__ ++#ifdef HAVE_W32API_WINDOWS_H + #include + #else /* Not cygwin really */ + /* Don't include windows.h if it isn't necessary. That's why this is here and +-- +2.1.4 + diff --git a/src/libieee1284-4-getversion.patch b/src/libieee1284-4-getversion.patch new file mode 100644 index 00000000..99a9a2c0 --- /dev/null +++ b/src/libieee1284-4-getversion.patch @@ -0,0 +1,42 @@ +From c6962803f486e34cde370b34845741c8c380c460 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20Gl=C3=B6ckner?= +Date: Sat, 19 Sep 2015 01:39:15 +0200 +Subject: [PATCH] check Windows version before allowing IO access + +--- + src/detect.c | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/src/detect.c b/src/detect.c +index ca7f85b..d675584 100644 +--- a/src/detect.c ++++ b/src/detect.c +@@ -49,7 +49,7 @@ + #elif defined(HAVE_SOLARIS) + #include + #include +-#elif defined(HAVE_CYGWIN_NT) ++#elif defined(HAVE_CYGWIN_NT) || defined(HAVE_CYGWIN_9X) + #ifdef HAVE_W32API_WINDOWS_H + #include + #else +@@ -191,10 +191,12 @@ check_io (void) + } + debugprintf ("We can't use IOP, nothing will work\n"); + #elif defined(HAVE_CYGWIN_9X) +- /* note: 95 allows apps direct IO access */ +- debugprintf ("Taking a guess on port availability (win9x)\n"); +- capabilities |= IO_CAPABLE; +- return 1; ++ /* note: Win32s/95/98/ME allows apps direct IO access */ ++ if (GetVersion() & (1 << 31)) { ++ debugprintf ("Taking a guess on port availability (win9x)\n"); ++ capabilities |= IO_CAPABLE; ++ return 1; ++ } + #endif + + return 0; +-- +2.1.4 + diff --git a/src/libieee1284-5-pkg-config.patch b/src/libieee1284-5-pkg-config.patch new file mode 100644 index 00000000..11deea2c --- /dev/null +++ b/src/libieee1284-5-pkg-config.patch @@ -0,0 +1,57 @@ +From 53f13bfb5afa9f8458a940116cc7692960ab9f0e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20Gl=C3=B6ckner?= +Date: Mon, 4 Jan 2016 00:49:41 +0100 +Subject: [PATCH] add pkg-config metadata file + +--- + Makefile.am | 3 +++ + configure.in | 2 +- + libieee1284.pc.in | 11 +++++++++++ + 3 files changed, 15 insertions(+), 1 deletion(-) + create mode 100644 libieee1284.pc.in + +diff --git a/Makefile.am b/Makefile.am +index 2abe635..34f785a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -30,6 +30,9 @@ bin_PROGRAMS = libieee1284_test + libieee1284_test_SOURCES = tests/test.c + libieee1284_test_LDADD = libieee1284.la + ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = libieee1284.pc ++ + # Python bindings + src_ieee1284module_la_SOURCES = src/ieee1284module.c + if PYTHON +diff --git a/configure.in b/configure.in +index 9b6b82a..197a8b6 100644 +--- a/configure.in ++++ b/configure.in +@@ -79,5 +79,5 @@ fi + + dnl Checks for library functions. + +-AC_CONFIG_FILES([Makefile libieee1284.spec include/ieee1284.h]) ++AC_CONFIG_FILES([Makefile libieee1284.spec libieee1284.pc include/ieee1284.h]) + AC_OUTPUT +diff --git a/libieee1284.pc.in b/libieee1284.pc.in +new file mode 100644 +index 0000000..a9eacde +--- /dev/null ++++ b/libieee1284.pc.in +@@ -0,0 +1,11 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: @PACKAGE@ ++Version: @VERSION@ ++Description: IEEE1284 parallel port library ++URL: http://cyberelk.net/tim/software/libieee1284/ ++Libs: -L${libdir} -lieee1284 ++Cflags: -I${includedir} +-- +2.1.4 + diff --git a/src/libieee1284.mk b/src/libieee1284.mk new file mode 100644 index 00000000..0dbf388e --- /dev/null +++ b/src/libieee1284.mk @@ -0,0 +1,26 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := libieee1284 +$(PKG)_IGNORE := +$(PKG)_VERSION := 0.2.11 +$(PKG)_CHECKSUM := 7730de107782e5d2b071bdcb5b06a44da74856f00ef4a9be85d1ba4806a38f1a +$(PKG)_SUBDIR := libieee1284-$($(PKG)_VERSION) +$(PKG)_FILE := libieee1284-$($(PKG)_VERSION).tar.bz2 +$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := gcc + +define $(PKG)_UPDATE + $(WGET) -q -O - http://sourceforge.net/projects/libieee1284/files/ | \ + tr '\n' ' ' | \ + $(SED) 's/.*Looking for the latest version//;s/\(libieee1284-[0-9.]\+\)\.[^0-9].*/\1/;s/.*-//' +endef + +define $(PKG)_BUILD + cd '$(1)' && autoreconf -fi + cd '$(1)' && ./configure \ + $(MXE_CONFIGURE_OPTS) \ + --without-python + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_DOCS) +endef From 9594d78dd0a8aadaa1173fb9f6679cb410241a36 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 5 Jan 2016 17:57:00 +0300 Subject: [PATCH 0288/1463] qbittorrent: consolidate patches --- ...rrent-1-do-not-check-qmake-existance.patch | 33 --- plugins/apps/qbittorrent-1-fixes.patch | 220 ++++++++++++++++++ ...onvert-windows-includes-to-lowercase.patch | 98 -------- ...ove-unused-members-of-peerlistwidget.patch | 32 --- .../apps/qbittorrent-4-fix-library-list.patch | 92 -------- 5 files changed, 220 insertions(+), 255 deletions(-) delete mode 100644 plugins/apps/qbittorrent-1-do-not-check-qmake-existance.patch create mode 100644 plugins/apps/qbittorrent-1-fixes.patch delete mode 100644 plugins/apps/qbittorrent-2-convert-windows-includes-to-lowercase.patch delete mode 100644 plugins/apps/qbittorrent-3-remove-unused-members-of-peerlistwidget.patch delete mode 100644 plugins/apps/qbittorrent-4-fix-library-list.patch diff --git a/plugins/apps/qbittorrent-1-do-not-check-qmake-existance.patch b/plugins/apps/qbittorrent-1-do-not-check-qmake-existance.patch deleted file mode 100644 index a5df669a..00000000 --- a/plugins/apps/qbittorrent-1-do-not-check-qmake-existance.patch +++ /dev/null @@ -1,33 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -From 6f6377091a12ed3fe749fe646674be921d2c648c Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Sun, 30 Aug 2015 00:28:50 +0200 -Subject: [PATCH] do not check qmake existance - -Fix ./configure error: - -checking for mxe/usr/i686-w64-mingw32.static/qt/bin/qmake... -configure: error: cannot check for file existence when -cross compiling ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index f28d1b0..a414bd6 100755 ---- a/configure -+++ b/configure -@@ -4540,7 +4540,7 @@ if eval \${$as_ac_File+:} false; then : - $as_echo_n "(cached) " >&6 - else - test "$cross_compiling" = yes && -- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 -+ echo "cannot check for file existence when cross compiling" "$LINENO" 5 - if test -r "$QT_QMAKE/qmake"; then - eval "$as_ac_File=yes" - else --- -1.7.10.4 - diff --git a/plugins/apps/qbittorrent-1-fixes.patch b/plugins/apps/qbittorrent-1-fixes.patch new file mode 100644 index 00000000..08534e48 --- /dev/null +++ b/plugins/apps/qbittorrent-1-fixes.patch @@ -0,0 +1,220 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Sun, 30 Aug 2015 00:28:50 +0200 +Subject: [PATCH] do not check qmake existance + +Fix ./configure error: + +checking for mxe/usr/i686-w64-mingw32.static/qt/bin/qmake... +configure: error: cannot check for file existence when +cross compiling + +diff --git a/configure b/configure +index 1111111..2222222 100755 +--- a/configure ++++ b/configure +@@ -4540,7 +4540,7 @@ if eval \${$as_ac_File+:} false; then : + $as_echo_n "(cached) " >&6 + else + test "$cross_compiling" = yes && +- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 ++ echo "cannot check for file existence when cross compiling" "$LINENO" 5 + if test -r "$QT_QMAKE/qmake"; then + eval "$as_ac_File=yes" + else + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Sun, 30 Aug 2015 01:58:17 +0200 +Subject: [PATCH] convert includes like to lowercase + + +diff --git a/src/app/application.cpp b/src/app/application.cpp +index 1111111..2222222 100644 +--- a/src/app/application.cpp ++++ b/src/app/application.cpp +@@ -35,7 +35,7 @@ + + #ifndef DISABLE_GUI + #ifdef Q_OS_WIN +-#include ++#include + #include + #include + #endif // Q_OS_WIN +diff --git a/src/core/misc.cpp b/src/core/misc.cpp +index 1111111..2222222 100644 +--- a/src/core/misc.cpp ++++ b/src/core/misc.cpp +@@ -54,7 +54,7 @@ + + #ifdef Q_OS_WIN + #include +-#include ++#include + const int UNLEN = 256; + #else + #include +diff --git a/src/core/preferences.cpp b/src/core/preferences.cpp +index 1111111..2222222 100644 +--- a/src/core/preferences.cpp ++++ b/src/core/preferences.cpp +@@ -46,7 +46,7 @@ + #endif + + #ifdef Q_OS_WIN +-#include ++#include + #include + #endif + +diff --git a/src/core/qtlibtorrent/filterparserthread.h b/src/core/qtlibtorrent/filterparserthread.h +index 1111111..2222222 100644 +--- a/src/core/qtlibtorrent/filterparserthread.h ++++ b/src/core/qtlibtorrent/filterparserthread.h +@@ -45,7 +45,7 @@ using namespace std; + // P2B Stuff + #include + #ifdef Q_OS_WIN +-#include ++#include + #else + #include + #endif +diff --git a/src/core/qtlibtorrent/qtorrenthandle.cpp b/src/core/qtlibtorrent/qtorrenthandle.cpp +index 1111111..2222222 100644 +--- a/src/core/qtlibtorrent/qtorrenthandle.cpp ++++ b/src/core/qtlibtorrent/qtorrenthandle.cpp +@@ -48,7 +48,7 @@ + #include + + #ifdef Q_OS_WIN +-#include ++#include + #endif + + using namespace libtorrent; +diff --git a/src/gui/powermanagement/powermanagement.cpp b/src/gui/powermanagement/powermanagement.cpp +index 1111111..2222222 100644 +--- a/src/gui/powermanagement/powermanagement.cpp ++++ b/src/gui/powermanagement/powermanagement.cpp +@@ -40,7 +40,7 @@ + #endif + + #ifdef Q_OS_WIN +-#include ++#include + #endif + + PowerManagement::PowerManagement(QObject *parent) : QObject(parent), m_busy(false) + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Sun, 30 Aug 2015 01:59:15 +0200 +Subject: [PATCH] remove unused members of peerlistwidget + +They were still generated by MOC and caused compilation errors + +diff --git a/src/gui/properties/peerlistwidget.h b/src/gui/properties/peerlistwidget.h +index 1111111..2222222 100644 +--- a/src/gui/properties/peerlistwidget.h ++++ b/src/gui/properties/peerlistwidget.h +@@ -83,11 +83,6 @@ protected slots: + void saveSettings() const; + void showPeerListMenu(const QPoint&); + +-#if LIBTORRENT_VERSION_NUM < 10000 +- void limitUpRateSelectedPeers(const QStringList& peer_ips); +- void limitDlRateSelectedPeers(const QStringList& peer_ips); +-#endif +- + void banSelectedPeers(const QStringList& peer_ips); + void handleSortColumnChanged(int col); + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Sun, 30 Aug 2015 02:02:39 +0200 +Subject: [PATCH] fix library list + +Replace library list hardcoded in qmake files with +libraries found by autotools. + +diff --git a/configure b/configure +index 1111111..2222222 100755 +--- a/configure ++++ b/configure +@@ -8469,7 +8469,7 @@ fi + $as_echo "$as_me: Running qmake to generate the makefile..." >&6;} + CONFDIR="$( cd "$( dirname "$0" )" && pwd )" + +-$QT_QMAKE -r $CONFDIR/qbittorrent.pro ++$QT_QMAKE -r $CONFDIR/qbittorrent.pro "QMAKE_LRELEASE=$QMAKE_LRELEASE" "CONF_LIBS=$LIBS" + + ret="$?" + +diff --git a/winconf-mingw.pri b/winconf-mingw.pri +index 1111111..2222222 100644 +--- a/winconf-mingw.pri ++++ b/winconf-mingw.pri +@@ -17,19 +17,8 @@ CONFIG(debug, debug|release) { + + RC_FILE = qbittorrent_mingw.rc + +-# Adapt the lib names/versions accordingly +-CONFIG(debug, debug|release) { +- LIBS += libtorrent \ +- libboost_system-mgw45-mt-d-1_47 \ +- libboost_filesystem-mgw45-mt-d-1_47 \ +- libboost_thread-mgw45-mt-d-1_47 +-} else { +- LIBS += libtorrent \ +- libboost_system-mgw45-mt-1_47 \ +- libboost_filesystem-mgw45-mt-1_47 \ +- libboost_thread-mgw45-mt-1_47 +-} ++LIBS += $$CONF_LIBS + + LIBS += libadvapi32 libshell32 libuser32 +-LIBS += libcrypto.dll libssl.dll libwsock32 libws2_32 libz libiconv.dll ++LIBS += libcrypto libssl libwsock32 libws2_32 libz libiconv + LIBS += libpowrprof +diff --git a/winconf.pri b/winconf.pri +index 1111111..2222222 100644 +--- a/winconf.pri ++++ b/winconf.pri +@@ -9,15 +9,6 @@ INCLUDEPATH += $$quote(C:/qBittorrent/Zlib/include) + # Point this to the openssl include folder + INCLUDEPATH += $$quote(C:/qBittorrent/openssl/include) + +-# Point this to the boost lib folder +-LIBS += $$quote(-LC:/qBittorrent/boost_1_51_0/stage/lib) +-# Point this to the libtorrent lib folder +-LIBS += $$quote(-LC:/qBittorrent/RC_0_16/bin/) +-# Point this to the zlib lib folder +-LIBS += $$quote(-LC:/qBittorrent/Zlib/lib) +-# Point this to the openssl lib folder +-LIBS += $$quote(-LC:/qBittorrent/openssl/lib) +- + # LIBTORRENT DEFINES + DEFINES += BOOST_ALL_NO_LIB + DEFINES += BOOST_ASIO_HASH_MAP_BUCKETS=1021 +@@ -47,12 +38,7 @@ CONFIG(debug, debug|release) { + # Enable backtrace support + CONFIG += strace_win + +-win32-g++ { +- include(winconf-mingw.pri) +-} +-else { +- include(winconf-msvc.pri) +-} ++include(winconf-mingw.pri) + + DEFINES += WITH_GEOIP_EMBEDDED + message("On Windows, GeoIP database must be embedded.") diff --git a/plugins/apps/qbittorrent-2-convert-windows-includes-to-lowercase.patch b/plugins/apps/qbittorrent-2-convert-windows-includes-to-lowercase.patch deleted file mode 100644 index 0c452866..00000000 --- a/plugins/apps/qbittorrent-2-convert-windows-includes-to-lowercase.patch +++ /dev/null @@ -1,98 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -From 8976424272266837b7bf7574e555d13694d244e3 Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Sun, 30 Aug 2015 01:58:17 +0200 -Subject: [PATCH 1/3] convert includes like to lowercase - ---- - src/app/application.cpp | 2 +- - src/core/misc.cpp | 2 +- - src/core/preferences.cpp | 2 +- - src/core/qtlibtorrent/filterparserthread.h | 2 +- - src/core/qtlibtorrent/qtorrenthandle.cpp | 2 +- - src/gui/powermanagement/powermanagement.cpp | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/app/application.cpp b/src/app/application.cpp -index 2594e9a..90a43e1 100644 ---- a/src/app/application.cpp -+++ b/src/app/application.cpp -@@ -35,7 +35,7 @@ - - #ifndef DISABLE_GUI - #ifdef Q_OS_WIN --#include -+#include - #include - #include - #endif // Q_OS_WIN -diff --git a/src/core/misc.cpp b/src/core/misc.cpp -index 5e551ff..632b5ee 100644 ---- a/src/core/misc.cpp -+++ b/src/core/misc.cpp -@@ -54,7 +54,7 @@ - - #ifdef Q_OS_WIN - #include --#include -+#include - const int UNLEN = 256; - #else - #include -diff --git a/src/core/preferences.cpp b/src/core/preferences.cpp -index 1c43927..0759b5a 100644 ---- a/src/core/preferences.cpp -+++ b/src/core/preferences.cpp -@@ -46,7 +46,7 @@ - #endif - - #ifdef Q_OS_WIN --#include -+#include - #include - #endif - -diff --git a/src/core/qtlibtorrent/filterparserthread.h b/src/core/qtlibtorrent/filterparserthread.h -index a950865..36536df 100644 ---- a/src/core/qtlibtorrent/filterparserthread.h -+++ b/src/core/qtlibtorrent/filterparserthread.h -@@ -45,7 +45,7 @@ using namespace std; - // P2B Stuff - #include - #ifdef Q_OS_WIN --#include -+#include - #else - #include - #endif -diff --git a/src/core/qtlibtorrent/qtorrenthandle.cpp b/src/core/qtlibtorrent/qtorrenthandle.cpp -index a1cf5a3..bbe7bfb 100644 ---- a/src/core/qtlibtorrent/qtorrenthandle.cpp -+++ b/src/core/qtlibtorrent/qtorrenthandle.cpp -@@ -48,7 +48,7 @@ - #include - - #ifdef Q_OS_WIN --#include -+#include - #endif - - using namespace libtorrent; -diff --git a/src/gui/powermanagement/powermanagement.cpp b/src/gui/powermanagement/powermanagement.cpp -index ec07aa8..c51b229 100644 ---- a/src/gui/powermanagement/powermanagement.cpp -+++ b/src/gui/powermanagement/powermanagement.cpp -@@ -40,7 +40,7 @@ - #endif - - #ifdef Q_OS_WIN --#include -+#include - #endif - - PowerManagement::PowerManagement(QObject *parent) : QObject(parent), m_busy(false) --- -1.7.10.4 - diff --git a/plugins/apps/qbittorrent-3-remove-unused-members-of-peerlistwidget.patch b/plugins/apps/qbittorrent-3-remove-unused-members-of-peerlistwidget.patch deleted file mode 100644 index 940cbc32..00000000 --- a/plugins/apps/qbittorrent-3-remove-unused-members-of-peerlistwidget.patch +++ /dev/null @@ -1,32 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -From 9e74dc0c9cda72506303a276a0a6174b500fae15 Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Sun, 30 Aug 2015 01:59:15 +0200 -Subject: [PATCH 2/3] remove unused members of peerlistwidget - -They were still generated by MOC and caused compilation errors ---- - src/gui/properties/peerlistwidget.h | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/src/gui/properties/peerlistwidget.h b/src/gui/properties/peerlistwidget.h -index 0771555..7f5f771 100644 ---- a/src/gui/properties/peerlistwidget.h -+++ b/src/gui/properties/peerlistwidget.h -@@ -83,11 +83,6 @@ protected slots: - void saveSettings() const; - void showPeerListMenu(const QPoint&); - --#if LIBTORRENT_VERSION_NUM < 10000 -- void limitUpRateSelectedPeers(const QStringList& peer_ips); -- void limitDlRateSelectedPeers(const QStringList& peer_ips); --#endif -- - void banSelectedPeers(const QStringList& peer_ips); - void handleSortColumnChanged(int col); - --- -1.7.10.4 - diff --git a/plugins/apps/qbittorrent-4-fix-library-list.patch b/plugins/apps/qbittorrent-4-fix-library-list.patch deleted file mode 100644 index d149311a..00000000 --- a/plugins/apps/qbittorrent-4-fix-library-list.patch +++ /dev/null @@ -1,92 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -From f581b0bec9286cc9e2cb450a79a77e325f070fcb Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Sun, 30 Aug 2015 02:02:39 +0200 -Subject: [PATCH 3/3] fix library list - -Replace library list hardcoded in qmake files with -libraries found by autotools. ---- - configure | 2 +- - winconf-mingw.pri | 15 ++------------- - winconf.pri | 16 +--------------- - 3 files changed, 4 insertions(+), 29 deletions(-) - -diff --git a/configure b/configure -index a414bd6..7417654 100755 ---- a/configure -+++ b/configure -@@ -8469,7 +8469,7 @@ fi - $as_echo "$as_me: Running qmake to generate the makefile..." >&6;} - CONFDIR="$( cd "$( dirname "$0" )" && pwd )" - --$QT_QMAKE -r $CONFDIR/qbittorrent.pro -+$QT_QMAKE -r $CONFDIR/qbittorrent.pro "QMAKE_LRELEASE=$QMAKE_LRELEASE" "CONF_LIBS=$LIBS" - - ret="$?" - -diff --git a/winconf-mingw.pri b/winconf-mingw.pri -index 4507000..39d30dd 100644 ---- a/winconf-mingw.pri -+++ b/winconf-mingw.pri -@@ -17,19 +17,8 @@ CONFIG(debug, debug|release) { - - RC_FILE = qbittorrent_mingw.rc - --# Adapt the lib names/versions accordingly --CONFIG(debug, debug|release) { -- LIBS += libtorrent \ -- libboost_system-mgw45-mt-d-1_47 \ -- libboost_filesystem-mgw45-mt-d-1_47 \ -- libboost_thread-mgw45-mt-d-1_47 --} else { -- LIBS += libtorrent \ -- libboost_system-mgw45-mt-1_47 \ -- libboost_filesystem-mgw45-mt-1_47 \ -- libboost_thread-mgw45-mt-1_47 --} -+LIBS += $$CONF_LIBS - - LIBS += libadvapi32 libshell32 libuser32 --LIBS += libcrypto.dll libssl.dll libwsock32 libws2_32 libz libiconv.dll -+LIBS += libcrypto libssl libwsock32 libws2_32 libz libiconv - LIBS += libpowrprof -diff --git a/winconf.pri b/winconf.pri -index 3818cca..ede8535 100644 ---- a/winconf.pri -+++ b/winconf.pri -@@ -9,15 +9,6 @@ INCLUDEPATH += $$quote(C:/qBittorrent/Zlib/include) - # Point this to the openssl include folder - INCLUDEPATH += $$quote(C:/qBittorrent/openssl/include) - --# Point this to the boost lib folder --LIBS += $$quote(-LC:/qBittorrent/boost_1_51_0/stage/lib) --# Point this to the libtorrent lib folder --LIBS += $$quote(-LC:/qBittorrent/RC_0_16/bin/) --# Point this to the zlib lib folder --LIBS += $$quote(-LC:/qBittorrent/Zlib/lib) --# Point this to the openssl lib folder --LIBS += $$quote(-LC:/qBittorrent/openssl/lib) -- - # LIBTORRENT DEFINES - DEFINES += BOOST_ALL_NO_LIB - DEFINES += BOOST_ASIO_HASH_MAP_BUCKETS=1021 -@@ -47,12 +38,7 @@ CONFIG(debug, debug|release) { - # Enable backtrace support - CONFIG += strace_win - --win32-g++ { -- include(winconf-mingw.pri) --} --else { -- include(winconf-msvc.pri) --} -+include(winconf-mingw.pri) - - DEFINES += WITH_GEOIP_EMBEDDED - message("On Windows, GeoIP database must be embedded.") --- -1.7.10.4 - From d1599d5bcfbab43cc2ee561c9f6521530edbfbb9 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 3 Jan 2016 20:48:05 +0300 Subject: [PATCH 0289/1463] add Battleship to "Introduction" and "Used by" --- index.html | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index f705780d..41c6e9e3 100644 --- a/index.html +++ b/index.html @@ -86,12 +86,17 @@
  • integrates well with autotools, cmake, qmake, - and hand-written makefiles. + and hand-written makefiles
  • has been in continuous development since 2007 and is used by several projects
    • +
  • + has pre-compiled binaries + that can be used + in Continuous Integration systems +

    • Supported Toolchains

    @@ -4206,6 +4211,9 @@ endef
  • Aorta
    • +
  • + Battleship game +
  • Bino
    • From 8e207b6df77db12f5233a40cdad611e6d7ce340a Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 5 Jan 2016 18:17:42 +0300 Subject: [PATCH 0290/1463] qbittorrent: update from 3.2.3 to 3.3.1 * many files were renamed * file filterparserthread.h no longer include Winsock2.h * patch "remove unused members of peerlistwidget" was removed because peerlistwidget no longer has these members * embeded GeoIP.dat is not needed https://github.com/qbittorrent/qBittorrent/pull/3186 remove geoip-database from dependencies * --with-qt4=yes (now Qt5 is the default if both present) * patch "do not check qmake existance" was improved: its target file has multiple equal contexts for the diff and it was applied to wrong section; now applying to all --- plugins/apps/qbittorrent-1-fixes.patch | 99 +++++++++++--------------- plugins/apps/qbittorrent.mk | 10 ++- 2 files changed, 47 insertions(+), 62 deletions(-) diff --git a/plugins/apps/qbittorrent-1-fixes.patch b/plugins/apps/qbittorrent-1-fixes.patch index 08534e48..b2c7e6fe 100644 --- a/plugins/apps/qbittorrent-1-fixes.patch +++ b/plugins/apps/qbittorrent-1-fixes.patch @@ -27,6 +27,33 @@ index 1111111..2222222 100755 if test -r "$QT_QMAKE/qmake"; then eval "$as_ac_File=yes" else +@@ -4520,7 +4520,7 @@ if eval \${$as_ac_File+:} false; then : + $as_echo_n "(cached) " >&6 + else + test "$cross_compiling" = yes && +- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 ++ echo "cannot check for file existence when cross compiling" "$LINENO" 5 + if test -r "$QT_QMAKE/qmake-qt5"; then + eval "$as_ac_File=yes" + else +@@ -4617,7 +4617,7 @@ if eval \${$as_ac_File+:} false; then : + $as_echo_n "(cached) " >&6 + else + test "$cross_compiling" = yes && +- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 ++ echo "cannot check for file existence when cross compiling" "$LINENO" 5 + if test -r "$QT_QMAKE/qmake"; then + eval "$as_ac_File=yes" + else +@@ -4637,7 +4637,7 @@ if eval \${$as_ac_File+:} false; then : + $as_echo_n "(cached) " >&6 + else + test "$cross_compiling" = yes && +- as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 ++ echo "cannot check for file existence when cross compiling" "$LINENO" 5 + if test -r "$QT_QMAKE/qmake-qt4"; then + eval "$as_ac_File=yes" + else From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Nagaev @@ -38,19 +65,19 @@ diff --git a/src/app/application.cpp b/src/app/application.cpp index 1111111..2222222 100644 --- a/src/app/application.cpp +++ b/src/app/application.cpp -@@ -35,7 +35,7 @@ - +@@ -37,7 +37,7 @@ #ifndef DISABLE_GUI + #include "gui/guiiconprovider.h" #ifdef Q_OS_WIN -#include +#include #include #include #endif // Q_OS_WIN -diff --git a/src/core/misc.cpp b/src/core/misc.cpp +diff --git a/src/base/utils/misc.cpp b/src/base/utils/misc.cpp index 1111111..2222222 100644 ---- a/src/core/misc.cpp -+++ b/src/core/misc.cpp +--- a/src/base/utils/misc.cpp ++++ b/src/base/utils/misc.cpp @@ -54,7 +54,7 @@ #ifdef Q_OS_WIN @@ -60,10 +87,10 @@ index 1111111..2222222 100644 const int UNLEN = 256; #else #include -diff --git a/src/core/preferences.cpp b/src/core/preferences.cpp +diff --git a/src/base/preferences.cpp b/src/base/preferences.cpp index 1111111..2222222 100644 ---- a/src/core/preferences.cpp -+++ b/src/core/preferences.cpp +--- a/src/base/preferences.cpp ++++ b/src/base/preferences.cpp @@ -46,7 +46,7 @@ #endif @@ -73,32 +100,19 @@ index 1111111..2222222 100644 #include #endif -diff --git a/src/core/qtlibtorrent/filterparserthread.h b/src/core/qtlibtorrent/filterparserthread.h -index 1111111..2222222 100644 ---- a/src/core/qtlibtorrent/filterparserthread.h -+++ b/src/core/qtlibtorrent/filterparserthread.h -@@ -45,7 +45,7 @@ using namespace std; - // P2B Stuff - #include - #ifdef Q_OS_WIN --#include -+#include - #else - #include - #endif -diff --git a/src/core/qtlibtorrent/qtorrenthandle.cpp b/src/core/qtlibtorrent/qtorrenthandle.cpp -index 1111111..2222222 100644 ---- a/src/core/qtlibtorrent/qtorrenthandle.cpp -+++ b/src/core/qtlibtorrent/qtorrenthandle.cpp -@@ -48,7 +48,7 @@ - #include +diff --git a/src/base/bittorrent/torrenthandle.cpp b/src/base/bittorrent/torrenthandle.cpp +index de6ca9c..40b2498 100644 +--- a/src/base/bittorrent/torrenthandle.cpp ++++ b/src/base/bittorrent/torrenthandle.cpp +@@ -43,7 +43,7 @@ + #include #ifdef Q_OS_WIN -#include +#include #endif - using namespace libtorrent; + #include "base/logger.h" diff --git a/src/gui/powermanagement/powermanagement.cpp b/src/gui/powermanagement/powermanagement.cpp index 1111111..2222222 100644 --- a/src/gui/powermanagement/powermanagement.cpp @@ -113,30 +127,6 @@ index 1111111..2222222 100644 PowerManagement::PowerManagement(QObject *parent) : QObject(parent), m_busy(false) -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Sun, 30 Aug 2015 01:59:15 +0200 -Subject: [PATCH] remove unused members of peerlistwidget - -They were still generated by MOC and caused compilation errors - -diff --git a/src/gui/properties/peerlistwidget.h b/src/gui/properties/peerlistwidget.h -index 1111111..2222222 100644 ---- a/src/gui/properties/peerlistwidget.h -+++ b/src/gui/properties/peerlistwidget.h -@@ -83,11 +83,6 @@ protected slots: - void saveSettings() const; - void showPeerListMenu(const QPoint&); - --#if LIBTORRENT_VERSION_NUM < 10000 -- void limitUpRateSelectedPeers(const QStringList& peer_ips); -- void limitDlRateSelectedPeers(const QStringList& peer_ips); --#endif -- - void banSelectedPeers(const QStringList& peer_ips); - void handleSortColumnChanged(int col); - - From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 30 Aug 2015 02:02:39 +0200 @@ -204,7 +194,7 @@ index 1111111..2222222 100644 # LIBTORRENT DEFINES DEFINES += BOOST_ALL_NO_LIB DEFINES += BOOST_ASIO_HASH_MAP_BUCKETS=1021 -@@ -47,12 +38,7 @@ CONFIG(debug, debug|release) { +@@ -47,9 +38,4 @@ CONFIG(debug, debug|release) { # Enable backtrace support CONFIG += strace_win @@ -215,6 +205,3 @@ index 1111111..2222222 100644 - include(winconf-msvc.pri) -} +include(winconf-mingw.pri) - - DEFINES += WITH_GEOIP_EMBEDDED - message("On Windows, GeoIP database must be embedded.") diff --git a/plugins/apps/qbittorrent.mk b/plugins/apps/qbittorrent.mk index 2ef4b1be..60494872 100644 --- a/plugins/apps/qbittorrent.mk +++ b/plugins/apps/qbittorrent.mk @@ -3,12 +3,12 @@ PKG := qbittorrent $(PKG)_IGNORE := -$(PKG)_VERSION := 3.2.3 -$(PKG)_CHECKSUM := 86a79f3772bd06736a4be104180187d76c5c8feb2c1cdf1054135b4ba602a914 +$(PKG)_VERSION := 3.3.1 +$(PKG)_CHECKSUM := dad15a233a69ce13ea75957585af3f9122dbf915291aab0fdbc48a71b8a229d2 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := gcc libtorrent-rasterbar qt boost geoip-database +$(PKG)_DEPS := gcc libtorrent-rasterbar qt boost define $(PKG)_UPDATE $(WGET) -q -O- 'http://www.qbittorrent.org/download.php' | \ @@ -17,13 +17,11 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # On Windows, GeoIP database must be embedded - cp '$(PREFIX)/$(BUILD)/share/GeoIP/GeoIP.dat' \ - '$(1)'/src/gui/geoip/GeoIP.dat cd '$(1)' && \ QMAKE_LRELEASE='$(PREFIX)/$(TARGET)/qt/bin/lrelease' \ ./configure \ $(MXE_CONFIGURE_OPTS) \ + --with-qt4=yes \ --with-boost='$(PREFIX)/$(TARGET)' $(MAKE) -C '$(1)' -j '$(JOBS)' cp '$(1)'/src/release/qbittorrent.exe '$(PREFIX)/$(TARGET)/bin/' From b853064a34deb506cd09ba5ac4b6f368062ef0b4 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 5 Jan 2016 23:55:04 +0300 Subject: [PATCH 0291/1463] qbittorrent: import/export patch This commit was not ammended into previous commit to keep diff of previous commit simple. --- plugins/apps/qbittorrent-1-fixes.patch | 52 +++++++++++++------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/plugins/apps/qbittorrent-1-fixes.patch b/plugins/apps/qbittorrent-1-fixes.patch index b2c7e6fe..af1cb2a0 100644 --- a/plugins/apps/qbittorrent-1-fixes.patch +++ b/plugins/apps/qbittorrent-1-fixes.patch @@ -18,7 +18,7 @@ diff --git a/configure b/configure index 1111111..2222222 100755 --- a/configure +++ b/configure -@@ -4540,7 +4540,7 @@ if eval \${$as_ac_File+:} false; then : +@@ -4500,7 +4500,7 @@ if eval \${$as_ac_File+:} false; then : $as_echo_n "(cached) " >&6 else test "$cross_compiling" = yes && @@ -74,24 +74,24 @@ index 1111111..2222222 100644 #include #include #endif // Q_OS_WIN -diff --git a/src/base/utils/misc.cpp b/src/base/utils/misc.cpp +diff --git a/src/base/bittorrent/torrenthandle.cpp b/src/base/bittorrent/torrenthandle.cpp index 1111111..2222222 100644 ---- a/src/base/utils/misc.cpp -+++ b/src/base/utils/misc.cpp -@@ -54,7 +54,7 @@ +--- a/src/base/bittorrent/torrenthandle.cpp ++++ b/src/base/bittorrent/torrenthandle.cpp +@@ -43,7 +43,7 @@ + #include #ifdef Q_OS_WIN - #include --#include -+#include - const int UNLEN = 256; - #else - #include +-#include ++#include + #endif + + #include "base/logger.h" diff --git a/src/base/preferences.cpp b/src/base/preferences.cpp index 1111111..2222222 100644 --- a/src/base/preferences.cpp +++ b/src/base/preferences.cpp -@@ -46,7 +46,7 @@ +@@ -47,7 +47,7 @@ #endif #ifdef Q_OS_WIN @@ -100,19 +100,19 @@ index 1111111..2222222 100644 #include #endif -diff --git a/src/base/bittorrent/torrenthandle.cpp b/src/base/bittorrent/torrenthandle.cpp -index de6ca9c..40b2498 100644 ---- a/src/base/bittorrent/torrenthandle.cpp -+++ b/src/base/bittorrent/torrenthandle.cpp -@@ -43,7 +43,7 @@ - #include +diff --git a/src/base/utils/misc.cpp b/src/base/utils/misc.cpp +index 1111111..2222222 100644 +--- a/src/base/utils/misc.cpp ++++ b/src/base/utils/misc.cpp +@@ -48,7 +48,7 @@ #ifdef Q_OS_WIN --#include -+#include - #endif - - #include "base/logger.h" + #include +-#include ++#include + const int UNLEN = 256; + #else + #include diff --git a/src/gui/powermanagement/powermanagement.cpp b/src/gui/powermanagement/powermanagement.cpp index 1111111..2222222 100644 --- a/src/gui/powermanagement/powermanagement.cpp @@ -139,7 +139,7 @@ diff --git a/configure b/configure index 1111111..2222222 100755 --- a/configure +++ b/configure -@@ -8469,7 +8469,7 @@ fi +@@ -8345,7 +8345,7 @@ fi $as_echo "$as_me: Running qmake to generate the makefile..." >&6;} CONFDIR="$( cd "$( dirname "$0" )" && pwd )" @@ -152,7 +152,7 @@ diff --git a/winconf-mingw.pri b/winconf-mingw.pri index 1111111..2222222 100644 --- a/winconf-mingw.pri +++ b/winconf-mingw.pri -@@ -17,19 +17,8 @@ CONFIG(debug, debug|release) { +@@ -20,19 +20,8 @@ CONFIG(debug, debug|release) { RC_FILE = qbittorrent_mingw.rc @@ -194,7 +194,7 @@ index 1111111..2222222 100644 # LIBTORRENT DEFINES DEFINES += BOOST_ALL_NO_LIB DEFINES += BOOST_ASIO_HASH_MAP_BUCKETS=1021 -@@ -47,9 +38,4 @@ CONFIG(debug, debug|release) { +@@ -46,9 +37,4 @@ CONFIG(debug, debug|release) { # Enable backtrace support CONFIG += strace_win From fc13f478c6b980996b18fce1c2e3fe2902e8c913 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 4 Jan 2016 01:01:32 +0300 Subject: [PATCH 0292/1463] lua: disable readline on linux, macosx and freebsd fix #1060 --- src/lua-1-fixes.patch | 53 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 src/lua-1-fixes.patch diff --git a/src/lua-1-fixes.patch b/src/lua-1-fixes.patch new file mode 100644 index 00000000..e205963e --- /dev/null +++ b/src/lua-1-fixes.patch @@ -0,0 +1,53 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Mon, 4 Jan 2016 01:00:02 +0300 +Subject: [PATCH] disable readline on linux, macosx and freebsd + + +diff --git a/src/Makefile b/src/Makefile +index 1111111..2222222 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -102,15 +102,15 @@ c89: + + + freebsd: +- $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -lreadline" ++ $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" + + generic: $(ALL) + + linux: +- $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl -lreadline" ++ $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_LINUX" SYSLIBS="-Wl,-E -ldl" + + macosx: +- $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" SYSLIBS="-lreadline" CC=cc ++ $(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_MACOSX" CC=cc + + mingw: + $(MAKE) "LUA_A=lua53.dll" "LUA_T=lua.exe" \ +diff --git a/src/luaconf.h b/src/luaconf.h +index 1111111..2222222 100644 +--- a/src/luaconf.h ++++ b/src/luaconf.h +@@ -61,14 +61,12 @@ + #if defined(LUA_USE_LINUX) + #define LUA_USE_POSIX + #define LUA_USE_DLOPEN /* needs an extra library: -ldl */ +-#define LUA_USE_READLINE /* needs some extra libraries */ + #endif + + + #if defined(LUA_USE_MACOSX) + #define LUA_USE_POSIX + #define LUA_USE_DLOPEN /* MacOS does not need -ldl */ +-#define LUA_USE_READLINE /* needs an extra library: -lreadline */ + #endif + + From d9401362c54293fc1178c64ae46d9da6936cef35 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 6 Jan 2016 13:10:40 +1100 Subject: [PATCH 0293/1463] lua: use $(BUILD_CC) variable --- src/lua.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lua.mk b/src/lua.mk index d4a249d3..9d8e874b 100644 --- a/src/lua.mk +++ b/src/lua.mk @@ -76,6 +76,7 @@ endef define $(PKG)_BUILD_$(BUILD) $(MAKE) -C '$(1)/src' -j '$(JOBS)' \ + CC='$(BUILD_CC)' \ PLAT=$(shell ([ `uname -s` == Darwin ] && echo "macosx") || echo `uname -s` | tr '[:upper:]' '[:lower:]') $(INSTALL) '$(1)/src/lua' '$(PREFIX)/bin/$(BUILD)-lua' ln -sf '$(PREFIX)/bin/$(BUILD)-lua' '$(PREFIX)/$(BUILD)/bin/lua' From 65163d414b49af7a7c61bd076c7bfc784931a056 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 6 Jan 2016 14:40:40 +1100 Subject: [PATCH 0294/1463] add selected plugins to backup download closes #1135 --- tools/s3-fetch-and-sync | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/s3-fetch-and-sync b/tools/s3-fetch-and-sync index fc4ea7ee..3972c880 100755 --- a/tools/s3-fetch-and-sync +++ b/tools/s3-fetch-and-sync @@ -21,6 +21,10 @@ # Useful to prevent the same issue from being filed multiple times file_issue=true +# List of plugin dirs to include in downloads +# Can't include all subdirs since some affect versions +plugin_dirs=`echo plugins/{apps,luarocks,native,tcl.tk}` + cd ~/mxe && git pull # Test downloading without falling back to S3 download server. @@ -28,6 +32,7 @@ cd ~/mxe && git pull if ! ( \ cd ~/mxe && \ make download -k MXE_NO_BACKUP_DL=true MXE_VERBOSE=true \ + MXE_PLUGIN_DIRS="$plugin_dirs" \ 2>&1 >tmp-download-log \ ) && $file_issue; then # If one or more download process fails, upload log to sprunge.us (a @@ -39,6 +44,6 @@ if ! ( \ EDITOR=~/mxe/tools/fake-editor ghi open -L bug -- mxe/mxe fi -cd ~/mxe && make clean-junk +cd ~/mxe && make clean-junk MXE_PLUGIN_DIRS="$plugin_dirs" s3cmd sync --acl-public ~/mxe/pkg/* s3://mxe-pkg/ rm -f ~/mxe/tmp-download-log ~/mxe/tmp-url From 77721e5c20b3586da75962d8fdc488339064adc8 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Wed, 6 Jan 2016 04:58:40 +0000 Subject: [PATCH 0295/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index dacb65a0..dc3e4dc7 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -1559,7 +1559,7 @@ feel free to submit a pull request. libgnurx - 2.5.1 + 2.6.1 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 671b9e60..5b5729e2 100644 --- a/versions.json +++ b/versions.json @@ -151,7 +151,7 @@ "libgeotiff": "1.4.0", "libgit2": "0.23.2", "libglade": "2.6.4", - "libgnurx": "2.5.1", + "libgnurx": "2.6.1", "libgpg_error": "1.21", "libgsasl": "1.8.0", "libgsf": "1.14.30", From 4e07f89bb3410c37427220388e18a26e3522719d Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Tue, 5 Jan 2016 22:21:07 -0500 Subject: [PATCH 0296/1463] Disable jack on static builds It builds DLLs. --- src/jack.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/jack.mk b/src/jack.mk index b13afa9f..a83bc270 100644 --- a/src/jack.mk +++ b/src/jack.mk @@ -27,3 +27,5 @@ define $(PKG)_BUILD --prefix='$(PREFIX)/$(TARGET)' \ --dist-target=mingw endef + +$(PKG)_BUILD_STATIC = From fbbf762bd7ff144bfabc1e225617b89b472998f3 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Tue, 5 Jan 2016 22:22:12 -0500 Subject: [PATCH 0297/1463] Fix multiple bugs in aubio --- src/aubio-1-fixes.patch | 211 ++++++++++++++++++++++++++-------------- src/aubio.mk | 4 - 2 files changed, 139 insertions(+), 76 deletions(-) diff --git a/src/aubio-1-fixes.patch b/src/aubio-1-fixes.patch index 4f543e81..c93739af 100644 --- a/src/aubio-1-fixes.patch +++ b/src/aubio-1-fixes.patch @@ -1,12 +1,104 @@ -From a34301d5fcdb6187dceb508bab341727ec57d0b4 Mon Sep 17 00:00:00 2001 +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Paul Brossier +Date: Tue, 5 Jan 2016 21:28:06 -0500 +Subject: [PATCH] wscript: check HAVE_AV* from ctx.env + +From https://github.com/aubio/aubio/commit/eb6899125ac83900710180c02b94bc593a1426d2 + +diff --git a/wscript b/wscript +index 1111111..2222222 100644 +--- a/wscript ++++ b/wscript +@@ -226,7 +226,7 @@ def configure(ctx): + args = '--cflags --libs', uselib_store = 'AVUTIL', mandatory = False) + ctx.check_cfg(package = 'libavresample', atleast_version = '1.0.1', + args = '--cflags --libs', uselib_store = 'AVRESAMPLE', mandatory = False) +- if all ( 'HAVE_' + i in ctx.env.define_key ++ if all ( 'HAVE_' + i in ctx.env + for i in ['AVCODEC', 'AVFORMAT', 'AVUTIL', 'AVRESAMPLE'] ): + ctx.define('HAVE_LIBAV', 1) + ctx.msg('Checking for all libav libraries', 'yes') + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Tue, 5 Jan 2016 21:47:01 -0500 +Subject: [PATCH] wscript: check more variables from ctx.env + + +diff --git a/wscript b/wscript +index 1111111..2222222 100644 +--- a/wscript ++++ b/wscript +@@ -192,11 +192,11 @@ def configure(ctx): + ctx.define('HAVE_FFTW3', 1) + + # fftw not enabled, use vDSP or ooura +- if 'HAVE_FFTW3F' in ctx.env.define_key: ++ if 'HAVE_FFTW3F' in ctx.env: + ctx.msg('Checking for FFT implementation', 'fftw3f') +- elif 'HAVE_FFTW3' in ctx.env.define_key: ++ elif 'HAVE_FFTW3' in ctx.env: + ctx.msg('Checking for FFT implementation', 'fftw3') +- elif 'HAVE_ACCELERATE' in ctx.env.define_key: ++ elif 'HAVE_ACCELERATE' in ctx.env: + ctx.msg('Checking for FFT implementation', 'vDSP') + else: + ctx.msg('Checking for FFT implementation', 'ooura') + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Tue, 5 Jan 2016 22:48:20 -0500 +Subject: [PATCH] wscript: fftw3 support requires pthreads + + +diff --git a/wscript b/wscript +index 1111111..2222222 100644 +--- a/wscript ++++ b/wscript +@@ -194,8 +194,10 @@ def configure(ctx): + # fftw not enabled, use vDSP or ooura + if 'HAVE_FFTW3F' in ctx.env: + ctx.msg('Checking for FFT implementation', 'fftw3f') ++ ctx.env.LINKFLAGS += ['-pthread'] + elif 'HAVE_FFTW3' in ctx.env: + ctx.msg('Checking for FFT implementation', 'fftw3') ++ ctx.env.LINKFLAGS += ['-pthread'] + elif 'HAVE_ACCELERATE' in ctx.env: + ctx.msg('Checking for FFT implementation', 'vDSP') + else: + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Timothy Gu -Date: Fri, 14 Nov 2014 16:37:52 -0500 -Subject: [PATCH 1/4] Add options for enabling shared and/or static libraries +Date: Tue, 5 Jan 2016 22:18:21 -0500 +Subject: [PATCH] wscript: Install static library -Signed-off-by: Timothy Gu diff --git a/src/wscript_build b/src/wscript_build -index 94b2062..1a72e4a 100644 +index 1111111..2222222 100644 +--- a/src/wscript_build ++++ b/src/wscript_build +@@ -38,3 +38,7 @@ for target in build_features: + ctx.install_files('${PREFIX}/include/aubio/', + ctx.path.ant_glob('**/*.h', excl = ['**_priv.h', 'config.h']), + relative_trick=True) ++ ++# install static libs ++from waflib.Tools.c import cstlib ++cstlib.inst_to = '${LIBDIR}' + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Timothy Gu +Date: Tue, 5 Jan 2016 21:15:37 -0500 +Subject: [PATCH] Add options for enabling shared and/or static libraries + + +diff --git a/src/wscript_build b/src/wscript_build +index 1111111..2222222 100644 --- a/src/wscript_build +++ b/src/wscript_build @@ -18,13 +18,11 @@ ctx(features = 'c', @@ -21,23 +113,23 @@ index 94b2062..1a72e4a 100644 -else: #linux, darwin, android, mingw, ... - build_features = ['cshlib', 'cstlib'] +build_features = [] -+if ctx.options.enable_shared: ++if ctx.env.HAVE_SHARED: + build_features += ['cshlib'] -+if ctx.options.enable_static: ++if ctx.env.HAVE_STATIC: + build_features += ['cstlib'] for target in build_features: ctx(features = 'c ' + target, diff --git a/wscript b/wscript -index 83ad7b8..7013f12 100644 +index 1111111..2222222 100644 --- a/wscript +++ b/wscript -@@ -73,6 +73,13 @@ def options(ctx): - help_str = 'compile in double precision mode', - help_disable_str = 'compile in single precision mode (default)') +@@ -76,6 +76,13 @@ def options(ctx): + help_str = 'build fat binaries (darwin only)', + help_disable_str = 'do not build fat binaries (default)') + add_option_enable_disable(ctx, 'shared', default = True, -+ help_str = 'compile shared libraries (defaut)', ++ help_str = 'compile shared libraries (default)', + help_disable_str = 'do not compile shared library') + add_option_enable_disable(ctx, 'static', default = True, + help_str = 'compile static libraries (default)', @@ -46,45 +138,27 @@ index 83ad7b8..7013f12 100644 ctx.add_option('--with-target-platform', type='string', help='set target platform for cross-compilation', dest='target_platform') --- -1.9.1 - - -From e133535438a965b3f6f7f0cac5cb5c062c07829f Mon Sep 17 00:00:00 2001 -From: Timothy Gu -Date: Fri, 14 Nov 2014 16:39:51 -0500 -Subject: [PATCH 2/4] fftw3 support requires -pthread - -Signed-off-by: Timothy Gu - -diff --git a/wscript b/wscript -index 7013f12..052fb27 100644 ---- a/wscript -+++ b/wscript -@@ -197,8 +197,10 @@ def configure(ctx): - # fftw not enabled, use vDSP or ooura - if 'HAVE_FFTW3F' in ctx.env.define_key: - ctx.msg('Checking for FFT implementation', 'fftw3f') -+ ctx.env.LINKFLAGS += ['-pthread'] - elif 'HAVE_FFTW3' in ctx.env.define_key: - ctx.msg('Checking for FFT implementation', 'fftw3') -+ ctx.env.LINKFLAGS += ['-pthread'] - elif 'HAVE_ACCELERATE' in ctx.env.define_key: - ctx.msg('Checking for FFT implementation', 'vDSP') +@@ -99,7 +106,10 @@ def configure(ctx): else: --- -1.9.1 - + ctx.env.CFLAGS += ['-Wall'] + +- if target_platform not in ['win32', 'win64']: ++ ctx.env.HAVE_SHARED = int(ctx.options.enable_shared) ++ ctx.env.HAVE_STATIC = int(ctx.options.enable_static) ++ ++ if not ctx.options.enable_shared and target_platform not in ['win32', 'win64']: + ctx.env.CFLAGS += ['-fPIC'] + else: + ctx.define('HAVE_WIN_HACKS', 1) -From 16fda40e02065b670b63e193a453357051ca9c33 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Timothy Gu -Date: Fri, 14 Nov 2014 16:40:53 -0500 -Subject: [PATCH 3/4] Add static deps to pkgconfig file +Date: Tue, 5 Jan 2016 21:25:46 -0500 +Subject: [PATCH] Add static deps to pkgconfig file -Signed-off-by: Timothy Gu diff --git a/aubio.pc.in b/aubio.pc.in -index 301a1b5..0cd2281 100644 +index 1111111..2222222 100644 --- a/aubio.pc.in +++ b/aubio.pc.in @@ -6,5 +6,7 @@ includedir=@includedir@ @@ -96,10 +170,10 @@ index 301a1b5..0cd2281 100644 +Libs.private: @PCLIBS@ Cflags: -I${includedir} diff --git a/wscript b/wscript -index 052fb27..424bcf8 100644 +index 1111111..2222222 100644 --- a/wscript +++ b/wscript -@@ -176,6 +176,8 @@ def configure(ctx): +@@ -183,6 +183,8 @@ def configure(ctx): if (ctx.options.enable_complex == True): ctx.check(header_name='complex.h') @@ -108,44 +182,44 @@ index 052fb27..424bcf8 100644 # check for fftw3 if (ctx.options.enable_fftw3 != False or ctx.options.enable_fftw3f != False): # one of fftwf or fftw3f -@@ -197,9 +199,13 @@ def configure(ctx): +@@ -204,9 +206,13 @@ def configure(ctx): # fftw not enabled, use vDSP or ooura - if 'HAVE_FFTW3F' in ctx.env.define_key: + if 'HAVE_FFTW3F' in ctx.env: ctx.msg('Checking for FFT implementation', 'fftw3f') + pcrequires += ['fftw3f >= 3.0.0'] -+ pclibs += ['-lpthread'] ++ pclibs += ['-pthread'] ctx.env.LINKFLAGS += ['-pthread'] - elif 'HAVE_FFTW3' in ctx.env.define_key: + elif 'HAVE_FFTW3' in ctx.env: ctx.msg('Checking for FFT implementation', 'fftw3') + pcrequires += ['fftw3 >= 3.0.0'] -+ pclibs += ['-lpthread'] ++ pclibs += ['-pthread'] ctx.env.LINKFLAGS += ['-pthread'] - elif 'HAVE_ACCELERATE' in ctx.env.define_key: + elif 'HAVE_ACCELERATE' in ctx.env: ctx.msg('Checking for FFT implementation', 'vDSP') -@@ -210,16 +216,22 @@ def configure(ctx): +@@ -217,16 +223,22 @@ def configure(ctx): if (ctx.options.enable_sndfile != False): ctx.check_cfg(package = 'sndfile', atleast_version = '1.0.4', args = '--cflags --libs', mandatory = False) -+ if 'HAVE_SNDFILE' in ctx.env.define_key: ++ if 'HAVE_SNDFILE' in ctx.env: + pcrequires += ['sndfile >= 1.0.4'] # check for libsamplerate if (ctx.options.enable_samplerate != False): ctx.check_cfg(package = 'samplerate', atleast_version = '0.0.15', args = '--cflags --libs', mandatory = False) -+ if 'HAVE_SAMPLERATE' in ctx.env.define_key: ++ if 'HAVE_SAMPLERATE' in ctx.env: + pcrequires += ['samplerate >= 0.0.15'] # check for jack if (ctx.options.enable_jack != False): ctx.check_cfg(package = 'jack', args = '--cflags --libs', mandatory = False) -+ if 'HAVE_JACK' in ctx.env.define_key: ++ if 'HAVE_JACK' in ctx.env: + pcrequires += ['jack'] # check for libav if (ctx.options.enable_avcodec != False): -@@ -235,9 +247,13 @@ def configure(ctx): +@@ -242,9 +254,13 @@ def configure(ctx): for i in ['AVCODEC', 'AVFORMAT', 'AVUTIL', 'AVRESAMPLE'] ): ctx.define('HAVE_LIBAV', 1) ctx.msg('Checking for all libav libraries', 'yes') @@ -159,22 +233,18 @@ index 052fb27..424bcf8 100644 ctx.define('HAVE_WAVREAD', 1) ctx.define('HAVE_WAVWRITE', 1) --- -1.9.1 - -From 407863716f05ffca5b2241d7dcedb3d1c1ae87ad Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Timothy Gu -Date: Fri, 14 Nov 2014 16:45:04 -0500 -Subject: [PATCH 4/4] [MXE] disable tests and examples +Date: Tue, 5 Jan 2016 21:27:05 -0500 +Subject: [PATCH] [MXE] disable tests and examples -Signed-off-by: Timothy Gu diff --git a/wscript b/wscript -index 424bcf8..7f135b5 100644 +index 1111111..2222222 100644 --- a/wscript +++ b/wscript -@@ -290,9 +290,9 @@ def build(bld): +@@ -297,9 +297,9 @@ def build(bld): bld.recurse('src') if bld.env['DEST_OS'] not in ['ios', 'iosimulator']: pass @@ -182,11 +252,8 @@ index 424bcf8..7f135b5 100644 - bld.recurse('examples') - bld.recurse('tests') + #if bld.env['DEST_OS'] not in ['ios', 'iosimulator', 'android']: -+ #bld.recurse('examples') -+ #bld.recurse('tests') ++ # bld.recurse('examples') ++ # bld.recurse('tests') bld( source = 'aubio.pc.in' ) --- -1.9.1 - diff --git a/src/aubio.mk b/src/aubio.mk index 8c7adbe3..ec1bbf44 100644 --- a/src/aubio.mk +++ b/src/aubio.mk @@ -35,10 +35,6 @@ define $(PKG)_BUILD cd '$(1)' && ./waf build install - # It is not trivial to adjust the installation in waf-based builds - $(if $(BUILD_STATIC), \ - $(INSTALL) -m644 '$(1)/build/src/libaubio.a' '$(PREFIX)/$(TARGET)/lib') - '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-aubio.exe' \ From 7804a5775c5b7e9b72bd5b2531ec62eb0d1ce5c0 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 6 Jan 2016 17:15:33 +1100 Subject: [PATCH 0298/1463] Makefile: don't clean build-matrix.html --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 41747d94..44a6864c 100644 --- a/Makefile +++ b/Makefile @@ -612,7 +612,7 @@ BUILD_PKG_TMP_FILES := *-*.list mxe-*.tar.xz mxe-*.deb* wheezy jessie .PHONY: clean clean: - rm -rf $(call TMP_DIR,*) $(PREFIX) build-matrix.html \ + rm -rf $(call TMP_DIR,*) $(PREFIX) \ $(addprefix $(TOP_DIR)/, $(BUILD_PKG_TMP_FILES)) .PHONY: clean-pkg From b3fa1da8ce0966c2a00c0f81e51acec47991b4c1 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Wed, 16 Dec 2015 17:00:34 -0800 Subject: [PATCH 0299/1463] Update ffmpeg --- src/ffmpeg.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ffmpeg.mk b/src/ffmpeg.mk index 79f256c1..14de3cc8 100644 --- a/src/ffmpeg.mk +++ b/src/ffmpeg.mk @@ -3,8 +3,8 @@ PKG := ffmpeg $(PKG)_IGNORE := -$(PKG)_VERSION := 2.8.2 -$(PKG)_CHECKSUM := 830ec647f7ad774fc0caf17ba47774bf5dee7a89cbd65894f364a87ba3ad21b2 +$(PKG)_VERSION := 2.8.4 +$(PKG)_CHECKSUM := 83cc8136a7845546062a43cda9ae3cf0a02f43ef5e434d2f997f055231a75f8e $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://www.ffmpeg.org/releases/$($(PKG)_FILE) From d20b41f2eee9317c4a551e6ed9dc719f32f87ee8 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Wed, 16 Dec 2015 17:07:41 -0800 Subject: [PATCH 0300/1463] libass: Fix update routine --- src/libass.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/libass.mk b/src/libass.mk index 428beb51..39330d73 100644 --- a/src/libass.mk +++ b/src/libass.mk @@ -11,8 +11,10 @@ $(PKG)_URL := https://github.com/libass/libass/releases/download/$($(PKG)_V $(PKG)_DEPS := gcc fontconfig freetype fribidi harfbuzz define $(PKG)_UPDATE - $(WGET) -q -O- 'http://code.google.com/p/libass/downloads/list?sort=-uploaded' | \ - $(SED) -n 's,.*libass-\([0-9][^<]*\)\.tar.*,\1,p' | \ + $(WGET) -q -O- "https://api.github.com/repos/libass/libass/releases" | \ + grep 'tag_name' | \ + $(SED) -n 's,.*tag_name": "\([0-9][^>]*\)".*,\1,p' | \ + $(SORT) -Vr | \ head -1 endef From cbe1c8f46cd5060b5f0b6d42a4f6e0dc683b9327 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Wed, 16 Dec 2015 17:08:46 -0800 Subject: [PATCH 0301/1463] libaacs, libass, libbluray, libvpx: update libass fix from Tony Theodore Signed-off-by: Timothy Gu --- src/libaacs-1.patch | 32 -------------------------------- src/libaacs.mk | 4 ++-- src/libass.mk | 5 +++-- src/libbluray.mk | 4 ++-- src/libvpx.mk | 4 ++-- 5 files changed, 9 insertions(+), 40 deletions(-) diff --git a/src/libaacs-1.patch b/src/libaacs-1.patch index 985fdce1..4097e055 100644 --- a/src/libaacs-1.patch +++ b/src/libaacs-1.patch @@ -1,38 +1,6 @@ This file is part of MXE. See index.html for further information. -From 5ebe4419738fd337f5c2f8e2849dd8e7c1f55d01 Mon Sep 17 00:00:00 2001 -From: Timothy Gu -Date: Sat, 28 Mar 2015 21:06:26 +0100 -Subject: [PATCH 1/2] fix configure - - -diff --git a/configure.ac b/configure.ac -index 155acad..8cb7e79 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -126,7 +126,7 @@ if test x$libgcrypt_config_prefix != x ; then - fi - fi - --AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) -+AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no) - if test x"$LIBGCRYPT_CONFIG" = xno; then - AC_MSG_ERROR([libgcrypt not found on system]) - else -@@ -149,7 +149,7 @@ if test x$gpg_error_config_prefix != x ; then - fi - fi - --AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no) -+AC_PATH_TOOL(GPG_ERROR_CONFIG, gpg-error-config, no) - if test x"$GPG_ERROR_CONFIG" = xno; then - AC_MSG_ERROR([gpg-error not found on system]) - else --- -2.1.0 - - From c807305d0df68e88aa04fabd3275aff4f34d4368 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sat, 28 Mar 2015 21:06:56 +0100 diff --git a/src/libaacs.mk b/src/libaacs.mk index e1f0e8a2..0f4c2f33 100644 --- a/src/libaacs.mk +++ b/src/libaacs.mk @@ -3,8 +3,8 @@ PKG := libaacs $(PKG)_IGNORE := -$(PKG)_VERSION := 0.7.1 -$(PKG)_CHECKSUM := ecc49a22ae2a645cfb5b8e732b51fe0e2684e6488a68debc5edd6e07edadb2b0 +$(PKG)_VERSION := 0.8.1 +$(PKG)_CHECKSUM := 95c344a02c47c9753c50a5386fdfb8313f9e4e95949a5c523a452f0bcb01bbe8 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.bz2 $(PKG)_URL := http://ftp.videolan.org/pub/videolan/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) diff --git a/src/libass.mk b/src/libass.mk index 39330d73..9d70e72e 100644 --- a/src/libass.mk +++ b/src/libass.mk @@ -3,8 +3,8 @@ PKG := libass $(PKG)_IGNORE := -$(PKG)_VERSION := 0.13.0 -$(PKG)_CHECKSUM := e0071a3b2e95411c8d474014678368e3f0b852f7d663e0564b344e7335eb0671 +$(PKG)_VERSION := 0.13.1 +$(PKG)_CHECKSUM := 4aa36b1876a61cab46fc9284fee84224b9e2840fe7b3e63d96a8d32574343fe7 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.xz $(PKG)_URL := https://github.com/libass/libass/releases/download/$($(PKG)_VERSION)/$($(PKG)_FILE) @@ -19,6 +19,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD + cd '$(1)' && $(LIBTOOLIZE) && autoreconf -fi # fontconfig is only required for legacy XP support cd '$(1)' && ./configure \ $(MXE_CONFIGURE_OPTS) \ diff --git a/src/libbluray.mk b/src/libbluray.mk index cd012a33..ed4f3d18 100644 --- a/src/libbluray.mk +++ b/src/libbluray.mk @@ -3,8 +3,8 @@ PKG := libbluray $(PKG)_IGNORE := -$(PKG)_VERSION := 0.7.0 -$(PKG)_CHECKSUM := f79beb9fbb24117cbb1264c919e686ae9e6349c0ad08b48c4b6233b2887eb68d +$(PKG)_VERSION := 0.9.2 +$(PKG)_CHECKSUM := efc994f42d2bce6af2ce69d05ba89dbbd88bcec7aca065de094fb3a7880ce7ea $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.bz2 $(PKG)_URL := http://ftp.videolan.org/pub/videolan/libbluray/$($(PKG)_VERSION)/$($(PKG)_FILE) diff --git a/src/libvpx.mk b/src/libvpx.mk index 3bff844a..1146bff8 100644 --- a/src/libvpx.mk +++ b/src/libvpx.mk @@ -3,8 +3,8 @@ PKG := libvpx $(PKG)_IGNORE := -$(PKG)_VERSION := 1.4.0 -$(PKG)_CHECKSUM := f582d9b2d60a592a4a3d8c32965ca2d2167e9ade38c6c30bac8801ff66a118e4 +$(PKG)_VERSION := 1.5.0 +$(PKG)_CHECKSUM := 306d67908625675f8e188d37a81fbfafdf5068b09d9aa52702b6fbe601c76797 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://storage.googleapis.com/downloads.webmproject.org/releases/webm/$($(PKG)_FILE) From 3ca9791bf1c8762d872afffdb4e455a6ce2162d3 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Wed, 16 Dec 2015 17:15:32 -0800 Subject: [PATCH 0302/1463] Remove libbluray patch It was for MinGW.org, which we don't support any more. --- src/libbluray-1.patch | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 src/libbluray-1.patch diff --git a/src/libbluray-1.patch b/src/libbluray-1.patch deleted file mode 100644 index ce6ceb75..00000000 --- a/src/libbluray-1.patch +++ /dev/null @@ -1,31 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -From b9d39febfd23198c1f9758ffe400cb35a97c1223 Mon Sep 17 00:00:00 2001 -From: Timothy Gu -Date: Sat, 28 Mar 2015 10:57:00 +0100 -Subject: [PATCH] fix strncasecmp - - -diff --git a/src/libbluray/bdnav/meta_parse.c b/src/libbluray/bdnav/meta_parse.c -index a74ed6e..73ea57b 100644 ---- a/src/libbluray/bdnav/meta_parse.c -+++ b/src/libbluray/bdnav/meta_parse.c -@@ -29,6 +29,13 @@ - #include "meta_parse.h" - #include "libbluray/register.h" - -+#if (defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)) -+#define strncasecmp _strnicmp -+#ifdef __STRICT_ANSI__ -+#undef __STRICT_ANSI__ -+#endif -+#endif -+ - #include - #include - #include --- -2.1.0 - - From c5037ecf520b12095d52e0e3b878b05647448a90 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 6 Jan 2016 18:47:20 +1100 Subject: [PATCH 0303/1463] libass: add note about removing autoreconf --- src/libass.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libass.mk b/src/libass.mk index 9d70e72e..812ce741 100644 --- a/src/libass.mk +++ b/src/libass.mk @@ -3,6 +3,8 @@ PKG := libass $(PKG)_IGNORE := +# remove autoreconf step after 0.13.1 +# https://github.com/libass/libass/issues/209 $(PKG)_VERSION := 0.13.1 $(PKG)_CHECKSUM := 4aa36b1876a61cab46fc9284fee84224b9e2840fe7b3e63d96a8d32574343fe7 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) From 989ea9ad3d642c2b928672ae24abd69e3b293e47 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Wed, 6 Jan 2016 07:48:38 +0000 Subject: [PATCH 0304/1463] Update versions.json & build-matrix.html --- build-matrix.html | 10 +++++----- versions.json | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index dc3e4dc7..aaac4546 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -529,7 +529,7 @@ feel free to submit a pull request. ffmpeg - 2.8.2 + 2.8.4 ✓ ✓ ✓ @@ -1269,7 +1269,7 @@ feel free to submit a pull request. libaacs - 0.7.1 + 0.8.1 ✓ ✓ ✓ @@ -1289,7 +1289,7 @@ feel free to submit a pull request. libass - 0.13.0 + 0.13.1 ✓ ✓ ✓ @@ -1299,7 +1299,7 @@ feel free to submit a pull request. libbluray - 0.7.0 + 0.9.2 ✓ ✓ ✓ @@ -2009,7 +2009,7 @@ feel free to submit a pull request. libvpx - 1.4.0 + 1.5.0 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 5b5729e2..7701c951 100644 --- a/versions.json +++ b/versions.json @@ -48,7 +48,7 @@ "expat": "2.1.0", "faad2": "2.7", "fdk-aac": "0.1.4", - "ffmpeg": "2.8.2", + "ffmpeg": "2.8.4", "fftw": "3.3.4", "file": "5.24", "flac": "1.3.1", @@ -122,10 +122,10 @@ "lcms1": "1.19", "lensfun": "0.3.0", "levmar": "2.6", - "libaacs": "0.7.1", + "libaacs": "0.8.1", "libarchive": "3.1.2", - "libass": "0.13.0", - "libbluray": "0.7.0", + "libass": "0.13.1", + "libbluray": "0.9.2", "libbs2b": "3.1.0", "libcaca": "0.99.beta19", "libcdio": "0.93", @@ -196,7 +196,7 @@ "libunistring": "0.9.4", "libusb": "1.2.6.0", "libusb1": "1.0.19", - "libvpx": "1.4.0", + "libvpx": "1.5.0", "libwebp": "0.4.4", "libwebsockets": "1.4-chrome43-firefox-36", "libxml++": "2.37.2", From 15c2d85c7ac9efc5c9d41752a722b4995c5d3380 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 6 Jan 2016 19:14:25 +1100 Subject: [PATCH 0305/1463] ossim: add missing libgeotiff dependency fixes #1137 --- src/ossim.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ossim.mk b/src/ossim.mk index b19566ff..b78d377d 100644 --- a/src/ossim.mk +++ b/src/ossim.mk @@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := a9148cbc7eebaed1d09d139e68c038592edcf74318ec2623f21494aa56879 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)-1 $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_URL := http://download.osgeo.org/ossim/source/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := gcc freetype geos jpeg libpng openthreads proj tiff zlib +$(PKG)_DEPS := gcc freetype geos jpeg libgeotiff libpng openthreads proj tiff zlib define $(PKG)_UPDATE $(WGET) -q -O- 'http://download.osgeo.org/ossim/source/latest/' | \ From 7fbc88e8bac09329efba0b055d6c58751a569acf Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 6 Jan 2016 15:05:57 +0300 Subject: [PATCH 0306/1463] Revert "jack: use waf from package waf" This reverts commit 4dc528380c7873aec87a52656e88eec662a9dc81. *.dll.a were installed to bin/ I will come back to this when jack updates. --- src/jack-1-fixes.patch | 264 ++++++----------------------------------- src/jack.mk | 6 +- 2 files changed, 37 insertions(+), 233 deletions(-) diff --git a/src/jack-1-fixes.patch b/src/jack-1-fixes.patch index d7c21512..b19423dd 100644 --- a/src/jack-1-fixes.patch +++ b/src/jack-1-fixes.patch @@ -189,232 +189,38 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Nagaev -Date: Sun, 3 Jan 2016 16:56:19 +0100 -Subject: [PATCH] update wscript's for waf 1.8.17 - - * all waf modules are now submodules of waflib - * tool_options => load - * check_tool => load - * compiler_cc => compiler_c - * sub_options => recurse - * sub_config => recurse - * add_subdirs => recurse - -diff --git a/common/wscript b/common/wscript -index 1111111..2222222 100644 ---- a/common/wscript -+++ b/common/wscript -@@ -1,7 +1,7 @@ - #! /usr/bin/env python - # encoding: utf-8 - --import Build -+from waflib import Build - import re - import os - -diff --git a/dbus/wscript b/dbus/wscript -index 1111111..2222222 100644 ---- a/dbus/wscript -+++ b/dbus/wscript -@@ -2,9 +2,9 @@ - # encoding: utf-8 - - import os.path --import Options -+from waflib import Options - import re # subst_func --import Logs -+from waflib import Logs - - def options(opt): - opt.add_option('--enable-pkg-config-dbus-service-dir', action='store_true', default=False, help='force D-Bus service install dir to be one returned by pkg-config') -diff --git a/man/wscript b/man/wscript -index 1111111..2222222 100644 ---- a/man/wscript -+++ b/man/wscript -@@ -1,7 +1,7 @@ - #! /usr/bin/env python - # encoding: utf-8 - --import Build -+from waflib import Build - import re - import os - -diff --git a/wscript b/wscript -index 1111111..2222222 100644 ---- a/wscript -+++ b/wscript -@@ -3,14 +3,14 @@ - from __future__ import print_function - - import os --import Utils --import Options -+from waflib import Utils -+from waflib import Options - import subprocess - g_maxlen = 40 - import shutil --import Task -+from waflib import Task - import re --import Logs -+from waflib import Logs - import sys - - import waflib.Options -@@ -65,8 +65,8 @@ def create_svnversion_task(bld, header='svnversion.h', define=None): - - def options(opt): - # options provided by the modules -- opt.tool_options('compiler_cxx') -- opt.tool_options('compiler_cc') -+ opt.load('compiler_cxx') -+ opt.load('compiler_c') - - opt.add_option('--libdir', type='string', help="Library directory [Default: /lib]") - opt.add_option('--libdir32', type='string', help="32bit Library directory [Default: /lib32]") -@@ -87,11 +87,11 @@ def options(opt): - opt.add_option('--autostart', type='string', default="default", help='Autostart method. Possible values: "default", "classic", "dbus", "none"') - opt.add_option('--portaudio', action='store_true', default=False, help='Enable Portaudio driver') - opt.add_option('--winmme', action='store_true', default=False, help='Enable WinMME driver') -- opt.sub_options('dbus') -+ opt.recurse('dbus') - - def configure(conf): - conf.load('compiler_cxx') -- conf.load('compiler_cc') -+ conf.load('compiler_c') - if Options.options.dist_target == 'auto': - platform = sys.platform - conf.env['IS_MACOSX'] = platform == 'darwin' -@@ -116,34 +116,34 @@ def configure(conf): - Logs.pprint('CYAN', "Windows detected") - - if conf.env['IS_LINUX']: -- conf.check_tool('compiler_cxx') -- conf.check_tool('compiler_cc') -+ conf.load('compiler_cxx') -+ conf.load('compiler_c') - - if conf.env['IS_MACOSX']: -- conf.check_tool('compiler_cxx') -- conf.check_tool('compiler_cc') -+ conf.load('compiler_cxx') -+ conf.load('compiler_c') - -- # waf 1.5 : check_tool('compiler_cxx') and check_tool('compiler_cc') do not work correctly, so explicit use of gcc and g++ -+ # waf 1.5 : load('compiler_cxx') and load('compiler_c') do not work correctly, so explicit use of gcc and g++ - if conf.env['IS_SUN']: -- conf.check_tool('g++') -- conf.check_tool('gcc') -+ conf.load('g++') -+ conf.load('gcc') - - #if conf.env['IS_SUN']: -- # conf.check_tool('compiler_cxx') -- # conf.check_tool('compiler_cc') -+ # conf.load('compiler_cxx') -+ # conf.load('compiler_c') - - if conf.env['IS_WINDOWS']: -- conf.check_tool('compiler_cxx') -- conf.check_tool('compiler_cc') -+ conf.load('compiler_cxx') -+ conf.load('compiler_c') - conf.env.append_unique('CCDEFINES', '_POSIX') - conf.env.append_unique('CXXDEFINES', '_POSIX') - - conf.env.append_unique('CXXFLAGS', '-Wall') - conf.env.append_unique('CFLAGS', '-Wall') - -- conf.sub_config('common') -+ conf.recurse('common') - if conf.env['IS_LINUX']: -- conf.sub_config('linux') -+ conf.recurse('linux') - if Options.options.alsa and not conf.env['BUILD_DRIVER_ALSA']: - conf.fatal('ALSA driver was explicitly requested but cannot be built') - if Options.options.freebob and not conf.env['BUILD_DRIVER_FREEBOB']: -@@ -157,12 +157,12 @@ def configure(conf): - conf.env['BUILD_DRIVER_FREEBOB'] = Options.options.freebob - conf.env['BUILD_DRIVER_IIO'] = Options.options.iio - if conf.env['IS_WINDOWS']: -- conf.sub_config('windows') -+ conf.recurse('windows') - if Options.options.portaudio and not conf.env['BUILD_DRIVER_PORTAUDIO']: - conf.fatal('Portaudio driver was explicitly requested but cannot be built') - conf.env['BUILD_DRIVER_WINMME'] = Options.options.winmme - if Options.options.dbus: -- conf.sub_config('dbus') -+ conf.recurse('dbus') - if conf.env['BUILD_JACKDBUS'] != True: - conf.fatal('jackdbus was explicitly requested but cannot be built') - -@@ -171,7 +171,7 @@ def configure(conf): - if conf.is_defined('HAVE_SAMPLERATE'): - conf.env['LIB_SAMPLERATE'] = ['samplerate'] - -- conf.sub_config('example-clients') -+ conf.recurse('example-clients') - - if conf.check_cfg(package='celt', atleast_version='0.11.0', args='--cflags --libs', mandatory=False): - conf.define('HAVE_CELT', 1) -@@ -404,38 +404,38 @@ def build(bld): - waflib.Options.commands.append(bld.cmd + '_' + lib32) - - # process subfolders from here -- bld.add_subdirs('common') -+ bld.recurse('common') - - if bld.variant: - # only the wscript in common/ knows how to handle variants - return - - if bld.env['IS_LINUX']: -- bld.add_subdirs('linux') -- bld.add_subdirs('example-clients') -- bld.add_subdirs('tests') -- bld.add_subdirs('man') -+ bld.recurse('linux') -+ bld.recurse('example-clients') -+ bld.recurse('tests') -+ bld.recurse('man') - if bld.env['BUILD_JACKDBUS'] == True: -- bld.add_subdirs('dbus') -+ bld.recurse('dbus') - - if bld.env['IS_MACOSX']: -- bld.add_subdirs('macosx') -- bld.add_subdirs('example-clients') -- bld.add_subdirs('tests') -+ bld.recurse('macosx') -+ bld.recurse('example-clients') -+ bld.recurse('tests') - if bld.env['BUILD_JACKDBUS'] == True: -- bld.add_subdirs('dbus') -+ bld.recurse('dbus') - - if bld.env['IS_SUN']: -- bld.add_subdirs('solaris') -- bld.add_subdirs('example-clients') -- bld.add_subdirs('tests') -+ bld.recurse('solaris') -+ bld.recurse('example-clients') -+ bld.recurse('tests') - if bld.env['BUILD_JACKDBUS'] == True: -- bld.add_subdirs('dbus') -+ bld.recurse('dbus') - - if bld.env['IS_WINDOWS']: -- bld.add_subdirs('windows') -- bld.add_subdirs('example-clients') -- #bld.add_subdirs('tests') -+ bld.recurse('windows') -+ bld.recurse('example-clients') -+ #bld.recurse('tests') - - if bld.env['BUILD_DOXYGEN_DOCS'] == True: - html_docs_source_dir = "build/default/html" +Date: Fri, 1 Jan 2016 15:21:46 +0300 +Subject: [PATCH] waf: disable function causing pickling errors + +According to Debian patch of py3cairo which also uses waf [1], + +80_fix pickle.patch: +> during the build process, a context instance is pickled, or at +> least attempted to be. This fails because self.node_class is assigned to a +> class which is nested inside the __init__() method. Because Python cannot +> find this class at unpickling time (i.e. it cannot be imported), Python +> refuses to pickle the Context instance, leading to a FTBFS. Since there's no +> obvious reason why the class has to be so nested, moving it to a module +> global solves the build failure. + +81_pickling again.patch: +> follow up to 80_fix-pickle.patch. just disable pickling +> altogether since the previous patch doesn't really fix the problem, and not +> storing the pickle seems to have no adverse effects on the build, while +> avoiding the observed traceback. + +[1] http://sources.debian.net/patches/summary/py3cairo/1.10.0+dfsg-5/ + +diff --git a/waf b/waf +index 1111111..2222222 100755 +--- a/waf ++++ b/waf +@@ -158,6 +158,8 @@ sys.path.insert(0, wafdir) + if __name__ == '__main__': + import waflib.extras.compat15 + from waflib import Scripting ++ from waflib import Build ++ Build.BuildContext.store = lambda self: True + Scripting.waf_entry_point(cwd, VERSION, wafdir) + + #==> diff --git a/src/jack.mk b/src/jack.mk index 60bc3c9d..b13afa9f 100644 --- a/src/jack.mk +++ b/src/jack.mk @@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := 5bc6336e6ac9799e3cb241915e2ba5d01b030589bbb2afae39579a59ef0f2 $(PKG)_SUBDIR := jack-$($(PKG)_VERSION) $(PKG)_FILE := jack-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := https://dl.dropboxusercontent.com/u/28869550/$($(PKG)_FILE) -$(PKG)_DEPS := gcc libgnurx libsamplerate libsndfile portaudio pthreads readline waf +$(PKG)_DEPS := gcc libgnurx libsamplerate libsndfile portaudio pthreads readline define $(PKG)_UPDATE $(WGET) -q -O- 'http://jackaudio.org/downloads/' | \ @@ -17,14 +17,12 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - rm '$(1)/waf' cd '$(1)' && \ AR='$(TARGET)-ar' \ CC='$(TARGET)-gcc' \ CXX='$(TARGET)-g++' \ PKGCONFIG='$(TARGET)-pkg-config' \ - '$(PREFIX)/$(BUILD)/bin/waf' \ - configure build install \ + ./waf configure build install \ -j '$(JOBS)' \ --prefix='$(PREFIX)/$(TARGET)' \ --dist-target=mingw From cd11f46263dc1a3e79d40de7f35c45b2019c0af1 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 6 Jan 2016 15:07:58 +0300 Subject: [PATCH 0307/1463] jack: add TODO about waf --- src/jack.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/src/jack.mk b/src/jack.mk index b13afa9f..f09a0786 100644 --- a/src/jack.mk +++ b/src/jack.mk @@ -17,6 +17,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD + # TODO: use waf installed by MXE package waf cd '$(1)' && \ AR='$(TARGET)-ar' \ CC='$(TARGET)-gcc' \ From c7cb714f38fbf9f94a847bdc034253c403cd09c8 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 6 Jan 2016 15:56:06 +0100 Subject: [PATCH 0308/1463] sqlite: update --- src/sqlite.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sqlite.mk b/src/sqlite.mk index 702a3f49..c39be609 100644 --- a/src/sqlite.mk +++ b/src/sqlite.mk @@ -3,11 +3,11 @@ PKG := sqlite $(PKG)_IGNORE := -$(PKG)_VERSION := 3090200 -$(PKG)_CHECKSUM := 064c0abe9c9177534d4c770bca7a5902f9924b629ac886b4c08956be6dfbc36b +$(PKG)_VERSION := 3100000 +$(PKG)_CHECKSUM := 43cc292d70711fa7580250c8a1cd7c64813a4a0a479dbd502cce5f10b5d91042 $(PKG)_SUBDIR := $(PKG)-autoconf-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-autoconf-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://www.sqlite.org/2015/$($(PKG)_FILE) +$(PKG)_URL := http://www.sqlite.org/2016/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE From 0a543327c02cbc2706400936c6df773a179f79eb Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Wed, 6 Jan 2016 14:58:49 +0000 Subject: [PATCH 0309/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index aaac4546..848e75ec 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -3489,7 +3489,7 @@ feel free to submit a pull request. sqlite - 3090200 + 3100000 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 7701c951..6ccef977 100644 --- a/versions.json +++ b/versions.json @@ -344,7 +344,7 @@ "sox": "14.4.2", "speex": "1.2rc2", "speexdsp": "1.2rc3", - "sqlite": "3090200", + "sqlite": "3100000", "suitesparse": "4.2.1", "t4k_common": "0.1.1", "taglib": "1.7.2", From a39897c2810cabac4bc0a35102f3633d2a8d5065 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Wed, 6 Jan 2016 17:08:24 -0800 Subject: [PATCH 0310/1463] aubio: Explicitly disable jack for static builds Prevents issues arising with existing jack shared libraries that are already installed to static directories. --- src/aubio.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/aubio.mk b/src/aubio.mk index ec1bbf44..86970ace 100644 --- a/src/aubio.mk +++ b/src/aubio.mk @@ -27,7 +27,7 @@ define $(PKG)_BUILD --prefix='$(PREFIX)/$(TARGET)' \ --enable-fftw3f \ $(if $(BUILD_STATIC), \ - --enable-static --disable-shared, \ + --enable-static --disable-shared --disable-jack, \ --disable-static --enable-shared) # disable txt2man and doxygen From 9ef23fce94ac2cf92e68a3bcd2c2b316c5ab21cb Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Thu, 7 Jan 2016 01:11:46 +0000 Subject: [PATCH 0311/1463] Update versions.json & build-matrix.html --- build-matrix.html | 14 ++++++++++++-- versions.json | 1 + 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 848e75ec..4ea71387 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -3747,6 +3747,16 @@ feel free to submit a pull request. ✗ + + waf + 1.8.17 + ✗ + ✗ + ✗ + ✗ + ✓ + + wavpack 4.75.2 @@ -3931,13 +3941,13 @@ feel free to submit a pull request. Total: 381
    (+5 virtual -+3 native-only) ++4 native-only) 379 273 360 271 -10 +11 diff --git a/versions.json b/versions.json index 6ccef977..fe1b9a2e 100644 --- a/versions.json +++ b/versions.json @@ -370,6 +370,7 @@ "vorbis": "1.3.5", "vtk": "5.8.0", "vtk6": "6.3.0", + "waf": "1.8.17", "wavpack": "4.75.2", "wget": "1.16.3", "widl": "4.0.4", From 45eca0332c08cdd2c8c01243a915616fa58f4fdb Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 7 Jan 2016 13:31:05 +1100 Subject: [PATCH 0312/1463] fix backup download * use bash for brace expansion * http://sprunge.us/ is down (fixes #1145) --- tools/s3-fetch-and-sync | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/s3-fetch-and-sync b/tools/s3-fetch-and-sync index 3972c880..36b9cf79 100755 --- a/tools/s3-fetch-and-sync +++ b/tools/s3-fetch-and-sync @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # This file is part of MXE. # See index.html for further information. @@ -19,7 +19,7 @@ # Manual switch to enable/disable issue filing on GitHub. # Useful to prevent the same issue from being filed multiple times -file_issue=true +file_issue=false # List of plugin dirs to include in downloads # Can't include all subdirs since some affect versions From 50d60a20b90c248307d27d597652e2dbd7e43381 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Thu, 7 Jan 2016 13:32:18 +0000 Subject: [PATCH 0313/1463] Update versions.json & build-matrix.html --- build-matrix.html | 20 +++++++++++++++----- versions.json | 1 + 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 4ea71387..ad1255ef 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -1657,6 +1657,16 @@ feel free to submit a pull request. ✗ + + libieee1284 + 0.2.11 + ✓ + ✓ + ✓ + ✓ + ✗ + + libircclient 1.8 @@ -3939,14 +3949,14 @@ feel free to submit a pull request. -Total: 381 +Total: 382
    (+5 virtual +4 native-only) -379 -273 -360 -271 +380 +274 +361 +272 11 diff --git a/versions.json b/versions.json index fe1b9a2e..e33bf45c 100644 --- a/versions.json +++ b/versions.json @@ -161,6 +161,7 @@ "libiconv": "1.14", "libid3tag": "0.15.1b", "libidn": "1.32", + "libieee1284": "0.2.11", "libircclient": "1.8", "libjpeg-turbo": "1.4.1", "liblaxjson": "1.0.5", From 59f825eee05589940ec34a645c905bb148448442 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Thu, 7 Jan 2016 16:39:17 +0300 Subject: [PATCH 0314/1463] libieee1284: consolidate patches --- src/libieee1284-1-fixes.patch | 265 +++++++++++++++++++++++++ src/libieee1284-1-ssize_t.patch | 80 -------- src/libieee1284-2-dll.patch | 25 --- src/libieee1284-3-windows-header.patch | 91 --------- src/libieee1284-4-getversion.patch | 42 ---- src/libieee1284-5-pkg-config.patch | 57 ------ 6 files changed, 265 insertions(+), 295 deletions(-) create mode 100644 src/libieee1284-1-fixes.patch delete mode 100644 src/libieee1284-1-ssize_t.patch delete mode 100644 src/libieee1284-2-dll.patch delete mode 100644 src/libieee1284-3-windows-header.patch delete mode 100644 src/libieee1284-4-getversion.patch delete mode 100644 src/libieee1284-5-pkg-config.patch diff --git a/src/libieee1284-1-fixes.patch b/src/libieee1284-1-fixes.patch new file mode 100644 index 00000000..fa0625b1 --- /dev/null +++ b/src/libieee1284-1-fixes.patch @@ -0,0 +1,265 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20Gl=C3=B6ckner?= +Date: Sun, 3 Jan 2016 05:48:59 +0100 +Subject: [PATCH] make configure determine if basetsd.h is needed for ssize_t + +The result is hardcoded in ieee1284.h. +Duplicate logic in detect.h is replaced by including that file. + +diff --git a/configure.in b/configure.in +index 1111111..2222222 100644 +--- a/configure.in ++++ b/configure.in +@@ -72,7 +72,17 @@ if test $ac_cv_use_python = yes; then + AM_PATH_PYTHON + fi + ++AC_CHECK_TYPE([ssize_t],,,[#include ]) ++if test $ac_cv_type_ssize_t != yes; then ++ AC_CHECK_TYPE([SSIZE_T], ++ AC_SUBST([SSIZE_T_IN_BASETSD_H], 1), ++ AC_MSG_ERROR([No definition of ssize_t found.]), ++ [#include ]) ++else ++ AC_SUBST([SSIZE_T_IN_BASETSD_H], 0) ++fi ++ + dnl Checks for library functions. + +-AC_CONFIG_FILES(Makefile libieee1284.spec) ++AC_CONFIG_FILES([Makefile libieee1284.spec include/ieee1284.h]) + AC_OUTPUT +diff --git a/include/ieee1284.h b/include/ieee1284.h.in +similarity index 99% +rename from include/ieee1284.h +rename to include/ieee1284.h.in +index 1111111..2222222 100644 +--- a/include/ieee1284.h ++++ b/include/ieee1284.h.in +@@ -27,7 +27,7 @@ + #include /* for struct timeval */ + #endif + +-#if (defined __MINGW32__ || defined _MSC_VER) && !defined OWN_SSIZE_T ++#if @SSIZE_T_IN_BASETSD_H@ && !defined OWN_SSIZE_T + #include /* for SSIZE_T */ + #define OWN_SSIZE_T + typedef SSIZE_T ssize_t; +diff --git a/src/detect.h b/src/detect.h +index 1111111..2222222 100644 +--- a/src/detect.h ++++ b/src/detect.h +@@ -24,18 +24,7 @@ + #ifndef _DETECT_H_ + #define _DETECT_H_ + +-#include +-#ifndef _MSC_VER +-#include +-#else +-#include +-#endif +- +-#if (defined __MINGW32__ || defined _MSC_VER) && !defined OWN_SSIZE_T +-#include /* for SSIZE_T */ +-#define OWN_SSIZE_T +-typedef SSIZE_T ssize_t; +-#endif ++#include "ieee1284.h" + + struct parport; + struct parport_internal; + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20Gl=C3=B6ckner?= +Date: Sun, 20 Sep 2015 19:14:18 +0200 +Subject: [PATCH] persuade libtool build a DLL on windows + + +diff --git a/Makefile.am b/Makefile.am +index 1111111..2222222 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -8,7 +8,7 @@ libieee1284_la_SOURCES = src/detect.c src/detect.h src/ports.c src/deviceid.c \ + src/par_nt.h src/io.h src/conf.h src/conf.c libieee1284.sym + # When rolling a release, remember to adjust the version info. + # It's current:release:age. +-libieee1284_la_LDFLAGS = -version-info 5:2:2 \ ++libieee1284_la_LDFLAGS = -version-info 5:2:2 -no-undefined \ + -export-symbols $(top_srcdir)/libieee1284.sym + include_HEADERS = include/ieee1284.h + INCLUDES = -I$(top_srcdir)/include + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20Gl=C3=B6ckner?= +Date: Sun, 20 Sep 2015 19:15:15 +0200 +Subject: [PATCH] search for windows.h + +instead of relying on the __CYGWIN__ macro + +diff --git a/configure.in b/configure.in +index 1111111..2222222 100644 +--- a/configure.in ++++ b/configure.in +@@ -37,21 +37,16 @@ case "{$host}" in + AC_DEFINE(HAVE_SOLARIS,1,enable solaris iop access) + solaris_io=true + ;; +-*-*-cygwin*) +- dnl Strip version number from uname and make sure we're on NT not 9x +- case `uname -s | sed 's/-.*$//'` in +- CYGWIN_NT*) +- AC_CHECK_HEADER(w32api/windows.h, [ +- AC_DEFINE(HAVE_CYGWIN_NT,1,enable w32api access) +- ], AC_MSG_ERROR(You need the cygwin w32api files on NT)) +- ;; +- *) +- AC_DEFINE(HAVE_CYGWIN_9X,1,enable win95 access) +- ;; +- esac +-;; +-*-*-mingw*) +-dnl AC_DEFINE(HAVE_CYGWIN_9X,1,enable win95 access) ++*-*-cygwin* | *-*-mingw*) ++ windows_h_found=false ++ AC_CHECK_HEADERS([windows.h] [w32api/windows.h], [ ++ windows_h_found=true ++ break ++ ]) ++ AS_VAR_IF(windows_h_found, [false], [ ++ AC_MSG_ERROR(windows.h not found) ++ ]) ++ AC_DEFINE(HAVE_CYGWIN_9X,1,enable win95 access) + AC_DEFINE(HAVE_CYGWIN_NT,1,enable w32api access) + ;; + *) +diff --git a/src/access_lpt.c b/src/access_lpt.c +index 1111111..2222222 100644 +--- a/src/access_lpt.c ++++ b/src/access_lpt.c +@@ -51,7 +51,7 @@ + + #ifdef HAVE_CYGWIN_NT + +-#ifdef __CYGWIN__ ++#ifdef HAVE_W32API_WINDOWS_H + #include + #else + #include +diff --git a/src/detect.c b/src/detect.c +index 1111111..2222222 100644 +--- a/src/detect.c ++++ b/src/detect.c +@@ -50,7 +50,7 @@ + #include + #include + #elif defined(HAVE_CYGWIN_NT) +-#ifdef __CYGWIN__ ++#ifdef HAVE_W32API_WINDOWS_H + #include + #else + #include +diff --git a/src/ports.c b/src/ports.c +index 1111111..2222222 100644 +--- a/src/ports.c ++++ b/src/ports.c +@@ -36,7 +36,7 @@ + #include "detect.h" + + #ifdef HAVE_CYGWIN_NT +-#ifdef __CYGWIN__ ++#ifdef HAVE_W32API_WINDOWS_H + #include + #else /* Not cygwin really */ + /* Don't include windows.h if it isn't necessary. That's why this is here and + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20Gl=C3=B6ckner?= +Date: Sat, 19 Sep 2015 01:39:15 +0200 +Subject: [PATCH] check Windows version before allowing IO access + + +diff --git a/src/detect.c b/src/detect.c +index 1111111..2222222 100644 +--- a/src/detect.c ++++ b/src/detect.c +@@ -49,7 +49,7 @@ + #elif defined(HAVE_SOLARIS) + #include + #include +-#elif defined(HAVE_CYGWIN_NT) ++#elif defined(HAVE_CYGWIN_NT) || defined(HAVE_CYGWIN_9X) + #ifdef HAVE_W32API_WINDOWS_H + #include + #else +@@ -191,10 +191,12 @@ check_io (void) + } + debugprintf ("We can't use IOP, nothing will work\n"); + #elif defined(HAVE_CYGWIN_9X) +- /* note: 95 allows apps direct IO access */ +- debugprintf ("Taking a guess on port availability (win9x)\n"); +- capabilities |= IO_CAPABLE; +- return 1; ++ /* note: Win32s/95/98/ME allows apps direct IO access */ ++ if (GetVersion() & (1 << 31)) { ++ debugprintf ("Taking a guess on port availability (win9x)\n"); ++ capabilities |= IO_CAPABLE; ++ return 1; ++ } + #endif + + return 0; + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20Gl=C3=B6ckner?= +Date: Mon, 4 Jan 2016 00:49:41 +0100 +Subject: [PATCH] add pkg-config metadata file + + +diff --git a/Makefile.am b/Makefile.am +index 1111111..2222222 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -30,6 +30,9 @@ bin_PROGRAMS = libieee1284_test + libieee1284_test_SOURCES = tests/test.c + libieee1284_test_LDADD = libieee1284.la + ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = libieee1284.pc ++ + # Python bindings + src_ieee1284module_la_SOURCES = src/ieee1284module.c + if PYTHON +diff --git a/configure.in b/configure.in +index 1111111..2222222 100644 +--- a/configure.in ++++ b/configure.in +@@ -79,5 +79,5 @@ fi + + dnl Checks for library functions. + +-AC_CONFIG_FILES([Makefile libieee1284.spec include/ieee1284.h]) ++AC_CONFIG_FILES([Makefile libieee1284.spec libieee1284.pc include/ieee1284.h]) + AC_OUTPUT +diff --git a/libieee1284.pc.in b/libieee1284.pc.in +new file mode 100644 +index 1111111..2222222 +--- /dev/null ++++ b/libieee1284.pc.in +@@ -0,0 +1,11 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: @PACKAGE@ ++Version: @VERSION@ ++Description: IEEE1284 parallel port library ++URL: http://cyberelk.net/tim/software/libieee1284/ ++Libs: -L${libdir} -lieee1284 ++Cflags: -I${includedir} diff --git a/src/libieee1284-1-ssize_t.patch b/src/libieee1284-1-ssize_t.patch deleted file mode 100644 index ce23384e..00000000 --- a/src/libieee1284-1-ssize_t.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 55a02d19ec885b2cc1d9c39813aa706bf68c122b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20Gl=C3=B6ckner?= -Date: Sun, 3 Jan 2016 05:48:59 +0100 -Subject: [PATCH] make configure determine if basetsd.h is needed for ssize_t - -The result is hardcoded in ieee1284.h. -Duplicate logic in detect.h is replaced by including that file. ---- - configure.in | 12 +++++++++++- - include/{ieee1284.h => ieee1284.h.in} | 2 +- - src/detect.h | 13 +------------ - 3 files changed, 13 insertions(+), 14 deletions(-) - rename include/{ieee1284.h => ieee1284.h.in} (99%) - -diff --git a/configure.in b/configure.in -index a22fe97..7cd9561 100644 ---- a/configure.in -+++ b/configure.in -@@ -72,7 +72,17 @@ if test $ac_cv_use_python = yes; then - AM_PATH_PYTHON - fi - -+AC_CHECK_TYPE([ssize_t],,,[#include ]) -+if test $ac_cv_type_ssize_t != yes; then -+ AC_CHECK_TYPE([SSIZE_T], -+ AC_SUBST([SSIZE_T_IN_BASETSD_H], 1), -+ AC_MSG_ERROR([No definition of ssize_t found.]), -+ [#include ]) -+else -+ AC_SUBST([SSIZE_T_IN_BASETSD_H], 0) -+fi -+ - dnl Checks for library functions. - --AC_CONFIG_FILES(Makefile libieee1284.spec) -+AC_CONFIG_FILES([Makefile libieee1284.spec include/ieee1284.h]) - AC_OUTPUT -diff --git a/include/ieee1284.h b/include/ieee1284.h.in -similarity index 99% -rename from include/ieee1284.h -rename to include/ieee1284.h.in -index 03614cb..be02850 100644 ---- a/include/ieee1284.h -+++ b/include/ieee1284.h.in -@@ -27,7 +27,7 @@ - #include /* for struct timeval */ - #endif - --#if (defined __MINGW32__ || defined _MSC_VER) && !defined OWN_SSIZE_T -+#if @SSIZE_T_IN_BASETSD_H@ && !defined OWN_SSIZE_T - #include /* for SSIZE_T */ - #define OWN_SSIZE_T - typedef SSIZE_T ssize_t; -diff --git a/src/detect.h b/src/detect.h -index 71e7d60..ab35f82 100644 ---- a/src/detect.h -+++ b/src/detect.h -@@ -24,18 +24,7 @@ - #ifndef _DETECT_H_ - #define _DETECT_H_ - --#include --#ifndef _MSC_VER --#include --#else --#include --#endif -- --#if (defined __MINGW32__ || defined _MSC_VER) && !defined OWN_SSIZE_T --#include /* for SSIZE_T */ --#define OWN_SSIZE_T --typedef SSIZE_T ssize_t; --#endif -+#include "ieee1284.h" - - struct parport; - struct parport_internal; --- -2.1.4 - diff --git a/src/libieee1284-2-dll.patch b/src/libieee1284-2-dll.patch deleted file mode 100644 index 1c75b79a..00000000 --- a/src/libieee1284-2-dll.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9f599be4745f9e09741ba48a2af55d8d684b68db Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20Gl=C3=B6ckner?= -Date: Sun, 20 Sep 2015 19:14:18 +0200 -Subject: [PATCH] persuade libtool build a DLL on windows - ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 9fdaff5..2abe635 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -8,7 +8,7 @@ libieee1284_la_SOURCES = src/detect.c src/detect.h src/ports.c src/deviceid.c \ - src/par_nt.h src/io.h src/conf.h src/conf.c libieee1284.sym - # When rolling a release, remember to adjust the version info. - # It's current:release:age. --libieee1284_la_LDFLAGS = -version-info 5:2:2 \ -+libieee1284_la_LDFLAGS = -version-info 5:2:2 -no-undefined \ - -export-symbols $(top_srcdir)/libieee1284.sym - include_HEADERS = include/ieee1284.h - INCLUDES = -I$(top_srcdir)/include --- -2.1.4 - diff --git a/src/libieee1284-3-windows-header.patch b/src/libieee1284-3-windows-header.patch deleted file mode 100644 index 0d02c495..00000000 --- a/src/libieee1284-3-windows-header.patch +++ /dev/null @@ -1,91 +0,0 @@ -From d8da09469573051c2fb85da1048bef5a4742cb2f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20Gl=C3=B6ckner?= -Date: Sun, 20 Sep 2015 19:15:15 +0200 -Subject: [PATCH] search for windows.h - -instead of relying on the __CYGWIN__ macro ---- - configure.in | 25 ++++++++++--------------- - src/access_lpt.c | 2 +- - src/detect.c | 2 +- - src/ports.c | 2 +- - 4 files changed, 13 insertions(+), 18 deletions(-) - -diff --git a/configure.in b/configure.in -index 7cd9561..9b6b82a 100644 ---- a/configure.in -+++ b/configure.in -@@ -37,21 +37,16 @@ case "{$host}" in - AC_DEFINE(HAVE_SOLARIS,1,enable solaris iop access) - solaris_io=true - ;; --*-*-cygwin*) -- dnl Strip version number from uname and make sure we're on NT not 9x -- case `uname -s | sed 's/-.*$//'` in -- CYGWIN_NT*) -- AC_CHECK_HEADER(w32api/windows.h, [ -- AC_DEFINE(HAVE_CYGWIN_NT,1,enable w32api access) -- ], AC_MSG_ERROR(You need the cygwin w32api files on NT)) -- ;; -- *) -- AC_DEFINE(HAVE_CYGWIN_9X,1,enable win95 access) -- ;; -- esac --;; --*-*-mingw*) --dnl AC_DEFINE(HAVE_CYGWIN_9X,1,enable win95 access) -+*-*-cygwin* | *-*-mingw*) -+ windows_h_found=false -+ AC_CHECK_HEADERS([windows.h] [w32api/windows.h], [ -+ windows_h_found=true -+ break -+ ]) -+ AS_VAR_IF(windows_h_found, [false], [ -+ AC_MSG_ERROR(windows.h not found) -+ ]) -+ AC_DEFINE(HAVE_CYGWIN_9X,1,enable win95 access) - AC_DEFINE(HAVE_CYGWIN_NT,1,enable w32api access) - ;; - *) -diff --git a/src/access_lpt.c b/src/access_lpt.c -index ad210f4..8cda6cb 100644 ---- a/src/access_lpt.c -+++ b/src/access_lpt.c -@@ -51,7 +51,7 @@ - - #ifdef HAVE_CYGWIN_NT - --#ifdef __CYGWIN__ -+#ifdef HAVE_W32API_WINDOWS_H - #include - #else - #include -diff --git a/src/detect.c b/src/detect.c -index a53ef19..ca7f85b 100644 ---- a/src/detect.c -+++ b/src/detect.c -@@ -50,7 +50,7 @@ - #include - #include - #elif defined(HAVE_CYGWIN_NT) --#ifdef __CYGWIN__ -+#ifdef HAVE_W32API_WINDOWS_H - #include - #else - #include -diff --git a/src/ports.c b/src/ports.c -index f3c38f1..ebd5110 100644 ---- a/src/ports.c -+++ b/src/ports.c -@@ -36,7 +36,7 @@ - #include "detect.h" - - #ifdef HAVE_CYGWIN_NT --#ifdef __CYGWIN__ -+#ifdef HAVE_W32API_WINDOWS_H - #include - #else /* Not cygwin really */ - /* Don't include windows.h if it isn't necessary. That's why this is here and --- -2.1.4 - diff --git a/src/libieee1284-4-getversion.patch b/src/libieee1284-4-getversion.patch deleted file mode 100644 index 99a9a2c0..00000000 --- a/src/libieee1284-4-getversion.patch +++ /dev/null @@ -1,42 +0,0 @@ -From c6962803f486e34cde370b34845741c8c380c460 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20Gl=C3=B6ckner?= -Date: Sat, 19 Sep 2015 01:39:15 +0200 -Subject: [PATCH] check Windows version before allowing IO access - ---- - src/detect.c | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/src/detect.c b/src/detect.c -index ca7f85b..d675584 100644 ---- a/src/detect.c -+++ b/src/detect.c -@@ -49,7 +49,7 @@ - #elif defined(HAVE_SOLARIS) - #include - #include --#elif defined(HAVE_CYGWIN_NT) -+#elif defined(HAVE_CYGWIN_NT) || defined(HAVE_CYGWIN_9X) - #ifdef HAVE_W32API_WINDOWS_H - #include - #else -@@ -191,10 +191,12 @@ check_io (void) - } - debugprintf ("We can't use IOP, nothing will work\n"); - #elif defined(HAVE_CYGWIN_9X) -- /* note: 95 allows apps direct IO access */ -- debugprintf ("Taking a guess on port availability (win9x)\n"); -- capabilities |= IO_CAPABLE; -- return 1; -+ /* note: Win32s/95/98/ME allows apps direct IO access */ -+ if (GetVersion() & (1 << 31)) { -+ debugprintf ("Taking a guess on port availability (win9x)\n"); -+ capabilities |= IO_CAPABLE; -+ return 1; -+ } - #endif - - return 0; --- -2.1.4 - diff --git a/src/libieee1284-5-pkg-config.patch b/src/libieee1284-5-pkg-config.patch deleted file mode 100644 index 11deea2c..00000000 --- a/src/libieee1284-5-pkg-config.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 53f13bfb5afa9f8458a940116cc7692960ab9f0e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20Gl=C3=B6ckner?= -Date: Mon, 4 Jan 2016 00:49:41 +0100 -Subject: [PATCH] add pkg-config metadata file - ---- - Makefile.am | 3 +++ - configure.in | 2 +- - libieee1284.pc.in | 11 +++++++++++ - 3 files changed, 15 insertions(+), 1 deletion(-) - create mode 100644 libieee1284.pc.in - -diff --git a/Makefile.am b/Makefile.am -index 2abe635..34f785a 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -30,6 +30,9 @@ bin_PROGRAMS = libieee1284_test - libieee1284_test_SOURCES = tests/test.c - libieee1284_test_LDADD = libieee1284.la - -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = libieee1284.pc -+ - # Python bindings - src_ieee1284module_la_SOURCES = src/ieee1284module.c - if PYTHON -diff --git a/configure.in b/configure.in -index 9b6b82a..197a8b6 100644 ---- a/configure.in -+++ b/configure.in -@@ -79,5 +79,5 @@ fi - - dnl Checks for library functions. - --AC_CONFIG_FILES([Makefile libieee1284.spec include/ieee1284.h]) -+AC_CONFIG_FILES([Makefile libieee1284.spec libieee1284.pc include/ieee1284.h]) - AC_OUTPUT -diff --git a/libieee1284.pc.in b/libieee1284.pc.in -new file mode 100644 -index 0000000..a9eacde ---- /dev/null -+++ b/libieee1284.pc.in -@@ -0,0 +1,11 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: @PACKAGE@ -+Version: @VERSION@ -+Description: IEEE1284 parallel port library -+URL: http://cyberelk.net/tim/software/libieee1284/ -+Libs: -L${libdir} -lieee1284 -+Cflags: -I${includedir} --- -2.1.4 - From 53a92a86df19b5b764bea0d49a815c7bcd79864c Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Thu, 7 Jan 2016 17:59:52 +0300 Subject: [PATCH 0315/1463] print Perl version to log See https://github.com/mxe/mxe/issues/1108#issuecomment-169556116 See https://github.com/mxe/mxe/issues/1112 --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 44a6864c..ff76dda0 100644 --- a/Makefile +++ b/Makefile @@ -510,6 +510,7 @@ build-only-$(1)_$(3): autoconf --version 2>/dev/null | head -1 automake --version 2>/dev/null | head -1 python --version + perl --version 2>&1 | head -3 rm -rf '$(2)' mkdir -p '$(2)' $$(if $(value $(call LOOKUP_PKG_RULE,$(1),FILE,$(3))),\ From 72477c9ac2dd029ce29d0f563492dde408a3093b Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Fri, 8 Jan 2016 03:10:13 +0000 Subject: [PATCH 0316/1463] Update versions.json & build-matrix.html --- build-matrix.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index ad1255ef..e871f331 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -1130,9 +1130,9 @@ feel free to submit a pull request. jack 1.9.10 + ✗ ✓ - ✓ - ✓ + ✗ ✓ ✗ @@ -3953,9 +3953,9 @@ Total: 382
    (+5 virtual +4 native-only) -380 +379 274 -361 +360 272 11 From a516d920efaeb18de81bc38c70064b7c9a111453 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 5 Jan 2016 01:00:41 +0300 Subject: [PATCH 0317/1463] reimplement patch-tool-mxe in Makefile fix #1063 --- Makefile | 83 +++++++++++++++++++++++++++++++- tools/patch-tool-mxe | 109 ++----------------------------------------- 2 files changed, 86 insertions(+), 106 deletions(-) diff --git a/Makefile b/Makefile index ff76dda0..23ae9d3d 100644 --- a/Makefile +++ b/Makefile @@ -45,6 +45,7 @@ REQUIREMENTS := autoconf automake autopoint bash bison bzip2 flex \ PREFIX := $(PWD)/usr LOG_DIR := $(PWD)/log +GITS_DIR := $(PWD)/gits GIT_HEAD := $(shell git rev-parse HEAD) TIMESTAMP := $(shell date +%Y%m%d_%H%M%S) PKG_DIR := $(PWD)/pkg @@ -154,7 +155,8 @@ endef PRELOAD_VARS := LD_PRELOAD DYLD_FORCE_FLAT_NAMESPACE DYLD_INSERT_LIBRARIES # use a minimal whitelist of safe environment variables -ENV_WHITELIST := PATH LANG MAKE% MXE% %PROXY %proxy LD_LIBRARY_PATH $(PRELOAD_VARS) ACLOCAL_PATH +# HOME is needed for ~/.gitconfig for patch-tool-mxe +ENV_WHITELIST := PATH HOME LANG MAKE% MXE% %PROXY %proxy LD_LIBRARY_PATH $(PRELOAD_VARS) ACLOCAL_PATH unexport $(filter-out $(ENV_WHITELIST),$(shell env | cut -d '=' -f1)) # disable wine with readonly directory (created by mxe-conf) @@ -793,3 +795,82 @@ versions.json: $(foreach PKG,$(PKGS), $(TOP_DIR)/src/$(PKG).mk) "$($(PKG)_VERSION)",';)} >> $@ @echo ' "": null' >> $@ @echo '}' >> $@ + +# for patch-tool-mxe + +GIT_DIR = $(if $(patsubst .,,$($(1)_SUBDIR)) \ + ,$(GITS_DIR)/$($(1)_SUBDIR),$(GITS_DIR)/$(1)) + +GIT_CMD = git \ + --work-tree='$(call GIT_DIR,$(1))' \ + --git-dir='$(call GIT_DIR,$(1))'/.git + +define INIT_GIT + # unpack to gits/tmp/pkg + rm -rf '$(GITS_DIR)/tmp' + mkdir -p '$(GITS_DIR)/tmp/$(1)' + cd '$(GITS_DIR)/tmp/$(1)' && $(call UNPACK_PKG_ARCHIVE,$(1)) + # if PKG_SUBDIR is ".", the following will move gits/tmp/pkg + mv '$(abspath $(GITS_DIR)/tmp/$(1)/$($(1)_SUBDIR))' '$(call GIT_DIR,$(1))' + rm -rf '$(GITS_DIR)/tmp' + # initialize git + $(call GIT_CMD,$(1)) init + $(call GIT_CMD,$(1)) add -A + $(call GIT_CMD,$(1)) commit -m "init" + $(call GIT_CMD,$(1)) tag dist +endef + +init-git-%: download-only-% + $(if $(call set_is_member,$*,$(PKGS)), \ + $(if $(wildcard $(call GIT_DIR,$*)), \ + $(error $(call GIT_DIR,$*) already exists), \ + $(call INIT_GIT,$*)), \ + $(error Package $* not found in index.html)) + +PATCH_NAME = 1-fixes + +# can't use PKG_PATCHES here, because it returns existing patches +# while export-patch creates new patch +PATCH_BY_NAME = $(patsubst %.mk,%-$(2).patch,$(PKG_MAKEFILES)) + +define IMPORT_PATCH + cd '$(call GIT_DIR,$(1))' \ + && cat '$(PATCH_BY_NAME)' \ + | sed '/^From/,$$ !d' \ + | sed s/'^From: MXE'/"From: fix@me"/'g;' \ + | $(call GIT_CMD,$(1)) am --keep-cr +endef + +import-patch-%: + $(if $(call set_is_member,$*,$(PKGS)), \ + $(if $(wildcard $(call GIT_DIR,$*)), \ + $(call IMPORT_PATCH,$*,$(PATCH_NAME)), \ + $(error $(call GIT_DIR,$*) does not exist)), \ + $(error Package $* not found in index.html)) + +define EXPORT_PATCH + cd '$(call GIT_DIR,$(1))' \ + && ( \ + echo 'This file is part of MXE.'; \ + echo 'See index.html for further information.'; \ + echo ''; \ + echo 'Contains ad hoc patches for cross building.'; \ + echo ''; \ + $(call GIT_CMD,$(1)) format-patch \ + --no-numbered \ + -p \ + --no-signature \ + --stdout \ + --text \ + dist..HEAD \ + | sed 's/^From [0-9a-f]\{40\} /From 0000000000000000000000000000000000000000 /' \ + | sed 's/^index .......\.\......../index 1111111..2222222/' \ + ) > '$(PATCH_BY_NAME)' +endef + +export-patch-%: + $(if $(call set_is_member,$*,$(PKGS)), \ + $(if $(wildcard $(call GIT_DIR,$*)), \ + $(call EXPORT_PATCH,$*,$(PATCH_NAME)), \ + $(error $(call GIT_DIR,$*) does not exist)), \ + $(error Package $* not found in index.html)) diff --git a/tools/patch-tool-mxe b/tools/patch-tool-mxe index ab021cb9..cdc96141 100755 --- a/tools/patch-tool-mxe +++ b/tools/patch-tool-mxe @@ -10,122 +10,21 @@ patch_name=${3:-1-fixes} setupEnv() { # MXE directory export mxedir=$(cd $(dirname $0) && cd .. && pwd) - - # directory for unpacked tarballs/git repos - export gitsdir=${mxedir}/gits - - mkdir -p ${gitsdir} - - - export pkg_version=`grep '^$(PKG)_VERSION' $mxedir/src/$pkg.mk | \ - sed 's/.*:= \(.*\)/\1/'` - - export pkg_short_version=`echo $pkg_version | sed s/'\(.*\)\.[^.]*$'/'\1'/` - - export pkg_subdir=`grep '^$(PKG)_SUBDIR' $mxedir/src/$pkg.mk | \ - sed 's/.*:= \(.*\)/\1/' | \ - sed s/'$($(PKG)_VERSION)'/$pkg_version/ | \ - sed s/'$(call SHORT_PKG_VERSION,$(PKG))'/$pkg_short_version/ | \ - sed s/'$(PKG)'/$pkg/;` - - export pkg_file=`grep '^$(PKG)_FILE\>' $mxedir/src/$pkg.mk | \ - sed 's/.*:= \(.*\)/\1/' | \ - sed s/'$($(PKG)_VERSION)'/$pkg_version/ | \ - sed s/'$(call SHORT_PKG_VERSION,$(PKG))'/$pkg_short_version/ | \ - sed s/'$($(PKG)_SUBDIR)'/$pkg_subdir/ | \ - sed s/'$(PKG)'/$pkg/;` - - #echo $pkg - #echo $pkg_version - #echo $pkg_subdir - #echo $pkg_file - } -# init + function init_git { setupEnv - cd $gitsdir - - if [ -d $gitsdir/$pkg_subdir ]; then - echo "Error: $gitsdir/$pkg_subdir already exists. Cancelling init." >&2 - exit 1 - fi - - echo "Checking for cached $pkg_file" - if [ ! -f $mxedir/pkg/$pkg_file ]; then - make -C "$mxedir" download-only-$pkg - echo "Building the mxe Makefile target 'download-only-$pkg' to get missing file" - if [ ! $? -eq 0 ]; then - echo "Could not build target download-only-$pkg - cancelling init." >&2 - exit 1 - fi - fi - - echo "Unpacking archive..." - (echo $pkg_file | grep "\.tar\.gz") || (echo $pkg_file | grep "\.tgz") \ - >> /dev/null && tar xf $mxedir/pkg/$pkg_file - (echo $pkg_file | grep "\.tar\.bz2") || (echo $pkg_file | grep "\.tbz2") \ - >> /dev/null && tar xf $mxedir/pkg/$pkg_file - (echo $pkg_file | grep "\.tar\.xz") || (echo $pkg_file | grep "\.txz") \ - >> /dev/null && xz -dc $mxedir/pkg/$pkg_file | tar xf - - echo $pkg_file | grep "\.zip" >> /dev/null && unzip $mxedir/pkg/$pkg_file >> /dev/null - - echo "Initializing repo and adding all as first commit" - cd $gitsdir/$pkg_subdir && \ - (git init; git add -A; git commit -m "init") > /dev/null - - echo "Creating 'dist' tag for distribution tarball state" - git tag dist - - echo "Repository ready in $gitsdir/$pkg_subdir" + make -C $mxedir init-git-$pkg } function export_patch { setupEnv - if [ ! -d $gitsdir/$pkg_subdir ]; then - echo "Error: $gitsdir/$pkg_subdir does not exist, so cannot export patches. Cancelling export." >&2 - exit 1 - fi - - cd $gitsdir/$pkg_subdir && \ - ( - echo 'This file is part of MXE.' - echo 'See index.html for further information.' - echo '' - echo 'Contains ad hoc patches for cross building.' - echo '' - git format-patch \ - --no-numbered \ - -p \ - --no-signature \ - --stdout \ - --text \ - dist..HEAD | \ - sed 's/^From [0-9a-f]\{40\} /From 0000000000000000000000000000000000000000 /' | \ - sed 's/^index .......\.\......../index 1111111..2222222/' - ) > $mxedir/src/${pkg}-${patch_name}.patch && \ - echo "Generated ${mxedir}/src/${pkg}-${patch_name}.patch" + make -C $mxedir export-patch-$pkg PATCH_NAME=${patch_name} } function import_patch { setupEnv - if [ ! -d $gitsdir/$pkg_subdir ]; then - echo "Error: $gitsdir/$pkg_subdir does not exist, so cannot import patches. Cancelling import - try 'init' first." >&2 - exit 1 - fi - - if [ -f ${mxedir}/src/${pkg}-${patch_name}.patch ]; then - cd $gitsdir/$pkg_subdir && \ - cat ${mxedir}/src/${pkg}-${patch_name}.patch | \ - sed '/^From/,$ !d' | \ - sed s/'^From: MXE'/"From: fix@me"/'g;' | \ - git am --keep-cr && \ - echo "Imported ${mxedir}/src/${pkg}-${patch_name}.patch" - else - echo "patch file ${mxedir}/src/${pkg}-${patch_name}.patch not found." - echo "Cancelling import." >&2 - exit 1 - fi + make -C $mxedir import-patch-$pkg PATCH_NAME=${patch_name} } case "$cmd" in From adb07e2153696a9ef4c9b4a8cc931054e0788fdf Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 5 Jan 2016 17:23:38 +0300 Subject: [PATCH 0318/1463] patch-tool-mxe can import all patches of a package --- Makefile | 14 +++++++++++--- tools/patch-tool-mxe | 9 +++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 23ae9d3d..e91f2161 100644 --- a/Makefile +++ b/Makefile @@ -835,16 +835,24 @@ PATCH_BY_NAME = $(patsubst %.mk,%-$(2).patch,$(PKG_MAKEFILES)) define IMPORT_PATCH cd '$(call GIT_DIR,$(1))' \ - && cat '$(PATCH_BY_NAME)' \ + && cat '$(2)' \ | sed '/^From/,$$ !d' \ | sed s/'^From: MXE'/"From: fix@me"/'g;' \ - | $(call GIT_CMD,$(1)) am --keep-cr + | $(call GIT_CMD,$(1)) am --keep-cr ; endef import-patch-%: $(if $(call set_is_member,$*,$(PKGS)), \ $(if $(wildcard $(call GIT_DIR,$*)), \ - $(call IMPORT_PATCH,$*,$(PATCH_NAME)), \ + $(call IMPORT_PATCH,$*,$(call PATCH_BY_NAME,$*,$(PATCH_NAME))), \ + $(error $(call GIT_DIR,$*) does not exist)), \ + $(error Package $* not found in index.html)) + +import-all-patches-%: + $(if $(call set_is_member,$*,$(PKGS)), \ + $(if $(wildcard $(call GIT_DIR,$*)), \ + $(foreach PKG_PATCH,$(call PKG_PATCHES,$*), \ + $(call IMPORT_PATCH,$*,$(PKG_PATCH))), \ $(error $(call GIT_DIR,$*) does not exist)), \ $(error Package $* not found in index.html)) diff --git a/tools/patch-tool-mxe b/tools/patch-tool-mxe index cdc96141..b7720e65 100755 --- a/tools/patch-tool-mxe +++ b/tools/patch-tool-mxe @@ -27,6 +27,11 @@ function import_patch { make -C $mxedir import-patch-$pkg PATCH_NAME=${patch_name} } +function import_all_patches { + setupEnv + make -C $mxedir import-all-patches-$pkg +} + case "$cmd" in init) init_git $pkg @@ -34,6 +39,9 @@ case "$cmd" in import) import_patch $pkg ;; + import-all) + import_all_patches $pkg + ;; export) export_patch $pkg ;; @@ -44,6 +52,7 @@ case "$cmd" in where COMMAND is one of: init - create a git directory for the package with the raw source import - apply the "pkgname-PATCHNAME.patch" patch commits + import-all - apply commits from all the patches of the package export - create/replace the "pkgname-PATCHNAME.patch" patch with a patch of all commits since init. If PATCHNAME is not set, it is default to "1-fixes". From efc287a8d99f35176daf79af6ccd174eed8acd36 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 5 Jan 2016 21:20:43 +0300 Subject: [PATCH 0319/1463] move patching functions and targets to patch.mk See https://github.com/mxe/mxe/pull/1134#issuecomment-168873410 See https://github.com/mxe/mxe/pull/1134#issuecomment-169867926 --- Makefile | 85 +------------------------------------------ patch.mk | 87 +++++++++++++++++++++++++++++++++++++++++++++ tools/build-pkg.lua | 1 + 3 files changed, 89 insertions(+), 84 deletions(-) create mode 100644 patch.mk diff --git a/Makefile b/Makefile index e91f2161..d18e4c0e 100644 --- a/Makefile +++ b/Makefile @@ -798,87 +798,4 @@ versions.json: $(foreach PKG,$(PKGS), $(TOP_DIR)/src/$(PKG).mk) # for patch-tool-mxe -GIT_DIR = $(if $(patsubst .,,$($(1)_SUBDIR)) \ - ,$(GITS_DIR)/$($(1)_SUBDIR),$(GITS_DIR)/$(1)) - -GIT_CMD = git \ - --work-tree='$(call GIT_DIR,$(1))' \ - --git-dir='$(call GIT_DIR,$(1))'/.git - -define INIT_GIT - # unpack to gits/tmp/pkg - rm -rf '$(GITS_DIR)/tmp' - mkdir -p '$(GITS_DIR)/tmp/$(1)' - cd '$(GITS_DIR)/tmp/$(1)' && $(call UNPACK_PKG_ARCHIVE,$(1)) - # if PKG_SUBDIR is ".", the following will move gits/tmp/pkg - mv '$(abspath $(GITS_DIR)/tmp/$(1)/$($(1)_SUBDIR))' '$(call GIT_DIR,$(1))' - rm -rf '$(GITS_DIR)/tmp' - # initialize git - $(call GIT_CMD,$(1)) init - $(call GIT_CMD,$(1)) add -A - $(call GIT_CMD,$(1)) commit -m "init" - $(call GIT_CMD,$(1)) tag dist -endef - -init-git-%: download-only-% - $(if $(call set_is_member,$*,$(PKGS)), \ - $(if $(wildcard $(call GIT_DIR,$*)), \ - $(error $(call GIT_DIR,$*) already exists), \ - $(call INIT_GIT,$*)), \ - $(error Package $* not found in index.html)) - -PATCH_NAME = 1-fixes - -# can't use PKG_PATCHES here, because it returns existing patches -# while export-patch creates new patch -PATCH_BY_NAME = $(patsubst %.mk,%-$(2).patch,$(PKG_MAKEFILES)) - -define IMPORT_PATCH - cd '$(call GIT_DIR,$(1))' \ - && cat '$(2)' \ - | sed '/^From/,$$ !d' \ - | sed s/'^From: MXE'/"From: fix@me"/'g;' \ - | $(call GIT_CMD,$(1)) am --keep-cr ; -endef - -import-patch-%: - $(if $(call set_is_member,$*,$(PKGS)), \ - $(if $(wildcard $(call GIT_DIR,$*)), \ - $(call IMPORT_PATCH,$*,$(call PATCH_BY_NAME,$*,$(PATCH_NAME))), \ - $(error $(call GIT_DIR,$*) does not exist)), \ - $(error Package $* not found in index.html)) - -import-all-patches-%: - $(if $(call set_is_member,$*,$(PKGS)), \ - $(if $(wildcard $(call GIT_DIR,$*)), \ - $(foreach PKG_PATCH,$(call PKG_PATCHES,$*), \ - $(call IMPORT_PATCH,$*,$(PKG_PATCH))), \ - $(error $(call GIT_DIR,$*) does not exist)), \ - $(error Package $* not found in index.html)) - -define EXPORT_PATCH - cd '$(call GIT_DIR,$(1))' \ - && ( \ - echo 'This file is part of MXE.'; \ - echo 'See index.html for further information.'; \ - echo ''; \ - echo 'Contains ad hoc patches for cross building.'; \ - echo ''; \ - $(call GIT_CMD,$(1)) format-patch \ - --no-numbered \ - -p \ - --no-signature \ - --stdout \ - --text \ - dist..HEAD \ - | sed 's/^From [0-9a-f]\{40\} /From 0000000000000000000000000000000000000000 /' \ - | sed 's/^index .......\.\......../index 1111111..2222222/' \ - ) > '$(PATCH_BY_NAME)' -endef - -export-patch-%: - $(if $(call set_is_member,$*,$(PKGS)), \ - $(if $(wildcard $(call GIT_DIR,$*)), \ - $(call EXPORT_PATCH,$*,$(PATCH_NAME)), \ - $(error $(call GIT_DIR,$*) does not exist)), \ - $(error Package $* not found in index.html)) +include patch.mk diff --git a/patch.mk b/patch.mk new file mode 100644 index 00000000..87c72d00 --- /dev/null +++ b/patch.mk @@ -0,0 +1,87 @@ +# This file is part of MXE. +# See index.html for further information. + +GIT_DIR = $(if $(patsubst .,,$($(1)_SUBDIR)) \ + ,$(GITS_DIR)/$($(1)_SUBDIR),$(GITS_DIR)/$(1)) + +GIT_CMD = git \ + --work-tree='$(call GIT_DIR,$(1))' \ + --git-dir='$(call GIT_DIR,$(1))'/.git + +PATCH_NAME = 1-fixes + +# can't use PKG_PATCHES here, because it returns existing patches +# while export-patch creates new patch +PATCH_BY_NAME = $(patsubst %.mk,%-$(2).patch,$(PKG_MAKEFILES)) + +define INIT_GIT + # unpack to gits/tmp/pkg + rm -rf '$(GITS_DIR)/tmp' + mkdir -p '$(GITS_DIR)/tmp/$(1)' + cd '$(GITS_DIR)/tmp/$(1)' && $(call UNPACK_PKG_ARCHIVE,$(1)) + # if PKG_SUBDIR is ".", the following will move gits/tmp/pkg + mv '$(abspath $(GITS_DIR)/tmp/$(1)/$($(1)_SUBDIR))' '$(call GIT_DIR,$(1))' + rm -rf '$(GITS_DIR)/tmp' + # initialize git + $(call GIT_CMD,$(1)) init + $(call GIT_CMD,$(1)) add -A + $(call GIT_CMD,$(1)) commit -m "init" + $(call GIT_CMD,$(1)) tag dist +endef + +define IMPORT_PATCH + cd '$(call GIT_DIR,$(1))' \ + && cat '$(2)' \ + | sed '/^From/,$$ !d' \ + | sed s/'^From: MXE'/"From: fix@me"/'g;' \ + | $(call GIT_CMD,$(1)) am --keep-cr ; +endef + +define EXPORT_PATCH + cd '$(call GIT_DIR,$(1))' \ + && ( \ + echo 'This file is part of MXE.'; \ + echo 'See index.html for further information.'; \ + echo ''; \ + echo 'Contains ad hoc patches for cross building.'; \ + echo ''; \ + $(call GIT_CMD,$(1)) format-patch \ + --no-numbered \ + -p \ + --no-signature \ + --stdout \ + --text \ + dist..HEAD \ + | sed 's/^From [0-9a-f]\{40\} /From 0000000000000000000000000000000000000000 /' \ + | sed 's/^index .......\.\......../index 1111111..2222222/' \ + ) > '$(PATCH_BY_NAME)' +endef + +init-git-%: download-only-% + $(if $(call set_is_member,$*,$(PKGS)), \ + $(if $(wildcard $(call GIT_DIR,$*)), \ + $(error $(call GIT_DIR,$*) already exists), \ + $(call INIT_GIT,$*)), \ + $(error Package $* not found in index.html)) + +import-patch-%: + $(if $(call set_is_member,$*,$(PKGS)), \ + $(if $(wildcard $(call GIT_DIR,$*)), \ + $(call IMPORT_PATCH,$*,$(call PATCH_BY_NAME,$*,$(PATCH_NAME))), \ + $(error $(call GIT_DIR,$*) does not exist)), \ + $(error Package $* not found in index.html)) + +import-all-patches-%: + $(if $(call set_is_member,$*,$(PKGS)), \ + $(if $(wildcard $(call GIT_DIR,$*)), \ + $(foreach PKG_PATCH,$(call PKG_PATCHES,$*), \ + $(call IMPORT_PATCH,$*,$(PKG_PATCH))), \ + $(error $(call GIT_DIR,$*) does not exist)), \ + $(error Package $* not found in index.html)) + +export-patch-%: + $(if $(call set_is_member,$*,$(PKGS)), \ + $(if $(wildcard $(call GIT_DIR,$*)), \ + $(call EXPORT_PATCH,$*,$(PATCH_NAME)), \ + $(error $(call GIT_DIR,$*) does not exist)), \ + $(error Package $* not found in index.html)) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index e9e7287d..7cd853f1 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -800,6 +800,7 @@ local function makeMxeSourcePackage() 'CNAME', 'LICENSE.md', 'Makefile', + 'patch.mk', 'README.md', 'assets', 'doc', From 0edd0899ba948fc2ce775d257eb35c6efc3347f7 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Thu, 7 Jan 2016 16:42:14 +0300 Subject: [PATCH 0320/1463] patch-tool-mxe: add "-M9" to git format-patch See https://github.com/mxe/mxe/pull/1131#issuecomment-168547049 --- patch.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/patch.mk b/patch.mk index 87c72d00..c67e7b39 100644 --- a/patch.mk +++ b/patch.mk @@ -51,6 +51,7 @@ define EXPORT_PATCH --no-signature \ --stdout \ --text \ + -M9 \ dist..HEAD \ | sed 's/^From [0-9a-f]\{40\} /From 0000000000000000000000000000000000000000 /' \ | sed 's/^index .......\.\......../index 1111111..2222222/' \ From dbe12929de6abbcc335f2b48bc7a2511bbb2722f Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Thu, 7 Jan 2016 02:20:33 +0300 Subject: [PATCH 0321/1463] pcre: enable C++ Application EiskaltDC++ requires pcre with C++ support. See https://github.com/mxe/mxe/pull/1127#issuecomment-169418284 --- src/pcre.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pcre.mk b/src/pcre.mk index 41c16081..2a8e9c65 100644 --- a/src/pcre.mk +++ b/src/pcre.mk @@ -23,7 +23,7 @@ define $(PKG)_BUILD_SHARED --enable-pcre16 \ --enable-utf \ --enable-unicode-properties \ - --disable-cpp \ + --enable-cpp \ --disable-pcregrep-libz \ --disable-pcregrep-libbz2 \ --disable-pcretest-libreadline From e1f3dc02f6b4f2be5d83202d98833c98cfc461a4 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Fri, 8 Jan 2016 16:22:12 +0300 Subject: [PATCH 0322/1463] update taglib from 1.7.2 to 1.10 Remove the patch which should be in upstream [1]. The project was moved to GitHub [2]. [1] https://bugs.kde.org/show_bug.cgi?id=268441 [2] http://lists.nongnu.org/archive/html/mingw-cross-env-list/2016-01/msg00001.html --- src/taglib-1-static.patch | 23 ----------------------- src/taglib.mk | 10 ++++------ 2 files changed, 4 insertions(+), 29 deletions(-) delete mode 100644 src/taglib-1-static.patch diff --git a/src/taglib-1-static.patch b/src/taglib-1-static.patch deleted file mode 100644 index 8a3d6b11..00000000 --- a/src/taglib-1-static.patch +++ /dev/null @@ -1,23 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -This patch has been taken from: -https://bugs.kde.org/show_bug.cgi?id=268441 - -diff --git a/bindings/c/CMakeLists.txt b/bindings/c/CMakeLists.txt -index 79c7a6b..fa4056d 100644 ---- a/bindings/c/CMakeLists.txt -+++ b/bindings/c/CMakeLists.txt -@@ -19,9 +19,11 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib_c.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc ) - ########### next target ############### - --ADD_LIBRARY(tag_c SHARED tag_c.cpp) - if(ENABLE_STATIC) -+ add_library(tag_c STATIC tag_c.cpp) - set_target_properties(tag_c PROPERTIES COMPILE_DEFINITIONS TAGLIB_STATIC) -+else(ENABLE_STATIC) -+ add_library(tag_c SHARED tag_c.cpp) - endif(ENABLE_STATIC) - - TARGET_LINK_LIBRARIES(tag_c tag ) diff --git a/src/taglib.mk b/src/taglib.mk index 3501d0af..8962a7f2 100644 --- a/src/taglib.mk +++ b/src/taglib.mk @@ -3,17 +3,15 @@ PKG := taglib $(PKG)_IGNORE := -$(PKG)_VERSION := 1.7.2 -$(PKG)_CHECKSUM := 38f7e5283b594021b28426a61339cffbf2d503b450338b02f651fab1b0b42899 +$(PKG)_VERSION := 1.10 +$(PKG)_CHECKSUM := 24c32d50042cb0ddf162eb263f8ac75c5a158e12bf32ed534c1d5c71ee369baa $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://developer.kde.org/~wheeler/files/src/$($(PKG)_FILE) +$(PKG)_URL := http://taglib.github.io/releases/$($(PKG)_FILE) $(PKG)_DEPS := gcc zlib define $(PKG)_UPDATE - $(WGET) -q -O- 'http://developer.kde.org/~wheeler/files/src/?C=M;O=D' | \ - $(SED) -n 's,.*"taglib-\([0-9][^"]*\)\.tar.*,\1,p' | \ - head -1 + $(call MXE_GET_GITHUB_TAGS, taglib/taglib, v) endef define $(PKG)_BUILD From c827bc7ccbe9f37da1a1c90aa8dbad52f80eb67d Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 9 Jan 2016 09:54:12 +1100 Subject: [PATCH 0323/1463] taglib: enable shared tested on all four targets --- src/taglib.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/taglib.mk b/src/taglib.mk index 8962a7f2..66fcc00e 100644 --- a/src/taglib.mk +++ b/src/taglib.mk @@ -18,8 +18,6 @@ define $(PKG)_BUILD mkdir '$(1)/build' cd '$(1)/build' && cmake .. \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ - -DENABLE_STATIC=ON + -DENABLE_STATIC=$(CMAKE_STATIC_BOOL) $(MAKE) -C '$(1)/build' -j '$(JOBS)' install endef - -$(PKG)_BUILD_SHARED = From d27ff9c3b83086bb37ef00a56f1f3a5bdd11ae92 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sat, 9 Jan 2016 00:10:00 +0000 Subject: [PATCH 0324/1463] Update versions.json & build-matrix.html --- build-matrix.html | 10 +++++----- versions.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index e871f331..658ba904 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -3529,11 +3529,11 @@ feel free to submit a pull request. taglib - 1.7.2 + 1.10 + ✓ + ✓ ✓ - ✗ ✓ - ✗ ✗ @@ -3954,9 +3954,9 @@ Total: 382 +4 native-only) 379 -274 +275 360 -272 +273 11 diff --git a/versions.json b/versions.json index e33bf45c..f8e07ede 100644 --- a/versions.json +++ b/versions.json @@ -348,7 +348,7 @@ "sqlite": "3100000", "suitesparse": "4.2.1", "t4k_common": "0.1.1", - "taglib": "1.7.2", + "taglib": "1.10", "tclap": "1.2.1", "teem": "1.11.0", "termcap": "1.3.1", From 67c21345294df5cb4f74bdac5021c20cb8241ffa Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 9 Jan 2016 16:44:50 +1100 Subject: [PATCH 0325/1463] doc/gmsl.html: update from cvs version in tarball is incorrect, no change to other files fixes #1154 --- doc/gmsl.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/gmsl.html b/doc/gmsl.html index 28fd58d9..494d7f35 100644 --- a/doc/gmsl.html +++ b/doc/gmsl.html @@ -22,7 +22,7 @@ include the GMSL in your Makefile do
    you have the right version of gmsl use the gmsl_compatible function (see -below). The current version is 1 1 6.
    +below). The current version is 1 1 7.

    The GMSL package also includes a test suite for GMSL.  Just run make -f gmsl-tests.

    Logical Operators

    GMSL has boolean $(true) (a non-empty string) From 7ce44c1a67827bc24fa2345c799c349b69772ef9 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Fri, 8 Jan 2016 11:03:59 +0100 Subject: [PATCH 0326/1463] gnutls: update --- src/gnutls-1-fixes.patch | 27 --------------------------- src/gnutls.mk | 4 ++-- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/src/gnutls-1-fixes.patch b/src/gnutls-1-fixes.patch index a79b2955..e2be04af 100644 --- a/src/gnutls-1-fixes.patch +++ b/src/gnutls-1-fixes.patch @@ -57,30 +57,3 @@ index b126c30..a97d445 100644 2.5.0 -From 46316cbe2097bfebc0681819ae11df4b77a1315d Mon Sep 17 00:00:00 2001 -From: Nikos Mavrogiannopoulos -Date: Tue, 24 Nov 2015 12:54:32 +0100 -Subject: [PATCH 3/3] tools: don't call endservent in windows - - -diff --git a/src/socket.c b/src/socket.c -index 8991089..be8a4a1 100644 ---- a/src/socket.c -+++ b/src/socket.c -@@ -33,8 +33,11 @@ - #include - #include - #ifndef _WIN32 --#include --#include -+# include -+# include -+#else -+# undef endservent -+# define endservent() - #endif - #include - #include --- -2.5.0 - diff --git a/src/gnutls.mk b/src/gnutls.mk index d0708e2c..456314da 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -2,8 +2,8 @@ # See index.html for further information. PKG := gnutls -$(PKG)_VERSION := 3.4.7 -$(PKG)_CHECKSUM := c1be9e4b30295d7b5f96fa332c6a908e6fa2254377b67811301fca92eb882e5a +$(PKG)_VERSION := 3.4.8 +$(PKG)_CHECKSUM := e07c05dea525c6bf0dd8017fc5b89d886954f04fedf457ecd1ce488ac3b86ab7 $(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION) $(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://mirrors.dotsrc.org/gnupg/gnutls/v3.4/$($(PKG)_FILE) From b4ad5b87baa697e14251318ca9340d3301e41c4a Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sat, 9 Jan 2016 20:37:47 +0000 Subject: [PATCH 0327/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 658ba904..563a6b73 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -839,7 +839,7 @@ feel free to submit a pull request. gnutls - 3.4.7 + 3.4.8 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index f8e07ede..4a09faf3 100644 --- a/versions.json +++ b/versions.json @@ -79,7 +79,7 @@ "glib": "2.44.1", "glibmm": "2.42.0", "gmp": "6.1.0", - "gnutls": "3.4.7", + "gnutls": "3.4.8", "graphicsmagick": "1.3.21", "gsl": "1.16", "gsoap": "2.8.22", From b39f6d2b78c98a00980601fdb735b150d0fe8a92 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 10 Jan 2016 02:50:13 +0300 Subject: [PATCH 0328/1463] nsis: unify patch $ ./tools/patch-tool-mxe init nsis $ ./tools/patch-tool-mxe import nsis $ ./tools/patch-tool-mxe export nsis --- src/nsis-1-fixes.patch | 71 ++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 41 deletions(-) diff --git a/src/nsis-1-fixes.patch b/src/nsis-1-fixes.patch index ce535242..1fd99d9c 100644 --- a/src/nsis-1-fixes.patch +++ b/src/nsis-1-fixes.patch @@ -1,16 +1,18 @@ This file is part of MXE. See index.html for further information. -From 1cc3dd0dfd47bab82e06be916f9e57ef783406f9 Mon Sep 17 00:00:00 2001 +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sun, 12 Aug 2012 12:33:26 +0200 -Subject: [PATCH 1/4] explicit mingw cross prefix +Subject: [PATCH] explicit mingw cross prefix This patch has been taken from: http://sourceforge.net/tracker/index.php?func=detail&aid=3305366&group_id=22049&atid=373085 diff --git a/SCons/Tools/crossmingw.py b/SCons/Tools/crossmingw.py -index d27e01c..fef9150 100755 +index 1111111..2222222 100755 --- a/SCons/Tools/crossmingw.py +++ b/SCons/Tools/crossmingw.py @@ -61,6 +61,9 @@ prefixes = SCons.Util.Split(""" @@ -24,7 +26,7 @@ index d27e01c..fef9150 100755 # First search in the SCons path and then the OS path: if env.WhereIs(prefix + 'gcc') or SCons.Util.WhereIs(prefix + 'gcc'): diff --git a/SConstruct b/SConstruct -index 80872bc..4f113dd 100755 +index 1111111..2222222 100755 --- a/SConstruct +++ b/SConstruct @@ -59,6 +59,7 @@ doc = [ @@ -44,18 +46,15 @@ index 80872bc..4f113dd 100755 Export('defenv') --- -2.1.0 - -From 7df0fa80a65279ee7d99da8ec6abdddff7e040b0 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: freeman Date: Sun, 12 Aug 2012 12:36:39 +0200 -Subject: [PATCH 2/4] add missing header +Subject: [PATCH] add missing header diff --git a/Source/util.h b/Source/util.h -index 4259a6a..664923e 100755 +index 1111111..2222222 100755 --- a/Source/util.h +++ b/Source/util.h @@ -25,6 +25,7 @@ @@ -66,20 +65,17 @@ index 4259a6a..664923e 100755 #endif --- -2.1.0 - -From 9a40694c9177db6fa5db3f28d7d68c042d0a6144 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Fri, 3 May 2013 17:28:44 +1000 -Subject: [PATCH 3/4] Enable native 64-bit build +Subject: [PATCH] Enable native 64-bit build Taken from: http://anonscm.debian.org/gitweb/?p=collab-maint/nsis.git;a=blob;f=debian/patches/makensis_native_64bit.patch;h=2256a0e193db894dd99507ac0de66f8ae060b46b;hb=HEAD diff --git a/SCons/Config/gnu b/SCons/Config/gnu -index a1f917f..adfcbd1 100755 +index 1111111..2222222 100755 --- a/SCons/Config/gnu +++ b/SCons/Config/gnu @@ -95,8 +95,6 @@ makensis_env.Append(CXXFLAGS = ['-Wno-non-virtual-dtor']) # ignore virtual dtor @@ -110,7 +106,7 @@ index a1f917f..adfcbd1 100755 ### weird GCC requirements diff --git a/Source/DialogTemplate.cpp b/Source/DialogTemplate.cpp -index 109a1d7..f821a05 100755 +index 1111111..2222222 100755 --- a/Source/DialogTemplate.cpp +++ b/Source/DialogTemplate.cpp @@ -74,7 +74,7 @@ void ReadVarLenArr(LPBYTE &seeker, WCHAR* &readInto, unsigned int uCodePage) { @@ -166,7 +162,7 @@ index 109a1d7..f821a05 100755 // DONE! return pbDlg; diff --git a/Source/Platform.h b/Source/Platform.h -index 52eb9bc..3cdfe32 100755 +index 1111111..2222222 100755 --- a/Source/Platform.h +++ b/Source/Platform.h @@ -53,6 +53,7 @@ typedef unsigned char UCHAR; @@ -229,7 +225,7 @@ index 52eb9bc..3cdfe32 100755 // shell folders diff --git a/Source/Plugins.cpp b/Source/Plugins.cpp -index 6872b28..90ad393 100755 +index 1111111..2222222 100755 --- a/Source/Plugins.cpp +++ b/Source/Plugins.cpp @@ -29,7 +29,7 @@ @@ -253,7 +249,7 @@ index 6872b28..90ad393 100755 const string name = string((char*)exports + FIX_ENDIAN_INT32(names[j]) - ExportDirVA); const string signature = dllName + "::" + name; diff --git a/Source/ResourceEditor.cpp b/Source/ResourceEditor.cpp -index 8509414..b819f4e 100755 +index 1111111..2222222 100755 --- a/Source/ResourceEditor.cpp +++ b/Source/ResourceEditor.cpp @@ -27,20 +27,10 @@ using namespace std; @@ -386,7 +382,7 @@ index 8509414..b819f4e 100755 else { m_bHasName = true; diff --git a/Source/ResourceEditor.h b/Source/ResourceEditor.h -index 59def2e..d25be31 100755 +index 1111111..2222222 100755 --- a/Source/ResourceEditor.h +++ b/Source/ResourceEditor.h @@ -27,7 +27,7 @@ @@ -435,7 +431,7 @@ index 59def2e..d25be31 100755 private: BYTE* m_pbData; diff --git a/Source/ResourceVersionInfo.cpp b/Source/ResourceVersionInfo.cpp -index 71df19e..7ed0ccf 100755 +index 1111111..2222222 100755 --- a/Source/ResourceVersionInfo.cpp +++ b/Source/ResourceVersionInfo.cpp @@ -146,7 +146,7 @@ int GetVersionHeader (LPSTR &p, WORD &wLength, WORD &wValueLength, WORD &wType) @@ -448,7 +444,7 @@ index 71df19e..7ed0ccf 100755 return p - baseP; } diff --git a/Source/fileform.cpp b/Source/fileform.cpp -index 72296ba..e879ad5 100755 +index 1111111..2222222 100755 --- a/Source/fileform.cpp +++ b/Source/fileform.cpp @@ -149,7 +149,7 @@ void ctlcolors_writer::write(const ctlcolors *data) @@ -461,7 +457,7 @@ index 72296ba..e879ad5 100755 m_sink->write_int(data->flags); } diff --git a/Source/mmap.cpp b/Source/mmap.cpp -index 1e0be7a..562a7ed 100755 +index 1111111..2222222 100755 --- a/Source/mmap.cpp +++ b/Source/mmap.cpp @@ -322,7 +322,7 @@ void MMapFile::release(void *pView, int size) @@ -474,7 +470,7 @@ index 1e0be7a..562a7ed 100755 size += alignment; #ifdef _WIN32 diff --git a/Source/script.cpp b/Source/script.cpp -index a492051..2951d98 100755 +index 1111111..2222222 100755 --- a/Source/script.cpp +++ b/Source/script.cpp @@ -2129,7 +2129,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line) @@ -523,7 +519,7 @@ index a492051..2951d98 100755 ent.offsets[3]=add_string(line.gettoken_str(4)); ent.offsets[4]=which_token == TOK_ENUMREGKEY; diff --git a/Source/util.cpp b/Source/util.cpp -index 2c0b07f..18c31a2 100755 +index 1111111..2222222 100755 --- a/Source/util.cpp +++ b/Source/util.cpp @@ -77,9 +77,9 @@ int update_bitmap(CResourceEditor* re, WORD id, const char* filename, int width/ @@ -581,18 +577,15 @@ index 2c0b07f..18c31a2 100755 { SetLastError( 0 ); return dwResult; --- -2.1.0 - -From eb6e12dd7173f4c259fd31c9074b0c95bc567487 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 9 May 2013 13:08:59 +1000 -Subject: [PATCH 4/4] i686-w64-mingw32 fixes +Subject: [PATCH] i686-w64-mingw32 fixes diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp -index d8303b0..fefc8f8 100755 +index 1111111..2222222 100755 --- a/Contrib/InstallOptions/InstallerOptions.cpp +++ b/Contrib/InstallOptions/InstallerOptions.cpp @@ -13,6 +13,7 @@ @@ -640,7 +633,7 @@ index d8303b0..fefc8f8 100755 for (x = 0; x < bm.bmWidth;) { if ((*bmp & 0xFFFFFF) == keycolor) { diff --git a/Contrib/Makensisw/afxres.h b/Contrib/Makensisw/afxres.h -index d4c5e1f..16b729d 100755 +index 1111111..2222222 100755 --- a/Contrib/Makensisw/afxres.h +++ b/Contrib/Makensisw/afxres.h @@ -1,4 +1,4 @@ @@ -650,7 +643,7 @@ index d4c5e1f..16b729d 100755 #ifndef IDC_STATIC diff --git a/Contrib/Makensisw/makensisw.h b/Contrib/Makensisw/makensisw.h -index beadc3f..1479b2f 100755 +index 1111111..2222222 100755 --- a/Contrib/Makensisw/makensisw.h +++ b/Contrib/Makensisw/makensisw.h @@ -22,7 +22,7 @@ @@ -663,7 +656,7 @@ index beadc3f..1479b2f 100755 #include #include "utils.h" diff --git a/Source/SConscript b/Source/SConscript -index 505e438..f9aee9d 100755 +index 1111111..2222222 100755 --- a/Source/SConscript +++ b/Source/SConscript @@ -71,7 +71,7 @@ AddAvailableLibs(env, libs) @@ -676,7 +669,7 @@ index 505e438..f9aee9d 100755 ##### Set PCH diff --git a/Source/exehead/SConscript b/Source/exehead/SConscript -index bebdd54..2f4e490 100755 +index 1111111..2222222 100755 --- a/Source/exehead/SConscript +++ b/Source/exehead/SConscript @@ -53,7 +53,7 @@ Import('env compression solid_compression') @@ -689,7 +682,7 @@ index bebdd54..2f4e490 100755 ### Some other settings diff --git a/Source/util.cpp b/Source/util.cpp -index 18c31a2..fc9443f 100755 +index 1111111..2222222 100755 --- a/Source/util.cpp +++ b/Source/util.cpp @@ -1,15 +1,15 @@ @@ -771,7 +764,3 @@ index 18c31a2..fc9443f 100755 { return GetVxdVersion( szFile, &dwLen, lpData ); } --- -2.1.0 - - From 1016805d4111808c58202900583721685937aba4 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 10 Jan 2016 02:58:40 +0300 Subject: [PATCH 0329/1463] nsis: remove patches fixing whitespace errors --- src/nsis-1-fixes.patch | 110 ----------------------------------------- 1 file changed, 110 deletions(-) diff --git a/src/nsis-1-fixes.patch b/src/nsis-1-fixes.patch index 1fd99d9c..a0407bc4 100644 --- a/src/nsis-1-fixes.patch +++ b/src/nsis-1-fixes.patch @@ -596,15 +596,6 @@ index 1111111..2222222 100755 #include // nsis plugin -@@ -149,7 +150,7 @@ struct FieldType { - int nField; // field number in INI file - char *pszHwndEntry; // "HWND" or "HWND2" - -- long wndProc; -+ long wndProc; - }; - - // initial buffer size. buffers will grow as required. @@ -759,7 +760,7 @@ BOOL CALLBACK cfgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) DrawText(lpdis->hDC, pField->pszText, -1, &rc, DT_VCENTER | DT_WORDBREAK | DT_CALCRECT); @@ -614,24 +605,6 @@ index 1111111..2222222 100755 // Move rect to right if in RTL mode if (bRTL) -@@ -877,7 +878,7 @@ int WINAPI NumbersOnlyPasteWndProc(HWND hWin, UINT uMsg, WPARAM wParam, LPARAM l - if (OpenClipboard(hWin)) - { - HGLOBAL hData = GetClipboardData(CF_TEXT); -- -+ - if (hData) - { - char *lpData = (char *) GlobalLock(hData); -@@ -1346,7 +1347,7 @@ int WINAPI createCfgDlg() - - int keycolor = *bmp & 0xFFFFFF; - -- // Search for transparent pixels -+ // Search for transparent pixels - for (y = bm.bmHeight - 1; y >= 0; y--) { - for (x = 0; x < bm.bmWidth;) { - if ((*bmp & 0xFFFFFF) == keycolor) { diff --git a/Contrib/Makensisw/afxres.h b/Contrib/Makensisw/afxres.h index 1111111..2222222 100755 --- a/Contrib/Makensisw/afxres.h @@ -681,86 +654,3 @@ index 1111111..2222222 100755 ### Some other settings -diff --git a/Source/util.cpp b/Source/util.cpp -index 1111111..2222222 100755 ---- a/Source/util.cpp -+++ b/Source/util.cpp -@@ -1,15 +1,15 @@ - /* - * util.cpp -- * -+ * - * This file is a part of NSIS. -- * -+ * - * Copyright (C) 1999-2009 Nullsoft and Contributors -- * -+ * - * Licensed under the zlib/libpng license (the "License"); - * you may not use this file except in compliance with the License. -- * -+ * - * Licence details can be found in the file COPYING. -- * -+ * - * This software is provided 'as-is', without any express or implied - * warranty. - */ -@@ -616,7 +616,7 @@ typedef struct _VXD_VERSION_RESOURCE { - } VXD_VERSION_RESOURCE, *PVXD_VERSION_RESOURCE; - #pragma pack( pop, pre_vxd_ver ) - --static BOOL GetVxdVersion( LPCSTR szFile, LPDWORD lpdwLen, LPVOID lpData ) -+static BOOL GetVxdVersion( LPCSTR szFile, LPDWORD lpdwLen, LPVOID lpData ) - { - - HANDLE hFile = NULL; -@@ -673,7 +673,7 @@ static BOOL GetVxdVersion( LPCSTR szFile, LPDWORD lpdwLen, LPVOID lpData ) - pDosExeHdr = (PIMAGE_DOS_HEADER) pView; - - // Check to make sure the file has a DOS EXE header. -- if ( pDosExeHdr->e_magic != IMAGE_DOS_SIGNATURE ) -+ if ( pDosExeHdr->e_magic != IMAGE_DOS_SIGNATURE ) - { - if ( pView ) - UnmapViewOfFile( pView ); -@@ -693,7 +693,7 @@ static BOOL GetVxdVersion( LPCSTR szFile, LPDWORD lpdwLen, LPVOID lpData ) - + pDosExeHdr->e_lfanew ); - - // Check to make sure the file is a VxD. -- if ( (DWORD) pNtExeHdr->Signature != IMAGE_VXD_SIGNATURE ) -+ if ( (DWORD) pNtExeHdr->Signature != IMAGE_VXD_SIGNATURE ) - { - if ( pView ) - UnmapViewOfFile( pView ); -@@ -769,18 +769,18 @@ static BOOL GetVxdVersion( LPCSTR szFile, LPDWORD lpdwLen, LPVOID lpData ) - return TRUE; - } - --static DWORD GetVxdVersionInfoSize( LPCSTR szFile ) -+static DWORD GetVxdVersionInfoSize( LPCSTR szFile ) - { - DWORD dwResult = 0; - - // Call GetVxdVersion() with NULL for the pointer to the buffer. -- if ( !GetVxdVersion( szFile, &dwResult, NULL ) ) -+ if ( !GetVxdVersion( szFile, &dwResult, NULL ) ) - { - DWORD dwError = GetLastError(); - - // GetVxdVersion() will fail with ERROR_INSUFFICIENT_BUFFER and - // the required buffer size will be returned in dwResult. -- if ( dwError == ERROR_INSUFFICIENT_BUFFER ) -+ if ( dwError == ERROR_INSUFFICIENT_BUFFER ) - { - SetLastError( 0 ); - return dwResult; -@@ -791,7 +791,7 @@ static DWORD GetVxdVersionInfoSize( LPCSTR szFile ) - return 0; - } - --static BOOL GetVxdVersionInfo( LPCSTR szFile, DWORD dwLen, LPVOID lpData ) -+static BOOL GetVxdVersionInfo( LPCSTR szFile, DWORD dwLen, LPVOID lpData ) - { - return GetVxdVersion( szFile, &dwLen, lpData ); - } From c16137170db90d48749d2d59f6241f9b8ae410c1 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 10 Jan 2016 03:03:55 +0300 Subject: [PATCH 0330/1463] fix nsis updater --- src/nsis.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/nsis.mk b/src/nsis.mk index 113b8b47..94bf5dda 100644 --- a/src/nsis.mk +++ b/src/nsis.mk @@ -11,9 +11,8 @@ $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/nsis/NSIS 2/$($(PKG)_VER $(PKG)_DEPS := gcc define $(PKG)_UPDATE - $(WGET) -q -O- 'http://sourceforge.net/p/nsis/code/HEAD/tree/NSIS/tags/' | \ - grep ' Date: Sun, 10 Jan 2016 03:05:37 +0300 Subject: [PATCH 0331/1463] nsis: update from 2.46 to 2.50 --- src/nsis.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nsis.mk b/src/nsis.mk index 94bf5dda..07c576c9 100644 --- a/src/nsis.mk +++ b/src/nsis.mk @@ -3,8 +3,8 @@ PKG := nsis $(PKG)_IGNORE := -$(PKG)_VERSION := 2.46 -$(PKG)_CHECKSUM := f5f9e5e22505e44b25aea14fe17871c1ed324c1f3cc7a753ef591f76c9e8a1ae +$(PKG)_VERSION := 2.50 +$(PKG)_CHECKSUM := 3fb674cb75e0237ef6b7c9e8a8e8ce89504087a6932c5d2e26764d4220a89848 $(PKG)_SUBDIR := nsis-$($(PKG)_VERSION)-src $(PKG)_FILE := nsis-$($(PKG)_VERSION)-src.tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/nsis/NSIS 2/$($(PKG)_VERSION)/$($(PKG)_FILE) From 0f64a5a138802bbabbc7d8e4129a9bbfadc8b236 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sun, 10 Jan 2016 01:09:59 +0000 Subject: [PATCH 0332/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 563a6b73..80785f8a 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -2339,7 +2339,7 @@ feel free to submit a pull request. nsis - 2.46 + 2.50 ✓ ✓ ✗ diff --git a/versions.json b/versions.json index 4a09faf3..14ee5144 100644 --- a/versions.json +++ b/versions.json @@ -229,7 +229,7 @@ "netpbm": "10.35.96", "nettle": "3.1", "nlopt": "2.4.2", - "nsis": "2.46", + "nsis": "2.50", "ocaml-cairo": "1.2.0", "ocaml-camlimages": "4.0.1", "ocaml-core": "4.00.1", From 31e57014bca7c5a8e9896b5689001efa78ab009e Mon Sep 17 00:00:00 2001 From: Rashad Kanavath Date: Sun, 10 Jan 2016 21:05:07 +1100 Subject: [PATCH 0333/1463] gdal: install pkg-config and data files, add test using pkg-config --- src/gdal-test.c | 23 +++++++++++++++++++++++ src/gdal.mk | 9 +++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 src/gdal-test.c diff --git a/src/gdal-test.c b/src/gdal-test.c new file mode 100644 index 00000000..d6a8c8ea --- /dev/null +++ b/src/gdal-test.c @@ -0,0 +1,23 @@ +/* + * This file is part of MXE. + * See index.html for further information. + */ + +#include "gdal.h" +#include "cpl_conv.h" /* for CPLMalloc() */ +int main() +{ + GDALDatasetH hDataset; + GDALAllRegister(); + hDataset = GDALOpen( "/tmp/test.img", GA_ReadOnly ); + if( hDataset == NULL ) + { + + } + else + { + GDALClose( hDataset ); + } + + return 0; +} diff --git a/src/gdal.mk b/src/gdal.mk index e927ecf6..fe06fd27 100644 --- a/src/gdal.mk +++ b/src/gdal.mk @@ -78,8 +78,8 @@ define $(PKG)_BUILD CXXFLAGS='-D_WIN32_WINNT=0x0600' \ LIBS="-ljpeg -lsecur32 -lportablexdr `'$(TARGET)-pkg-config' --libs openssl libtiff-4`" - $(MAKE) -C '$(1)' -j '$(JOBS)' lib-target - $(MAKE) -C '$(1)' -j '$(JOBS)' install-lib + $(MAKE) -C '$(1)' -j '$(JOBS)' lib-target gdal.pc + $(MAKE) -C '$(1)' -j '$(JOBS)' install-actions $(MAKE) -C '$(1)/port' -j '$(JOBS)' install $(MAKE) -C '$(1)/gcore' -j '$(JOBS)' install $(MAKE) -C '$(1)/frmts' -j '$(JOBS)' install @@ -87,4 +87,9 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)/ogr' -j '$(JOBS)' install OGR_ENABLED= $(MAKE) -C '$(1)/apps' -j '$(JOBS)' install ln -sf '$(PREFIX)/$(TARGET)/bin/gdal-config' '$(PREFIX)/bin/$(TARGET)-gdal-config' + + '$(TARGET)-gcc' -Wall \ + '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-gdal.exe' \ + `'$(TARGET)-pkg-config' --cflags --libs gdal` + endef From 513096f06ec35a4c9fcdb1d7941a05f78883d1bb Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sat, 9 Jan 2016 22:41:25 +0300 Subject: [PATCH 0334/1463] add native builds for upx, ucl, zlib fix #988 --- src/lzma.mk | 4 ++++ src/ucl.mk | 2 ++ src/upx.mk | 18 ++++++++++++++++++ src/zlib.mk | 2 ++ 4 files changed, 26 insertions(+) diff --git a/src/lzma.mk b/src/lzma.mk index 239ae39c..fc565d29 100644 --- a/src/lzma.mk +++ b/src/lzma.mk @@ -9,6 +9,8 @@ $(PKG)_SUBDIR := . $(PKG)_FILE := lzma$(subst .,,$($(PKG)_VERSION)).tar.bz2 $(PKG)_URL := http://www.7-zip.org/a/$($(PKG)_FILE) $(PKG)_DEPS := gcc +$(PKG)_DEPS_$(BUILD) := +$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) define $(PKG)_UPDATE $(WGET) -q -O- 'http://www.7-zip.org/sdk.html' | \ @@ -40,3 +42,5 @@ define $(PKG)_BUILD cp '$(1)/CPP/7zip/Bundles/LzmaCon/lzma.exe' \ '$(PREFIX)/$(TARGET)/bin/lzma-cxx.exe' endef + +$(PKG)_BUILD_$(BUILD) := diff --git a/src/ucl.mk b/src/ucl.mk index d374a2fa..020c5754 100644 --- a/src/ucl.mk +++ b/src/ucl.mk @@ -9,6 +9,8 @@ $(PKG)_SUBDIR := ucl-$($(PKG)_VERSION) $(PKG)_FILE := ucl-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.oberhumer.com/opensource/ucl/download/$($(PKG)_FILE) $(PKG)_DEPS := gcc +$(PKG)_DEPS_$(BUILD) := +$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) define $(PKG)_UPDATE $(WGET) -q -O- 'http://www.oberhumer.com/opensource/ucl/' | \ diff --git a/src/upx.mk b/src/upx.mk index 4b86d427..db6ad76d 100644 --- a/src/upx.mk +++ b/src/upx.mk @@ -9,6 +9,8 @@ $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)-src $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION)-src.tar.bz2 $(PKG)_URL := http://upx.sourceforge.net/download/$($(PKG)_FILE) $(PKG)_DEPS := gcc ucl zlib lzma +$(PKG)_DEPS_$(BUILD) := ucl zlib lzma +$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) define $(PKG)_UPDATE $(WGET) -q -O- 'http://upx.sourceforge.net/' | \ @@ -32,3 +34,19 @@ define $(PKG)_BUILD 'exeext=.exe' cp '$(1)/src/upx.exe' '$(PREFIX)/$(TARGET)/bin/' endef + +define $(PKG)_BUILD_$(BUILD) + $(call PREPARE_PKG_SOURCE,ucl,$(1)) + mkdir '$(1)/lzma' + $(call PREPARE_PKG_SOURCE,lzma,$(1)/lzma) + UPX_UCLDIR='$(1)/$(ucl_SUBDIR)' \ + UPX_LZMADIR='$(1)/lzma' \ + UPX_LZMA_VERSION=0x$(subst .,,$(lzma_VERSION)) \ + $(MAKE) -C '$(1)' -j '$(JOBS)' all \ + 'CXX=$(BUILD_CXX)' \ + 'CC=$(BUILD_CC)' \ + 'PKG_CONFIG=$(PREFIX)/$(BUILD)/bin/pkgconf' \ + 'LIBS=-L$(PREFIX)/$(BUILD)/lib -lucl -lz' \ + 'exeext=' + cp '$(1)/src/upx' '$(PREFIX)/$(BUILD)/bin/' +endef diff --git a/src/zlib.mk b/src/zlib.mk index 860709c1..a2626fc3 100644 --- a/src/zlib.mk +++ b/src/zlib.mk @@ -10,6 +10,8 @@ $(PKG)_FILE := zlib-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://zlib.net/$($(PKG)_FILE) $(PKG)_URL_2 := http://$(SOURCEFORGE_MIRROR)/project/libpng/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc +$(PKG)_DEPS_$(BUILD) := +$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) define $(PKG)_UPDATE $(WGET) -q -O- 'http://zlib.net/' | \ From cc4509ccea306af798a5dda0b4715e4f986c90c0 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sun, 10 Jan 2016 12:29:03 +1100 Subject: [PATCH 0335/1463] upx: fix unused-local-typedef errors on OSX resulting executable works and compresses fine --- src/upx.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/src/upx.mk b/src/upx.mk index db6ad76d..205ae8f7 100644 --- a/src/upx.mk +++ b/src/upx.mk @@ -47,6 +47,7 @@ define $(PKG)_BUILD_$(BUILD) 'CC=$(BUILD_CC)' \ 'PKG_CONFIG=$(PREFIX)/$(BUILD)/bin/pkgconf' \ 'LIBS=-L$(PREFIX)/$(BUILD)/lib -lucl -lz' \ + $(shell [ `uname -s` == Darwin ] && echo "CXXFLAGS='-Wno-error=unused-local-typedef'") \ 'exeext=' cp '$(1)/src/upx' '$(PREFIX)/$(BUILD)/bin/' endef From 51219d14b85178ce8b23241291b8769737973e7b Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sun, 10 Jan 2016 10:44:05 +0000 Subject: [PATCH 0336/1463] Update versions.json & build-matrix.html --- build-matrix.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 80785f8a..b45fd703 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -2144,7 +2144,7 @@ feel free to submit a pull request. ✓ ✓ ✓ - ✗ + ✓ @@ -3634,7 +3634,7 @@ feel free to submit a pull request. ✓ ✓ ✓ - ✗ + ✓ @@ -3654,7 +3654,7 @@ feel free to submit a pull request. ✓ ✓ ✓ - ✗ + ✓ @@ -3934,7 +3934,7 @@ feel free to submit a pull request. ✓ ✓ ✓ - ✗ + ✓ @@ -3957,7 +3957,7 @@ Total: 382 275 360 273 -11 +15 From a381d9cded1342ea928920e08eff66b211543569 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 9 Jan 2016 11:40:47 +1100 Subject: [PATCH 0337/1463] mxe-activate: update completions and change alias to mxe-make * remove `build-only*` - too low level for general use * add new patch related commands and catch-all completions * `mxe-make` alias is more descriptive --- tools/mxe-activate | 52 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 16 deletions(-) diff --git a/tools/mxe-activate b/tools/mxe-activate index 3d436a56..45c35dd6 100644 --- a/tools/mxe-activate +++ b/tools/mxe-activate @@ -8,7 +8,7 @@ MXE_TRIPLETS=`grep ^MXE_TRIPLETS Makefile | cut -d '=' -f2 | cut -d ' ' -f2- | t MXE_LIB_TYPES=`grep ^MXE_LIB_TYPES Makefile | cut -d '=' -f2 | cut -d ' ' -f2- | tr ' ' ','` MXE_TARGET_LIST=`eval "echo {$MXE_TRIPLETS}.{$MXE_LIB_TYPES}"` -alias mxe='$MAKE -C $MXE_DIR --no-print-directory' +alias mxe-make='$MAKE -C $MXE_DIR --no-print-directory' unset `compgen -e | \ grep -vi '^EDITOR\|^HOME\|^LANG\|MXE\|^PATH' | \ @@ -26,17 +26,6 @@ _mxe() tgts=$MXE_TARGET_LIST case "${cur}" in - build-only-*_*) - local base=`echo ${cur} | $SED -n 's,\(.*_\).*,\1,p'` - local _tgts=$( for x in ${tgts}; do echo $base${x} ; done ) - COMPREPLY=( $(compgen -W "${_tgts}" -- ${cur}) ) - return 0 - ;; - build-only-*) - local _pkgs=$( for x in ${pkgs}; do echo build-only-${x} ; done ) - COMPREPLY=( $(compgen -W "${_pkgs}" -- ${cur}) ) - return 0 - ;; download-*) local _pkgs=$( for x in ${pkgs}; do echo download-${x} ; done ) COMPREPLY=( $(compgen -W "${_pkgs}" -- ${cur}) ) @@ -53,14 +42,45 @@ _mxe() COMPREPLY=( $(compgen -W "${_pkgs}" -- ${cur}) ) return 0 ;; + *-*-*) + local base=`echo ${cur} | $SED -n 's,\(.*-.*-\).*,\1,p'` + local _pkgs=$( for x in ${pkgs}; do echo $base${x} ; done ) + COMPREPLY=( $(compgen -W "${_pkgs}" -- ${cur}) ) + return 0 + ;; + *-*-*-*) + local base=`echo ${cur} | $SED -n 's,\(.*-.*-.*-\).*,\1,p'` + local _pkgs=$( for x in ${pkgs}; do echo $base${x} ; done ) + COMPREPLY=( $(compgen -W "${_pkgs}" -- ${cur}) ) + return 0 + ;; [!-]*) - pkgs+=" build-only- build-matrix.html check-requirements \ - clean clean-pkg download download- update-checksum- \ - show-deps- show-downstream-deps- show-upstream-deps-" + pkgs+=" build-matrix.html \ + check-requirements \ + clean \ + clean-junk \ + clean-pkg \ + cleanup-deps-style \ + cleanup-style \ + download \ + download- \ + download-only- \ + export-patch- \ + gmsl-print- \ + import-all-patches- \ + import-patch- \ + init-git- \ + print-deps-for-build-pkg \ + show-deps- \ + show-downstream-deps- \ + show-upstream-deps- \ + update \ + update-checksum- \ + update-package- " COMPREPLY=( $(compgen -W "${pkgs}" -- ${cur}) ) return 0 ;; esac } -complete -o nospace -o default -F _mxe mxe make gmake +complete -o nospace -o default -F _mxe mxe-make make gmake From e247b7a426bb87f8fb65667478ae78c6a7eca13a Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sun, 10 Jan 2016 17:53:23 +0100 Subject: [PATCH 0338/1463] vmime: fix TLS and CHARSETCONV config options The old way didn't work. We didn't notice because "gnutls" was the default anyway. For CHARSETCONV, the original configuration attempted "win", but this isn't fully supported by vmime. "iconv" is probably the best choice for most users. --- src/vmime.mk | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/vmime.mk b/src/vmime.mk index e06bb621..5eea2374 100644 --- a/src/vmime.mk +++ b/src/vmime.mk @@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := fc9342784ac660b6572a7cc2343e37293e59d499de4ccf141c947fbb732ce $(PKG)_SUBDIR := kisli-vmime-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/kisli/vmime/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := gcc gnutls libgsasl pthreads zlib +$(PKG)_DEPS := gcc gnutls iconv libgsasl pthreads zlib $(PKG)_UPDATE = $(call MXE_GET_GITHUB_SHA, kisli/vmime, master) | $(SED) 's/^\(.......\).*/\1/;' @@ -28,11 +28,8 @@ define $(PKG)_BUILD -DVMIME_BUILD_SAMPLES=OFF \ -DVMIME_BUILD_DOCUMENTATION=OFF \ -DCMAKE_MODULE_PATH='$(1)/cmake' \ - -DVMIME_CHARSETCONV_LIB_IS_ICONV=OFF \ - -DVMIME_CHARSETCONV_LIB_IS_ICU=OFF \ - -DVMIME_CHARSETCONV_LIB_IS_WIN=ON \ - -DVMIME_TLS_SUPPORT_LIB_IS_GNUTLS=ON \ - -DVMIME_TLS_SUPPORT_LIB_IS_OPENSSL=OFF \ + -DVMIME_CHARSETCONV_LIB=iconv \ + -DVMIME_TLS_SUPPORT_LIB=gnutls \ -DVMIME_SHARED_PTR_USE_CXX=ON \ -DCXX11_COMPILER_FLAGS=ON \ -C '$(PWD)/src/vmime-TryRunResults.cmake' \ From 8a9f073fbcf99b6c9137c716f3ddebe522191ca6 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sun, 10 Jan 2016 18:04:29 +0100 Subject: [PATCH 0339/1463] vmime: fix typo in last commit --- src/vmime.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vmime.mk b/src/vmime.mk index 5eea2374..df47c5d4 100644 --- a/src/vmime.mk +++ b/src/vmime.mk @@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := fc9342784ac660b6572a7cc2343e37293e59d499de4ccf141c947fbb732ce $(PKG)_SUBDIR := kisli-vmime-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/kisli/vmime/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := gcc gnutls iconv libgsasl pthreads zlib +$(PKG)_DEPS := gcc gnutls libiconv libgsasl pthreads zlib $(PKG)_UPDATE = $(call MXE_GET_GITHUB_SHA, kisli/vmime, master) | $(SED) 's/^\(.......\).*/\1/;' From 77a96085cf90110b8589cae50ab0f9ad93b6ba54 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 11 Jan 2016 17:43:56 +1100 Subject: [PATCH 0340/1463] Revert "gdal: install pkg-config and data files, add test using pkg-config" This reverts commit 31e57014bca7c5a8e9896b5689001efa78ab009e. --- src/gdal-test.c | 23 ----------------------- src/gdal.mk | 9 ++------- 2 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 src/gdal-test.c diff --git a/src/gdal-test.c b/src/gdal-test.c deleted file mode 100644 index d6a8c8ea..00000000 --- a/src/gdal-test.c +++ /dev/null @@ -1,23 +0,0 @@ -/* - * This file is part of MXE. - * See index.html for further information. - */ - -#include "gdal.h" -#include "cpl_conv.h" /* for CPLMalloc() */ -int main() -{ - GDALDatasetH hDataset; - GDALAllRegister(); - hDataset = GDALOpen( "/tmp/test.img", GA_ReadOnly ); - if( hDataset == NULL ) - { - - } - else - { - GDALClose( hDataset ); - } - - return 0; -} diff --git a/src/gdal.mk b/src/gdal.mk index fe06fd27..e927ecf6 100644 --- a/src/gdal.mk +++ b/src/gdal.mk @@ -78,8 +78,8 @@ define $(PKG)_BUILD CXXFLAGS='-D_WIN32_WINNT=0x0600' \ LIBS="-ljpeg -lsecur32 -lportablexdr `'$(TARGET)-pkg-config' --libs openssl libtiff-4`" - $(MAKE) -C '$(1)' -j '$(JOBS)' lib-target gdal.pc - $(MAKE) -C '$(1)' -j '$(JOBS)' install-actions + $(MAKE) -C '$(1)' -j '$(JOBS)' lib-target + $(MAKE) -C '$(1)' -j '$(JOBS)' install-lib $(MAKE) -C '$(1)/port' -j '$(JOBS)' install $(MAKE) -C '$(1)/gcore' -j '$(JOBS)' install $(MAKE) -C '$(1)/frmts' -j '$(JOBS)' install @@ -87,9 +87,4 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)/ogr' -j '$(JOBS)' install OGR_ENABLED= $(MAKE) -C '$(1)/apps' -j '$(JOBS)' install ln -sf '$(PREFIX)/$(TARGET)/bin/gdal-config' '$(PREFIX)/bin/$(TARGET)-gdal-config' - - '$(TARGET)-gcc' -Wall \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-gdal.exe' \ - `'$(TARGET)-pkg-config' --cflags --libs gdal` - endef From a96fcf41143baa5aaf3c0e31a9fe204089fad3d9 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 11 Jan 2016 23:25:12 +1100 Subject: [PATCH 0341/1463] doc update: ocaml now builds on OSX --- index.html | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/index.html b/index.html index 8c32c443..457e33d5 100644 --- a/index.html +++ b/index.html @@ -820,12 +820,7 @@ USE_OSGPLUGIN(<plugin2>)

    to build the remainder of MXE, run:

    - 
    make EXCLUDE_PKGS='nsis ocaml%'
    -

    - to see a list of all dependent downstream packages that - will be excluded, run: -

    - 
    make show-downstream-deps-'nsis ocaml%'
    + 
    make EXCLUDE_PKGS='nsis'

    openSUSE

    From bff9b400f5f12e7a4e58f8efe6c8f06381672a13 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 12 Jan 2016 02:12:42 +0300 Subject: [PATCH 0342/1463] 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 --- patch.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/patch.mk b/patch.mk index c67e7b39..87c72d00 100644 --- a/patch.mk +++ b/patch.mk @@ -51,7 +51,6 @@ define EXPORT_PATCH --no-signature \ --stdout \ --text \ - -M9 \ dist..HEAD \ | sed 's/^From [0-9a-f]\{40\} /From 0000000000000000000000000000000000000000 /' \ | sed 's/^index .......\.\......../index 1111111..2222222/' \ From 64b0d70492f688ca4e35ee82057c207ce7eb1291 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 12 Jan 2016 02:15:53 +0300 Subject: [PATCH 0343/1463] libieee1284 patch: do not rename import/export the patch fix #1170 --- src/libieee1284-1-fixes.patch | 590 +++++++++++++++++++++++++++++++++- 1 file changed, 577 insertions(+), 13 deletions(-) diff --git a/src/libieee1284-1-fixes.patch b/src/libieee1284-1-fixes.patch index fa0625b1..0fd19e01 100644 --- a/src/libieee1284-1-fixes.patch +++ b/src/libieee1284-1-fixes.patch @@ -34,22 +34,586 @@ index 1111111..2222222 100644 -AC_CONFIG_FILES(Makefile libieee1284.spec) +AC_CONFIG_FILES([Makefile libieee1284.spec include/ieee1284.h]) AC_OUTPUT -diff --git a/include/ieee1284.h b/include/ieee1284.h.in -similarity index 99% -rename from include/ieee1284.h -rename to include/ieee1284.h.in -index 1111111..2222222 100644 +diff --git a/include/ieee1284.h b/include/ieee1284.h +deleted file mode 100644 +index 1111111..2222222 --- a/include/ieee1284.h -+++ b/include/ieee1284.h.in -@@ -27,7 +27,7 @@ - #include /* for struct timeval */ - #endif - ++++ /dev/null +@@ -1,284 +0,0 @@ +-/* +- * libieee1284 - IEEE 1284 library +- * Copyright (C) 2001, 2002, 2003 Tim Waugh +- * +- * This program is free software; you can redistribute it and/or modify +- * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation; either version 2 of the License, or +- * (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +- */ +- +-#ifndef HAVE_IEEE1284_H +-#define HAVE_IEEE1284_H +- +-#include /* for size_t */ +-#ifndef _MSC_VER +-#include /* for struct timeval */ +-#else +-#include /* for struct timeval */ +-#endif +- -#if (defined __MINGW32__ || defined _MSC_VER) && !defined OWN_SSIZE_T +-#include /* for SSIZE_T */ +-#define OWN_SSIZE_T +-typedef SSIZE_T ssize_t; +-#endif +- +-#ifdef __cplusplus +-extern "C" { +-#endif +- +-/* Errors. When a function returns a negative number, it's one of +- * these errors. */ +-enum E1284 { +- E1284_OK = 0, /* Everything went fine */ +- E1284_NOTIMPL = -1, /* Not implemented in libieee1284 */ +- E1284_NOTAVAIL = -2, /* Not available on this system */ +- E1284_TIMEDOUT = -3, /* Operation timed out */ +- E1284_REJECTED = -4, /* IEEE 1284 negotiation rejected */ +- E1284_NEGFAILED = -5, /* Negotiation went wrong */ +- E1284_NOMEM = -6, /* No memory left */ +- E1284_INIT = -7, /* Error initialising port */ +- E1284_SYS = -8, /* Error interfacing system */ +- E1284_NOID = -9, /* No IEEE 1284 ID available */ +- E1284_INVALIDPORT = -10 /* Invalid port */ +-}; +- +-/* A parallel port. */ +-struct parport { +- /* An arbitrary name for the port */ +- const char *name; +- +- /* The base address of the port, if that has any meaning, or zero. */ +- unsigned long base_addr; +- +- /* The ECR address of the port, if that has any meaning, or zero. */ +- unsigned long hibase_addr; +- +- /* For internal use only: */ +- void *priv; +- +- /* The filename associated with this port, +- * if that has any meaning, or NULL. */ +- const char *filename; +-}; +- +-/* Some parallel ports. */ +-struct parport_list { +- int portc; +- struct parport **portv; +-}; +- +-/* The first function to be called. This gives the library a chance +- * to look around and see what's available, and gives the program a +- * chance to choose a port to use. */ +-extern int ieee1284_find_ports (struct parport_list *list, int flags); +- +-/* The last function to be called. After calling this, only +- * ieee1284_find_ports may be used. */ +-extern void ieee1284_free_ports (struct parport_list *list); +- +-/* +- * Retrieving the Device ID of a device on a port. +- * This is a special operation since there are some shortcuts on some +- * operating systems (i.e. Linux) that allow us to elide any actual +- * communications. +- */ +- +-enum ieee1284_devid_flags +-{ +- F1284_FRESH = (1<<1) /* Guarantee a fresh Device ID */ +-}; +- +-extern ssize_t ieee1284_get_deviceid (struct parport *port, int daisy, +- int flags, char *buffer, size_t len); +-/* daisy is the daisy chain address (0-3), or -1 for normal IEEE 1284. */ +- +-/* +- * Sharing hooks +- */ +- +-enum ieee1284_open_flags +-{ +- F1284_EXCL = (1<<0) /* Require exclusive access to the port */ +-}; +-enum ieee1284_capabilities +-{ +- CAP1284_RAW = (1<<0), /* Pin-level access */ +- CAP1284_NIBBLE = (1<<1), +- CAP1284_BYTE = (1<<2), +- CAP1284_COMPAT = (1<<3), +- CAP1284_BECP = (1<<4), +- CAP1284_ECP = (1<<5), +- CAP1284_ECPRLE = (1<<6), +- CAP1284_ECPSWE = (1<<7), +- CAP1284_EPP = (1<<8), +- CAP1284_EPPSL = (1<<9), +- CAP1284_EPPSWE = (1<<10), +- CAP1284_IRQ = (1<<11), +- CAP1284_DMA = (1<<12) +-}; +-extern int ieee1284_open (struct parport *port, int flags, int *capabilities); +- +-extern int ieee1284_close (struct parport *port); +- +-extern int ieee1284_ref (struct parport *port); +-extern int ieee1284_unref (struct parport *port); +- +-extern int ieee1284_claim (struct parport *port); +-/* Must be called before any function below. May fail. */ +- +-extern void ieee1284_release (struct parport *port); +- +-/* +- * Interrupt notification +- */ +-extern int ieee1284_get_irq_fd (struct parport *port); +-extern int ieee1284_clear_irq (struct parport *port, unsigned int *count); +- +-/* +- * Raw port access (PC-style port registers but within inversions) +- * Functions returning int may fail. +- */ +- +-extern int ieee1284_read_data (struct parport *port); +-extern void ieee1284_write_data (struct parport *port, unsigned char dt); +-extern int ieee1284_wait_data (struct parport *port, unsigned char mask, +- unsigned char val, struct timeval *timeout); +-extern int ieee1284_data_dir (struct parport *port, int reverse); +- +-/* The status pin functions operate in terms of these bits: */ +-enum ieee1284_status_bits +-{ +- S1284_NFAULT = 0x08, +- S1284_SELECT = 0x10, +- S1284_PERROR = 0x20, +- S1284_NACK = 0x40, +- S1284_BUSY = 0x80, +- /* To convert those values into PC-style register values, use this: */ +- S1284_INVERTED = S1284_BUSY +-}; +- +-extern int ieee1284_read_status (struct parport *port); +- +-/* Wait until those status pins in mask have the values in val. +- * Return E1284_OK when condition met, E1284_TIMEDOUT on timeout. +- * timeout may be modified. */ +-extern int ieee1284_wait_status (struct parport *port, +- unsigned char mask, +- unsigned char val, +- struct timeval *timeout); +- +-/* The control pin functions operate in terms of these bits: */ +-enum ieee1284_control_bits +-{ +- C1284_NSTROBE = 0x01, +- C1284_NAUTOFD = 0x02, +- C1284_NINIT = 0x04, +- C1284_NSELECTIN = 0x08, +- /* To convert those values into PC-style register values, use this: */ +- C1284_INVERTED = (C1284_NSTROBE| +- C1284_NAUTOFD| +- C1284_NSELECTIN) +-}; +- +-extern int ieee1284_read_control (struct parport *port); +-/* ieee1284_read_control may be unreliable */ +- +-extern void ieee1284_write_control (struct parport *port, unsigned char ct); +-/* NOTE: This will not change the direction of the data lines; use +- * ieee1284_data_dir for that. */ +- +-extern void ieee1284_frob_control (struct parport *port, unsigned char mask, +- unsigned char val); +-/* frob is "out ((in & ~mask) ^ val)" */ +- +-/* This function may or may not be available, depending on PPWCTLONIRQ +- * availability. Its operation is: +- * If operation unavailable, return E1284_NOTAVAIL. Otherwise: +- * Set control pins to ct_before. +- * Wait for nAck interrupt. If timeout elapses, return E1284_TIMEDOUT. +- * Otherwise, set control pins to ct_after and return 0. +- * timeout may be modified. */ +-extern int ieee1284_do_nack_handshake (struct parport *port, +- unsigned char ct_before, +- unsigned char ct_after, +- struct timeval *timeout); +- +-/* +- * IEEE 1284 operations +- */ +- +-/* Negotiation/termination */ +-enum ieee1284_modes +-{ +- M1284_NIBBLE = 0, +- M1284_BYTE = (1<<0), +- M1284_COMPAT = (1<<8), +- M1284_BECP = (1<<9), +- M1284_ECP = (1<<4), +- M1284_ECPRLE = ((1<<4) | (1<<5)), +- M1284_ECPSWE = (1<<10), /* Software emulated */ +- M1284_EPP = (1<<6), +- M1284_EPPSL = (1<<11), /* EPP 1.7 */ +- M1284_EPPSWE = (1<<12), /* Software emulated */ +- M1284_FLAG_DEVICEID = (1<<2), +- M1284_FLAG_EXT_LINK = (1<<14) /* Uses bits in 0x7f */ +-}; +- +-extern int ieee1284_negotiate (struct parport *port, int mode); +-extern void ieee1284_terminate (struct parport *port); +- +-/* ECP direction switching */ +-extern int ieee1284_ecp_fwd_to_rev (struct parport *port); +-extern int ieee1284_ecp_rev_to_fwd (struct parport *port); +- +-/* Block I/O +- * The return value is the number of bytes successfully transferred, +- * or an error code (only if no transfer took place). */ +-enum ieee1284_transfer_flags +-{ +- F1284_NONBLOCK = (1<<0), /* Non-blocking semantics */ +- F1284_SWE = (1<<2), /* Don't use hardware assistance */ +- F1284_RLE = (1<<3), /* Use ECP RLE */ +- F1284_FASTEPP = (1<<4) /* Use faster EPP (counts are unreliable) */ +-}; +-extern ssize_t ieee1284_nibble_read (struct parport *port, int flags, +- char *buffer, size_t len); +-extern ssize_t ieee1284_compat_write (struct parport *port, int flags, +- const char *buffer, size_t len); +-extern ssize_t ieee1284_byte_read (struct parport *port, int flags, +- char *buffer, size_t len); +-extern ssize_t ieee1284_epp_read_data (struct parport *port, int flags, +- char *buffer, size_t len); +-extern ssize_t ieee1284_epp_write_data (struct parport *port, int flags, +- const char *buffer, size_t len); +-extern ssize_t ieee1284_epp_read_addr (struct parport *port, int flags, +- char *buffer, size_t len); +-extern ssize_t ieee1284_epp_write_addr (struct parport *port, int flags, +- const char *buffer, size_t len); +-extern ssize_t ieee1284_ecp_read_data (struct parport *port, int flags, +- char *buffer, size_t len); +-extern ssize_t ieee1284_ecp_write_data (struct parport *port, int flags, +- const char *buffer, size_t len); +-extern ssize_t ieee1284_ecp_read_addr (struct parport *port, int flags, +- char *buffer, size_t len); +-extern ssize_t ieee1284_ecp_write_addr (struct parport *port, int flags, +- const char *buffer, size_t len); +-extern struct timeval *ieee1284_set_timeout (struct parport *port, +- struct timeval *timeout); +- +-#ifdef __cplusplus +-} /* extern "C" */ +-#endif +- +-#endif /* HAVE_IEEE1284_H */ +diff --git a/include/ieee1284.h.in b/include/ieee1284.h.in +new file mode 100644 +index 1111111..2222222 +--- /dev/null ++++ b/include/ieee1284.h.in +@@ -0,0 +1,284 @@ ++/* ++ * libieee1284 - IEEE 1284 library ++ * Copyright (C) 2001, 2002, 2003 Tim Waugh ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ */ ++ ++#ifndef HAVE_IEEE1284_H ++#define HAVE_IEEE1284_H ++ ++#include /* for size_t */ ++#ifndef _MSC_VER ++#include /* for struct timeval */ ++#else ++#include /* for struct timeval */ ++#endif ++ +#if @SSIZE_T_IN_BASETSD_H@ && !defined OWN_SSIZE_T - #include /* for SSIZE_T */ - #define OWN_SSIZE_T - typedef SSIZE_T ssize_t; ++#include /* for SSIZE_T */ ++#define OWN_SSIZE_T ++typedef SSIZE_T ssize_t; ++#endif ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++/* Errors. When a function returns a negative number, it's one of ++ * these errors. */ ++enum E1284 { ++ E1284_OK = 0, /* Everything went fine */ ++ E1284_NOTIMPL = -1, /* Not implemented in libieee1284 */ ++ E1284_NOTAVAIL = -2, /* Not available on this system */ ++ E1284_TIMEDOUT = -3, /* Operation timed out */ ++ E1284_REJECTED = -4, /* IEEE 1284 negotiation rejected */ ++ E1284_NEGFAILED = -5, /* Negotiation went wrong */ ++ E1284_NOMEM = -6, /* No memory left */ ++ E1284_INIT = -7, /* Error initialising port */ ++ E1284_SYS = -8, /* Error interfacing system */ ++ E1284_NOID = -9, /* No IEEE 1284 ID available */ ++ E1284_INVALIDPORT = -10 /* Invalid port */ ++}; ++ ++/* A parallel port. */ ++struct parport { ++ /* An arbitrary name for the port */ ++ const char *name; ++ ++ /* The base address of the port, if that has any meaning, or zero. */ ++ unsigned long base_addr; ++ ++ /* The ECR address of the port, if that has any meaning, or zero. */ ++ unsigned long hibase_addr; ++ ++ /* For internal use only: */ ++ void *priv; ++ ++ /* The filename associated with this port, ++ * if that has any meaning, or NULL. */ ++ const char *filename; ++}; ++ ++/* Some parallel ports. */ ++struct parport_list { ++ int portc; ++ struct parport **portv; ++}; ++ ++/* The first function to be called. This gives the library a chance ++ * to look around and see what's available, and gives the program a ++ * chance to choose a port to use. */ ++extern int ieee1284_find_ports (struct parport_list *list, int flags); ++ ++/* The last function to be called. After calling this, only ++ * ieee1284_find_ports may be used. */ ++extern void ieee1284_free_ports (struct parport_list *list); ++ ++/* ++ * Retrieving the Device ID of a device on a port. ++ * This is a special operation since there are some shortcuts on some ++ * operating systems (i.e. Linux) that allow us to elide any actual ++ * communications. ++ */ ++ ++enum ieee1284_devid_flags ++{ ++ F1284_FRESH = (1<<1) /* Guarantee a fresh Device ID */ ++}; ++ ++extern ssize_t ieee1284_get_deviceid (struct parport *port, int daisy, ++ int flags, char *buffer, size_t len); ++/* daisy is the daisy chain address (0-3), or -1 for normal IEEE 1284. */ ++ ++/* ++ * Sharing hooks ++ */ ++ ++enum ieee1284_open_flags ++{ ++ F1284_EXCL = (1<<0) /* Require exclusive access to the port */ ++}; ++enum ieee1284_capabilities ++{ ++ CAP1284_RAW = (1<<0), /* Pin-level access */ ++ CAP1284_NIBBLE = (1<<1), ++ CAP1284_BYTE = (1<<2), ++ CAP1284_COMPAT = (1<<3), ++ CAP1284_BECP = (1<<4), ++ CAP1284_ECP = (1<<5), ++ CAP1284_ECPRLE = (1<<6), ++ CAP1284_ECPSWE = (1<<7), ++ CAP1284_EPP = (1<<8), ++ CAP1284_EPPSL = (1<<9), ++ CAP1284_EPPSWE = (1<<10), ++ CAP1284_IRQ = (1<<11), ++ CAP1284_DMA = (1<<12) ++}; ++extern int ieee1284_open (struct parport *port, int flags, int *capabilities); ++ ++extern int ieee1284_close (struct parport *port); ++ ++extern int ieee1284_ref (struct parport *port); ++extern int ieee1284_unref (struct parport *port); ++ ++extern int ieee1284_claim (struct parport *port); ++/* Must be called before any function below. May fail. */ ++ ++extern void ieee1284_release (struct parport *port); ++ ++/* ++ * Interrupt notification ++ */ ++extern int ieee1284_get_irq_fd (struct parport *port); ++extern int ieee1284_clear_irq (struct parport *port, unsigned int *count); ++ ++/* ++ * Raw port access (PC-style port registers but within inversions) ++ * Functions returning int may fail. ++ */ ++ ++extern int ieee1284_read_data (struct parport *port); ++extern void ieee1284_write_data (struct parport *port, unsigned char dt); ++extern int ieee1284_wait_data (struct parport *port, unsigned char mask, ++ unsigned char val, struct timeval *timeout); ++extern int ieee1284_data_dir (struct parport *port, int reverse); ++ ++/* The status pin functions operate in terms of these bits: */ ++enum ieee1284_status_bits ++{ ++ S1284_NFAULT = 0x08, ++ S1284_SELECT = 0x10, ++ S1284_PERROR = 0x20, ++ S1284_NACK = 0x40, ++ S1284_BUSY = 0x80, ++ /* To convert those values into PC-style register values, use this: */ ++ S1284_INVERTED = S1284_BUSY ++}; ++ ++extern int ieee1284_read_status (struct parport *port); ++ ++/* Wait until those status pins in mask have the values in val. ++ * Return E1284_OK when condition met, E1284_TIMEDOUT on timeout. ++ * timeout may be modified. */ ++extern int ieee1284_wait_status (struct parport *port, ++ unsigned char mask, ++ unsigned char val, ++ struct timeval *timeout); ++ ++/* The control pin functions operate in terms of these bits: */ ++enum ieee1284_control_bits ++{ ++ C1284_NSTROBE = 0x01, ++ C1284_NAUTOFD = 0x02, ++ C1284_NINIT = 0x04, ++ C1284_NSELECTIN = 0x08, ++ /* To convert those values into PC-style register values, use this: */ ++ C1284_INVERTED = (C1284_NSTROBE| ++ C1284_NAUTOFD| ++ C1284_NSELECTIN) ++}; ++ ++extern int ieee1284_read_control (struct parport *port); ++/* ieee1284_read_control may be unreliable */ ++ ++extern void ieee1284_write_control (struct parport *port, unsigned char ct); ++/* NOTE: This will not change the direction of the data lines; use ++ * ieee1284_data_dir for that. */ ++ ++extern void ieee1284_frob_control (struct parport *port, unsigned char mask, ++ unsigned char val); ++/* frob is "out ((in & ~mask) ^ val)" */ ++ ++/* This function may or may not be available, depending on PPWCTLONIRQ ++ * availability. Its operation is: ++ * If operation unavailable, return E1284_NOTAVAIL. Otherwise: ++ * Set control pins to ct_before. ++ * Wait for nAck interrupt. If timeout elapses, return E1284_TIMEDOUT. ++ * Otherwise, set control pins to ct_after and return 0. ++ * timeout may be modified. */ ++extern int ieee1284_do_nack_handshake (struct parport *port, ++ unsigned char ct_before, ++ unsigned char ct_after, ++ struct timeval *timeout); ++ ++/* ++ * IEEE 1284 operations ++ */ ++ ++/* Negotiation/termination */ ++enum ieee1284_modes ++{ ++ M1284_NIBBLE = 0, ++ M1284_BYTE = (1<<0), ++ M1284_COMPAT = (1<<8), ++ M1284_BECP = (1<<9), ++ M1284_ECP = (1<<4), ++ M1284_ECPRLE = ((1<<4) | (1<<5)), ++ M1284_ECPSWE = (1<<10), /* Software emulated */ ++ M1284_EPP = (1<<6), ++ M1284_EPPSL = (1<<11), /* EPP 1.7 */ ++ M1284_EPPSWE = (1<<12), /* Software emulated */ ++ M1284_FLAG_DEVICEID = (1<<2), ++ M1284_FLAG_EXT_LINK = (1<<14) /* Uses bits in 0x7f */ ++}; ++ ++extern int ieee1284_negotiate (struct parport *port, int mode); ++extern void ieee1284_terminate (struct parport *port); ++ ++/* ECP direction switching */ ++extern int ieee1284_ecp_fwd_to_rev (struct parport *port); ++extern int ieee1284_ecp_rev_to_fwd (struct parport *port); ++ ++/* Block I/O ++ * The return value is the number of bytes successfully transferred, ++ * or an error code (only if no transfer took place). */ ++enum ieee1284_transfer_flags ++{ ++ F1284_NONBLOCK = (1<<0), /* Non-blocking semantics */ ++ F1284_SWE = (1<<2), /* Don't use hardware assistance */ ++ F1284_RLE = (1<<3), /* Use ECP RLE */ ++ F1284_FASTEPP = (1<<4) /* Use faster EPP (counts are unreliable) */ ++}; ++extern ssize_t ieee1284_nibble_read (struct parport *port, int flags, ++ char *buffer, size_t len); ++extern ssize_t ieee1284_compat_write (struct parport *port, int flags, ++ const char *buffer, size_t len); ++extern ssize_t ieee1284_byte_read (struct parport *port, int flags, ++ char *buffer, size_t len); ++extern ssize_t ieee1284_epp_read_data (struct parport *port, int flags, ++ char *buffer, size_t len); ++extern ssize_t ieee1284_epp_write_data (struct parport *port, int flags, ++ const char *buffer, size_t len); ++extern ssize_t ieee1284_epp_read_addr (struct parport *port, int flags, ++ char *buffer, size_t len); ++extern ssize_t ieee1284_epp_write_addr (struct parport *port, int flags, ++ const char *buffer, size_t len); ++extern ssize_t ieee1284_ecp_read_data (struct parport *port, int flags, ++ char *buffer, size_t len); ++extern ssize_t ieee1284_ecp_write_data (struct parport *port, int flags, ++ const char *buffer, size_t len); ++extern ssize_t ieee1284_ecp_read_addr (struct parport *port, int flags, ++ char *buffer, size_t len); ++extern ssize_t ieee1284_ecp_write_addr (struct parport *port, int flags, ++ const char *buffer, size_t len); ++extern struct timeval *ieee1284_set_timeout (struct parport *port, ++ struct timeval *timeout); ++ ++#ifdef __cplusplus ++} /* extern "C" */ ++#endif ++ ++#endif /* HAVE_IEEE1284_H */ diff --git a/src/detect.h b/src/detect.h index 1111111..2222222 100644 --- a/src/detect.h From a449841274217582a15c11f560944853c910b30b Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 12 Jan 2016 12:03:11 +1100 Subject: [PATCH 0344/1463] docs: link to build-matrix.html and note libgomp and pthreads availability --- index.html | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index 457e33d5..c9a1528c 100644 --- a/index.html +++ b/index.html @@ -124,9 +124,14 @@

    - These numbers were last updated on December 16, 2015. You can see the - current status by executing make build-matrix.html in the - MXE directory. + These numbers were last updated on December 16, 2015. + See the current status + for individual packages. +

    +

    + OpenMP (libgomp) + and pthreads (winpthreads) + are always available.

    Experimental support for GCC with posix threads was From 01dc8941ec047644f8c4c749b6acdbc6a44cc61e Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 4 Jan 2016 11:01:24 +0100 Subject: [PATCH 0345/1463] mxe-conf: create .gitkeep in CMAKE_TOOLCHAIN_DIR It is needed for build-pkg and #1111, Git doesn't see empty directories. --- src/mxe-conf.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mxe-conf.mk b/src/mxe-conf.mk index 57fd890d..89ce4fbb 100644 --- a/src/mxe-conf.mk +++ b/src/mxe-conf.mk @@ -16,6 +16,7 @@ define $(PKG)_BUILD # individual packages (e.g. hdf5) should add their # own files under CMAKE_TOOLCHAIN_DIR [ -d '$(CMAKE_TOOLCHAIN_DIR)' ] || mkdir -p '$(CMAKE_TOOLCHAIN_DIR)' + touch '$(CMAKE_TOOLCHAIN_DIR)/.gitkeep' (echo 'set(CMAKE_SYSTEM_NAME Windows)'; \ echo 'set(MSYS 1)'; \ echo 'set(BUILD_SHARED_LIBS $(if $(BUILD_SHARED),ON,OFF))'; \ From dfec32636625636d85706a815dbb3f3efaab4aad Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 7 Jan 2016 19:42:44 +1100 Subject: [PATCH 0346/1463] 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 --- Makefile | 16 +++++++++------- src/mxe-conf.mk | 19 +++++++++++++------ 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index d18e4c0e..132bd11a 100644 --- a/Makefile +++ b/Makefile @@ -329,10 +329,13 @@ define CHECK_REQUIREMENT_VERSION fi endef -$(shell [ -d '$(PREFIX)/installed' ] || mkdir -p '$(PREFIX)/installed') + +%/.gitkeep: + +@mkdir -p '$(dir $@)' + @touch '$@' check-requirements: $(PREFIX)/installed/check-requirements -$(PREFIX)/installed/check-requirements: $(MAKEFILE) +$(PREFIX)/installed/check-requirements: $(MAKEFILE) | $(PREFIX)/installed/.gitkeep @echo '[check requirements]' $(foreach REQUIREMENT,$(REQUIREMENTS),$(call CHECK_REQUIREMENT,$(REQUIREMENT))) $(call CHECK_REQUIREMENT_VERSION,autoconf,2\.6[8-9]\|2\.[7-9][0-9]) @@ -349,7 +352,7 @@ $(PREFIX)/installed/check-requirements: $(MAKEFILE) .PHONY: print-git-oneline print-git-oneline: $(PREFIX)/installed/print-git-oneline-$(GIT_HEAD) -$(PREFIX)/installed/print-git-oneline-$(GIT_HEAD): +$(PREFIX)/installed/print-git-oneline-$(GIT_HEAD): | $(PREFIX)/installed/.gitkeep @git log --pretty=tformat:'[git-log] %h %s' -1 | cat @rm -f '$(PREFIX)/installed/print-git-oneline-'* @touch '$@' @@ -449,9 +452,7 @@ else NONET_CFLAGS := -arch i386 -arch x86_64 endif -$(shell [ -d '$(PREFIX)/$(BUILD)/lib' ] || mkdir -p '$(PREFIX)/$(BUILD)/lib') - -$(NONET_LIB): $(TOP_DIR)/tools/nonetwork.c +$(NONET_LIB): $(TOP_DIR)/tools/nonetwork.c | $(PREFIX)/$(BUILD)/lib/.gitkeep @echo '[build nonetwork lib]' @$(BUILD_CC) -shared -fPIC $(NONET_CFLAGS) -o $@ $< @@ -467,6 +468,7 @@ $(PREFIX)/$(3)/installed/$(1): $(PKG_MAKEFILES) \ $(if $(value $(call LOOKUP_PKG_RULE,$(1),URL,$(3))),download-only-$(1)) \ $(addprefix $(PREFIX)/$(3)/installed/,$(if $(call set_is_not_member,$(1),$(MXE_CONF_PKGS)),$(MXE_CONF_PKGS))) \ $(NONET_LIB) \ + $(PREFIX)/$(3)/installed/.gitkeep \ print-git-oneline @[ -d '$(LOG_DIR)/$(TIMESTAMP)' ] || mkdir -p '$(LOG_DIR)/$(TIMESTAMP)' $(if $(value $(call LOOKUP_PKG_RULE,$(1),BUILD,$(3))), @@ -529,7 +531,6 @@ build-only-$(1)_$(3): touch '$(PREFIX)/$(3)/installed/$(1)' endef $(foreach TARGET,$(MXE_TARGETS), \ - $(shell [ -d '$(PREFIX)/$(TARGET)/installed' ] || mkdir -p '$(PREFIX)/$(TARGET)/installed') \ $(foreach PKG,$($(TARGET)_PKGS), \ $(eval $(call PKG_TARGET_RULE,$(PKG),$(call TMP_DIR,$(PKG)-$(TARGET)),$(TARGET))))) @@ -615,6 +616,7 @@ BUILD_PKG_TMP_FILES := *-*.list mxe-*.tar.xz mxe-*.deb* wheezy jessie .PHONY: clean clean: + -chmod 0755 "$$WINEPREFIX" rm -rf $(call TMP_DIR,*) $(PREFIX) \ $(addprefix $(TOP_DIR)/, $(BUILD_PKG_TMP_FILES)) diff --git a/src/mxe-conf.mk b/src/mxe-conf.mk index 89ce4fbb..11e49d8b 100644 --- a/src/mxe-conf.mk +++ b/src/mxe-conf.mk @@ -7,15 +7,20 @@ $(PKG)_UPDATE := echo 1 $(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS) define $(PKG)_BUILD + # create basic non-empty directory hierarchy + for d in bin include lib share; do \ + mkdir -p "$(PREFIX)/$(TARGET)/$$d" && \ + touch "$(PREFIX)/$(TARGET)/$$d/.gitkeep" ; \ + done + # install target-specific autotools config file - $(INSTALL) -d '$(PREFIX)/$(TARGET)/share' # setting ac_cv_build bypasses the config.guess check in every package echo "ac_cv_build=$(BUILD)" > '$(PREFIX)/$(TARGET)/share/config.site' # create the CMake toolchain file # individual packages (e.g. hdf5) should add their # own files under CMAKE_TOOLCHAIN_DIR - [ -d '$(CMAKE_TOOLCHAIN_DIR)' ] || mkdir -p '$(CMAKE_TOOLCHAIN_DIR)' + mkdir -p '$(CMAKE_TOOLCHAIN_DIR)' touch '$(CMAKE_TOOLCHAIN_DIR)/.gitkeep' (echo 'set(CMAKE_SYSTEM_NAME Windows)'; \ echo 'set(MSYS 1)'; \ @@ -67,7 +72,7 @@ define $(PKG)_BUILD chmod 0755 '$(PREFIX)/bin/$(TARGET)-cmake' # create pkg-config files for OpenGL/GLU - $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig' + mkdir -p '$(PREFIX)/$(TARGET)/lib/pkgconfig' (echo 'Name: gl'; \ echo 'Version: 0'; \ echo 'Description: OpenGL'; \ @@ -83,11 +88,11 @@ endef define $(PKG)_BUILD_$(BUILD) # install config.guess for general use - $(INSTALL) -d '$(PREFIX)/bin' + mkdir -p '$(PREFIX)/bin' $(INSTALL) -m755 '$(EXT_DIR)/config.guess' '$(PREFIX)/bin/' # install cmake modules - $(INSTALL) -d '$(PREFIX)/share/cmake/modules' + mkdir -p '$(PREFIX)/share/cmake/modules' $(INSTALL) -m644 '$(PWD)/src/cmake/modules/'* '$(PREFIX)/share/cmake/modules' # fail early if autotools can't autoreconf @@ -103,7 +108,9 @@ define $(PKG)_BUILD_$(BUILD) cd '$(1)' && ./configure #create readonly directory to force wine to fail - $(INSTALL) -m444 -d "$$WINEPREFIX" + mkdir -p "$$WINEPREFIX" + touch "$$WINEPREFIX/.gitkeep" + chmod 0555 "$$WINEPREFIX" #create script "wine" in a directory which is in PATH mkdir -p '$(PREFIX)/$(BUILD)/bin/' From f5414c6002fdf70e1e562c83afed54fd2ed44864 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 9 Jan 2016 11:34:58 +1100 Subject: [PATCH 0347/1463] liboil: enable shared and x86_64-w64-mingw32 build --- src/liboil-1-fixes.patch | 163 +++++++++++++++++++++++++++++++++++++++ src/liboil.mk | 17 ++-- 2 files changed, 172 insertions(+), 8 deletions(-) create mode 100644 src/liboil-1-fixes.patch diff --git a/src/liboil-1-fixes.patch b/src/liboil-1-fixes.patch new file mode 100644 index 00000000..a14b92de --- /dev/null +++ b/src/liboil-1-fixes.patch @@ -0,0 +1,163 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: David Schleef +Date: Tue, 20 Jul 2010 14:05:26 -0700 +Subject: [PATCH] x86: Fix cpuid function on x86-64 + +Taken from: +http://cgit.freedesktop.org/liboil/commit/?id=705916007fba0a845229a02dc6474cb523eff150 + +diff --git a/liboil/liboilcpu-x86.c b/liboil/liboilcpu-x86.c +index 1111111..2222222 100644 +--- a/liboil/liboilcpu-x86.c ++++ b/liboil/liboilcpu-x86.c +@@ -162,13 +162,10 @@ get_cpuid (uint32_t op, uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d) + static void + get_cpuid (uint32_t op, uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d) + { ++ *a = op; + __asm__ ( +- " pushq %%rbx\n" + " cpuid\n" +- " mov %%ebx, %%esi\n" +- " popq %%rbx\n" +- : "=a" (*a), "=S" (*b), "=c" (*c), "=d" (*d) +- : "0" (op)); ++ : "+a" (*a), "=b" (*b), "=c" (*c), "=d" (*d)); + } + #endif + +@@ -185,7 +182,7 @@ oil_cpu_detect_cpuid (void) + { + uint32_t eax, ebx, ecx, edx; + uint32_t level; +- char vendor[13] = { 0 }; ++ char vendor[13+4] = { 0 }; + int ret; + + oil_fault_check_enable (); + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore +Date: Sat, 9 Jan 2016 11:21:30 +1100 +Subject: [PATCH] Win64 Support + +Taken from: +https://bugs.freedesktop.org/show_bug.cgi?id=26651 + +diff --git a/liboil/amd64/wavelet.c b/liboil/amd64/wavelet.c +index 1111111..2222222 100644 +--- a/liboil/amd64/wavelet.c ++++ b/liboil/amd64/wavelet.c +@@ -2,7 +2,7 @@ + #include + #include + #include +- ++#include + + void + deinterleave2_asm (int16_t *d1, int16_t *d2, int16_t *s_2xn, int n) +@@ -1409,7 +1409,7 @@ multiply_and_acc_12xn_s16_u8_mmx (int16_t *i1, int is1, int16_t *s1, + " jnz 1b\n" + " emms\n" + : "+r" (i1), "+r" (s1), "+r" (s2), "+r" (n) +- : "r" ((long)is1), "r" ((long)ss1), "r" ((long)ss2) ++ : "r" ((intptr_t)is1), "r" ((intptr_t)ss1), "r" ((intptr_t)ss2) + ); + } + OIL_DEFINE_IMPL_FULL (multiply_and_acc_12xn_s16_u8_mmx, +@@ -1596,7 +1596,7 @@ mas4_across_add_s16_mmx (int16_t *d, int16_t *s1, int16_t *s2_nx4, int sstr2, + [s2_nx4_off] "+r" (s2_nx4_off), + [n] "+m" (n), + [s1] "+r" (s1) +- : [sstr] "r" ((long)(sstr2)) ++ : [sstr] "r" ((intptr_t)(sstr2)) + ); + } + OIL_DEFINE_IMPL_FULL (mas4_across_add_s16_mmx, mas4_across_add_s16, +@@ -1753,8 +1753,8 @@ mas8_across_add_s16_mmx (int16_t *d, int16_t *s1, int16_t *s2_nx8, int sstr2, + [s3_8] "+r" (s3_8), + [d] "+r" (d), + [n] "+m" (n), +- [s1] "+r" ((long)(s1)) +- : [sstr] "r" ((long)(sstr2)) ++ [s1] "+r" ((intptr_t)(s1)) ++ : [sstr] "r" ((intptr_t)(sstr2)) + ); + } + OIL_DEFINE_IMPL_FULL (mas8_across_add_s16_mmx, mas8_across_add_s16, +diff --git a/liboil/i386_amd64/mas.c b/liboil/i386_amd64/mas.c +index 1111111..2222222 100644 +--- a/liboil/i386_amd64/mas.c ++++ b/liboil/i386_amd64/mas.c +@@ -1,7 +1,7 @@ + + #include + #include +- ++#include + + void + mas10_u8_mmx (uint8_t *d, const uint8_t *s1_np9, const int16_t *s2_10, +@@ -1106,7 +1106,7 @@ mas8_across_u8_mmx_3 (uint8_t *d, const uint8_t *s1_nx8, int ss1, + " packuswb %%mm2, %%mm2\n" + " movd %%mm2, 0(%[d])\n" + : [p] "+r" (p) +- : [d] "r" (d), [ss1] "r" ((long)ss1)); ++ : [d] "r" (d), [ss1] "r" ((intptr_t)ss1)); + d+=4; + s1_nx8+=4; + n--; +diff --git a/liboil/i386_amd64/multiply_and_acc.c b/liboil/i386_amd64/multiply_and_acc.c +index 1111111..2222222 100644 +--- a/liboil/i386_amd64/multiply_and_acc.c ++++ b/liboil/i386_amd64/multiply_and_acc.c +@@ -1,6 +1,7 @@ + + #include + #include ++#include + + void + multiply_and_acc_6xn_s16_u8_mmx (int16_t *i1, int is1, int16_t *s1, +@@ -32,7 +33,7 @@ multiply_and_acc_6xn_s16_u8_mmx (int16_t *i1, int is1, int16_t *s1, + #ifdef __i386__ + : "m" (is1), "m" (ss1), "m" (ss2) + #else +- : "r" ((long)is1), "r" ((long)ss1), "r" ((long)ss2) ++ : "r" ((intptr_t)is1), "r" ((intptr_t)ss1), "r" ((intptr_t)ss2) + #endif + ); + } +@@ -68,7 +69,7 @@ multiply_and_acc_8xn_s16_u8_mmx (int16_t *i1, int is1, int16_t *s1, + #ifdef __i386__ + : "m" (is1), "m" (ss1), "m" (ss2) + #else +- : "r" ((long)is1), "r" ((long)ss1), "r" ((long)ss2) ++ : "r" ((intptr_t)is1), "r" ((intptr_t)ss1), "r" ((intptr_t)ss2) + #endif + ); + } +@@ -114,7 +115,7 @@ multiply_and_acc_16xn_s16_u8_mmx (int16_t *i1, int is1, int16_t *s1, + #ifdef __i386__ + : "m" (is1), "m" (ss1), "m" (ss2) + #else +- : "r" ((long)is1), "r" ((long)ss1), "r" ((long)ss2) ++ : "r" ((intptr_t)is1), "r" ((intptr_t)ss1), "r" ((intptr_t)ss2) + #endif + ); + } +@@ -170,7 +171,7 @@ multiply_and_acc_24xn_s16_u8_mmx (int16_t *i1, int is1, int16_t *s1, + #ifdef __i386__ + : "m" (is1), "m" (ss1), "m" (ss2) + #else +- : "r" ((long)is1), "r" ((long)ss1), "r" ((long)ss2) ++ : "r" ((intptr_t)is1), "r" ((intptr_t)ss1), "r" ((intptr_t)ss2) + #endif + ); + } diff --git a/src/liboil.mk b/src/liboil.mk index f13c7760..9aad9294 100644 --- a/src/liboil.mk +++ b/src/liboil.mk @@ -16,19 +16,20 @@ define $(PKG)_UPDATE head -1 endef +# liboil is in maintenance-only phase: +# http://cgit.freedesktop.org/liboil/commit/?id=04b154aa118c0fdf244932dadc3d085f6290db7a + +# configure doesn't wildcard host test for x86_64 +# `as_cv_unaligned_access` so set it manually + define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(MXE_CONFIGURE_OPTS) \ --disable-debug \ --disable-examples \ --mandir='$(1)/sink' \ --docdir='$(1)/sink' \ - --with-html-dir='$(1)/sink' + --with-html-dir='$(1)/sink' \ + as_cv_unaligned_access=yes $(MAKE) -C '$(1)' -j '$(JOBS)' install endef - -$(PKG)_BUILD_x86_64-w64-mingw32 = - -$(PKG)_BUILD_SHARED = From dbe0a606e155bd261d629aa1badf35a7ebfd8dfe Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 9 Jan 2016 12:54:45 +1100 Subject: [PATCH 0348/1463] libshout: update 2.3.1 --> 2.4.1 --- src/libshout-1-fixes.patch | 54 +++++++++++++++++++++++--------------- src/libshout.mk | 12 ++++----- 2 files changed, 38 insertions(+), 28 deletions(-) diff --git a/src/libshout-1-fixes.patch b/src/libshout-1-fixes.patch index 715ccb40..083397dc 100644 --- a/src/libshout-1-fixes.patch +++ b/src/libshout-1-fixes.patch @@ -3,30 +3,42 @@ See index.html for further information. Contains ad hoc patches for cross building. -From b05b2d82333e13f637dffb93f821907f775eb585 Mon Sep 17 00:00:00 2001 -From: Mark Brand -Date: Sun, 20 May 2012 23:23:37 +0200 -Subject: [PATCH] mingw fixes +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jean-Baptiste Kempf +Date: Mon, 30 Nov 2015 17:19:26 +0100 +Subject: [PATCH] Fix: test arpa/inet.h presence before using it ---- - include/shout/shout.h.in | 2 ++ - 1 file changed, 2 insertions(+) +Fix: test arpa/inet.h presence before using it -diff --git a/include/shout/shout.h.in b/include/shout/shout.h.in -index 682ad49..f412cdc 100644 ---- a/include/shout/shout.h.in -+++ b/include/shout/shout.h.in -@@ -23,8 +23,10 @@ +This fixes the Windows build. + +Taken from: +https://git.xiph.org/?p=icecast-libshout.git;a=commit;h=53aa028d13ac624e2c1e71796d529e773867d1d4 + +diff --git a/configure.ac b/configure.ac +index 1111111..2222222 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -74,7 +74,7 @@ dnl Checks for programs. + dnl Checks for header files. + AC_HEADER_STDC + AC_HEADER_TIME +-AC_CHECK_HEADERS([strings.h sys/timeb.h]) ++AC_CHECK_HEADERS([strings.h sys/timeb.h arpa/inet.h]) - #include - #ifdef WIN32 -+#ifndef __MINGW32__ - #include + dnl Checks for typedefs, structures, and compiler characteristics. + AC_C_CONST +diff --git a/src/proto_roaraudio.c b/src/proto_roaraudio.c +index 1111111..2222222 100644 +--- a/src/proto_roaraudio.c ++++ b/src/proto_roaraudio.c +@@ -28,7 +28,9 @@ #endif + + /* for htonl(). */ ++#ifdef HAVE_ARPA_INET_H + #include +#endif - #define SHOUTERR_SUCCESS (0) - #define SHOUTERR_INSANE (-1) --- -1.7.9.2 - + #include + #include diff --git a/src/libshout.mk b/src/libshout.mk index b2d9f4eb..7fde08d7 100644 --- a/src/libshout.mk +++ b/src/libshout.mk @@ -3,12 +3,12 @@ PKG := libshout $(PKG)_IGNORE := -$(PKG)_VERSION := 2.3.1 -$(PKG)_CHECKSUM := cf3c5f6b4a5e3fcfbe09fb7024aa88ad4099a9945f7cb037ec06bcee7a23926e +$(PKG)_VERSION := 2.4.1 +$(PKG)_CHECKSUM := f3acb8dec26f2dbf6df778888e0e429a4ce9378a9d461b02a7ccbf2991bbf24d $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://downloads.us.xiph.org/releases/$(PKG)/$($(PKG)_FILE) -$(PKG)_DEPS := gcc ogg speex theora vorbis +$(PKG)_DEPS := gcc ogg openssl speex theora vorbis define $(PKG)_UPDATE $(WGET) -q -O- 'http://www.icecast.org/download.php' | \ @@ -18,10 +18,8 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(MXE_CONFIGURE_OPTS) \ + ac_cv_prog_PKGCONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \ --disable-thread \ --infodir='$(1)/sink' \ --mandir='$(1)/sink' From cc102cf94bb82fe2e14d870c5fd63b65bcf9bd09 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 9 Jan 2016 14:46:22 +1100 Subject: [PATCH 0349/1463] gstreamer and plugins: update 1.4.5 --> 1.6.2 and enable shared --- src/gst-plugins-base.mk | 11 +++-------- src/gst-plugins-good.mk | 20 ++++++++++---------- src/gstreamer-1-fixes.patch | 27 --------------------------- src/gstreamer.mk | 15 +++++++-------- 4 files changed, 20 insertions(+), 53 deletions(-) delete mode 100644 src/gstreamer-1-fixes.patch diff --git a/src/gst-plugins-base.mk b/src/gst-plugins-base.mk index a4120455..1655ef19 100644 --- a/src/gst-plugins-base.mk +++ b/src/gst-plugins-base.mk @@ -3,8 +3,8 @@ PKG := gst-plugins-base $(PKG)_IGNORE := -$(PKG)_VERSION := 1.4.5 -$(PKG)_CHECKSUM := 77bd8199e7a312d3d71de9b7ddf761a3b78560a2c2a80829d0815ca39cbd551d +$(PKG)_VERSION := 1.6.2 +$(PKG)_CHECKSUM := c75dd400e451526ed71e1c4955e33d470a2581f5e71ecf84920a41c0a5c75322 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE) @@ -17,10 +17,7 @@ define $(PKG)_BUILD -exec $(SED) -i 's,glib-mkenums,$(PREFIX)/$(TARGET)/bin/glib-mkenums,g' {} \; \ -exec $(SED) -i 's,glib-genmarshal,$(PREFIX)/$(TARGET)/bin/glib-genmarshal,g' {} \; cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(MXE_CONFIGURE_OPTS) \ --disable-debug \ --disable-examples \ --disable-x \ @@ -29,5 +26,3 @@ define $(PKG)_BUILD --with-html-dir='$(1)/sink' $(MAKE) -C '$(1)' -j '$(JOBS)' install endef - -$(PKG)_BUILD_SHARED = diff --git a/src/gst-plugins-good.mk b/src/gst-plugins-good.mk index f96a87aa..f65b3ef5 100644 --- a/src/gst-plugins-good.mk +++ b/src/gst-plugins-good.mk @@ -3,13 +3,13 @@ PKG := gst-plugins-good $(PKG)_IGNORE := -$(PKG)_VERSION := 1.4.5 -$(PKG)_CHECKSUM := 79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641 +$(PKG)_VERSION := 1.6.2 +$(PKG)_CHECKSUM := 876e54dfce93274b98e024f353258d35fa4d49d1f9010069e676c530f6eb6a92 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE) -$(PKG)_DEPS := gcc cairo flac glib gst-plugins-base gstreamer gtk2 \ - jpeg liboil libpng libshout libxml2 speex taglib wavpack +$(PKG)_DEPS := gcc cairo flac glib gst-plugins-base gstreamer jpeg \ + liboil libpng libshout libxml2 speex taglib wavpack $(PKG)_UPDATE = $(subst gstreamer/refs,gst-plugins-good/refs,$(gstreamer_UPDATE)) @@ -21,18 +21,18 @@ define $(PKG)_BUILD # http://www.videolan.org/developers/vlc/doc/doxygen/html/vlc__codecs_8h-source.html # http://lists.mplayerhq.hu/pipermail/mplayer-cvslog/2004-August/019283.html cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(MXE_CONFIGURE_OPTS) \ --disable-debug \ --disable-examples \ --disable-aalib \ + $(if $(BUILD_SHARED), --disable-shout2) \ --disable-x \ --mandir='$(1)/sink' \ --docdir='$(1)/sink' \ --with-html-dir='$(1)/sink' $(MAKE) -C '$(1)' -j '$(JOBS)' install CFLAGS='-DWAVE_FORMAT_DOLBY_AC3_SPDIF=0x0092' -endef -$(PKG)_BUILD_SHARED = + # some .dlls are installed to lib - no obvious way to change + $(and $(BUILD_SHARED), + mv -v '$(PREFIX)/$(TARGET)/lib/gstreamer-1.0/'*.dll '$(PREFIX)/$(TARGET)/bin/') +endef diff --git a/src/gstreamer-1-fixes.patch b/src/gstreamer-1-fixes.patch deleted file mode 100644 index 873dd2ba..00000000 --- a/src/gstreamer-1-fixes.patch +++ /dev/null @@ -1,27 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Contains ad hoc patches for cross building. - -From 3c2f96d5bbadcff5724523612e5cf0e2d6a9ac51 Mon Sep 17 00:00:00 2001 -From: MXE -Date: Tue, 12 Nov 2013 02:49:49 +1100 -Subject: [PATCH] remove _chsize redefinition - - -diff --git a/plugins/elements/gstfilesink.c b/plugins/elements/gstfilesink.c -index 470ad5e..eb8dbe8 100644 ---- a/plugins/elements/gstfilesink.c -+++ b/plugins/elements/gstfilesink.c -@@ -56,8 +56,6 @@ - #define lseek _lseeki64 - #undef off_t - #define off_t guint64 --#undef ftruncate --#define ftruncate _chsize - #ifdef _MSC_VER /* Check if we are using MSVC, fileno is deprecated in favour */ - #define fileno _fileno /* of _fileno */ - #endif --- -1.8.4 - diff --git a/src/gstreamer.mk b/src/gstreamer.mk index 2509c356..d1409219 100644 --- a/src/gstreamer.mk +++ b/src/gstreamer.mk @@ -3,8 +3,8 @@ PKG := gstreamer $(PKG)_IGNORE := -$(PKG)_VERSION := 1.4.5 -$(PKG)_CHECKSUM := 40801aa7f979024526258a0e94707ba42b8ab6f7d2206e56adbc4433155cb0ae +$(PKG)_VERSION := 1.6.2 +$(PKG)_CHECKSUM := 5896716bd8e089dba452932a2eff2bb6f6c9d58ff64a96635d157f1ffaf8feb2 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE) @@ -21,10 +21,7 @@ define $(PKG)_BUILD $(SED) -i 's,glib-mkenums,$(PREFIX)/$(TARGET)/bin/glib-mkenums,g' '$(1)'/gst/Makefile.in $(SED) -i 's,glib-genmarshal,$(PREFIX)/$(TARGET)/bin/glib-genmarshal,g' '$(1)'/gst/Makefile.in cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ - --disable-shared \ + $(MXE_CONFIGURE_OPTS) \ --disable-debug \ --disable-check \ --disable-tests \ @@ -33,6 +30,8 @@ define $(PKG)_BUILD --docdir='$(1)/sink' \ --with-html-dir='$(1)/sink' $(MAKE) -C '$(1)' -j '$(JOBS)' install -endef -$(PKG)_BUILD_SHARED = + # some .dlls are installed to lib - no obvious way to change + $(and $(BUILD_SHARED), + mv -v '$(PREFIX)/$(TARGET)/lib/gstreamer-1.0/'*.dll '$(PREFIX)/$(TARGET)/bin/') +endef From 719e7e0c30551bd08463031acc1e49da72bcf4bd Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 9 Jan 2016 17:38:47 +1100 Subject: [PATCH 0350/1463] cairo: update 1.14.2 --> 1.14.6 --- src/cairo.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cairo.mk b/src/cairo.mk index ab98c2c8..32b39037 100644 --- a/src/cairo.mk +++ b/src/cairo.mk @@ -3,8 +3,8 @@ PKG := cairo $(PKG)_IGNORE := -$(PKG)_VERSION := 1.14.2 -$(PKG)_CHECKSUM := c919d999ddb1bbbecd4bbe65299ca2abd2079c7e13d224577895afa7005ecceb +$(PKG)_VERSION := 1.14.6 +$(PKG)_CHECKSUM := 613cb38447b76a93ff7235e17acd55a78b52ea84a9df128c3f2257f8eaa7b252 $(PKG)_SUBDIR := cairo-$($(PKG)_VERSION) $(PKG)_FILE := cairo-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://cairographics.org/releases/$($(PKG)_FILE) From e0e2ae59a98bc2cefa16e7895dbad7129af2292e Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 9 Jan 2016 17:39:30 +1100 Subject: [PATCH 0351/1463] dbus: update 1.10.6 --> 1.11.0 --- src/dbus.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dbus.mk b/src/dbus.mk index b092d895..50126a23 100644 --- a/src/dbus.mk +++ b/src/dbus.mk @@ -3,8 +3,8 @@ PKG := dbus $(PKG)_IGNORE := -$(PKG)_VERSION := 1.10.6 -$(PKG)_CHECKSUM := b5fefa08a77edd76cd64d872db949eebc02cf6f3f8be82e4bbc641742af5d35f +$(PKG)_VERSION := 1.11.0 +$(PKG)_CHECKSUM := 6da762d768f061da720a2acfe0b481f31ef72f88aa10243922789c6ab19d5556 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://$(PKG).freedesktop.org/releases/$(PKG)/$($(PKG)_FILE) From ec62f3c7cd7032293bc7b59497b2ef64603dfada Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 9 Jan 2016 17:40:27 +1100 Subject: [PATCH 0352/1463] gdk-pixbuf: update 2.30.8 --> 2.32.3 --- src/gdk-pixbuf.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gdk-pixbuf.mk b/src/gdk-pixbuf.mk index 1a9d4bcc..d04a96b7 100644 --- a/src/gdk-pixbuf.mk +++ b/src/gdk-pixbuf.mk @@ -3,8 +3,8 @@ PKG := gdk-pixbuf $(PKG)_IGNORE := -$(PKG)_VERSION := 2.30.8 -$(PKG)_CHECKSUM := 4853830616113db4435837992c0aebd94cbb993c44dc55063cee7f72a7bef8be +$(PKG)_VERSION := 2.32.3 +$(PKG)_CHECKSUM := 2b6771f1ac72f687a8971e59810b8dc658e65e7d3086bd2e676e618fd541d031 $(PKG)_SUBDIR := gdk-pixbuf-$($(PKG)_VERSION) $(PKG)_FILE := gdk-pixbuf-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) From f2024506a4e8bc35d3d3c67698c51dfa8f0dcc1a Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 9 Jan 2016 17:41:03 +1100 Subject: [PATCH 0353/1463] gettext: update 0.19.5.1 --> 0.19.7 --- src/gettext.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gettext.mk b/src/gettext.mk index 26ce2727..03982cfd 100644 --- a/src/gettext.mk +++ b/src/gettext.mk @@ -3,8 +3,8 @@ PKG := gettext $(PKG)_IGNORE := -$(PKG)_VERSION := 0.19.5.1 -$(PKG)_CHECKSUM := a198d53b0c1fb11421ead197b7e76b144e887c9ef5a685323e92cbc950227731 +$(PKG)_VERSION := 0.19.7 +$(PKG)_CHECKSUM := 5386d2a40500295783c6a52121adcf42a25519e2d23675950619c9e69558c23f $(PKG)_SUBDIR := gettext-$($(PKG)_VERSION) $(PKG)_FILE := gettext-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://ftp.gnu.org/pub/gnu/gettext/$($(PKG)_FILE) From 43ec871a39110177c1139c558b739fb3cb1f97ac Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 9 Jan 2016 17:41:35 +1100 Subject: [PATCH 0354/1463] icu4c: update 54.1 --> 56.1 --- src/icu4c.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/icu4c.mk b/src/icu4c.mk index d91042c9..8875b5ea 100644 --- a/src/icu4c.mk +++ b/src/icu4c.mk @@ -3,9 +3,9 @@ PKG := icu4c $(PKG)_IGNORE := -$(PKG)_VERSION := 54.1 +$(PKG)_VERSION := 56.1 $(PKG)_MAJOR := $(word 1,$(subst ., ,$($(PKG)_VERSION))) -$(PKG)_CHECKSUM := d42bc9a8ca6a91c55eb0925c279f49e5b508d51ef26ac9850d9be55de5bb8ab3 +$(PKG)_CHECKSUM := 3a64e9105c734dcf631c0b3ed60404531bce6c0f5a64bfe1a6402a4cc2314816 $(PKG)_SUBDIR := icu $(PKG)_FILE := $(PKG)-$(subst .,_,$($(PKG)_VERSION))-src.tgz $(PKG)_URL := http://download.icu-project.org/files/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) From 34cf58c18f37bdaa2a707419bc18f40c7103173c Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 9 Jan 2016 17:42:06 +1100 Subject: [PATCH 0355/1463] libpng: update 1.6.19 --> 1.6.20 --- src/libpng.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libpng.mk b/src/libpng.mk index cd80af77..532c77d6 100644 --- a/src/libpng.mk +++ b/src/libpng.mk @@ -3,8 +3,8 @@ PKG := libpng $(PKG)_IGNORE := -$(PKG)_VERSION := 1.6.19 -$(PKG)_CHECKSUM := 311c5657f53516986c67713c946f616483e3cdb52b8b2ee26711be74e8ac35e8 +$(PKG)_VERSION := 1.6.20 +$(PKG)_CHECKSUM := 55c5959e9f3484d96141a3226c53bc9da42a4845e70879d3e1d6e94833d1918b $(PKG)_SUBDIR := libpng-$($(PKG)_VERSION) $(PKG)_FILE := libpng-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/libpng/libpng16/$($(PKG)_VERSION)/$($(PKG)_FILE) From 08a63fdb4b7fcfcf4f72b59d77c61378fcebbdd2 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 9 Jan 2016 17:42:31 +1100 Subject: [PATCH 0356/1463] lzo: update 2.08 --> 2.09 --- src/lzo.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lzo.mk b/src/lzo.mk index 379630b3..58f807dc 100644 --- a/src/lzo.mk +++ b/src/lzo.mk @@ -3,8 +3,8 @@ PKG := lzo $(PKG)_IGNORE := -$(PKG)_VERSION := 2.08 -$(PKG)_CHECKSUM := ac1b3e4dee46febe9fd28737eb7f5692d3232ef1a01da10444394c3d47536614 +$(PKG)_VERSION := 2.09 +$(PKG)_CHECKSUM := f294a7ced313063c057c504257f437c8335c41bfeed23531ee4e6a2b87bcb34c $(PKG)_SUBDIR := lzo-$($(PKG)_VERSION) $(PKG)_FILE := lzo-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.oberhumer.com/opensource/lzo/download/$($(PKG)_FILE) From 03bc07914dfd612de99360dab114e6818054b1b7 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 9 Jan 2016 17:43:06 +1100 Subject: [PATCH 0357/1463] pixman: update 0.31.2 --> 0.33.6 --- src/pixman.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pixman.mk b/src/pixman.mk index 2f024c93..26f090d8 100644 --- a/src/pixman.mk +++ b/src/pixman.mk @@ -3,8 +3,8 @@ PKG := pixman $(PKG)_IGNORE := -$(PKG)_VERSION := 0.31.2 -$(PKG)_CHECKSUM := 7e2dbef309f359276b98bbaf20e3fbef2c26edf4bce414138d0a51be7becc1ae +$(PKG)_VERSION := 0.33.6 +$(PKG)_CHECKSUM := 4e1e72c0ed31d10944f304976e87e6c87b441c853713eeecf115e22c23d4b17d $(PKG)_SUBDIR := pixman-$($(PKG)_VERSION) $(PKG)_FILE := pixman-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://cairographics.org/snapshots/$($(PKG)_FILE) From 3d05f1d602535ce4df2c1fb7ae3109cc943a0c73 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 9 Jan 2016 20:21:24 +1100 Subject: [PATCH 0358/1463] gtkimageview: fix using deprecated gdk-pixbuf declarations --- src/gtkimageview.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gtkimageview.mk b/src/gtkimageview.mk index 1145d2ad..9dbbd789 100644 --- a/src/gtkimageview.mk +++ b/src/gtkimageview.mk @@ -31,7 +31,8 @@ define $(PKG)_BUILD --prefix='$(PREFIX)/$(TARGET)' \ --disable-gtk-doc \ GLIB_GENMARSHAL='$(PREFIX)/$(TARGET)/bin/glib-genmarshal' \ - GLIB_MKENUMS='$(PREFIX)/$(TARGET)/bin/glib-mkenums' + GLIB_MKENUMS='$(PREFIX)/$(TARGET)/bin/glib-mkenums' \ + CFLAGS='-Wno-error=deprecated-declarations -std=c99' $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= From 578e7979041b95e1f5bd756ed4acbb975c274cdf Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sun, 10 Jan 2016 14:19:41 +1100 Subject: [PATCH 0359/1463] openscenegraph: consolidate patches --- ...openscenegraph-1-fix-case-in-headers.patch | 58 -------- src/openscenegraph-1-fixes.patch | 137 ++++++++++++++++++ ...negraph-2-fix-case-in-library-ws2-32.patch | 56 ------- ...x-pointer-to-int-conversion-on-64bit.patch | 28 ---- src/openscenegraph-4-noopenthreads.patch | 14 -- 5 files changed, 137 insertions(+), 156 deletions(-) delete mode 100644 src/openscenegraph-1-fix-case-in-headers.patch create mode 100644 src/openscenegraph-1-fixes.patch delete mode 100644 src/openscenegraph-2-fix-case-in-library-ws2-32.patch delete mode 100644 src/openscenegraph-3-fix-pointer-to-int-conversion-on-64bit.patch delete mode 100644 src/openscenegraph-4-noopenthreads.patch diff --git a/src/openscenegraph-1-fix-case-in-headers.patch b/src/openscenegraph-1-fix-case-in-headers.patch deleted file mode 100644 index 04ef6ba5..00000000 --- a/src/openscenegraph-1-fix-case-in-headers.patch +++ /dev/null @@ -1,58 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -From 31fe54c6c787bc3b66dd22a17528aeaeb0544752 Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Fri, 9 Oct 2015 11:13:12 +0200 -Subject: [PATCH] fix case in headers windows.h, winsock2.h - ---- - examples/osghangglide/hat.cpp | 2 +- - src/osg/DisplaySettings.cpp | 2 +- - src/osgPlugins/ply/typedefs.h | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/examples/osghangglide/hat.cpp b/examples/osghangglide/hat.cpp -index 4ef9e79..2884770 100644 ---- a/examples/osghangglide/hat.cpp -+++ b/examples/osghangglide/hat.cpp -@@ -17,7 +17,7 @@ - */ - - #ifdef _MSC_VER --#include -+#include - #pragma warning( disable : 4244 ) - #endif - -diff --git a/src/osg/DisplaySettings.cpp b/src/osg/DisplaySettings.cpp -index 8ebae0d..8731c10 100644 ---- a/src/osg/DisplaySettings.cpp -+++ b/src/osg/DisplaySettings.cpp -@@ -24,7 +24,7 @@ using namespace osg; - using namespace std; - - #if defined(WIN32) && !defined(__CYGWIN__) --#include -+#include - extern "C" { OSG_EXPORT DWORD NvOptimusEnablement=0x00000001; } - #else - extern "C" { int NvOptimusEnablement=0x00000001; } -diff --git a/src/osgPlugins/ply/typedefs.h b/src/osgPlugins/ply/typedefs.h -index 4d6c833..7a1e334 100644 ---- a/src/osgPlugins/ply/typedefs.h -+++ b/src/osgPlugins/ply/typedefs.h -@@ -13,8 +13,8 @@ - #define MESH_TYPEDEFS_H - - # if defined(_MSC_VER) --# include --# include -+# include -+# include - # endif - - # include --- -1.7.10.4 - diff --git a/src/openscenegraph-1-fixes.patch b/src/openscenegraph-1-fixes.patch new file mode 100644 index 00000000..f3289872 --- /dev/null +++ b/src/openscenegraph-1-fixes.patch @@ -0,0 +1,137 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Fri, 9 Oct 2015 11:13:12 +0200 +Subject: [PATCH] fix case in headers windows.h, winsock2.h + + +diff --git a/examples/osghangglide/hat.cpp b/examples/osghangglide/hat.cpp +index 1111111..2222222 100644 +--- a/examples/osghangglide/hat.cpp ++++ b/examples/osghangglide/hat.cpp +@@ -17,7 +17,7 @@ + */ + + #ifdef _MSC_VER +-#include ++#include + #pragma warning( disable : 4244 ) + #endif + +diff --git a/src/osg/DisplaySettings.cpp b/src/osg/DisplaySettings.cpp +index 1111111..2222222 100644 +--- a/src/osg/DisplaySettings.cpp ++++ b/src/osg/DisplaySettings.cpp +@@ -24,7 +24,7 @@ using namespace osg; + using namespace std; + + #if defined(WIN32) && !defined(__CYGWIN__) +-#include ++#include + extern "C" { OSG_EXPORT DWORD NvOptimusEnablement=0x00000001; } + #else + extern "C" { int NvOptimusEnablement=0x00000001; } +diff --git a/src/osgPlugins/ply/typedefs.h b/src/osgPlugins/ply/typedefs.h +index 1111111..2222222 100644 +--- a/src/osgPlugins/ply/typedefs.h ++++ b/src/osgPlugins/ply/typedefs.h +@@ -13,8 +13,8 @@ + #define MESH_TYPEDEFS_H + + # if defined(_MSC_VER) +-# include +-# include ++# include ++# include + # endif + + # include + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Fri, 9 Oct 2015 12:54:07 +0200 +Subject: [PATCH] fix case in library ws2_32 + + +diff --git a/src/osgPlugins/ZeroConfDevice/CMakeLists.txt b/src/osgPlugins/ZeroConfDevice/CMakeLists.txt +index 1111111..2222222 100644 +--- a/src/osgPlugins/ZeroConfDevice/CMakeLists.txt ++++ b/src/osgPlugins/ZeroConfDevice/CMakeLists.txt +@@ -19,7 +19,7 @@ IF(WIN32) + mdns_win/dns_sd.h + mdns_win/dns-sd.c + ) +- SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};Ws2_32.lib;winmm") ++ SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};ws2_32.lib;winmm") + SET(TARGET_LIBRARIES_VARS ZEROCONF_LIBRARY) + ADD_DEFINITIONS(-DNOT_HAVE_GETOPT) + ADD_DEFINITIONS(-DNOT_HAVE_SETLINEBUF) +diff --git a/src/osgPlugins/osc/CMakeLists.txt b/src/osgPlugins/osc/CMakeLists.txt +index 1111111..2222222 100644 +--- a/src/osgPlugins/osc/CMakeLists.txt ++++ b/src/osgPlugins/osc/CMakeLists.txt +@@ -35,7 +35,7 @@ if(WIN32 AND NOT ANDROID) + ip/win32/NetworkingUtils.cpp + ip/win32/UdpSocket.cpp + ) +- SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};Ws2_32.lib;winmm") ++ SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};ws2_32.lib;winmm") + ELSE() + SET(TARGET_SRC + ${TARGET_SRC} +diff --git a/src/osgPlugins/vrml/CMakeLists.txt b/src/osgPlugins/vrml/CMakeLists.txt +index 1111111..2222222 100644 +--- a/src/osgPlugins/vrml/CMakeLists.txt ++++ b/src/osgPlugins/vrml/CMakeLists.txt +@@ -27,7 +27,7 @@ IF (WIN32) + PNG_LIBRARY + ZLIB_LIBRARY) + SET(TARGET_EXTERNAL_LIBRARIES +- Ws2_32.lib) ++ ws2_32.lib) + ELSE() + SET(TARGET_LIBRARIES_VARS + OPENVRML_LIBRARY) + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Fri, 9 Oct 2015 14:00:54 +0200 +Subject: [PATCH] fix pointer to int conversion on 64bit + + +diff --git a/src/osgPlugins/osgjs/WriteVisitor.cpp b/src/osgPlugins/osgjs/WriteVisitor.cpp +index 1111111..2222222 100644 +--- a/src/osgPlugins/osgjs/WriteVisitor.cpp ++++ b/src/osgPlugins/osgjs/WriteVisitor.cpp +@@ -225,7 +225,7 @@ JSONObject* createImage(osg::Image* image, bool inlineImages, int maxTextureDime + // no image file so use this inline name image and create a file + std::stringstream ss; + ss << osgDB::getFilePath(baseName) << osgDB::getNativePathSeparator(); +- ss << (long int)image << ".inline_conv_generated.png"; // write the pointer location ++ ss << (uintptr_t)image << ".inline_conv_generated.png"; // write the pointer location + std::string filename = ss.str(); + if (osgDB::writeImageFile(*image, filename)) { + image->setFileName(filename); + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Rashad Kanavath +Date: Sun, 10 Jan 2016 14:04:18 +1100 +Subject: [PATCH] openscenegraph: use previously built openthreads + + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 1111111..2222222 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -8,7 +8,6 @@ ENDIF() + + #the old construct SUBDIRS( was substituded by ADD_SUBDIRECTORY that is to be preferred according on CMake docs. + FOREACH( mylibfolder +- OpenThreads + osg + osgDB + osgUtil diff --git a/src/openscenegraph-2-fix-case-in-library-ws2-32.patch b/src/openscenegraph-2-fix-case-in-library-ws2-32.patch deleted file mode 100644 index 7221e20d..00000000 --- a/src/openscenegraph-2-fix-case-in-library-ws2-32.patch +++ /dev/null @@ -1,56 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -From c78dde633089cdff3142eb30cc01c5bd77a3c617 Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Fri, 9 Oct 2015 12:54:07 +0200 -Subject: [PATCH] fix case in library ws2_32 - ---- - src/osgPlugins/ZeroConfDevice/CMakeLists.txt | 2 +- - src/osgPlugins/osc/CMakeLists.txt | 2 +- - src/osgPlugins/vrml/CMakeLists.txt | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/osgPlugins/ZeroConfDevice/CMakeLists.txt b/src/osgPlugins/ZeroConfDevice/CMakeLists.txt -index 5287cfc..fab449e 100644 ---- a/src/osgPlugins/ZeroConfDevice/CMakeLists.txt -+++ b/src/osgPlugins/ZeroConfDevice/CMakeLists.txt -@@ -19,7 +19,7 @@ IF(WIN32) - mdns_win/dns_sd.h - mdns_win/dns-sd.c - ) -- SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};Ws2_32.lib;winmm") -+ SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};ws2_32.lib;winmm") - SET(TARGET_LIBRARIES_VARS ZEROCONF_LIBRARY) - ADD_DEFINITIONS(-DNOT_HAVE_GETOPT) - ADD_DEFINITIONS(-DNOT_HAVE_SETLINEBUF) -diff --git a/src/osgPlugins/osc/CMakeLists.txt b/src/osgPlugins/osc/CMakeLists.txt -index 6bf6127..0529e17 100644 ---- a/src/osgPlugins/osc/CMakeLists.txt -+++ b/src/osgPlugins/osc/CMakeLists.txt -@@ -35,7 +35,7 @@ if(WIN32 AND NOT ANDROID) - ip/win32/NetworkingUtils.cpp - ip/win32/UdpSocket.cpp - ) -- SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};Ws2_32.lib;winmm") -+ SET(TARGET_EXTERNAL_LIBRARIES "${TARGET_EXTERNAL_LIBRARIES};ws2_32.lib;winmm") - ELSE() - SET(TARGET_SRC - ${TARGET_SRC} -diff --git a/src/osgPlugins/vrml/CMakeLists.txt b/src/osgPlugins/vrml/CMakeLists.txt -index 867e0df..5e5eb26 100644 ---- a/src/osgPlugins/vrml/CMakeLists.txt -+++ b/src/osgPlugins/vrml/CMakeLists.txt -@@ -27,7 +27,7 @@ IF (WIN32) - PNG_LIBRARY - ZLIB_LIBRARY) - SET(TARGET_EXTERNAL_LIBRARIES -- Ws2_32.lib) -+ ws2_32.lib) - ELSE() - SET(TARGET_LIBRARIES_VARS - OPENVRML_LIBRARY) --- -1.7.10.4 - diff --git a/src/openscenegraph-3-fix-pointer-to-int-conversion-on-64bit.patch b/src/openscenegraph-3-fix-pointer-to-int-conversion-on-64bit.patch deleted file mode 100644 index c6484770..00000000 --- a/src/openscenegraph-3-fix-pointer-to-int-conversion-on-64bit.patch +++ /dev/null @@ -1,28 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -From 9858a76d8daebe3e26f67eb530c89a8f00d5cd28 Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Fri, 9 Oct 2015 14:00:54 +0200 -Subject: [PATCH] fix pointer to int conversion on 64bit - ---- - src/osgPlugins/osgjs/WriteVisitor.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/osgPlugins/osgjs/WriteVisitor.cpp b/src/osgPlugins/osgjs/WriteVisitor.cpp -index 9f2b3c7..98e0c19 100644 ---- a/src/osgPlugins/osgjs/WriteVisitor.cpp -+++ b/src/osgPlugins/osgjs/WriteVisitor.cpp -@@ -225,7 +225,7 @@ JSONObject* createImage(osg::Image* image, bool inlineImages, int maxTextureDime - // no image file so use this inline name image and create a file - std::stringstream ss; - ss << osgDB::getFilePath(baseName) << osgDB::getNativePathSeparator(); -- ss << (long int)image << ".inline_conv_generated.png"; // write the pointer location -+ ss << (uintptr_t)image << ".inline_conv_generated.png"; // write the pointer location - std::string filename = ss.str(); - if (osgDB::writeImageFile(*image, filename)) { - image->setFileName(filename); --- -1.7.10.4 - diff --git a/src/openscenegraph-4-noopenthreads.patch b/src/openscenegraph-4-noopenthreads.patch deleted file mode 100644 index f88f084f..00000000 --- a/src/openscenegraph-4-noopenthreads.patch +++ /dev/null @@ -1,14 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -diff -burN OpenSceneGraph-3.4.0.orig/src/CMakeLists.txt OpenSceneGraph-3.4.0/src/CMakeLists.txt ---- OpenSceneGraph-3.4.0.orig/src/CMakeLists.txt 2015-12-03 11:53:17.597970954 +0100 -+++ OpenSceneGraph-3.4.0/src/CMakeLists.txt 2015-12-03 11:55:07.941146106 +0100 -@@ -8,7 +8,6 @@ - - #the old construct SUBDIRS( was substituded by ADD_SUBDIRECTORY that is to be preferred according on CMake docs. - FOREACH( mylibfolder -- OpenThreads - osg - osgDB - osgUtil From 121d251ddff4dbae43a4ee770e072e148385504e Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sun, 10 Jan 2016 14:20:55 +1100 Subject: [PATCH 0360/1463] openscenegraph: add missing gstreamer dep and fix detection on mingw --- src/openscenegraph-1-fixes.patch | 20 ++++++++++++++++++++ src/openscenegraph.mk | 4 +++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/openscenegraph-1-fixes.patch b/src/openscenegraph-1-fixes.patch index f3289872..2e97c392 100644 --- a/src/openscenegraph-1-fixes.patch +++ b/src/openscenegraph-1-fixes.patch @@ -135,3 +135,23 @@ index 1111111..2222222 100644 osg osgDB osgUtil + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore +Date: Sun, 10 Jan 2016 14:19:57 +1100 +Subject: [PATCH] use pkg-config for gstreamer detection in mingw + + +diff --git a/CMakeModules/FindGStreamer.cmake b/CMakeModules/FindGStreamer.cmake +index 1111111..2222222 100644 +--- a/CMakeModules/FindGStreamer.cmake ++++ b/CMakeModules/FindGStreamer.cmake +@@ -65,7 +65,7 @@ + # ) + #endmacro() + +-if (WIN32) ++if (WIN32 AND NOT MINGW) + macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _library) + find_path(${_component_prefix}_INCLUDE_DIRS + NAMES ${_header} diff --git a/src/openscenegraph.mk b/src/openscenegraph.mk index e9b35aa7..c7551ec0 100644 --- a/src/openscenegraph.mk +++ b/src/openscenegraph.mk @@ -8,7 +8,9 @@ $(PKG)_CHECKSUM := 5c727d84755da276adf8c4a4a3a8ba9c9570fc4b4969f06f1d2e9f89b1e30 $(PKG)_SUBDIR := OpenSceneGraph-$($(PKG)_VERSION) $(PKG)_FILE := OpenSceneGraph-$($(PKG)_VERSION).zip $(PKG)_URL := http://trac.openscenegraph.org/downloads/developer_releases/$($(PKG)_FILE) -$(PKG)_DEPS := gcc boost curl dcmtk ffmpeg freetype gdal giflib gta jasper jpeg libpng openal openexr openthreads poppler qt tiff xine-lib zlib +$(PKG)_DEPS := gcc boost curl dcmtk ffmpeg freetype gdal giflib gstreamer \ + gta jasper jpeg libpng openal openexr openthreads poppler \ + qt tiff xine-lib zlib define $(PKG)_UPDATE $(WGET) -q -O- 'http://trac.openscenegraph.org/downloads/developer_releases/?C=M;O=D' | \ From f50c9c5263a5650860d4a2ff8ff406133f39a000 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 11 Jan 2016 15:36:07 +1100 Subject: [PATCH 0361/1463] openthreads: convert patch --- ...xcmake.patch => openthreads-1-fixes.patch} | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) rename src/{openthreads-1-fixcmake.patch => openthreads-1-fixes.patch} (69%) diff --git a/src/openthreads-1-fixcmake.patch b/src/openthreads-1-fixes.patch similarity index 69% rename from src/openthreads-1-fixcmake.patch rename to src/openthreads-1-fixes.patch index 989b3afe..9ae5208f 100644 --- a/src/openthreads-1-fixcmake.patch +++ b/src/openthreads-1-fixes.patch @@ -1,10 +1,19 @@ This file is part of MXE. See index.html for further information. -diff -burN OpenSceneGraph-3.4.0.orig/CMakeLists.txt OpenSceneGraph-3.4.0/CMakeLists.txt ---- OpenSceneGraph-3.4.0.orig/CMakeLists.txt 2015-08-12 08:38:59.000000000 +0200 -+++ OpenSceneGraph-3.4.0/CMakeLists.txt 2015-12-02 16:42:16.565976939 +0100 -@@ -1046,16 +1046,7 @@ +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Rashad Kanavath +Date: Mon, 11 Jan 2016 15:33:57 +1100 +Subject: [PATCH] only build openthreads + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1111111..2222222 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1046,16 +1046,7 @@ ENDIF() # OSG Core @@ -22,7 +31,7 @@ diff -burN OpenSceneGraph-3.4.0.orig/CMakeLists.txt OpenSceneGraph-3.4.0/CMakeLi IF(APPLE AND NOT ANDROID) -@@ -1251,24 +1242,7 @@ +@@ -1251,24 +1242,7 @@ ENDIF() # Generate pkg-config configuration files From a3124bf7a78cdcb491a604fee0d60266c1628e76 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 11 Jan 2016 16:34:11 +1100 Subject: [PATCH 0362/1463] openthreads: build standalone and fix static build --- src/openthreads-1-fixes.patch | 77 ++++++++++++++++++++--------------- src/openthreads.mk | 5 ++- 2 files changed, 48 insertions(+), 34 deletions(-) diff --git a/src/openthreads-1-fixes.patch b/src/openthreads-1-fixes.patch index 9ae5208f..2621288c 100644 --- a/src/openthreads-1-fixes.patch +++ b/src/openthreads-1-fixes.patch @@ -6,54 +6,67 @@ Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Rashad Kanavath Date: Mon, 11 Jan 2016 15:33:57 +1100 -Subject: [PATCH] only build openthreads +Subject: [PATCH] build standalone openthreads diff --git a/CMakeLists.txt b/CMakeLists.txt index 1111111..2222222 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1046,16 +1046,7 @@ ENDIF() +@@ -649,7 +649,7 @@ OPTION(OSG_USE_LOCAL_LUA_SOURCE "Enable to use local Lua source when building th + # + IF(ANDROID) + ANDROID_3RD_PARTY() +-ELSE() ++ELSEIF(NOT OPENTHREADS_STANDALONE) + # Common to all platforms except android: + FIND_PACKAGE(Freetype) + FIND_PACKAGE(Inventor) +@@ -787,7 +787,7 @@ ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID) + # Image readers/writers depend on 3rd party libraries except for OS X which + # can use Quicktime. +-IF(NOT ANDROID) ++IF(NOT ANDROID AND NOT OPENTHREADS_STANDALONE) + IF(NOT APPLE) + FIND_PACKAGE(GIFLIB) + FIND_PACKAGE(JPEG) +@@ -1044,7 +1044,9 @@ ELSE () + SET(OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC "STATIC") + ENDIF() - # OSG Core --ADD_SUBDIRECTORY(src) -- --IF (BUILD_OSG_APPLICATIONS AND NOT ANDROID) -- ADD_SUBDIRECTORY(applications) --ENDIF() -- --IF (BUILD_OSG_EXAMPLES) -- ADD_SUBDIRECTORY(examples) --ENDIF() - ++IF(OPENTHREADS_STANDALONE) +ADD_SUBDIRECTORY(src/OpenThreads) ++ELSE() + # OSG Core + ADD_SUBDIRECTORY(src) + +@@ -1055,7 +1057,7 @@ ENDIF() + IF (BUILD_OSG_EXAMPLES) + ADD_SUBDIRECTORY(examples) + ENDIF() +- ++ENDIF() IF(APPLE AND NOT ANDROID) -@@ -1251,24 +1242,7 @@ ENDIF() +@@ -1250,7 +1252,9 @@ IF(CMAKE_CPACK_COMMAND) + ENDIF() # Generate pkg-config configuration files - --SET(PKGCONFIG_FILES -- openscenegraph -- openscenegraph-osg -- openscenegraph-osgDB -- openscenegraph-osgFX -- openscenegraph-osgGA -- openscenegraph-osgParticle -- openscenegraph-osgSim -- openscenegraph-osgText -- openscenegraph-osgUtil -- openscenegraph-osgTerrain -- openscenegraph-osgManipulator -- openscenegraph-osgViewer -- openscenegraph-osgWidget -- openscenegraph-osgShadow -- openscenegraph-osgAnimation -- openscenegraph-osgVolume --) +- ++IF(OPENTHREADS_STANDALONE) +SET(PKGCONFIG_FILES) ++ELSE() + SET(PKGCONFIG_FILES + openscenegraph + openscenegraph-osg +@@ -1269,6 +1273,7 @@ SET(PKGCONFIG_FILES + openscenegraph-osgAnimation + openscenegraph-osgVolume + ) ++ENDIF() IF(QT4_FOUND OR Qt5Widgets_FOUND ) SET(PKGCONFIG_FILES ${PKGCONFIG_FILES} openscenegraph-osgQt) diff --git a/src/openthreads.mk b/src/openthreads.mk index 167cec6c..94ed993d 100644 --- a/src/openthreads.mk +++ b/src/openthreads.mk @@ -17,9 +17,10 @@ endef define $(PKG)_BUILD mkdir '$(1).build' cd '$(1).build' && '$(TARGET)-cmake' \ - -DBUILD_SHARED_LIBS=$(CMAKE_SHARED_BOOL) \ + -DDYNAMIC_OPENTHREADS=$(CMAKE_SHARED_BOOL) \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \ - -DPKG_CONFIG_EXECUTABLE='$(PREFIX)/bin/$(TARGET)-pkg-config' \ + -DOPENTHREADS_STANDALONE=TRUE \ + -DOSG_USE_QT=FALSE \ -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE=1 \ -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED=1 \ '$(1)' From b4b195321c3b6f97fbe1df860aacf3f9fce115a8 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 11 Jan 2016 20:29:16 +1100 Subject: [PATCH 0363/1463] openal: really disable examples --- src/openal.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openal.mk b/src/openal.mk index 268d7fd0..a759692b 100644 --- a/src/openal.mk +++ b/src/openal.mk @@ -21,7 +21,7 @@ define $(PKG)_BUILD cd '$(1)/build' && cmake .. \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DLIBTYPE=$(if $(BUILD_SHARED),SHARED,STATIC) \ - -DEXAMPLES=FALSE \ + -DALSOFT_EXAMPLES=FALSE \ -DALSOFT_UTILS=FALSE $(MAKE) -C '$(1)/build' -j '$(JOBS)' install From 0651b6cb611537f9cf95d9e9bd57523e57ef8290 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Tue, 12 Jan 2016 08:44:34 +0000 Subject: [PATCH 0364/1463] Update versions.json & build-matrix.html --- build-matrix.html | 48 +++++++++++++++++++++++------------------------ versions.json | 24 ++++++++++++------------ 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index b45fd703..19184b65 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -219,7 +219,7 @@ feel free to submit a pull request. cairo - 1.14.2 + 1.14.6 ✓ ✓ ✓ @@ -439,7 +439,7 @@ feel free to submit a pull request. dbus - 1.10.6 + 1.11.0 ✓ ✓ ✓ @@ -719,7 +719,7 @@ feel free to submit a pull request. gdk-pixbuf - 2.30.8 + 2.32.3 ✓ ✓ ✓ @@ -759,7 +759,7 @@ feel free to submit a pull request. gettext - 0.19.5.1 + 0.19.7 ✓ ✓ ✓ @@ -879,31 +879,31 @@ feel free to submit a pull request. gst-plugins-base - 1.4.5 + 1.6.2 + ✓ + ✓ ✓ - ✗ ✓ - ✗ ✗ gst-plugins-good - 1.4.5 + 1.6.2 + ✓ + ✓ ✓ - ✗ ✓ - ✗ ✗ gstreamer - 1.4.5 + 1.6.2 + ✓ + ✓ ✓ - ✗ ✓ - ✗ ✗ @@ -1069,7 +1069,7 @@ feel free to submit a pull request. icu4c - 54.1 + 56.1 ✓ ✓ ✓ @@ -1831,9 +1831,9 @@ feel free to submit a pull request. liboil 0.3.17 ✓ - ✗ - ✗ - ✗ + ✓ + ✓ + ✓ ✗ @@ -1869,7 +1869,7 @@ feel free to submit a pull request. libpng - 1.6.19 + 1.6.20 ✓ ✓ ✓ @@ -1909,7 +1909,7 @@ feel free to submit a pull request. libshout - 2.3.1 + 2.4.1 ✓ ✗ ✓ @@ -2149,7 +2149,7 @@ feel free to submit a pull request. lzo - 2.08 + 2.09 ✓ ✓ ✓ @@ -2709,7 +2709,7 @@ feel free to submit a pull request. pixman - 0.31.2 + 0.33.6 ✓ ✓ ✓ @@ -3954,9 +3954,9 @@ Total: 382 +4 native-only) 379 -275 -360 -273 +279 +361 +277 15 diff --git a/versions.json b/versions.json index 14ee5144..c2fdf876 100644 --- a/versions.json +++ b/versions.json @@ -17,7 +17,7 @@ "box2d": "2.3.1", "bullet": "2.82-r2704", "bzip2": "1.0.6", - "cairo": "1.14.2", + "cairo": "1.14.6", "cairomm": "1.11.2", "cblas": "1", "ccfits": "2.4", @@ -39,7 +39,7 @@ "cunit": "2.1-3", "curl": "7.46.0", "db": "6.1.26", - "dbus": "1.10.6", + "dbus": "1.11.0", "dcmtk": "3.6.0", "devil": "1.7.8", "dlfcn-win32": "1.0.0", @@ -67,11 +67,11 @@ "gd": "2.1.0", "gdal": "2.0.1", "gdb": "7.10.1", - "gdk-pixbuf": "2.30.8", + "gdk-pixbuf": "2.32.3", "gendef": "4.0.4", "geoip-database": "20150317-1", "geos": "3.4.2", - "gettext": "0.19.5.1", + "gettext": "0.19.7", "giflib": "5.0.5", "glew": "1.12.0", "glfw2": "2.7.9", @@ -83,9 +83,9 @@ "graphicsmagick": "1.3.21", "gsl": "1.16", "gsoap": "2.8.22", - "gst-plugins-base": "1.4.5", - "gst-plugins-good": "1.4.5", - "gstreamer": "1.4.5", + "gst-plugins-base": "1.6.2", + "gst-plugins-good": "1.6.2", + "gstreamer": "1.6.2", "gta": "1.0.7", "gtk2": "2.24.29", "gtk3": "3.14.4", @@ -102,7 +102,7 @@ "hdf4": "4.2.10", "hdf5": "1.8.12", "hunspell": "1.3.3", - "icu4c": "54.1", + "icu4c": "56.1", "id3lib": "3.8.3", "ilmbase": "2.2.0", "imagemagick": "6.9.0-0", @@ -182,11 +182,11 @@ "libpano13": "2.9.18", "libpaper": "1.1.24+nmu4", "libplist": "1.12", - "libpng": "1.6.19", + "libpng": "1.6.20", "librsvg": "2.40.5", "librtmp": "a107cef", "libsamplerate": "0.1.8", - "libshout": "2.3.1", + "libshout": "2.4.1", "libsigc++": "2.4.0", "libsndfile": "1.0.25", "libsodium": "1.0.6", @@ -210,7 +210,7 @@ "luabind": "0.9.1", "luajit": "2.0.4", "lzma": "920", - "lzo": "2.08", + "lzo": "2.09", "matio": "1.5.2", "mdbtools": "0.7.1", "mingw-w64": "4.0.4", @@ -266,7 +266,7 @@ "physfs": "2.0.3", "picomodel": "1142ad8", "pire": "0.0.5", - "pixman": "0.31.2", + "pixman": "0.33.6", "pkgconf": "da179fd", "plib": "1.8.5-rc1", "plibc": "cd7ed09", From fe062e7fe8a1a1497a773ffa1397e29c3d8619ba Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 12 Jan 2016 22:40:57 +0100 Subject: [PATCH 0365/1463] wget: update To avoid trouble with static linking to gnutls_free, defined GNUTLS_INTERNAL_BUILD to prevent defining _SYM_EXPORT. --- src/wget.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/wget.mk b/src/wget.mk index ed9e68ef..bf5f7bab 100644 --- a/src/wget.mk +++ b/src/wget.mk @@ -2,8 +2,8 @@ # See index.html for further information. PKG := wget -$(PKG)_VERSION := 1.16.3 -$(PKG)_CHECKSUM := 67f7b7b0f5c14db633e3b18f53172786c001e153d545cfc85d82759c5c2ffb37 +$(PKG)_VERSION := 1.17.1 +$(PKG)_CHECKSUM := fe559b61eb9cc01635ac6206a14e02cb51591838c35fa83c7a4aacae0bdd97c9 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE) @@ -18,12 +18,10 @@ endef define $(PKG)_BUILD # avoid conflict with base64_encode from gnutls $(if $(BUILD_STATIC), $(SED) -i 's/^base64_encode /wget_base64_encode /;' '$(1)/src/utils.c') - $(SED) -i 's/-lidn/`$(TARGET)-pkg-config --libs libidn`/g;' '$(1)/configure' cd '$(1)' && ./configure \ $(MXE_CONFIGURE_OPTS) \ --with-ssl=gnutls \ - CFLAGS='-DIN6_ARE_ADDR_EQUAL=IN6_ADDR_EQUAL' \ - LIBS='-lpthread' + CFLAGS='-DIN6_ARE_ADDR_EQUAL=IN6_ADDR_EQUAL $(if $(BUILD_STATIC),-DGNUTLS_INTERNAL_BUILD,)' $(MAKE) -C '$(1)/lib' -j '$(JOBS)' $(MAKE) -C '$(1)/src' -j '$(JOBS)' install-binPROGRAMS endef From 1555116931f39d7cbdbf25d0f0ccca384305e644 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Tue, 12 Jan 2016 22:12:44 +0000 Subject: [PATCH 0366/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 19184b65..d3dfc87c 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -3779,7 +3779,7 @@ feel free to submit a pull request. wget - 1.16.3 + 1.17.1 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index c2fdf876..903cede9 100644 --- a/versions.json +++ b/versions.json @@ -373,7 +373,7 @@ "vtk6": "6.3.0", "waf": "1.8.17", "wavpack": "4.75.2", - "wget": "1.16.3", + "wget": "1.17.1", "widl": "4.0.4", "winpcap": "4_1_3", "wt": "3.3.5", From 1c8e11dcc66e23c3c8ac94e82f4f253c59aa0bfe Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 13 Jan 2016 10:01:40 +0100 Subject: [PATCH 0367/1463] pcre: update --- src/pcre.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pcre.mk b/src/pcre.mk index 2a8e9c65..0bc76295 100644 --- a/src/pcre.mk +++ b/src/pcre.mk @@ -3,8 +3,8 @@ PKG := pcre $(PKG)_IGNORE := -$(PKG)_VERSION := 8.37 -$(PKG)_CHECKSUM := 51679ea8006ce31379fb0860e46dd86665d864b5020fc9cd19e71260eef4789d +$(PKG)_VERSION := 8.38 +$(PKG)_CHECKSUM := b9e02d36e23024d6c02a2e5b25204b3a4fa6ade43e0a5f869f254f49535079df $(PKG)_SUBDIR := pcre-$($(PKG)_VERSION) $(PKG)_FILE := pcre-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/pcre/pcre/$($(PKG)_VERSION)/$($(PKG)_FILE) From 19e3cf15cb7e0f84af14ccc7ba74db34c91ccc12 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Wed, 13 Jan 2016 09:04:20 +0000 Subject: [PATCH 0368/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index d3dfc87c..fd0e9e4e 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -2639,7 +2639,7 @@ feel free to submit a pull request. pcre - 8.37 + 8.38 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 903cede9..5ba82b24 100644 --- a/versions.json +++ b/versions.json @@ -259,7 +259,7 @@ "pango": "1.37.4", "pangomm": "2.34.0", "pcl": "1.7.2", - "pcre": "8.37", + "pcre": "8.38", "pdcurses": "3.4", "pdflib_lite": "7.0.5p3", "pfstools": "2.0.4", From 199f2e53b8409c7bf85deb711b088815362d423c Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 13 Jan 2016 23:19:50 +0300 Subject: [PATCH 0369/1463] luarocks wrapper: exit with non-zero on failure --- plugins/luarocks/luarocks.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/luarocks/luarocks.mk b/plugins/luarocks/luarocks.mk index a852c37b..9b942a61 100644 --- a/plugins/luarocks/luarocks.mk +++ b/plugins/luarocks/luarocks.mk @@ -41,6 +41,7 @@ define $(PKG)_BUILD_SHARED # see https://github.com/mxe/mxe/pull/1017#issuecomment-161557440 $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/luarocks' (echo '#!/usr/bin/env bash'; \ + echo 'set -ue'; \ echo 'echo "== Using MXE wrapper: $(PREFIX)/$(TARGET)/bin/luarocks"'; \ echo '# Creating a directory is an atomic operation, that is why'; \ echo '# it can be used as a mutex.'; \ From cd9e79dc6269a7aa7c6c1d652f5d4101b890f8b0 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 12 Jan 2016 02:38:13 +0300 Subject: [PATCH 0370/1463] luarocks: unify the patch --- ...s-1-platform-mxe.patch => luarocks-1-fixes.patch} | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) rename plugins/luarocks/{luarocks-1-platform-mxe.patch => luarocks-1-fixes.patch} (94%) diff --git a/plugins/luarocks/luarocks-1-platform-mxe.patch b/plugins/luarocks/luarocks-1-fixes.patch similarity index 94% rename from plugins/luarocks/luarocks-1-platform-mxe.patch rename to plugins/luarocks/luarocks-1-fixes.patch index 127e06e4..8940e8e4 100644 --- a/plugins/luarocks/luarocks-1-platform-mxe.patch +++ b/plugins/luarocks/luarocks-1-fixes.patch @@ -1,13 +1,16 @@ This file is part of MXE. See index.html for further information. -From 5cd28e7a8f0de2539322ede15616904835a4dbe3 Mon Sep 17 00:00:00 2001 +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sat, 10 Oct 2015 17:45:24 +0100 Subject: [PATCH] platform MXE + diff --git a/src/luarocks/build/builtin.lua b/src/luarocks/build/builtin.lua -index 00fd09e..a4985e9 100644 +index 1111111..2222222 100644 --- a/src/luarocks/build/builtin.lua +++ b/src/luarocks/build/builtin.lua @@ -165,7 +165,7 @@ function builtin.run(rockspec) @@ -20,7 +23,7 @@ index 00fd09e..a4985e9 100644 end return execute(variables.LD.." "..variables.LIBFLAG, "-o", library, "-L"..variables.LUA_LIBDIR, unpack(extras)) diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua -index 99b4077..a17fbaa 100644 +index 1111111..2222222 100644 --- a/src/luarocks/cfg.lua +++ b/src/luarocks/cfg.lua @@ -118,6 +118,9 @@ elseif system and system:match("^Windows") then @@ -78,6 +81,3 @@ index 99b4077..a17fbaa 100644 if detected.cygwin then defaults.lib_extension = "so" -- can be overridden in the config file for mingw builds defaults.arch = "cygwin-"..proc --- -2.1.4 - From 4f2f9bf8064a0ad8733a2297d5a0cbcad7f35d3f Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 12 Jan 2016 02:47:11 +0300 Subject: [PATCH 0371/1463] update luarocks from 2.2.2 to 2.3.0 --- plugins/luarocks/luarocks-1-fixes.patch | 30 ++++++++++++++++--------- plugins/luarocks/luarocks.mk | 4 ++-- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/plugins/luarocks/luarocks-1-fixes.patch b/plugins/luarocks/luarocks-1-fixes.patch index 8940e8e4..33e9fb82 100644 --- a/plugins/luarocks/luarocks-1-fixes.patch +++ b/plugins/luarocks/luarocks-1-fixes.patch @@ -26,21 +26,29 @@ diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua index 1111111..2222222 100644 --- a/src/luarocks/cfg.lua +++ b/src/luarocks/cfg.lua -@@ -118,6 +118,9 @@ elseif system and system:match("^Windows") then - elseif system and system:match("^MINGW") then - detected.windows = true - detected.mingw32 = true +@@ -120,6 +120,9 @@ elseif system and system:match("^MINGW") then + cfg.platforms.windows = true + cfg.platforms.mingw32 = true + cfg.platforms.win32 = true +elseif system and system:match("^MXE") then -+ detected.unix = true -+ detected.mxe = true ++ cfg.platforms.unix = true ++ cfg.platforms.mxe = true else - detected.unix = true + cfg.platforms.unix = true -- Fall back to Unix in unknown systems. -@@ -430,6 +433,44 @@ if detected.unix then +@@ -137,6 +140,7 @@ local platform_order = { + linux = 7, + macosx = 8, + cygwin = 9, ++ mxe = 13, + -- Windows + win32 = 10, + mingw32 = 11, +@@ -509,6 +513,44 @@ if cfg.platforms.unix then defaults.web_browser = "xdg-open" end -+if detected.mxe then ++if cfg.platforms.mxe then + local MXE_ROOT, MXE_TARGET = + assert(site_config.LUAROCKS_PREFIX:match('^(.*)/usr/([^/]+)$')) + defaults.lib_extension = "dll" @@ -78,6 +86,6 @@ index 1111111..2222222 100644 + } +end + - if detected.cygwin then + if cfg.platforms.cygwin then defaults.lib_extension = "so" -- can be overridden in the config file for mingw builds - defaults.arch = "cygwin-"..proc + defaults.arch = "cygwin-"..cfg.target_cpu diff --git a/plugins/luarocks/luarocks.mk b/plugins/luarocks/luarocks.mk index 9b942a61..ef4a5acb 100644 --- a/plugins/luarocks/luarocks.mk +++ b/plugins/luarocks/luarocks.mk @@ -5,8 +5,8 @@ PKG := luarocks $(PKG)_WEBSITE := https://luarocks.org/ $(PKG)_OWNER := https://github.com/starius $(PKG)_IGNORE := -$(PKG)_VERSION := 2.2.2 -$(PKG)_CHECKSUM := 4f0427706873f30d898aeb1dfb6001b8a3478e46a5249d015c061fe675a1f022 +$(PKG)_VERSION := 2.3.0 +$(PKG)_CHECKSUM := 68e38feeb66052e29ad1935a71b875194ed8b9c67c2223af5f4d4e3e2464ed97 $(PKG)_SUBDIR := luarocks-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_URL := https://keplerproject.github.io/luarocks/releases/$($(PKG)_FILE) From f566d0279223c818c56cf61254cddb86b1e7cda8 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 14 Jan 2016 14:39:31 +0100 Subject: [PATCH 0372/1463] sqlite: update --- src/sqlite.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sqlite.mk b/src/sqlite.mk index c39be609..4f56c78c 100644 --- a/src/sqlite.mk +++ b/src/sqlite.mk @@ -3,8 +3,8 @@ PKG := sqlite $(PKG)_IGNORE := -$(PKG)_VERSION := 3100000 -$(PKG)_CHECKSUM := 43cc292d70711fa7580250c8a1cd7c64813a4a0a479dbd502cce5f10b5d91042 +$(PKG)_VERSION := 3100100 +$(PKG)_CHECKSUM := 3cb4e17137f7422554c8e8906b5a7274c7a0d362872e8aa25233c3f1246bda98 $(PKG)_SUBDIR := $(PKG)-autoconf-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-autoconf-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.sqlite.org/2016/$($(PKG)_FILE) From 6aed1e2bcf97d73cf561f8fe4b9776b44ec055d4 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Thu, 14 Jan 2016 13:40:35 +0000 Subject: [PATCH 0373/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index fd0e9e4e..47211d0c 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -3499,7 +3499,7 @@ feel free to submit a pull request. sqlite - 3100000 + 3100100 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 5ba82b24..4fde2098 100644 --- a/versions.json +++ b/versions.json @@ -345,7 +345,7 @@ "sox": "14.4.2", "speex": "1.2rc2", "speexdsp": "1.2rc3", - "sqlite": "3100000", + "sqlite": "3100100", "suitesparse": "4.2.1", "t4k_common": "0.1.1", "taglib": "1.10", From d59e47708686f147ab8491b9b2c58bdfed2aafeb Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 16 Jan 2016 02:11:27 +1100 Subject: [PATCH 0374/1463] gnutls: add missing libidn dependency fixes #1181 --- src/gnutls.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gnutls.mk b/src/gnutls.mk index 456314da..3fdb207a 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -8,7 +8,7 @@ $(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION) $(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://mirrors.dotsrc.org/gnupg/gnutls/v3.4/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4//$($(PKG)_FILE) -$(PKG)_DEPS := gcc gettext gmp libgnurx nettle zlib +$(PKG)_DEPS := gcc gettext gmp libgnurx libidn nettle zlib define $(PKG)_UPDATE $(WGET) -q -O- ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/ | \ From dde3543ed2a3def23013617ee339b466407e3e79 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 16 Jan 2016 10:55:41 +0100 Subject: [PATCH 0375/1463] libpng: update --- src/libpng.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libpng.mk b/src/libpng.mk index 532c77d6..b0d18da0 100644 --- a/src/libpng.mk +++ b/src/libpng.mk @@ -3,8 +3,8 @@ PKG := libpng $(PKG)_IGNORE := -$(PKG)_VERSION := 1.6.20 -$(PKG)_CHECKSUM := 55c5959e9f3484d96141a3226c53bc9da42a4845e70879d3e1d6e94833d1918b +$(PKG)_VERSION := 1.6.21 +$(PKG)_CHECKSUM := 6c8f1849eb9264219bf5d703601e5abe92a58651ecae927a03d1a1aa15ee2083 $(PKG)_SUBDIR := libpng-$($(PKG)_VERSION) $(PKG)_FILE := libpng-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/libpng/libpng16/$($(PKG)_VERSION)/$($(PKG)_FILE) From 9c573f17c2780e17f95f22474201188272f49400 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sat, 16 Jan 2016 09:56:08 +0000 Subject: [PATCH 0376/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 47211d0c..504830fe 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -1869,7 +1869,7 @@ feel free to submit a pull request. libpng - 1.6.20 + 1.6.21 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 4fde2098..0c6e0751 100644 --- a/versions.json +++ b/versions.json @@ -182,7 +182,7 @@ "libpano13": "2.9.18", "libpaper": "1.1.24+nmu4", "libplist": "1.12", - "libpng": "1.6.20", + "libpng": "1.6.21", "librsvg": "2.40.5", "librtmp": "a107cef", "libsamplerate": "0.1.8", From 3a7534879772b2aac87912df648e927d096637da Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 13 Jan 2016 17:44:21 +1100 Subject: [PATCH 0377/1463] add gnu patch to native plugins --- plugins/native/patch.mk | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 plugins/native/patch.mk diff --git a/plugins/native/patch.mk b/plugins/native/patch.mk new file mode 100644 index 00000000..cb8634b8 --- /dev/null +++ b/plugins/native/patch.mk @@ -0,0 +1,30 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := patch +$(PKG)_IGNORE := +$(PKG)_VERSION := 2.7.5 +$(PKG)_CHECKSUM := 7436f5a19f93c3ca83153ce9c5cbe4847e97c5d956e57a220121e741f6e7968f +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE) +$(PKG)_URL_2 := ftp://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE) +$(PKG)_WEBSITE := http://www.gnu.org/software/$(PKG) +$(PKG)_OWNER := https://github.com/tonytheodore +$(PKG)_TARGETS := $(BUILD) +$(PKG)_DEPS := + +define $(PKG)_UPDATE + $(WGET) -q -O- 'http://ftp.gnu.org/gnu/patch/?C=M;O=D' | \ + $(SED) -n 's,.* Date: Sun, 17 Jan 2016 13:37:08 +0300 Subject: [PATCH 0378/1463] qtbase: unify the patch --- src/{qtbase-1.patch => qtbase-1-fixes.patch} | 58 +++++++------------- 1 file changed, 21 insertions(+), 37 deletions(-) rename src/{qtbase-1.patch => qtbase-1-fixes.patch} (82%) diff --git a/src/qtbase-1.patch b/src/qtbase-1-fixes.patch similarity index 82% rename from src/qtbase-1.patch rename to src/qtbase-1-fixes.patch index df814c50..1c93bb56 100644 --- a/src/qtbase-1.patch +++ b/src/qtbase-1-fixes.patch @@ -1,16 +1,18 @@ This file is part of MXE. See index.html for further information. -From b4a1284aa84466a5c757e1efd16a694d128b1038 Mon Sep 17 00:00:00 2001 +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 6 Aug 2015 23:35:08 +0200 -Subject: [PATCH 1/6] fix qwindows plugin linking with system-freetype (MXE +Subject: [PATCH] fix qwindows plugin linking with system-freetype (MXE specific) Change-Id: I8783e3ab2d19011b083dd3c471107298a17293c4 diff --git a/src/3rdparty/freetype_dependency.pri b/src/3rdparty/freetype_dependency.pri -index 39280de..e152b0d 100644 +index 1111111..2222222 100644 --- a/src/3rdparty/freetype_dependency.pri +++ b/src/3rdparty/freetype_dependency.pri @@ -4,4 +4,5 @@ contains(QT_CONFIG, freetype) { @@ -19,19 +21,16 @@ index 39280de..e152b0d 100644 include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri) + win32:shared:LIBS_PRIVATE += -lfreetype } --- -2.1.4 - -From 217955a3e041e368857a696ebe8b512576d0cead Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 21 Jun 2014 13:12:49 +0200 -Subject: [PATCH 2/6] use pkg-config for harfbuzz (MXE specific) +Subject: [PATCH] use pkg-config for harfbuzz (MXE specific) Change-Id: Id4e4c37d68b63c9f480d72a561d95d4d2a5ded50 diff --git a/config.tests/unix/harfbuzz/harfbuzz.pro b/config.tests/unix/harfbuzz/harfbuzz.pro -index 32edd6e..a7f2c28 100644 +index 1111111..2222222 100644 --- a/config.tests/unix/harfbuzz/harfbuzz.pro +++ b/config.tests/unix/harfbuzz/harfbuzz.pro @@ -1,3 +1,4 @@ @@ -41,7 +40,7 @@ index 32edd6e..a7f2c28 100644 +CONFIG += link_pkgconfig +PKGCONFIG += harfbuzz diff --git a/src/3rdparty/harfbuzz_dependency.pri b/src/3rdparty/harfbuzz_dependency.pri -index 7443368..c24e684 100644 +index 1111111..2222222 100644 --- a/src/3rdparty/harfbuzz_dependency.pri +++ b/src/3rdparty/harfbuzz_dependency.pri @@ -2,5 +2,6 @@ contains(QT_CONFIG, harfbuzz) { @@ -52,19 +51,16 @@ index 7443368..c24e684 100644 + CONFIG += link_pkgconfig + PKGCONFIG += harfbuzz } --- -2.1.4 - -From 81c61f1cf8a2b8ea01545212081427eed0ab2950 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 8 Dec 2014 14:15:12 +0100 -Subject: [PATCH 3/6] fix oci config test on windows +Subject: [PATCH] fix oci config test on windows Change-Id: If1ce2241682259ca495b0ba68bf18410f8548922 diff --git a/config.tests/unix/oci/oci.pro b/config.tests/unix/oci/oci.pro -index 3ffda1d..39b6f3759 100644 +index 1111111..2222222 100644 --- a/config.tests/unix/oci/oci.pro +++ b/config.tests/unix/oci/oci.pro @@ -1,3 +1,3 @@ @@ -72,19 +68,16 @@ index 3ffda1d..39b6f3759 100644 CONFIG -= qt dylib -LIBS += -lclntsh +!win32:LIBS += -lclntsh --- -2.1.4 - -From b656a46abeecfa7ace2e08393b63412e74c62589 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 6 Aug 2015 13:24:56 +0200 -Subject: [PATCH 4/6] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows +Subject: [PATCH] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows Change-Id: I53c110ef40e3d14cc49fa23aa5d294611cac2ffa diff --git a/configure b/configure -index cea62fb..d6bbcd2 100755 +index 1111111..2222222 100755 --- a/configure +++ b/configure @@ -4464,7 +4464,7 @@ fi @@ -96,19 +89,16 @@ index cea62fb..d6bbcd2 100755 # SYSV IPC is not supported - check POSIX IPC if compileTest unix/ipc_posix "ipc_posix" ; then QCONFIG_FLAGS="$QCONFIG_FLAGS QT_POSIX_IPC" --- -2.1.4 - -From ae120a60f2f31c911a451036ecd826b4486e2d3f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 6 Oct 2015 09:53:20 +0200 -Subject: [PATCH 5/6] fix building mysql driver under mingw +Subject: [PATCH] fix building mysql driver under mingw Change-Id: I9c4e821d5b3a6919566c6b684cb4916827feb6a9 diff --git a/src/sql/drivers/mysql/qsql_mysql.pri b/src/sql/drivers/mysql/qsql_mysql.pri -index 3cfb614..8b7063f 100644 +index 1111111..2222222 100644 --- a/src/sql/drivers/mysql/qsql_mysql.pri +++ b/src/sql/drivers/mysql/qsql_mysql.pri @@ -4,7 +4,7 @@ SOURCES += $$PWD/qsql_mysql.cpp @@ -120,14 +110,11 @@ index 3cfb614..8b7063f 100644 isEmpty(QT_LFLAGS_MYSQL) { !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) { use_libmysqlclient_r:LIBS += -lmysqlclient_r --- -2.1.4 - -From 9f47024d54abca4590fc1954015d14df40b23755 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 18 Oct 2015 23:11:28 +0300 -Subject: [PATCH 6/6] configure: fix log corruption with option -v +Subject: [PATCH] configure: fix log corruption with option -v This bug occurs if ./configure is called with -v on systems on which fd proc entries point to the files/devices they are open @@ -163,7 +150,7 @@ Reviewed-by: Thiago Macieira (cherry picked from commit 45fe3f1cde1e516d1ddccddb5e33ea4316497c36) diff --git a/configure b/configure -index d6bbcd2..def691f 100755 +index 1111111..2222222 100755 --- a/configure +++ b/configure @@ -3571,10 +3571,9 @@ END { @@ -180,6 +167,3 @@ index d6bbcd2..def691f 100755 #setup the build parts if [ -z "$CFG_BUILD_PARTS" ]; then --- -2.1.4 - From eb43c1c0add6fd33b242dedd911801d84c113a93 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 17 Jan 2016 15:44:54 +0300 Subject: [PATCH 0379/1463] 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 --- src/qtbase-1-fixes.patch | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/src/qtbase-1-fixes.patch b/src/qtbase-1-fixes.patch index 1c93bb56..093e475e 100644 --- a/src/qtbase-1-fixes.patch +++ b/src/qtbase-1-fixes.patch @@ -167,3 +167,36 @@ index 1111111..2222222 100755 #setup the build parts if [ -z "$CFG_BUILD_PARTS" ]; then + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ray Donnelly +Date: Wed, 26 Aug 2015 12:45:43 +0100 +Subject: [PATCH] cmake: Rearrange STATIC vs INTERFACE targets + +Otherwise we attempt to add_library(Qt5::UiPlugin STATIC IMPORTED) +for header-only modules when building Qt5 statically. + +Source: https://git.io/vzWJz +See also: https://github.com/mxe/mxe/issues/1185 + +diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +index 1111111..2222222 100644 +--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +@@ -222,13 +222,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + endif() + !!ENDIF + ++!!IF equals(TEMPLATE, aux) ++ add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED) ++!!ELSE + !!IF !isEmpty(CMAKE_STATIC_TYPE) + add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED) + set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX") + !!ELSE +-!!IF equals(TEMPLATE, aux) +- add_library(Qt5::$${CMAKE_MODULE_NAME} INTERFACE IMPORTED) +-!!ELSE + add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED) + !!ENDIF + !!ENDIF From 9d09e67443f318f54e0f93a4018e008743e4c994 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 17 Jan 2016 15:47:54 +0300 Subject: [PATCH 0380/1463] qt5: add test that cmake works with QUiLoader See https://github.com/mxe/mxe/issues/1185 --- src/qttools-test/CMakeLists.txt | 31 ++++++++++++++++++++++++ src/qttools-test/mxe-cmake-qtuitools.cpp | 11 +++++++++ src/qttools.mk | 7 ++++++ 3 files changed, 49 insertions(+) create mode 100644 src/qttools-test/CMakeLists.txt create mode 100644 src/qttools-test/mxe-cmake-qtuitools.cpp diff --git a/src/qttools-test/CMakeLists.txt b/src/qttools-test/CMakeLists.txt new file mode 100644 index 00000000..888bf25a --- /dev/null +++ b/src/qttools-test/CMakeLists.txt @@ -0,0 +1,31 @@ +# This file is part of MXE. +# See index.html for further information. + +# Source: https://github.com/mxe/mxe/issues/1185 + +cmake_minimum_required(VERSION 3.0) +find_package(Qt5 REQUIRED COMPONENTS Core Widgets Gui UiTools) + +include_directories(${Qt5UiTools_INCLUDE_DIRS}) +add_executable(mxe-cmake-qtuitools mxe-cmake-qtuitools.cpp) +# NB: Qt5Widgets, Qt5Gui, Qt5Core must be given separately; otherwise they are +# appended automatically at the end, making it impossible to satisfy all the +# other implicit dependencies (opengl, harfbuzz, etc.) +target_link_libraries( + mxe-cmake-qtuitools + ${Qt5UiTools_LIBRARIES} + ${Qt5Widgets_LIBRARIES} + ${Qt5Gui_LIBRARIES} + ${Qt5Core_LIBRARIES} + opengl32 + harfbuzz + jpeg + png + glib-2.0 + winmm + ws2_32 + intl + iconv + pcre16 + z +) diff --git a/src/qttools-test/mxe-cmake-qtuitools.cpp b/src/qttools-test/mxe-cmake-qtuitools.cpp new file mode 100644 index 00000000..dc4eadb1 --- /dev/null +++ b/src/qttools-test/mxe-cmake-qtuitools.cpp @@ -0,0 +1,11 @@ +// This file is part of MXE. +// See index.html for further information. + +// Source: https://github.com/mxe/mxe/issues/1185 + +#include + +int main() { + QUiLoader l; + return 0; +} diff --git a/src/qttools.mk b/src/qttools.mk index bf5fe24a..a6bce29b 100644 --- a/src/qttools.mk +++ b/src/qttools.mk @@ -18,5 +18,12 @@ define $(PKG)_BUILD cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install + + # test QUiLoader + mkdir '$(1)'.test + cd '$(1)'.test && '$(TARGET)-cmake' '$(PWD)/src/qttools-test' + $(MAKE) -C '$(1)'.test + cp '$(1)'.test/mxe-cmake-qtuitools.exe \ + '$(PREFIX)/$(TARGET)/bin/test-qttools.exe' endef From b1e4eab1ad1388d4f96529e954bde3d6108a7727 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Fri, 1 Jan 2016 18:04:05 +0300 Subject: [PATCH 0381/1463] build-pkg: fix warnings of LuaCheck Warnings fixed: https://gist.github.com/b563dfd7708e1ef209b4 --- tools/build-pkg.lua | 50 +++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index 7cd853f1..15a5e668 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -185,8 +185,11 @@ local function isCross(target) return target ~= NATIVE_TARGET end -local cmd = "dpkg-architecture -qDEB_BUILD_ARCH 2> /dev/null" -local ARCH = trim(shell(cmd)) +local function getArch() + local cmd = "dpkg-architecture -qDEB_BUILD_ARCH 2> /dev/null" + return trim(shell(cmd)) +end +local ARCH = getArch() -- return target and package from item name local function parseItem(item) @@ -392,9 +395,7 @@ local function checkFile(file, item) local ext = file:sub(-4):lower() local cmd = 'file --dereference --brief %q' local file_type = trim(shell(cmd:format(file))) - if ext == '.bin' then - -- can be an executable or something else (font) - elseif ext == '.exe' then + if ext == '.exe' then if not file_type:match('PE32') then log('File %s (%s) is %q. Remove .exe', file, item, file_type) @@ -404,7 +405,8 @@ local function checkFile(file, item) log('File %s (%s) is %q. Remove .dll', file, item, file_type) end - else + elseif ext ~= '.bin' then + -- .bin can be an executable or something else (font) if file_type:match('PE32') then log('File %s (%s) is %q. Add exe or dll', file, item, file_type) @@ -525,7 +527,7 @@ local function debianControl(options) end local function makePackage(name, files, deps, ver, d1, d2, dst) - local dst = dst or '.' + dst = dst or '.' local dirname = ('%s/%s_%s'):format(dst, name, protectVersion(ver)) -- make .list file @@ -533,12 +535,12 @@ local function makePackage(name, files, deps, ver, d1, d2, dst) writeFile(list_path, table.concat(files, "\n") .. "\n") -- make .tar.xz file local tar_name = dirname .. '.tar.xz' - local cmd = '%s -T %s --owner=root --group=root -cJf %s' - os.execute(cmd:format(tool 'tar', list_path, tar_name)) + local cmd1 = '%s -T %s --owner=root --group=root -cJf %s' + os.execute(cmd1:format(tool 'tar', list_path, tar_name)) -- update list of files back from .tar.xz (see #1067) - local cmd = '%s -tf %s' - cmd = cmd:format(tool 'tar', tar_name) - local tar_reader = io.popen(cmd, 'r') + local cmd2 = '%s -tf %s' + cmd2 = cmd2:format(tool 'tar', tar_name) + local tar_reader = io.popen(cmd2, 'r') local files_str = tar_reader:read('*all') tar_reader:close() writeFile(list_path, files_str) @@ -558,16 +560,16 @@ local function makePackage(name, files, deps, ver, d1, d2, dst) os.execute(('mkdir -p %s'):format(usr)) os.execute(('mkdir -p %s/DEBIAN'):format(dirname)) -- use tar to copy files with paths - local cmd = '%s -C %s -xf %s' - cmd = 'fakeroot -s deb.fakeroot ' .. cmd - os.execute(cmd:format(tool 'tar', usr, tar_name)) + local cmd3 = '%s -C %s -xf %s' + cmd3 = 'fakeroot -s deb.fakeroot ' .. cmd3 + os.execute(cmd3:format(tool 'tar', usr, tar_name)) -- make DEBIAN/control file local control_fname = dirname .. '/DEBIAN/control' writeFile(control_fname, control_text) -- make .deb file - local cmd = 'dpkg-deb -Zxz -b %s' - cmd = 'fakeroot -i deb.fakeroot ' .. cmd - os.execute(cmd:format(dirname)) + local cmd4 = 'dpkg-deb -Zxz -b %s' + cmd4 = 'fakeroot -i deb.fakeroot ' .. cmd4 + os.execute(cmd4:format(dirname)) -- cleanup os.execute(('rm -fr %s deb.fakeroot'):format(dirname)) end @@ -640,7 +642,7 @@ local function progressPrinter(items) local started_at = os.time() local sums = {} for i, item in ipairs(items) do - local target, pkg = parseItem(item) + local _, pkg = parseItem(item) local expected_time = pkg2time[pkg] or 1 sums[i] = (sums[i - 1] or 0) + expected_time end @@ -649,11 +651,11 @@ local function progressPrinter(items) local pkgs_done = 0 local printer = {} -- - function printer:advance(i) + function printer.advance(_, i) pkgs_done = i time_done = sums[i] end - function printer:status() + function printer.status(_) local now = os.time() local spent = now - started_at local predicted_duration = spent * total_time / time_done @@ -667,7 +669,7 @@ local function progressPrinter(items) return printer end -local function isEmpty(item, files) +local function isEmpty(files) return #files == 1 end @@ -714,7 +716,7 @@ local function makeDebs(items, item2deps, item2ver, item2files) local to_build = {} for _, item in ipairs(items) do local files = assert(item2files[item], item) - if not isEmpty(item, files) then + if not isEmpty(files) then table.insert(to_build, item) end end @@ -727,7 +729,7 @@ local function makeDebs(items, item2deps, item2ver, item2files) local files = assert(item2files[item], item) for _, dep in ipairs(deps) do local dep_files = item2files[dep] - if isEmpty(dep, dep_files) then + if isEmpty(dep_files) then log('Item %s depends on ' .. 'empty item %s', item, dep) missing_deps_set[dep] = true From 0d0be19c2a805cdef04235a556cc068a97671ecf Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Fri, 1 Jan 2016 18:03:19 +0100 Subject: [PATCH 0382/1463] build-pkg: move git user config to var --- tools/build-pkg.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index 15a5e668..2b163647 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -40,6 +40,8 @@ local TODAY = os.date("%Y%m%d") local MXE_DIR = os.getenv('MXE_DIR') or '/usr/lib/mxe' local GIT = 'git --work-tree=./usr/ --git-dir=./usr/.git ' +local GIT_USER = '-c user.name="build-pkg" ' .. + '-c user.email="build-pkg@mxe" ' local BLACKLIST = { '^usr/installed/check%-requirements$', @@ -378,9 +380,7 @@ end -- git commits changes in ./usr local function gitCommit(message) - local cmd = GIT .. '-c user.name="build-pkg" ' .. - '-c user.email="build-pkg@mxe" ' .. - 'commit -a -m %q --quiet' + local cmd = GIT .. GIT_USER .. 'commit -a -m %q --quiet' os.execute(cmd:format(message)) end From ffa25d96fed4fa304d5c7a27f791b3dbfa462918 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Fri, 1 Jan 2016 18:04:34 +0100 Subject: [PATCH 0383/1463] build-pkg: make sure usr/.git doesn't exist --- tools/build-pkg.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index 2b163647..01db2833 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -818,6 +818,7 @@ local function makeMxeSourcePackage() makePackage(name, files, deps, ver, d1, d2) end +assert(not io.open('usr/.git'), 'Remove usr/') assert(trim(shell('pwd')) == MXE_DIR, "Clone MXE to " .. MXE_DIR) assert(execute(("%s check-requirements"):format(tool 'make'))) From 533f5da3fd59737aa8fbb3a7c602e7cfceb48ab3 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Fri, 1 Jan 2016 18:06:21 +0100 Subject: [PATCH 0384/1463] build-pkg: check-requirements MXE_TARGETS=... check-requirements creates directories usr/ 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.) --- tools/build-pkg.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index 01db2833..f9b40867 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -821,7 +821,8 @@ end assert(not io.open('usr/.git'), 'Remove usr/') assert(trim(shell('pwd')) == MXE_DIR, "Clone MXE to " .. MXE_DIR) -assert(execute(("%s check-requirements"):format(tool 'make'))) +assert(execute(("%s check-requirements MXE_TARGETS=%q"):format( + tool 'make', table.concat(TARGETS, ' ')))) if not max_items then local cmd = ('%s download -j 6 -k'):format(tool 'make') while not execute(cmd) do end From d31bdd48b50356f37770fbe6ae498775c3462e37 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 4 Jan 2016 11:03:18 +0100 Subject: [PATCH 0385/1463] build-pkg: make pkg without independent packages This is an implementation of detection of undeclared requiremenets using Git branches. See #1111 --- tools/build-pkg.lua | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index f9b40867..f437c80e 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -336,12 +336,47 @@ local function isBlacklisted(file) return isListed(file, BLACKLIST) end +local GIT_INITIAL = 'initial' +local GIT_ALL = 'first-all' + +local function itemToBranch(item) + return 'first-' .. item:gsub('~', '_') +end + -- creates git repo in ./usr local function gitInit() os.execute('mkdir -p ./usr') os.execute(GIT .. 'init --quiet') end +local function gitTag(name) + os.execute(GIT .. 'tag ' .. name) +end + +local function gitCheckout(new_branch, deps) + local main_dep = deps[1] + if main_dep then + main_dep = itemToBranch(main_dep) + else + main_dep = GIT_INITIAL + end + local cmd = '%s checkout -q -b %s %s' + os.execute(cmd:format(GIT, new_branch, main_dep)) + if #deps > 1 then + -- merge with other dependencies + local merged = {} + for i = 2, #deps do + table.insert(merged, itemToBranch(deps[i])) + end + local message = 'Merge ' .. table.concat(deps, ', ') + local cmd2 = '%s %s merge -q %s -m %q' + os.execute(cmd2:format(GIT, + GIT_USER, + table.concat(merged, ' '), + message)) + end +end + local function gitAdd() os.execute(GIT .. 'add .') end @@ -454,6 +489,7 @@ end -- builds package, returns list of new files local function buildItem(item, item2deps, file2item) + gitCheckout(itemToBranch(item), item2deps[item]) local target, pkg = parseItem(item) local cmd = '%s %s MXE_TARGETS=%s --jobs=1' os.execute(cmd:format(tool 'make', pkg, target)) @@ -821,18 +857,22 @@ end assert(not io.open('usr/.git'), 'Remove usr/') assert(trim(shell('pwd')) == MXE_DIR, "Clone MXE to " .. MXE_DIR) +gitInit() assert(execute(("%s check-requirements MXE_TARGETS=%q"):format( tool 'make', table.concat(TARGETS, ' ')))) if not max_items then local cmd = ('%s download -j 6 -k'):format(tool 'make') while not execute(cmd) do end end -gitInit() +gitAdd() +gitCommit('Initial commit') +gitTag(GIT_INITIAL) local items, item2deps, item2ver = getItems() local build_list = sortForBuild(items, item2deps) assert(isTopoOrdered(build_list, items, item2deps)) build_list = sliceArray(build_list, max_items) local unbroken, item2files = buildPackages(build_list, item2deps) +gitCheckout(GIT_ALL, unbroken) makeDebs(unbroken, item2deps, item2ver, item2files) if not no_debs then makeMxeRequirementsPackage('wheezy') From e464f12cd026b400fb4360e5db10412dc82e199c Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 5 Jan 2016 14:45:28 +0100 Subject: [PATCH 0386/1463] 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. --- tools/build-pkg.lua | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index f437c80e..ae12afc3 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -362,17 +362,13 @@ local function gitCheckout(new_branch, deps) end local cmd = '%s checkout -q -b %s %s' os.execute(cmd:format(GIT, new_branch, main_dep)) - if #deps > 1 then - -- merge with other dependencies - local merged = {} - for i = 2, #deps do - table.insert(merged, itemToBranch(deps[i])) - end - local message = 'Merge ' .. table.concat(deps, ', ') - local cmd2 = '%s %s merge -q %s -m %q' + -- merge with other dependencies + for i = 2, #deps do + local message = 'Merge with ' .. deps[i] + local cmd2 = '%s %s merge -q -s recursive -X ours %s -m %q' os.execute(cmd2:format(GIT, GIT_USER, - table.concat(merged, ' '), + itemToBranch(deps[i]), message)) end end From deae4dc3c9a694574adcbdd26d45008b04038e8e Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 5 Jan 2016 14:51:18 +0100 Subject: [PATCH 0387/1463] build-pkg: make sure checkout and merge succeed --- tools/build-pkg.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index ae12afc3..0c9533bd 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -361,15 +361,15 @@ local function gitCheckout(new_branch, deps) main_dep = GIT_INITIAL end local cmd = '%s checkout -q -b %s %s' - os.execute(cmd:format(GIT, new_branch, main_dep)) + assert(execute(cmd:format(GIT, new_branch, main_dep))) -- merge with other dependencies for i = 2, #deps do local message = 'Merge with ' .. deps[i] local cmd2 = '%s %s merge -q -s recursive -X ours %s -m %q' - os.execute(cmd2:format(GIT, + assert(execute(cmd2:format(GIT, GIT_USER, itemToBranch(deps[i]), - message)) + message))) end end From 6706af72c46d743be56205ab0f3e528347a7d633 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 6 Jan 2016 10:39:37 +0100 Subject: [PATCH 0388/1463] build-pkg: check exit status of "git commit" --- tools/build-pkg.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index 0c9533bd..2e761973 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -412,7 +412,7 @@ end -- git commits changes in ./usr local function gitCommit(message) local cmd = GIT .. GIT_USER .. 'commit -a -m %q --quiet' - os.execute(cmd:format(message)) + assert(execute(cmd:format(message))) end local function isValidBinary(target, file) @@ -491,7 +491,9 @@ local function buildItem(item, item2deps, file2item) os.execute(cmd:format(tool 'make', pkg, target)) gitAdd() local new_files, changed_files = gitStatus() - gitCommit(("Build %s"):format(item)) + if #new_files + #changed_files > 0 then + gitCommit(("Build %s"):format(item)) + end for _, file in ipairs(new_files) do checkFile(file, item) file2item[file] = item From 184084579587f386dd0ea7c380c5ef4350702bb9 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 6 Jan 2016 10:41:29 +0100 Subject: [PATCH 0389/1463] build-pkg: reorder functions gitCheckout() will use gitCommit() --- tools/build-pkg.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index 2e761973..acc46e8d 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -353,6 +353,12 @@ local function gitTag(name) os.execute(GIT .. 'tag ' .. name) end +-- git commits changes in ./usr +local function gitCommit(message) + local cmd = GIT .. GIT_USER .. 'commit -a -m %q --quiet' + assert(execute(cmd:format(message))) +end + local function gitCheckout(new_branch, deps) local main_dep = deps[1] if main_dep then @@ -409,12 +415,6 @@ local function gitStatus() return new_files, changed_files end --- git commits changes in ./usr -local function gitCommit(message) - local cmd = GIT .. GIT_USER .. 'commit -a -m %q --quiet' - assert(execute(cmd:format(message))) -end - local function isValidBinary(target, file) local cmd = './usr/bin/%s-objdump -t %s > /dev/null 2>&1' return execute(cmd:format(target, file)) From 53c384d4c5aed98623b76f2692ae4f15d7845829 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 6 Jan 2016 18:42:58 +0100 Subject: [PATCH 0390/1463] 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. --- tools/build-pkg.lua | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index acc46e8d..f664fec3 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -353,6 +353,17 @@ local function gitTag(name) os.execute(GIT .. 'tag ' .. name) end +local function gitConflicts() + local cmd = GIT .. 'diff --name-only --diff-filter=U' + local f = io.popen(cmd, 'r') + local conflicts = {} + for conflict in f:lines() do + table.insert(conflicts, conflict) + end + f:close() + return conflicts +end + -- git commits changes in ./usr local function gitCommit(message) local cmd = GIT .. GIT_USER .. 'commit -a -m %q --quiet' @@ -371,11 +382,19 @@ local function gitCheckout(new_branch, deps) -- merge with other dependencies for i = 2, #deps do local message = 'Merge with ' .. deps[i] - local cmd2 = '%s %s merge -q -s recursive -X ours %s -m %q' - assert(execute(cmd2:format(GIT, + local cmd2 = '%s %s merge -q %s -m %q' + if not execute(cmd2:format(GIT, GIT_USER, itemToBranch(deps[i]), - message))) + message)) + then + -- probably merge conflict + local conflicts = table.concat(gitConflicts(), ' ') + log('Merge conflicts: %s', conflicts) + local cmd3 = '%s checkout --ours %s' + assert(execute(cmd3:format(GIT, conflicts))) + gitCommit(message) + end end end From d08e5078b9352f1bf2c1333c0b38d7de38b267a6 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 6 Jan 2016 23:28:10 +0100 Subject: [PATCH 0391/1463] build-pkg: prevent accidental rebuilds touch all installed/* files after checkout. --- tools/build-pkg.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index f664fec3..102c74f7 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -396,6 +396,10 @@ local function gitCheckout(new_branch, deps) gitCommit(message) end end + if #deps > 0 then + -- prevent accidental rebuilds + assert(execute('touch usr/*/installed/*')) + end end local function gitAdd() From 36086a980a508f2496b4f2efe0d25a4d6149ad78 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sat, 9 Jan 2016 12:54:12 +0100 Subject: [PATCH 0392/1463] build-pkg: refactor function makeItem2Index() --- tools/build-pkg.lua | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index 102c74f7..8db71e46 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -299,18 +299,21 @@ local function sortForBuild(items, item2deps) return build_list end +local function makeItem2Index(build_list) + local item2index = {} + for index, item in ipairs(build_list) do + assert(not item2index[item], 'Duplicate item') + item2index[item] = index + end + return item2index +end + -- return if build_list is ordered topologically local function isTopoOrdered(build_list, items, item2deps) if #build_list ~= #items then return false, 'Length of build_list is wrong' end - local item2index = {} - for index, item in ipairs(build_list) do - if item2index[item] then - return false, 'Duplicate item: ' .. item - end - item2index[item] = index - end + local item2index = makeItem2Index(build_list) for item, deps in pairs(item2deps) do for _, dep in ipairs(deps) do if item2index[item] < item2index[dep] then From 53d21fac614435fc22da4bfeb45fa623d67fab63 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sat, 9 Jan 2016 12:55:00 +0100 Subject: [PATCH 0393/1463] build-pkg: touch usr/*/installed/* in build order See https://git.io/vuDJY --- tools/build-pkg.lua | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index 8db71e46..196b1e56 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -241,6 +241,18 @@ local function getItems() return items, item2deps, item2ver end +local function getInstalled() + local installed = {} + local f = io.popen('ls usr/*/installed/*') + local pattern = '/([^/]+)/installed/([^/]+)' + for file in f:lines() do + local target, pkg = assert(file:match(pattern)) + table.insert(installed, makeItem(target, pkg)) + end + f:close() + return installed +end + -- graph is a map from item to a list of destinations local function transpose(graph) local transposed = {} @@ -373,7 +385,7 @@ local function gitCommit(message) assert(execute(cmd:format(message))) end -local function gitCheckout(new_branch, deps) +local function gitCheckout(new_branch, deps, item2index) local main_dep = deps[1] if main_dep then main_dep = itemToBranch(main_dep) @@ -401,7 +413,17 @@ local function gitCheckout(new_branch, deps) end if #deps > 0 then -- prevent accidental rebuilds - assert(execute('touch usr/*/installed/*')) + -- touch usr/*/installed/* files in build order + -- see https://git.io/vuDJY + local installed = getInstalled() + table.sort(installed, function(x, y) + return item2index[x] < item2index[y] + end) + for _, item in ipairs(installed) do + local target, pkg = assert(parseItem(item)) + local cmd4 = 'touch -c usr/%s/installed/%s' + execute(cmd4:format(target, pkg)) + end end end @@ -510,8 +532,8 @@ local function checkFileList(files, item) end -- builds package, returns list of new files -local function buildItem(item, item2deps, file2item) - gitCheckout(itemToBranch(item), item2deps[item]) +local function buildItem(item, item2deps, file2item, item2index) + gitCheckout(itemToBranch(item), item2deps[item], item2index) local target, pkg = parseItem(item) local cmd = '%s %s MXE_TARGETS=%s --jobs=1' os.execute(cmd:format(tool 'make', pkg, target)) @@ -747,10 +769,12 @@ local function buildPackages(items, item2deps) end return false end + local item2index = makeItem2Index(items) local progress_printer = progressPrinter(items) for i, item in ipairs(items) do if not brokenDep(item) then - local files = buildItem(item, item2deps, file2item) + local files = buildItem(item, item2deps, + file2item, item2index) findForeignInstalls(item, files) if isBuilt(item, files) then item2files[item] = files @@ -896,7 +920,7 @@ local build_list = sortForBuild(items, item2deps) assert(isTopoOrdered(build_list, items, item2deps)) build_list = sliceArray(build_list, max_items) local unbroken, item2files = buildPackages(build_list, item2deps) -gitCheckout(GIT_ALL, unbroken) +gitCheckout(GIT_ALL, unbroken, makeItem2Index(build_list)) makeDebs(unbroken, item2deps, item2ver, item2files) if not no_debs then makeMxeRequirementsPackage('wheezy') From 6b25bbb150cc1c384892ecd94fb02b59c2800b76 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sat, 9 Jan 2016 15:10:43 +0100 Subject: [PATCH 0394/1463] build-pkg: log and remove empty directories --- tools/build-pkg.lua | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index 196b1e56..5c132155 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -531,6 +531,22 @@ local function checkFileList(files, item) end end +local function removeEmptyDirs(item) + -- removing an empty dir can reveal another one (parent) + local go_on = true + while go_on do + go_on = false + local f = io.popen('find usr/* -empty -type d', 'r') + for dir in f:lines() do + log("Remove empty directory %s created by %s", + dir, item) + os.remove(dir) + go_on = true + end + f:close() + end +end + -- builds package, returns list of new files local function buildItem(item, item2deps, file2item, item2index) gitCheckout(itemToBranch(item), item2deps[item], item2index) @@ -557,6 +573,7 @@ local function buildItem(item, item2deps, file2item, item2index) item, file, creator_item) end checkFileList(concatArrays(new_files, changed_files), item) + removeEmptyDirs(item) return new_files end From c26dbd9aec256a2ca2f619533228b5c868beb8dd Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 13 Jan 2016 02:39:16 +0300 Subject: [PATCH 0395/1463] 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. --- tools/build-pkg.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index 5c132155..40fcdc9c 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -705,7 +705,7 @@ local function findForeignInstalls(item, files) for _, file in ipairs(files) do local pattern = 'usr/([^/]+)/installed/([^/]+)' local t, p = file:match(pattern) - if t then + if t and p ~= '.gitkeep' then local item1 = makeItem(t, p) if item1 ~= item then log('Item %s built item %s', item, item1) From c6ae83c02922961657a2e19473dacabc82d08234 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sun, 17 Jan 2016 22:34:52 +0100 Subject: [PATCH 0396/1463] jpeg: update --- src/jpeg.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/jpeg.mk b/src/jpeg.mk index 93d21726..f47a43c5 100644 --- a/src/jpeg.mk +++ b/src/jpeg.mk @@ -3,8 +3,8 @@ PKG := jpeg $(PKG)_IGNORE := -$(PKG)_VERSION := 9a -$(PKG)_CHECKSUM := 3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7 +$(PKG)_VERSION := 9b +$(PKG)_CHECKSUM := 240fd398da741669bf3c90366f58452ea59041cacc741a489b99f2f6a0bad052 $(PKG)_SUBDIR := jpeg-$($(PKG)_VERSION) $(PKG)_FILE := jpegsrc.v$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.ijg.org/files/$($(PKG)_FILE) From f4ec5d3ac9db0d2fe598b4149d726661bbe865de Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sun, 17 Jan 2016 21:36:20 +0000 Subject: [PATCH 0397/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 504830fe..2d64cef1 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -1159,7 +1159,7 @@ feel free to submit a pull request. jpeg - 9a + 9b ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 0c6e0751..c1fbb915 100644 --- a/versions.json +++ b/versions.json @@ -111,7 +111,7 @@ "jack": "1.9.10", "jansson": "2.7", "jasper": "1.900.1", - "jpeg": "9a", + "jpeg": "9b", "json-c": "0.12", "json-glib": "1.0.4", "json_spirit": "4.08", From 68e950be5125ff1b109ec928204d3c37c4b453b5 Mon Sep 17 00:00:00 2001 From: Colin Bourassa Date: Tue, 19 Jan 2016 22:08:01 -0500 Subject: [PATCH 0398/1463] Update libcomm14cux to 2.1.1 --- src/libcomm14cux.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libcomm14cux.mk b/src/libcomm14cux.mk index 456cb401..9f57febe 100644 --- a/src/libcomm14cux.mk +++ b/src/libcomm14cux.mk @@ -3,8 +3,8 @@ PKG := libcomm14cux $(PKG)_IGNORE := -$(PKG)_VERSION := 2.1.0 -$(PKG)_CHECKSUM := 579c34b529600debd4a4216959e583fac5836d878de2bf2bec1115c4567d4623 +$(PKG)_VERSION := 2.1.1 +$(PKG)_CHECKSUM := 4b3d0969e2226a0f3c1250c609858e487631507ed62bf6732ce82f13f0d9fcc9 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/colinbourassa/libcomm14cux/archive/$($(PKG)_VERSION).tar.gz From d68db8e06d1ed658c18ea9ccbda715fd0d38bc49 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Wed, 20 Jan 2016 03:11:53 +0000 Subject: [PATCH 0399/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 2d64cef1..120b7fdf 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -1349,7 +1349,7 @@ feel free to submit a pull request. libcomm14cux - 2.1.0 + 2.1.1 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index c1fbb915..b1a185c3 100644 --- a/versions.json +++ b/versions.json @@ -130,7 +130,7 @@ "libcaca": "0.99.beta19", "libcdio": "0.93", "libcdio-paranoia": "10.2+0.93+1", - "libcomm14cux": "2.1.0", + "libcomm14cux": "2.1.1", "libcroco": "0.6.2", "libdca": "0.0.5", "libdnet": "1.11", From 8760249ba7afa89966edad2716cba4340b9e6e14 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 20 Jan 2016 16:36:31 +1100 Subject: [PATCH 0400/1463] devil: enable shared and x86_64 builds see also: * #295 * https://github.com/DentonW/DevIL/issues/29 closes #1188 --- src/devil.mk | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/devil.mk b/src/devil.mk index 8360846f..645f6189 100644 --- a/src/devil.mk +++ b/src/devil.mk @@ -18,12 +18,12 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - $(SED) -i 's,__declspec(dllimport),,' '$(1)/include/IL/il.h' + # autotools files in tarball are ancient (2009) so regenerate + $(if $(BUILD_STATIC), \ + $(SED) -i 's/__declspec(dllimport)//' '$(1)/include/IL/il.h', \ + cd '$(1)' && $(LIBTOOLIZE) && autoreconf -fi) cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --disable-shared \ - --prefix='$(PREFIX)/$(TARGET)' \ + $(MXE_CONFIGURE_OPTS) \ --enable-ILU \ --enable-ILUT \ --disable-allegro \ @@ -40,7 +40,3 @@ define $(PKG)_BUILD --without-examples $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= INFO_DEPS= endef - -$(PKG)_BUILD_x86_64-w64-mingw32 = - -$(PKG)_BUILD_SHARED = From 49deddf2411096cf1d60d7d8b81c8dfedf1412ed Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Wed, 20 Jan 2016 05:37:15 +0000 Subject: [PATCH 0401/1463] Update versions.json & build-matrix.html --- build-matrix.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 120b7fdf..08bad154 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -461,9 +461,9 @@ feel free to submit a pull request. devil 1.7.8 ✓ - ✗ - ✗ - ✗ + ✓ + ✓ + ✓ ✗ @@ -3954,9 +3954,9 @@ Total: 382 +4 native-only) 379 -279 -361 -277 +280 +362 +278 15 From 9bb3735baf327d008a0266b5282bad1856b4675b Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 20 Jan 2016 21:40:30 +0100 Subject: [PATCH 0402/1463] sqlite: update --- src/sqlite.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sqlite.mk b/src/sqlite.mk index 4f56c78c..be927cc9 100644 --- a/src/sqlite.mk +++ b/src/sqlite.mk @@ -3,8 +3,8 @@ PKG := sqlite $(PKG)_IGNORE := -$(PKG)_VERSION := 3100100 -$(PKG)_CHECKSUM := 3cb4e17137f7422554c8e8906b5a7274c7a0d362872e8aa25233c3f1246bda98 +$(PKG)_VERSION := 3100200 +$(PKG)_CHECKSUM := a2b3b4bd1291ea7d6c8252f7edff36a4362f2f0e5d5370444ba6cbe313ae2971 $(PKG)_SUBDIR := $(PKG)-autoconf-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-autoconf-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.sqlite.org/2016/$($(PKG)_FILE) From 6912ce18eec0550d7d1feec4198b7fb5dd392635 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Wed, 20 Jan 2016 20:45:11 +0000 Subject: [PATCH 0403/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 08bad154..bbed30ae 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -3499,7 +3499,7 @@ feel free to submit a pull request. sqlite - 3100100 + 3100200 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index b1a185c3..7b94b503 100644 --- a/versions.json +++ b/versions.json @@ -345,7 +345,7 @@ "sox": "14.4.2", "speex": "1.2rc2", "speexdsp": "1.2rc3", - "sqlite": "3100100", + "sqlite": "3100200", "suitesparse": "4.2.1", "t4k_common": "0.1.1", "taglib": "1.10", From 5dffb8ffe18997bf20c823c3c985d250a8756688 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 21 Jan 2016 17:43:01 +1100 Subject: [PATCH 0404/1463] mxe-conf: fix for touchin readonly directory --- src/mxe-conf.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mxe-conf.mk b/src/mxe-conf.mk index 11e49d8b..cd123570 100644 --- a/src/mxe-conf.mk +++ b/src/mxe-conf.mk @@ -109,7 +109,7 @@ define $(PKG)_BUILD_$(BUILD) #create readonly directory to force wine to fail mkdir -p "$$WINEPREFIX" - touch "$$WINEPREFIX/.gitkeep" + [ -f "$$WINEPREFIX/.gitkeep"] || touch "$$WINEPREFIX/.gitkeep" chmod 0555 "$$WINEPREFIX" #create script "wine" in a directory which is in PATH From eae41ccbfd983312b99cbf1461d6217b701a57b0 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 12 Jan 2016 13:52:44 +1100 Subject: [PATCH 0405/1463] gcc plugin: rename gcc52 to gcc5 and update 5.2.0 --> 5.3.0 --- plugins/{gcc52/gcc52-overlay.mk => gcc5/gcc5-overlay.mk} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename plugins/{gcc52/gcc52-overlay.mk => gcc5/gcc5-overlay.mk} (77%) diff --git a/plugins/gcc52/gcc52-overlay.mk b/plugins/gcc5/gcc5-overlay.mk similarity index 77% rename from plugins/gcc52/gcc52-overlay.mk rename to plugins/gcc5/gcc5-overlay.mk index a3a14ab1..3da31716 100644 --- a/plugins/gcc52/gcc52-overlay.mk +++ b/plugins/gcc5/gcc5-overlay.mk @@ -11,15 +11,15 @@ PKG := cloog $(PKG)_TARGETS := $(MXE_TARGETS) PKG := isl -$(PKG)_VERSION := 0.14 -$(PKG)_CHECKSUM := 7e3c02ff52f8540f6a85534f54158968417fd676001651c8289c705bd0228f36 +$(PKG)_VERSION := 0.15 +$(PKG)_CHECKSUM := 8ceebbf4d9a81afa2b4449113cee4b7cb14a687d7a549a963deb5e2a41458b6b $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://isl.gforge.inria.fr/$($(PKG)_FILE) PKG := gcc -$(PKG)_VERSION := 5.2.0 -$(PKG)_CHECKSUM := 5f835b04b5f7dd4f4d2dc96190ec1621b8d89f2dc6f638f9f8bc1b1014ba8cad +$(PKG)_VERSION := 5.3.0 +$(PKG)_CHECKSUM := b84f5592e9218b73dbae612b5253035a7b34a9a1f7688d2e1bfaaf7267d5c4db $(PKG)_SUBDIR := gcc-$($(PKG)_VERSION) $(PKG)_FILE := gcc-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE) From 8ec0d4dafb6ddd244a88e787ec3a6abac470b331 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 25 Jan 2016 21:56:13 +0300 Subject: [PATCH 0406/1463] build-pkg: set MXE_DIR automatically Produce a warning if MXE_DIR != /usr/lib/mxe When making a debug build, it is better to get a warning than set MXE_DIR manually each time. --- tools/build-pkg.lua | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index 40fcdc9c..d0870318 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -13,9 +13,7 @@ Packages are written to `*.tar.xz` files. Debian packages are written to `*.deb` files. Build in directory /usr/lib/mxe -This directory can not be changed in .deb packages -To change this directory, set environment variable -MXE_DIR to other directory. +This directory can not be changed in .deb packages. To prevent build-pkg from creating deb packages, set environment variable MXE_NO_DEBS to 1 @@ -37,8 +35,6 @@ local no_debs = os.getenv('MXE_NO_DEBS') local TODAY = os.date("%Y%m%d") -local MXE_DIR = os.getenv('MXE_DIR') or '/usr/lib/mxe' - local GIT = 'git --work-tree=./usr/ --git-dir=./usr/.git ' local GIT_USER = '-c user.name="build-pkg" ' .. '-c user.email="build-pkg@mxe" ' @@ -150,6 +146,8 @@ local function execute(cmd) end end +local MXE_DIR = trim(shell('pwd')) + -- for tar, try gtar and gnutar first local tools = {} local function tool(name) @@ -920,8 +918,11 @@ local function makeMxeSourcePackage() end assert(not io.open('usr/.git'), 'Remove usr/') -assert(trim(shell('pwd')) == MXE_DIR, - "Clone MXE to " .. MXE_DIR) +local MXE_DIR_EXPECTED = '/usr/lib/mxe' +if MXE_DIR ~= MXE_DIR_EXPECTED then + log("Warning! Building in dir %s, not in %s", + MXE_DIR, MXE_DIR_EXPECTED) +end gitInit() assert(execute(("%s check-requirements MXE_TARGETS=%q"):format( tool 'make', table.concat(TARGETS, ' ')))) From d75a5607a3754c3ebbd888fd6264ce745b62634a Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 26 Jan 2016 00:41:15 +0300 Subject: [PATCH 0407/1463] mxe-conf: prevent touching a file in readonly dir fix #1199 --- src/mxe-conf.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mxe-conf.mk b/src/mxe-conf.mk index cd123570..45ba6a30 100644 --- a/src/mxe-conf.mk +++ b/src/mxe-conf.mk @@ -109,7 +109,9 @@ define $(PKG)_BUILD_$(BUILD) #create readonly directory to force wine to fail mkdir -p "$$WINEPREFIX" - [ -f "$$WINEPREFIX/.gitkeep"] || touch "$$WINEPREFIX/.gitkeep" + [ -f "$$WINEPREFIX/.gitkeep" ] \ + || chmod 0755 "$$WINEPREFIX" \ + && touch "$$WINEPREFIX/.gitkeep" chmod 0555 "$$WINEPREFIX" #create script "wine" in a directory which is in PATH From bd5f44b810f8278f446d53186ebcdabad253f7c5 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 27 Jan 2016 10:43:52 +0100 Subject: [PATCH 0408/1463] binutils: update --- src/binutils.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/binutils.mk b/src/binutils.mk index 7d3d1ce2..73489b75 100644 --- a/src/binutils.mk +++ b/src/binutils.mk @@ -3,8 +3,8 @@ PKG := binutils $(PKG)_IGNORE := -$(PKG)_VERSION := 2.25.1 -$(PKG)_CHECKSUM := b5b14added7d78a8d1ca70b5cb75fef57ce2197264f4f5835326b0df22ac9f22 +$(PKG)_VERSION := 2.26 +$(PKG)_CHECKSUM := c2ace41809542f5237afc7e3b8f32bb92bc7bc53c6232a84463c423b0714ecd9 $(PKG)_SUBDIR := binutils-$($(PKG)_VERSION) $(PKG)_FILE := binutils-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://ftp.gnu.org/pub/gnu/binutils/$($(PKG)_FILE) From 239316668de71fcef89ea35a946529a6ae918f0a Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 27 Jan 2016 10:44:07 +0100 Subject: [PATCH 0409/1463] curl: update --- src/curl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/curl.mk b/src/curl.mk index de237430..9cf3dfd0 100644 --- a/src/curl.mk +++ b/src/curl.mk @@ -3,8 +3,8 @@ PKG := curl $(PKG)_IGNORE := -$(PKG)_VERSION := 7.46.0 -$(PKG)_CHECKSUM := fe854a0dedf0a89da72aa1725d8ff66285b613d366a88f14681dacd824024087 +$(PKG)_VERSION := 7.47.0 +$(PKG)_CHECKSUM := f7789a806fef4e24ec3d4b70ca86ff145243bf19d03ab0eb5c64f18f1b2748d8 $(PKG)_SUBDIR := curl-$($(PKG)_VERSION) $(PKG)_FILE := curl-$($(PKG)_VERSION).tar.lzma $(PKG)_URL := http://curl.haxx.se/download/$($(PKG)_FILE) From bb74e744864737706d7ae49bd7e889fe5dd7e040 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Wed, 27 Jan 2016 09:48:54 +0000 Subject: [PATCH 0410/1463] Update versions.json & build-matrix.html --- build-matrix.html | 8 ++++---- versions.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index bbed30ae..4a2ddc1a 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -149,7 +149,7 @@ feel free to submit a pull request. bfd - 2.25.1 + 2.26 ✓ ✗ ✓ @@ -159,7 +159,7 @@ feel free to submit a pull request. binutils - 2.25.1 + 2.26 ✓ ✓ ✓ @@ -419,7 +419,7 @@ feel free to submit a pull request. curl - 7.46.0 + 7.47.0 ✓ ✓ ✓ @@ -1609,7 +1609,7 @@ feel free to submit a pull request. libiberty - 2.25.1 + 2.26 ✓ ✗ ✓ diff --git a/versions.json b/versions.json index 7b94b503..ec76790f 100644 --- a/versions.json +++ b/versions.json @@ -10,8 +10,8 @@ "atk": "2.16.0", "atkmm": "2.22.7", "aubio": "0.4.2", - "bfd": "2.25.1", - "binutils": "2.25.1", + "bfd": "2.26", + "binutils": "2.26", "blas": "3.5.0", "boost": "1.60.0", "box2d": "2.3.1", @@ -37,7 +37,7 @@ "cryptopp": "5.6.3", "crystalhd": "1", "cunit": "2.1-3", - "curl": "7.46.0", + "curl": "7.47.0", "db": "6.1.26", "dbus": "1.11.0", "dcmtk": "3.6.0", @@ -156,7 +156,7 @@ "libgsasl": "1.8.0", "libgsf": "1.14.30", "libharu": "2.2.1", - "libiberty": "2.25.1", + "libiberty": "2.26", "libical": "1.0.1", "libiconv": "1.14", "libid3tag": "0.15.1b", From 99bee2983a068d27cbfa2643eb6db90c0b6549e2 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 28 Jan 2016 21:12:25 +0100 Subject: [PATCH 0411/1463] openssl: update --- src/openssl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openssl.mk b/src/openssl.mk index efd004ee..350c2d3a 100644 --- a/src/openssl.mk +++ b/src/openssl.mk @@ -3,8 +3,8 @@ PKG := openssl $(PKG)_IGNORE := -$(PKG)_VERSION := 1.0.2e -$(PKG)_CHECKSUM := e23ccafdb75cfcde782da0151731aa2185195ac745eea3846133f2e05c0e0bff +$(PKG)_VERSION := 1.0.2f +$(PKG)_CHECKSUM := 932b4ee4def2b434f85435d9e3e19ca8ba99ce9a065a61524b429a9d5e9b2e9c $(PKG)_SUBDIR := openssl-$($(PKG)_VERSION) $(PKG)_FILE := openssl-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.openssl.org/source/$($(PKG)_FILE) From ab23ca41da0895272813e7b4fa10e24909580ee7 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Thu, 28 Jan 2016 20:15:24 +0000 Subject: [PATCH 0412/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 4a2ddc1a..2683b577 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -2559,7 +2559,7 @@ feel free to submit a pull request. openssl - 1.0.2e + 1.0.2f ✓ ✓ ✓ diff --git a/versions.json b/versions.json index ec76790f..5995725d 100644 --- a/versions.json +++ b/versions.json @@ -251,7 +251,7 @@ "openjpeg": "2.1.0", "openmp-validation": "3.1", "openscenegraph": "3.4.0", - "openssl": "1.0.2e", + "openssl": "1.0.2f", "openthreads": "3.4.0", "opus": "1.1.1", "opusfile": "0.6", From 8e3046a01a12c007ca3fb8e6bde730740f9d66da Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Fri, 29 Jan 2016 11:46:44 +0100 Subject: [PATCH 0413/1463] nettle: update --- src/nettle-1.patch | 27 ++------------------------- src/nettle.mk | 4 ++-- 2 files changed, 4 insertions(+), 27 deletions(-) diff --git a/src/nettle-1.patch b/src/nettle-1.patch index 25436b22..0af6142f 100644 --- a/src/nettle-1.patch +++ b/src/nettle-1.patch @@ -1,7 +1,7 @@ This file is part of MXE. See index.html for further information. -From 29cb19fb27ec834473d638fb13a947e0e004116d Mon Sep 17 00:00:00 2001 +From c5836bef883966beb9b5be562ef0a6d0c6048879 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sun, 12 Apr 2015 10:07:58 +0200 Subject: [PATCH] Revert "Include private dependencies automatically in @@ -9,29 +9,6 @@ Subject: [PATCH] Revert "Include private dependencies automatically in This reverts commit c8b1d2fafff16c57ec50d413c999796ec2085413. -diff --git a/configure.ac b/configure.ac -index 5a16151..e6cd467 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -803,10 +803,8 @@ fi - - if test "x$enable_shared" = xyes ; then - IF_SHARED='' -- IF_NOT_SHARED='#' - else - IF_SHARED='#' -- IF_NOT_SHARED='' - fi - - # Documentation tools -@@ -840,7 +838,6 @@ fi - AC_SUBST(IF_HOGWEED) - AC_SUBST(IF_STATIC) - AC_SUBST(IF_SHARED) --AC_SUBST(IF_NOT_SHARED) - AC_SUBST(IF_DOCUMENTATION) - AC_SUBST(IF_DLL) - AC_SUBST(IF_MINI_GMP) diff --git a/hogweed.pc.in b/hogweed.pc.in index 97fb9d4..839f7d0 100644 --- a/hogweed.pc.in @@ -50,5 +27,5 @@ index 97fb9d4..839f7d0 100644 Cflags: -I${includedir} -- -2.1.4 +2.5.0 diff --git a/src/nettle.mk b/src/nettle.mk index 23b17853..72b384f0 100644 --- a/src/nettle.mk +++ b/src/nettle.mk @@ -3,8 +3,8 @@ PKG := nettle $(PKG)_IGNORE := -$(PKG)_VERSION := 3.1 -$(PKG)_CHECKSUM := f6859d4ec88e70805590af9862b4b8c43a2d1fc7991df0a7a711b1e7ca9fc9d3 +$(PKG)_VERSION := 3.2 +$(PKG)_CHECKSUM := ea4283def236413edab5a4cf9cf32adf540c8df1b9b67641cfc2302fca849d97 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.lysator.liu.se/~nisse/archive/$($(PKG)_FILE) From c6cd939552f48ee26bf131c730c8c572a1398118 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Fri, 29 Jan 2016 10:48:30 +0000 Subject: [PATCH 0414/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 2683b577..af345818 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -2319,7 +2319,7 @@ feel free to submit a pull request. nettle - 3.1 + 3.2 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 5995725d..acca9dd0 100644 --- a/versions.json +++ b/versions.json @@ -227,7 +227,7 @@ "ncurses": "e14300b", "netcdf": "4.3.0", "netpbm": "10.35.96", - "nettle": "3.1", + "nettle": "3.2", "nlopt": "2.4.2", "nsis": "2.50", "ocaml-cairo": "1.2.0", From ddb0b19de4d43fd4054233f04f541c5f860be6d2 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Fri, 22 Jan 2016 13:54:01 +1100 Subject: [PATCH 0415/1463] add native plugin for wheezy requirements closes #1177 and #1178 --- plugins/native/wheezy/autoconf.mk | 1 + plugins/native/wheezy/automake.mk | 1 + plugins/native/wheezy/gettext.mk | 1 + plugins/native/wheezy/libiconv.mk | 1 + plugins/native/wheezy/libtool.mk | 1 + plugins/native/wheezy/m4.mk | 1 + plugins/native/wheezy/patch.mk | 1 + 7 files changed, 7 insertions(+) create mode 120000 plugins/native/wheezy/autoconf.mk create mode 120000 plugins/native/wheezy/automake.mk create mode 120000 plugins/native/wheezy/gettext.mk create mode 120000 plugins/native/wheezy/libiconv.mk create mode 120000 plugins/native/wheezy/libtool.mk create mode 120000 plugins/native/wheezy/m4.mk create mode 120000 plugins/native/wheezy/patch.mk diff --git a/plugins/native/wheezy/autoconf.mk b/plugins/native/wheezy/autoconf.mk new file mode 120000 index 00000000..8bfe07e2 --- /dev/null +++ b/plugins/native/wheezy/autoconf.mk @@ -0,0 +1 @@ +../autoconf.mk \ No newline at end of file diff --git a/plugins/native/wheezy/automake.mk b/plugins/native/wheezy/automake.mk new file mode 120000 index 00000000..5bc30c05 --- /dev/null +++ b/plugins/native/wheezy/automake.mk @@ -0,0 +1 @@ +../automake.mk \ No newline at end of file diff --git a/plugins/native/wheezy/gettext.mk b/plugins/native/wheezy/gettext.mk new file mode 120000 index 00000000..6314aff1 --- /dev/null +++ b/plugins/native/wheezy/gettext.mk @@ -0,0 +1 @@ +../gettext.mk \ No newline at end of file diff --git a/plugins/native/wheezy/libiconv.mk b/plugins/native/wheezy/libiconv.mk new file mode 120000 index 00000000..629a6688 --- /dev/null +++ b/plugins/native/wheezy/libiconv.mk @@ -0,0 +1 @@ +../libiconv.mk \ No newline at end of file diff --git a/plugins/native/wheezy/libtool.mk b/plugins/native/wheezy/libtool.mk new file mode 120000 index 00000000..9b5568f9 --- /dev/null +++ b/plugins/native/wheezy/libtool.mk @@ -0,0 +1 @@ +../libtool.mk \ No newline at end of file diff --git a/plugins/native/wheezy/m4.mk b/plugins/native/wheezy/m4.mk new file mode 120000 index 00000000..fe3aad47 --- /dev/null +++ b/plugins/native/wheezy/m4.mk @@ -0,0 +1 @@ +../m4.mk \ No newline at end of file diff --git a/plugins/native/wheezy/patch.mk b/plugins/native/wheezy/patch.mk new file mode 120000 index 00000000..71213520 --- /dev/null +++ b/plugins/native/wheezy/patch.mk @@ -0,0 +1 @@ +../patch.mk \ No newline at end of file From a2e79fec92b09dbac440de062195df710e83d7f1 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sun, 31 Jan 2016 16:56:58 +1100 Subject: [PATCH 0416/1463] automatically set MXE_PLUGIN_DIRS for native requirements --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 132bd11a..d0c73c46 100644 --- a/Makefile +++ b/Makefile @@ -314,6 +314,10 @@ LOOKUP_PKG_RULE = $(strip \ .PHONY: all all: all-filtered +# Build native requirements for certain systems +OS_SHORT_NAME := $(call lc,$(shell lsb_release -sc 2>/dev/null || uname -s)) +MXE_PLUGIN_DIRS += $(realpath $(TOP_DIR)/plugins/native/$(OS_SHORT_NAME)) + .PHONY: check-requirements define CHECK_REQUIREMENT @if ! $(1) --help &>/dev/null; then \ From 2794426ecd5f9c11f97d57355b4cac244a49f054 Mon Sep 17 00:00:00 2001 From: Pavel Vatagin Date: Fri, 1 Jan 2016 02:27:11 +0300 Subject: [PATCH 0417/1463] add package libechonest --- index.html | 4 ++++ src/libechonest-test.cpp | 7 +++++++ src/libechonest.mk | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+) create mode 100644 src/libechonest-test.cpp create mode 100644 src/libechonest.mk diff --git a/index.html b/index.html index c9a1528c..98716962 100644 --- a/index.html +++ b/index.html @@ -1645,6 +1645,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) libdvdread libdvdread + + libechonest + libechonest + libepoxy libepoxy diff --git a/src/libechonest-test.cpp b/src/libechonest-test.cpp new file mode 100644 index 00000000..b627c7b0 --- /dev/null +++ b/src/libechonest-test.cpp @@ -0,0 +1,7 @@ +#include + +int main() +{ + Echonest::Song a; + return 0; +} diff --git a/src/libechonest.mk b/src/libechonest.mk new file mode 100644 index 00000000..3c73ff30 --- /dev/null +++ b/src/libechonest.mk @@ -0,0 +1,38 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := libechonest +$(PKG)_IGNORE := +$(PKG)_VERSION := 2.3.1 +$(PKG)_CHECKSUM := ab961ab952df30c5234b548031594d7e281e7c9f2a9d1ce91fe5421ddde85e7c +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://github.com/lfranchi/$(PKG)/archive/$($(PKG)_VERSION).tar.gz +$(PKG)_DEPS := gcc qt qjson + +define $(PKG)_UPDATE + $(call MXE_GET_GITHUB_TAGS, lfranchi/libechonest) +endef + +define $(PKG)_BUILD + mkdir '$(1).build' + cd '$(1).build' && '$(TARGET)-cmake' '$(1)' + $(MAKE) -C '$(1).build' -j '$(JOBS)' + $(MAKE) -C '$(1).build' -j 1 install + + # create pkg-config file + $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig' + (echo 'Name: $(PKG)'; \ + echo 'Version: $($(PKG)_VERSION)'; \ + echo 'Description: $(PKG)'; \ + echo 'Requires: QtCore QtNetwork'; \ + echo 'Libs: -lechonest';) \ + > '$(PREFIX)/$(TARGET)/lib/pkgconfig/$(PKG).pc' + + '$(TARGET)-g++' \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \ + `'$(TARGET)-pkg-config' libechonest --cflags --libs` +endef + +$(PKG)_BUILD_STATIC = From ddd75200d12e16d8010e0acb189c6f6142d766c8 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Mon, 1 Feb 2016 01:25:41 +0000 Subject: [PATCH 0418/1463] Update versions.json & build-matrix.html --- build-matrix.html | 16 +++++++++++++--- versions.json | 1 + 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index af345818..b4a9ce73 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -1427,6 +1427,16 @@ feel free to submit a pull request. ✗ + + libechonest + 2.3.1 + ✗ + ✓ + ✗ + ✓ + ✗ + + libepoxy 1.3.1 @@ -3949,14 +3959,14 @@ feel free to submit a pull request. -Total: 382 +Total: 383
    (+5 virtual +4 native-only) 379 -280 +281 362 -278 +279 15 diff --git a/versions.json b/versions.json index acca9dd0..771c6a27 100644 --- a/versions.json +++ b/versions.json @@ -138,6 +138,7 @@ "libdvdcss": "1.3.0", "libdvdnav": "5.0.1", "libdvdread": "5.0.0", + "libechonest": "2.3.1", "libepoxy": "1.3.1", "libevent": "2.0.21", "libf2c": "1", From 94938b331e6489ca557c4519ad2ed0f891207b55 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sun, 31 Jan 2016 18:45:02 +1100 Subject: [PATCH 0419/1463] binutils: revert update and ignore 2.26 See: http://lists.nongnu.org/archive/html/mingw-cross-env-list/2016-01/msg00013.html https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=813144 --- src/binutils.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/binutils.mk b/src/binutils.mk index 73489b75..2e9ff71c 100644 --- a/src/binutils.mk +++ b/src/binutils.mk @@ -2,9 +2,11 @@ # See index.html for further information. PKG := binutils -$(PKG)_IGNORE := -$(PKG)_VERSION := 2.26 -$(PKG)_CHECKSUM := c2ace41809542f5237afc7e3b8f32bb92bc7bc53c6232a84463c423b0714ecd9 +# see http://lists.nongnu.org/archive/html/mingw-cross-env-list/2016-01/msg00013.html +# 2.26 causes incorrect dlls to be built with sjlj exceptions +$(PKG)_IGNORE := 2.26 +$(PKG)_VERSION := 2.25.1 +$(PKG)_CHECKSUM := b5b14added7d78a8d1ca70b5cb75fef57ce2197264f4f5835326b0df22ac9f22 $(PKG)_SUBDIR := binutils-$($(PKG)_VERSION) $(PKG)_FILE := binutils-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://ftp.gnu.org/pub/gnu/binutils/$($(PKG)_FILE) From ab80818faaee822202888300c6dfe0b456265a8b Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Mon, 1 Feb 2016 03:49:49 +0000 Subject: [PATCH 0420/1463] Update versions.json & build-matrix.html --- build-matrix.html | 6 +++--- versions.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index b4a9ce73..fa094fac 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -149,7 +149,7 @@ feel free to submit a pull request. bfd - 2.26 + 2.25.1 ✓ ✗ ✓ @@ -159,7 +159,7 @@ feel free to submit a pull request. binutils - 2.26 + 2.25.1 ✓ ✓ ✓ @@ -1619,7 +1619,7 @@ feel free to submit a pull request. libiberty - 2.26 + 2.25.1 ✓ ✗ ✓ diff --git a/versions.json b/versions.json index 771c6a27..70f30809 100644 --- a/versions.json +++ b/versions.json @@ -10,8 +10,8 @@ "atk": "2.16.0", "atkmm": "2.22.7", "aubio": "0.4.2", - "bfd": "2.26", - "binutils": "2.26", + "bfd": "2.25.1", + "binutils": "2.25.1", "blas": "3.5.0", "boost": "1.60.0", "box2d": "2.3.1", @@ -157,7 +157,7 @@ "libgsasl": "1.8.0", "libgsf": "1.14.30", "libharu": "2.2.1", - "libiberty": "2.26", + "libiberty": "2.25.1", "libical": "1.0.1", "libiconv": "1.14", "libid3tag": "0.15.1b", From 9f9c17c98887cfa6ca2d2f1f7a6a141136afe666 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 1 Feb 2016 15:08:16 +1100 Subject: [PATCH 0421/1463] binutils: enable deterministic archives see: https://wiki.debian.org/ReproducibleBuilds/TimestampsInStaticLibraries --- src/binutils.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/src/binutils.mk b/src/binutils.mk index 2e9ff71c..5a7699a9 100644 --- a/src/binutils.mk +++ b/src/binutils.mk @@ -26,6 +26,7 @@ define $(PKG)_BUILD --build='$(BUILD)' \ --prefix='$(PREFIX)' \ --disable-multilib \ + --enable-deterministic-archives \ --with-gcc \ --with-gnu-ld \ --with-gnu-as \ From 759a8c34bb30f81d6914d959b0c33388753e62d6 Mon Sep 17 00:00:00 2001 From: darealshinji Date: Fri, 22 Jan 2016 15:07:09 +0100 Subject: [PATCH 0422/1463] new package: liblsmash --- index.html | 4 ++++ src/liblsmash-1.patch | 13 +++++++++++++ src/liblsmash.mk | 20 ++++++++++++++++++++ 3 files changed, 37 insertions(+) create mode 100644 src/liblsmash-1.patch create mode 100644 src/liblsmash.mk diff --git a/index.html b/index.html index 98716962..d234478a 100644 --- a/index.html +++ b/index.html @@ -1765,6 +1765,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) liblqr-1 liblqr-1 + + liblsmash + L-SMASH + libltdl GNU Libtool Library (libltdl) diff --git a/src/liblsmash-1.patch b/src/liblsmash-1.patch new file mode 100644 index 00000000..ea1c92c2 --- /dev/null +++ b/src/liblsmash-1.patch @@ -0,0 +1,13 @@ +This file is part of MXE. +See index.html for further information. + +--- a/configure ++++ b/configure +@@ -198,6 +198,7 @@ + case "$TARGET_OS" in + *mingw*) + EXT=".exe" ++ SHARED_NAME="liblsmash-$MAJVER" + SHARED_EXT=".dll" + IMPLIB="liblsmash.dll.a" + SO_LDFLAGS="-shared -Wl,--out-implib,$IMPLIB" diff --git a/src/liblsmash.mk b/src/liblsmash.mk new file mode 100644 index 00000000..3a255897 --- /dev/null +++ b/src/liblsmash.mk @@ -0,0 +1,20 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := liblsmash +$(PKG)_IGNORE := +$(PKG)_VERSION := 2.9.1 +$(PKG)_CHECKSUM := 17f24fc8bffba753f8c628f1732fc3581b80362341274747ef6fb96af1cac45c +$(PKG)_SUBDIR := l-smash-$($(PKG)_VERSION) +$(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz +$(PKG)_URL := https://github.com/l-smash/l-smash/archive/v$($(PKG)_VERSION).tar.gz +$(PKG)_DEPS := gcc + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + --prefix='$(PREFIX)/$(TARGET)' \ + --cross-prefix=$(TARGET)- \ + $(if $(BUILD_SHARED), --enable-shared --disable-static) + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef From 00d73f003c66b0d0b7846e7d4b68daa6b13997c9 Mon Sep 17 00:00:00 2001 From: darealshinji Date: Sat, 23 Jan 2016 12:40:46 +0100 Subject: [PATCH 0423/1463] liblsmash: add update rule --- src/liblsmash.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/liblsmash.mk b/src/liblsmash.mk index 3a255897..495077be 100644 --- a/src/liblsmash.mk +++ b/src/liblsmash.mk @@ -10,6 +10,13 @@ $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_URL := https://github.com/l-smash/l-smash/archive/v$($(PKG)_VERSION).tar.gz $(PKG)_DEPS := gcc +define $(PKG)_UPDATE + $(call MXE_GET_GITHUB_TAGS, l-smash/l-smash, v) +endef + +# L-SMASH uses a custom made configure script that doesn't recognize +# the option --host and fails on unknown options. +# Therefor $(MXE_CONFIGURE_OPTS) can't be used here. define $(PKG)_BUILD cd '$(1)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ From 1f7a3cd7ab6141931f384c6d837c39d19cad5018 Mon Sep 17 00:00:00 2001 From: darealshinji Date: Sat, 23 Jan 2016 22:11:48 +0100 Subject: [PATCH 0424/1463] x264: add a dependency on liblsmash --- src/x264.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/x264.mk b/src/x264.mk index 4c9d8c48..9d5e0d33 100644 --- a/src/x264.mk +++ b/src/x264.mk @@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := 80a4075ea12a81ec3b6c493e03529c5b7c1afb34c6e91d86bb078bc2ead2c $(PKG)_SUBDIR := $(PKG)-snapshot-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-snapshot-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://download.videolan.org/pub/videolan/$(PKG)/snapshots/$($(PKG)_FILE) -$(PKG)_DEPS := gcc yasm +$(PKG)_DEPS := gcc yasm liblsmash define $(PKG)_UPDATE $(WGET) -q -O- 'http://git.videolan.org/?p=x264.git;a=shortlog' | \ From 1da63bab34e92631a2edbb6526a989cc50b52d82 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Mon, 1 Feb 2016 05:29:21 +0000 Subject: [PATCH 0425/1463] Update versions.json & build-matrix.html --- build-matrix.html | 20 +++++++++++++++----- versions.json | 1 + 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index fa094fac..a308a27e 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -1727,6 +1727,16 @@ feel free to submit a pull request. ✗ + + liblsmash + 2.9.1 + ✓ + ✓ + ✓ + ✓ + ✗ + + libltdl 2.4.4 @@ -3959,14 +3969,14 @@ feel free to submit a pull request. -Total: 383 +Total: 384
    (+5 virtual +4 native-only) -379 -281 -362 -279 +380 +282 +363 +280 15 diff --git a/versions.json b/versions.json index 70f30809..c97c90f9 100644 --- a/versions.json +++ b/versions.json @@ -168,6 +168,7 @@ "liblaxjson": "1.0.5", "liblo": "0.28rc", "liblqr-1": "0.4.2", + "liblsmash": "2.9.1", "libltdl": "2.4.4", "libmad": "0.15.1b", "libmicrohttpd": "0.9.38", From a8bda25770f7e8576f1514543cd5053852b87bd3 Mon Sep 17 00:00:00 2001 From: Dennis Brentjes Date: Sat, 23 Jan 2016 15:12:26 +0100 Subject: [PATCH 0426/1463] Added package gst-plugins bad --- index.html | 4 ++++ src/gst-plugins-bad.mk | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 src/gst-plugins-bad.mk diff --git a/index.html b/index.html index d234478a..30ab8fd0 100644 --- a/index.html +++ b/index.html @@ -1433,6 +1433,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) gst-plugins-good gst-plugins-good + + gst-plugins-bad + gst-plugins-bad + gstreamer gstreamer diff --git a/src/gst-plugins-bad.mk b/src/gst-plugins-bad.mk new file mode 100644 index 00000000..f2db2b3e --- /dev/null +++ b/src/gst-plugins-bad.mk @@ -0,0 +1,28 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := gst-plugins-bad +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.6.2 +$(PKG)_CHECKSUM := 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz +$(PKG)_URL := http://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE) +$(PKG)_DEPS := gcc gst-plugins-base gstreamer faad2 libass libgcrypt mpg123 openjpeg openal vo-aacenc vo-amrwbenc + +$(PKG)_UPDATE = $(subst gstreamer/refs,gst-plugins-bad/refs,$(gstreamer_UPDATE)) + +define $(PKG)_BUILD + find '$(1)' -name Makefile.in \ + -exec $(SED) -i 's,glib-mkenums,$(PREFIX)/$(TARGET)/bin/glib-mkenums,g' {} \; \ + -exec $(SED) -i 's,glib-genmarshal,$(PREFIX)/$(TARGET)/bin/glib-genmarshal,g' {} \; + cd '$(1)' && ./configure \ + $(MXE_CONFIGURE_OPTS) \ + --disable-debug \ + --disable-examples \ + --disable-opengl \ + --mandir='$(1)/sink' \ + --docdir='$(1)/sink' \ + --with-html-dir='$(1)/sink' + $(MAKE) -C '$(1)' -j '$(JOBS)' install +endef From f7e7fe0a8134e3c47fb0d1d2ba4b0afabf97fed6 Mon Sep 17 00:00:00 2001 From: Dennis Brentjes Date: Sat, 23 Jan 2016 15:05:32 +0100 Subject: [PATCH 0427/1463] Added package gst-plugins-ugly --- index.html | 8 ++++++-- src/gst-plugins-ugly.mk | 28 ++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 src/gst-plugins-ugly.mk diff --git a/index.html b/index.html index 30ab8fd0..9579f19d 100644 --- a/index.html +++ b/index.html @@ -1425,6 +1425,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) gsoap gSOAP + + gst-plugins-bad + gst-plugins-bad + gst-plugins-base gst-plugins-base @@ -1434,8 +1438,8 @@ local-pkg-list: $(LOCAL_PKG_LIST) gst-plugins-good - gst-plugins-bad - gst-plugins-bad + gst-plugins-ugly + gst-plugins-ugly gstreamer diff --git a/src/gst-plugins-ugly.mk b/src/gst-plugins-ugly.mk new file mode 100644 index 00000000..4cdb5bfd --- /dev/null +++ b/src/gst-plugins-ugly.mk @@ -0,0 +1,28 @@ +#This file is part of MXE. +# See index.html for further information. + +PKG := gst-plugins-ugly +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.6.2 +$(PKG)_CHECKSUM := e7f1b6321c8667fabc0dedce3998a3c6e90ce9ce9dea7186d33dc4359f9e9845 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz +$(PKG)_URL := http://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE) +$(PKG)_DEPS := gcc gst-plugins-base gstreamer lame libdvdread x264 a52dec libmad libcdio opencore-amr twolame + +$(PKG)_UPDATE = $(subst gstreamer/refs,gst-plugins-ugly/refs,$(gstreamer_UPDATE)) + +define $(PKG)_BUILD + find '$(1)' -name Makefile.in \ + -exec $(SED) -i 's,glib-mkenums,$(PREFIX)/$(TARGET)/bin/glib-mkenums,g' {} \; \ + -exec $(SED) -i 's,glib-genmarshal,$(PREFIX)/$(TARGET)/bin/glib-genmarshal,g' {} \; + cd '$(1)' && ./configure \ + $(MXE_CONFIGURE_OPTS) \ + --disable-debug \ + --disable-examples \ + --disable-opengl \ + --mandir='$(1)/sink' \ + --docdir='$(1)/sink' \ + --with-html-dir='$(1)/sink' + $(MAKE) -C '$(1)' -j '$(JOBS)' install +endef From 2a44b93670eb25c57e0d61c55b3d372bed0e35f1 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Mon, 1 Feb 2016 07:42:21 +0000 Subject: [PATCH 0428/1463] Update versions.json & build-matrix.html --- build-matrix.html | 28 ++++++++++++++++++++++++---- versions.json | 2 ++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index a308a27e..261fdc55 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -877,6 +877,16 @@ feel free to submit a pull request. ✗ + + gst-plugins-bad + 1.6.2 + ✓ + ✓ + ✓ + ✓ + ✗ + + gst-plugins-base 1.6.2 @@ -897,6 +907,16 @@ feel free to submit a pull request. ✗ + + gst-plugins-ugly + 1.6.2 + ✓ + ✓ + ✓ + ✓ + ✗ + + gstreamer 1.6.2 @@ -3969,14 +3989,14 @@ feel free to submit a pull request. -Total: 384 +Total: 386
    (+5 virtual +4 native-only) -380 +382 +284 +365 282 -363 -280 15 diff --git a/versions.json b/versions.json index c97c90f9..40cd43bd 100644 --- a/versions.json +++ b/versions.json @@ -83,8 +83,10 @@ "graphicsmagick": "1.3.21", "gsl": "1.16", "gsoap": "2.8.22", + "gst-plugins-bad": "1.6.2", "gst-plugins-base": "1.6.2", "gst-plugins-good": "1.6.2", + "gst-plugins-ugly": "1.6.2", "gstreamer": "1.6.2", "gta": "1.0.7", "gtk2": "2.24.29", From f089be0b968ffb47e98e2428e2791637f6927a92 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 1 Feb 2016 11:22:57 +0300 Subject: [PATCH 0429/1463] Revert "fix libieee1284 on Wheezy and prevent patch-tool-mxe from using rename" --- patch.mk | 1 + src/libieee1284-1-fixes.patch | 590 +--------------------------------- 2 files changed, 14 insertions(+), 577 deletions(-) diff --git a/patch.mk b/patch.mk index 87c72d00..c67e7b39 100644 --- a/patch.mk +++ b/patch.mk @@ -51,6 +51,7 @@ define EXPORT_PATCH --no-signature \ --stdout \ --text \ + -M9 \ dist..HEAD \ | sed 's/^From [0-9a-f]\{40\} /From 0000000000000000000000000000000000000000 /' \ | sed 's/^index .......\.\......../index 1111111..2222222/' \ diff --git a/src/libieee1284-1-fixes.patch b/src/libieee1284-1-fixes.patch index 0fd19e01..fa0625b1 100644 --- a/src/libieee1284-1-fixes.patch +++ b/src/libieee1284-1-fixes.patch @@ -34,586 +34,22 @@ index 1111111..2222222 100644 -AC_CONFIG_FILES(Makefile libieee1284.spec) +AC_CONFIG_FILES([Makefile libieee1284.spec include/ieee1284.h]) AC_OUTPUT -diff --git a/include/ieee1284.h b/include/ieee1284.h -deleted file mode 100644 -index 1111111..2222222 +diff --git a/include/ieee1284.h b/include/ieee1284.h.in +similarity index 99% +rename from include/ieee1284.h +rename to include/ieee1284.h.in +index 1111111..2222222 100644 --- a/include/ieee1284.h -+++ /dev/null -@@ -1,284 +0,0 @@ --/* -- * libieee1284 - IEEE 1284 library -- * Copyright (C) 2001, 2002, 2003 Tim Waugh -- * -- * This program is free software; you can redistribute it and/or modify -- * it under the terms of the GNU General Public License as published by -- * the Free Software Foundation; either version 2 of the License, or -- * (at your option) any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -- */ -- --#ifndef HAVE_IEEE1284_H --#define HAVE_IEEE1284_H -- --#include /* for size_t */ --#ifndef _MSC_VER --#include /* for struct timeval */ --#else --#include /* for struct timeval */ --#endif -- --#if (defined __MINGW32__ || defined _MSC_VER) && !defined OWN_SSIZE_T --#include /* for SSIZE_T */ --#define OWN_SSIZE_T --typedef SSIZE_T ssize_t; --#endif -- --#ifdef __cplusplus --extern "C" { --#endif -- --/* Errors. When a function returns a negative number, it's one of -- * these errors. */ --enum E1284 { -- E1284_OK = 0, /* Everything went fine */ -- E1284_NOTIMPL = -1, /* Not implemented in libieee1284 */ -- E1284_NOTAVAIL = -2, /* Not available on this system */ -- E1284_TIMEDOUT = -3, /* Operation timed out */ -- E1284_REJECTED = -4, /* IEEE 1284 negotiation rejected */ -- E1284_NEGFAILED = -5, /* Negotiation went wrong */ -- E1284_NOMEM = -6, /* No memory left */ -- E1284_INIT = -7, /* Error initialising port */ -- E1284_SYS = -8, /* Error interfacing system */ -- E1284_NOID = -9, /* No IEEE 1284 ID available */ -- E1284_INVALIDPORT = -10 /* Invalid port */ --}; -- --/* A parallel port. */ --struct parport { -- /* An arbitrary name for the port */ -- const char *name; -- -- /* The base address of the port, if that has any meaning, or zero. */ -- unsigned long base_addr; -- -- /* The ECR address of the port, if that has any meaning, or zero. */ -- unsigned long hibase_addr; -- -- /* For internal use only: */ -- void *priv; -- -- /* The filename associated with this port, -- * if that has any meaning, or NULL. */ -- const char *filename; --}; -- --/* Some parallel ports. */ --struct parport_list { -- int portc; -- struct parport **portv; --}; -- --/* The first function to be called. This gives the library a chance -- * to look around and see what's available, and gives the program a -- * chance to choose a port to use. */ --extern int ieee1284_find_ports (struct parport_list *list, int flags); -- --/* The last function to be called. After calling this, only -- * ieee1284_find_ports may be used. */ --extern void ieee1284_free_ports (struct parport_list *list); -- --/* -- * Retrieving the Device ID of a device on a port. -- * This is a special operation since there are some shortcuts on some -- * operating systems (i.e. Linux) that allow us to elide any actual -- * communications. -- */ -- --enum ieee1284_devid_flags --{ -- F1284_FRESH = (1<<1) /* Guarantee a fresh Device ID */ --}; -- --extern ssize_t ieee1284_get_deviceid (struct parport *port, int daisy, -- int flags, char *buffer, size_t len); --/* daisy is the daisy chain address (0-3), or -1 for normal IEEE 1284. */ -- --/* -- * Sharing hooks -- */ -- --enum ieee1284_open_flags --{ -- F1284_EXCL = (1<<0) /* Require exclusive access to the port */ --}; --enum ieee1284_capabilities --{ -- CAP1284_RAW = (1<<0), /* Pin-level access */ -- CAP1284_NIBBLE = (1<<1), -- CAP1284_BYTE = (1<<2), -- CAP1284_COMPAT = (1<<3), -- CAP1284_BECP = (1<<4), -- CAP1284_ECP = (1<<5), -- CAP1284_ECPRLE = (1<<6), -- CAP1284_ECPSWE = (1<<7), -- CAP1284_EPP = (1<<8), -- CAP1284_EPPSL = (1<<9), -- CAP1284_EPPSWE = (1<<10), -- CAP1284_IRQ = (1<<11), -- CAP1284_DMA = (1<<12) --}; --extern int ieee1284_open (struct parport *port, int flags, int *capabilities); -- --extern int ieee1284_close (struct parport *port); -- --extern int ieee1284_ref (struct parport *port); --extern int ieee1284_unref (struct parport *port); -- --extern int ieee1284_claim (struct parport *port); --/* Must be called before any function below. May fail. */ -- --extern void ieee1284_release (struct parport *port); -- --/* -- * Interrupt notification -- */ --extern int ieee1284_get_irq_fd (struct parport *port); --extern int ieee1284_clear_irq (struct parport *port, unsigned int *count); -- --/* -- * Raw port access (PC-style port registers but within inversions) -- * Functions returning int may fail. -- */ -- --extern int ieee1284_read_data (struct parport *port); --extern void ieee1284_write_data (struct parport *port, unsigned char dt); --extern int ieee1284_wait_data (struct parport *port, unsigned char mask, -- unsigned char val, struct timeval *timeout); --extern int ieee1284_data_dir (struct parport *port, int reverse); -- --/* The status pin functions operate in terms of these bits: */ --enum ieee1284_status_bits --{ -- S1284_NFAULT = 0x08, -- S1284_SELECT = 0x10, -- S1284_PERROR = 0x20, -- S1284_NACK = 0x40, -- S1284_BUSY = 0x80, -- /* To convert those values into PC-style register values, use this: */ -- S1284_INVERTED = S1284_BUSY --}; -- --extern int ieee1284_read_status (struct parport *port); -- --/* Wait until those status pins in mask have the values in val. -- * Return E1284_OK when condition met, E1284_TIMEDOUT on timeout. -- * timeout may be modified. */ --extern int ieee1284_wait_status (struct parport *port, -- unsigned char mask, -- unsigned char val, -- struct timeval *timeout); -- --/* The control pin functions operate in terms of these bits: */ --enum ieee1284_control_bits --{ -- C1284_NSTROBE = 0x01, -- C1284_NAUTOFD = 0x02, -- C1284_NINIT = 0x04, -- C1284_NSELECTIN = 0x08, -- /* To convert those values into PC-style register values, use this: */ -- C1284_INVERTED = (C1284_NSTROBE| -- C1284_NAUTOFD| -- C1284_NSELECTIN) --}; -- --extern int ieee1284_read_control (struct parport *port); --/* ieee1284_read_control may be unreliable */ -- --extern void ieee1284_write_control (struct parport *port, unsigned char ct); --/* NOTE: This will not change the direction of the data lines; use -- * ieee1284_data_dir for that. */ -- --extern void ieee1284_frob_control (struct parport *port, unsigned char mask, -- unsigned char val); --/* frob is "out ((in & ~mask) ^ val)" */ -- --/* This function may or may not be available, depending on PPWCTLONIRQ -- * availability. Its operation is: -- * If operation unavailable, return E1284_NOTAVAIL. Otherwise: -- * Set control pins to ct_before. -- * Wait for nAck interrupt. If timeout elapses, return E1284_TIMEDOUT. -- * Otherwise, set control pins to ct_after and return 0. -- * timeout may be modified. */ --extern int ieee1284_do_nack_handshake (struct parport *port, -- unsigned char ct_before, -- unsigned char ct_after, -- struct timeval *timeout); -- --/* -- * IEEE 1284 operations -- */ -- --/* Negotiation/termination */ --enum ieee1284_modes --{ -- M1284_NIBBLE = 0, -- M1284_BYTE = (1<<0), -- M1284_COMPAT = (1<<8), -- M1284_BECP = (1<<9), -- M1284_ECP = (1<<4), -- M1284_ECPRLE = ((1<<4) | (1<<5)), -- M1284_ECPSWE = (1<<10), /* Software emulated */ -- M1284_EPP = (1<<6), -- M1284_EPPSL = (1<<11), /* EPP 1.7 */ -- M1284_EPPSWE = (1<<12), /* Software emulated */ -- M1284_FLAG_DEVICEID = (1<<2), -- M1284_FLAG_EXT_LINK = (1<<14) /* Uses bits in 0x7f */ --}; -- --extern int ieee1284_negotiate (struct parport *port, int mode); --extern void ieee1284_terminate (struct parport *port); -- --/* ECP direction switching */ --extern int ieee1284_ecp_fwd_to_rev (struct parport *port); --extern int ieee1284_ecp_rev_to_fwd (struct parport *port); -- --/* Block I/O -- * The return value is the number of bytes successfully transferred, -- * or an error code (only if no transfer took place). */ --enum ieee1284_transfer_flags --{ -- F1284_NONBLOCK = (1<<0), /* Non-blocking semantics */ -- F1284_SWE = (1<<2), /* Don't use hardware assistance */ -- F1284_RLE = (1<<3), /* Use ECP RLE */ -- F1284_FASTEPP = (1<<4) /* Use faster EPP (counts are unreliable) */ --}; --extern ssize_t ieee1284_nibble_read (struct parport *port, int flags, -- char *buffer, size_t len); --extern ssize_t ieee1284_compat_write (struct parport *port, int flags, -- const char *buffer, size_t len); --extern ssize_t ieee1284_byte_read (struct parport *port, int flags, -- char *buffer, size_t len); --extern ssize_t ieee1284_epp_read_data (struct parport *port, int flags, -- char *buffer, size_t len); --extern ssize_t ieee1284_epp_write_data (struct parport *port, int flags, -- const char *buffer, size_t len); --extern ssize_t ieee1284_epp_read_addr (struct parport *port, int flags, -- char *buffer, size_t len); --extern ssize_t ieee1284_epp_write_addr (struct parport *port, int flags, -- const char *buffer, size_t len); --extern ssize_t ieee1284_ecp_read_data (struct parport *port, int flags, -- char *buffer, size_t len); --extern ssize_t ieee1284_ecp_write_data (struct parport *port, int flags, -- const char *buffer, size_t len); --extern ssize_t ieee1284_ecp_read_addr (struct parport *port, int flags, -- char *buffer, size_t len); --extern ssize_t ieee1284_ecp_write_addr (struct parport *port, int flags, -- const char *buffer, size_t len); --extern struct timeval *ieee1284_set_timeout (struct parport *port, -- struct timeval *timeout); -- --#ifdef __cplusplus --} /* extern "C" */ --#endif -- --#endif /* HAVE_IEEE1284_H */ -diff --git a/include/ieee1284.h.in b/include/ieee1284.h.in -new file mode 100644 -index 1111111..2222222 ---- /dev/null +++ b/include/ieee1284.h.in -@@ -0,0 +1,284 @@ -+/* -+ * libieee1284 - IEEE 1284 library -+ * Copyright (C) 2001, 2002, 2003 Tim Waugh -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ */ -+ -+#ifndef HAVE_IEEE1284_H -+#define HAVE_IEEE1284_H -+ -+#include /* for size_t */ -+#ifndef _MSC_VER -+#include /* for struct timeval */ -+#else -+#include /* for struct timeval */ -+#endif -+ +@@ -27,7 +27,7 @@ + #include /* for struct timeval */ + #endif + +-#if (defined __MINGW32__ || defined _MSC_VER) && !defined OWN_SSIZE_T +#if @SSIZE_T_IN_BASETSD_H@ && !defined OWN_SSIZE_T -+#include /* for SSIZE_T */ -+#define OWN_SSIZE_T -+typedef SSIZE_T ssize_t; -+#endif -+ -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+/* Errors. When a function returns a negative number, it's one of -+ * these errors. */ -+enum E1284 { -+ E1284_OK = 0, /* Everything went fine */ -+ E1284_NOTIMPL = -1, /* Not implemented in libieee1284 */ -+ E1284_NOTAVAIL = -2, /* Not available on this system */ -+ E1284_TIMEDOUT = -3, /* Operation timed out */ -+ E1284_REJECTED = -4, /* IEEE 1284 negotiation rejected */ -+ E1284_NEGFAILED = -5, /* Negotiation went wrong */ -+ E1284_NOMEM = -6, /* No memory left */ -+ E1284_INIT = -7, /* Error initialising port */ -+ E1284_SYS = -8, /* Error interfacing system */ -+ E1284_NOID = -9, /* No IEEE 1284 ID available */ -+ E1284_INVALIDPORT = -10 /* Invalid port */ -+}; -+ -+/* A parallel port. */ -+struct parport { -+ /* An arbitrary name for the port */ -+ const char *name; -+ -+ /* The base address of the port, if that has any meaning, or zero. */ -+ unsigned long base_addr; -+ -+ /* The ECR address of the port, if that has any meaning, or zero. */ -+ unsigned long hibase_addr; -+ -+ /* For internal use only: */ -+ void *priv; -+ -+ /* The filename associated with this port, -+ * if that has any meaning, or NULL. */ -+ const char *filename; -+}; -+ -+/* Some parallel ports. */ -+struct parport_list { -+ int portc; -+ struct parport **portv; -+}; -+ -+/* The first function to be called. This gives the library a chance -+ * to look around and see what's available, and gives the program a -+ * chance to choose a port to use. */ -+extern int ieee1284_find_ports (struct parport_list *list, int flags); -+ -+/* The last function to be called. After calling this, only -+ * ieee1284_find_ports may be used. */ -+extern void ieee1284_free_ports (struct parport_list *list); -+ -+/* -+ * Retrieving the Device ID of a device on a port. -+ * This is a special operation since there are some shortcuts on some -+ * operating systems (i.e. Linux) that allow us to elide any actual -+ * communications. -+ */ -+ -+enum ieee1284_devid_flags -+{ -+ F1284_FRESH = (1<<1) /* Guarantee a fresh Device ID */ -+}; -+ -+extern ssize_t ieee1284_get_deviceid (struct parport *port, int daisy, -+ int flags, char *buffer, size_t len); -+/* daisy is the daisy chain address (0-3), or -1 for normal IEEE 1284. */ -+ -+/* -+ * Sharing hooks -+ */ -+ -+enum ieee1284_open_flags -+{ -+ F1284_EXCL = (1<<0) /* Require exclusive access to the port */ -+}; -+enum ieee1284_capabilities -+{ -+ CAP1284_RAW = (1<<0), /* Pin-level access */ -+ CAP1284_NIBBLE = (1<<1), -+ CAP1284_BYTE = (1<<2), -+ CAP1284_COMPAT = (1<<3), -+ CAP1284_BECP = (1<<4), -+ CAP1284_ECP = (1<<5), -+ CAP1284_ECPRLE = (1<<6), -+ CAP1284_ECPSWE = (1<<7), -+ CAP1284_EPP = (1<<8), -+ CAP1284_EPPSL = (1<<9), -+ CAP1284_EPPSWE = (1<<10), -+ CAP1284_IRQ = (1<<11), -+ CAP1284_DMA = (1<<12) -+}; -+extern int ieee1284_open (struct parport *port, int flags, int *capabilities); -+ -+extern int ieee1284_close (struct parport *port); -+ -+extern int ieee1284_ref (struct parport *port); -+extern int ieee1284_unref (struct parport *port); -+ -+extern int ieee1284_claim (struct parport *port); -+/* Must be called before any function below. May fail. */ -+ -+extern void ieee1284_release (struct parport *port); -+ -+/* -+ * Interrupt notification -+ */ -+extern int ieee1284_get_irq_fd (struct parport *port); -+extern int ieee1284_clear_irq (struct parport *port, unsigned int *count); -+ -+/* -+ * Raw port access (PC-style port registers but within inversions) -+ * Functions returning int may fail. -+ */ -+ -+extern int ieee1284_read_data (struct parport *port); -+extern void ieee1284_write_data (struct parport *port, unsigned char dt); -+extern int ieee1284_wait_data (struct parport *port, unsigned char mask, -+ unsigned char val, struct timeval *timeout); -+extern int ieee1284_data_dir (struct parport *port, int reverse); -+ -+/* The status pin functions operate in terms of these bits: */ -+enum ieee1284_status_bits -+{ -+ S1284_NFAULT = 0x08, -+ S1284_SELECT = 0x10, -+ S1284_PERROR = 0x20, -+ S1284_NACK = 0x40, -+ S1284_BUSY = 0x80, -+ /* To convert those values into PC-style register values, use this: */ -+ S1284_INVERTED = S1284_BUSY -+}; -+ -+extern int ieee1284_read_status (struct parport *port); -+ -+/* Wait until those status pins in mask have the values in val. -+ * Return E1284_OK when condition met, E1284_TIMEDOUT on timeout. -+ * timeout may be modified. */ -+extern int ieee1284_wait_status (struct parport *port, -+ unsigned char mask, -+ unsigned char val, -+ struct timeval *timeout); -+ -+/* The control pin functions operate in terms of these bits: */ -+enum ieee1284_control_bits -+{ -+ C1284_NSTROBE = 0x01, -+ C1284_NAUTOFD = 0x02, -+ C1284_NINIT = 0x04, -+ C1284_NSELECTIN = 0x08, -+ /* To convert those values into PC-style register values, use this: */ -+ C1284_INVERTED = (C1284_NSTROBE| -+ C1284_NAUTOFD| -+ C1284_NSELECTIN) -+}; -+ -+extern int ieee1284_read_control (struct parport *port); -+/* ieee1284_read_control may be unreliable */ -+ -+extern void ieee1284_write_control (struct parport *port, unsigned char ct); -+/* NOTE: This will not change the direction of the data lines; use -+ * ieee1284_data_dir for that. */ -+ -+extern void ieee1284_frob_control (struct parport *port, unsigned char mask, -+ unsigned char val); -+/* frob is "out ((in & ~mask) ^ val)" */ -+ -+/* This function may or may not be available, depending on PPWCTLONIRQ -+ * availability. Its operation is: -+ * If operation unavailable, return E1284_NOTAVAIL. Otherwise: -+ * Set control pins to ct_before. -+ * Wait for nAck interrupt. If timeout elapses, return E1284_TIMEDOUT. -+ * Otherwise, set control pins to ct_after and return 0. -+ * timeout may be modified. */ -+extern int ieee1284_do_nack_handshake (struct parport *port, -+ unsigned char ct_before, -+ unsigned char ct_after, -+ struct timeval *timeout); -+ -+/* -+ * IEEE 1284 operations -+ */ -+ -+/* Negotiation/termination */ -+enum ieee1284_modes -+{ -+ M1284_NIBBLE = 0, -+ M1284_BYTE = (1<<0), -+ M1284_COMPAT = (1<<8), -+ M1284_BECP = (1<<9), -+ M1284_ECP = (1<<4), -+ M1284_ECPRLE = ((1<<4) | (1<<5)), -+ M1284_ECPSWE = (1<<10), /* Software emulated */ -+ M1284_EPP = (1<<6), -+ M1284_EPPSL = (1<<11), /* EPP 1.7 */ -+ M1284_EPPSWE = (1<<12), /* Software emulated */ -+ M1284_FLAG_DEVICEID = (1<<2), -+ M1284_FLAG_EXT_LINK = (1<<14) /* Uses bits in 0x7f */ -+}; -+ -+extern int ieee1284_negotiate (struct parport *port, int mode); -+extern void ieee1284_terminate (struct parport *port); -+ -+/* ECP direction switching */ -+extern int ieee1284_ecp_fwd_to_rev (struct parport *port); -+extern int ieee1284_ecp_rev_to_fwd (struct parport *port); -+ -+/* Block I/O -+ * The return value is the number of bytes successfully transferred, -+ * or an error code (only if no transfer took place). */ -+enum ieee1284_transfer_flags -+{ -+ F1284_NONBLOCK = (1<<0), /* Non-blocking semantics */ -+ F1284_SWE = (1<<2), /* Don't use hardware assistance */ -+ F1284_RLE = (1<<3), /* Use ECP RLE */ -+ F1284_FASTEPP = (1<<4) /* Use faster EPP (counts are unreliable) */ -+}; -+extern ssize_t ieee1284_nibble_read (struct parport *port, int flags, -+ char *buffer, size_t len); -+extern ssize_t ieee1284_compat_write (struct parport *port, int flags, -+ const char *buffer, size_t len); -+extern ssize_t ieee1284_byte_read (struct parport *port, int flags, -+ char *buffer, size_t len); -+extern ssize_t ieee1284_epp_read_data (struct parport *port, int flags, -+ char *buffer, size_t len); -+extern ssize_t ieee1284_epp_write_data (struct parport *port, int flags, -+ const char *buffer, size_t len); -+extern ssize_t ieee1284_epp_read_addr (struct parport *port, int flags, -+ char *buffer, size_t len); -+extern ssize_t ieee1284_epp_write_addr (struct parport *port, int flags, -+ const char *buffer, size_t len); -+extern ssize_t ieee1284_ecp_read_data (struct parport *port, int flags, -+ char *buffer, size_t len); -+extern ssize_t ieee1284_ecp_write_data (struct parport *port, int flags, -+ const char *buffer, size_t len); -+extern ssize_t ieee1284_ecp_read_addr (struct parport *port, int flags, -+ char *buffer, size_t len); -+extern ssize_t ieee1284_ecp_write_addr (struct parport *port, int flags, -+ const char *buffer, size_t len); -+extern struct timeval *ieee1284_set_timeout (struct parport *port, -+ struct timeval *timeout); -+ -+#ifdef __cplusplus -+} /* extern "C" */ -+#endif -+ -+#endif /* HAVE_IEEE1284_H */ + #include /* for SSIZE_T */ + #define OWN_SSIZE_T + typedef SSIZE_T ssize_t; diff --git a/src/detect.h b/src/detect.h index 1111111..2222222 100644 --- a/src/detect.h From a7c2578ba2a6f931866bdb0489b55eca55a3965d Mon Sep 17 00:00:00 2001 From: Daniel Burr Date: Tue, 12 Jan 2016 10:06:16 +0100 Subject: [PATCH 0430/1463] qtserialport_qt4: enable static build and copy test program closes #1175 --- src/qtserialport_qt4-1-static.patch | 10 ++++++++++ src/qtserialport_qt4.mk | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 src/qtserialport_qt4-1-static.patch diff --git a/src/qtserialport_qt4-1-static.patch b/src/qtserialport_qt4-1-static.patch new file mode 100644 index 00000000..37f99eac --- /dev/null +++ b/src/qtserialport_qt4-1-static.patch @@ -0,0 +1,10 @@ +diff --git a/src/serialport/qt4support/serialport.prf b/src/serialport/qt4support/serialport.prf +index b1d65e1..d20d47a 100644 +--- a/src/serialport/qt4support/serialport.prf ++++ b/src/serialport/qt4support/serialport.prf +@@ -25,3 +25,5 @@ mac { + LIBS += -lQtSerialPort$${QT_LIBINFIX} + } + } ++ ++static:DEFINES += QT_STATIC diff --git a/src/qtserialport_qt4.mk b/src/qtserialport_qt4.mk index 91d69a1a..ee3c8f4b 100644 --- a/src/qtserialport_qt4.mk +++ b/src/qtserialport_qt4.mk @@ -15,8 +15,10 @@ $(PKG)_DEPS := gcc qt $(PKG)_UPDATE := $(call MXE_GET_GITHUB_SHA, $($(PKG)_GH_USER)/$($(PKG)_GH_REPO), $($(PKG)_GH_TREE)) -define $(PKG)_BUILD_SHARED +define $(PKG)_BUILD cd '$(1)' && '$(PREFIX)/$(TARGET)/qt/bin/qmake' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install + # install one of the test programs + cp -f '$(1)/examples/serialport/cenumerator/release/cenumerator.exe' '$(PREFIX)/$(TARGET)/bin/test-qtserialport_qt4.exe' endef From 407acb9ae4a5bfeee5317432ea2f800fcc89eef5 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 1 Feb 2016 20:05:38 +1100 Subject: [PATCH 0431/1463] qtserialport_qt4: convert diff to mxe patch format --- src/qtserialport_qt4-1-fixes.patch | 41 +++++++++++++++++++++++++++++ src/qtserialport_qt4-1-static.patch | 10 ------- 2 files changed, 41 insertions(+), 10 deletions(-) create mode 100644 src/qtserialport_qt4-1-fixes.patch delete mode 100644 src/qtserialport_qt4-1-static.patch diff --git a/src/qtserialport_qt4-1-fixes.patch b/src/qtserialport_qt4-1-fixes.patch new file mode 100644 index 00000000..abd0237f --- /dev/null +++ b/src/qtserialport_qt4-1-fixes.patch @@ -0,0 +1,41 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Daniel Burr +Date: Tue, 12 Jan 2016 18:37:28 +0100 +Subject: [PATCH] Allow static building of qtserialport_qt4 + +Taken from: +https://github.com/qtproject/qtserialport/pull/2 + +The QtSerialPort library expects QT_STATIC to be defined when it is +being compiled as a static library. If is not defined then the +Q_SERIALPORT_EXPORT macro will be set to one of +Q_DECL_IMPORT/Q_DECL_EXPORT, resulting in linking errors when the test +cases are built under Windows. + +The following changeset introduced support for the QT_STATIC macro into +QT: + +https://gitlab.com/pteam/pteam-qtbase/commit/96166fa56abb52157387c4911efbd4e5e6beee93 + +This change is not included in QT 4.8.7 (appears to be 5.x only) and +therefore QT_STATIC is not defined when QtSerialPort is compiled against +4.x QT versions. + +The workaround used here is for the QSerialPort build system to define +QT_STATIC when it is being compiled statically. + +diff --git a/src/serialport/qt4support/serialport.prf b/src/serialport/qt4support/serialport.prf +index 1111111..2222222 100644 +--- a/src/serialport/qt4support/serialport.prf ++++ b/src/serialport/qt4support/serialport.prf +@@ -25,3 +25,5 @@ mac { + LIBS += -lQtSerialPort$${QT_LIBINFIX} + } + } ++ ++static:DEFINES += QT_STATIC diff --git a/src/qtserialport_qt4-1-static.patch b/src/qtserialport_qt4-1-static.patch deleted file mode 100644 index 37f99eac..00000000 --- a/src/qtserialport_qt4-1-static.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/src/serialport/qt4support/serialport.prf b/src/serialport/qt4support/serialport.prf -index b1d65e1..d20d47a 100644 ---- a/src/serialport/qt4support/serialport.prf -+++ b/src/serialport/qt4support/serialport.prf -@@ -25,3 +25,5 @@ mac { - LIBS += -lQtSerialPort$${QT_LIBINFIX} - } - } -+ -+static:DEFINES += QT_STATIC From b5c2e0ef554e3c56e6094b3d6dc12f596b3a1525 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Mon, 1 Feb 2016 09:07:10 +0000 Subject: [PATCH 0432/1463] Update versions.json & build-matrix.html --- build-matrix.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 261fdc55..1e561c91 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -3140,9 +3140,9 @@ feel free to submit a pull request. qtserialport_qt4 5c3b6cc770 - ✗ ✓ - ✗ + ✓ + ✓ ✓ ✗ @@ -3993,9 +3993,9 @@ Total: 386
    (+5 virtual +4 native-only) -382 +383 284 -365 +366 282 15 From febd1bb37d0524c59f0f9455c739b9103f31d469 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 3 Feb 2016 12:13:07 +0100 Subject: [PATCH 0433/1463] gnutls: update --- src/gnutls.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gnutls.mk b/src/gnutls.mk index 3fdb207a..679b59db 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -2,8 +2,8 @@ # See index.html for further information. PKG := gnutls -$(PKG)_VERSION := 3.4.8 -$(PKG)_CHECKSUM := e07c05dea525c6bf0dd8017fc5b89d886954f04fedf457ecd1ce488ac3b86ab7 +$(PKG)_VERSION := 3.4.9 +$(PKG)_CHECKSUM := 48594fadba33d450f796ec69526cf2bce6ff9bc3dc90fbd7bf38dc3601f57c3f $(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION) $(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://mirrors.dotsrc.org/gnupg/gnutls/v3.4/$($(PKG)_FILE) From b45184e1a26273258d1c901b5e1d9ee274e96243 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Wed, 3 Feb 2016 11:14:08 +0000 Subject: [PATCH 0434/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 1e561c91..ab892465 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -839,7 +839,7 @@ feel free to submit a pull request. gnutls - 3.4.8 + 3.4.9 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 40cd43bd..3fa6a4d5 100644 --- a/versions.json +++ b/versions.json @@ -79,7 +79,7 @@ "glib": "2.44.1", "glibmm": "2.42.0", "gmp": "6.1.0", - "gnutls": "3.4.8", + "gnutls": "3.4.9", "graphicsmagick": "1.3.21", "gsl": "1.16", "gsoap": "2.8.22", From b1eb68704d31ac406af3bf7ad8cbb34692269dca Mon Sep 17 00:00:00 2001 From: root Date: Fri, 5 Feb 2016 21:51:44 +0100 Subject: [PATCH 0435/1463] introducing copydlldeps.sh and copydlldeps.txt --- tools/copydlldeps.sh | 382 ++++++++++++++++++++++++++++++++++++++++++ tools/copydlldeps.txt | 58 +++++++ 2 files changed, 440 insertions(+) create mode 100755 tools/copydlldeps.sh create mode 100644 tools/copydlldeps.txt diff --git a/tools/copydlldeps.sh b/tools/copydlldeps.sh new file mode 100755 index 00000000..23b31caa --- /dev/null +++ b/tools/copydlldeps.sh @@ -0,0 +1,382 @@ +#!/bin/bash +# + +# print version and license +# is hereby part of the code and also displayed to the user +version() { + cat <&2 + +Welcome to $( basename $0)! +Authors: Lars Holger Engelhard - DL5RCW (2016) + Tiancheng "Timothy" Gu (2014) + +Version: 1.0 + +# This file is part of the MXE Project, sponsored by the named authors +# it supports the shared build approach by providing an easy way to +# check for library dependencies in a recursive manner + +# Copyright (c) 2014 Tiancheng "Timothy" Gu +# (c) 2016 Lars Holger Engelhard - DL5RCW + +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject +# to the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +EOF +} + +# default application objdump +# you can specify your own objdump with --objdump or -o +OBJDUMP=objdump + +# create a temp directory +tmp=`mktemp -d` + +# print an help menu +help() { + cat <&2 + + +Usage: $0 -c -d DEST -s SRC [-f FILE|-F DIR] + or: $0 -p [-f FILE|-F DIR] + or: $0 -c -p -d DEST -s SRC [-f FILE|-F DIR] + or: $0 -p -d DEST -R SRC [-f FILE|-F DIR] + or: $0 -p -d DEST -S "SRC_1 SRC_2 ... SRC_n" [-f FILE|-F DIR] + or: $0 -c -d DEST -R SRC_1 -e SRC_2 [-f FILE|-F DIR] + + +Copy executable FILE(s) and their DLL dependencies for SRC directory to a +DEST directory, and/or print the recursive dependencies. + +Operating modes: + -c, --copy print and copy dependencies + -p, --print print dependencies (no copy action) + +Operating options: + -d, --destdir Destination directory + -f, --infile The input executable file or DLL. + -F, --infiles, --indir The input directory of executable files and/or DLLs. + -s, --srcdir [ multiCall ] The directory with DLLs that can be copied. + -S, --srcdirs [ multiCall ] List of directories with DLLs that can be copied. Put "" around them, e.g. "/dir1 /root/dir2 /root/dir3" + -R, --recursivesrcdir [ multiCall ] Target directory for recursive search of folders containing *dll files + +Optional binary settings: + -o, --objdump Specify the path or name of your objdump application + -e, --enforce Enforce executable files and/or DLLs of a specific directory + It will be entirely copied - flat, non recursive. assumes *.dll and *.exe in the top level directory + e.g. /mxe/usr//qt5/plugins/platforms/ - for qwindows.dll becomes + DESTDIR/platforms/ containing qwindows.dll +Other options: + -h,-H, --help Display this message and exit + -v,-V, --version Display version of this application + -l,-L, --logLevel Display more output - default is 1 + +multiCall => you can specify this option multiple times! + +Authors: Lars Holger Engelhard - DL5RCW + Tiancheng "Timothy" Gu +EOF +} + +# terminate the application +# print an error message +# and clean the tmp directory +die() { + echo $1 >&2 + rm -rf "$tmp" + help + exit 1 +} + +# find all directories containing dll files +# you can pass a list (array) of directories +# and findAllSrcDirectories will hunt for dlls in each one recursively +# it will return a sorted list and duplicates are removed +findAllSrcDirectories(){ +ar_recursiveDirList=${!1} +string="" +for curPath in "${ar_recursiveDirList[@]}"; do + for element in $(find $curPath -name "*.dll"); do + #ar_list+="$(dirname $element) " + string+="$(dirname $element) " + done +done +string=$(echo "$string" | tr -s ' ' | tr ' ' '\n' | nl | sort -u -k2 | sort -n | cut -f2-) +echo $string #returns the string +} + +while [ $# -gt 0 ]; do + key="$1" + shift + + case $key in + -f|--infile) + infile="$1" + shift + ;; + -F|--indir|--infiles) + indir="$1" + shift + ;; + -s|--srcdir) + srcdir+=" $1" + shift + ;; + -d|--destdir) + destdir="$1" + shift + ;; + -S|--srcdirs) + srcdirs+=" $1" + shift + ;; + -R|--recursivesrcdir) + recursivesrcdir+=" $1" + shift + ;; + -o|--objdump) + OBJDUMP="$1" + shift + ;; + -e|--enforce) + enforce+=" $1" + shift + ;; + -l|-L|--logLevel) + logLevel="$1" + shift + ;; + -p|--print) + opmode="print" + ;; + -c|--copy) + opmode="copy" + ;; + -h|-H|--help) + help + exit 0 + ;; + -v|-V|--version) + version + exit 0 + ;; + *) + echo "unknown option $key ignored" >&2 + ;; + esac +done +if ! [ "$logLevel" ]; then + logLevel=0 +fi + +if ! [ "$opmode" ]; then + opmode="copy" # used as default in productive + #opmode="print" # used as default in development +fi + +if [ "$indir" ] && [ "$infile" ]; then + die '--indir and --infile are mutually exclusive.' +elif ! [ "$indir" ] && ! [ "$infile" ]; then + die 'Neither --indir nor --infile is specified.' +fi + +if ! [ "$destdir" ]; then + die '--destdir is not specified.' +fi +if ! ([ "$srcdir" ] || [ "$srcdirs" ] || [ "$recursivesrcdir" ]); then + die 'either --srcdir or --srcdirs or --recursivesrcdir must be specified.' +fi + +if [ "$indir" ]; then + filelist=`find $indir -iregex '.*\(dll\|exe\)' | tr '\n' ' '` +else + filelist="$infile" +fi + +if [ -n "$(ls -A $destdir 2>/dev/null)" ]; then + echo 'Warning: --destdir already exists and contains files.' >&2 +else + mkdir -p "$destdir" + echo "info: created --destdir $destdir" +fi + +if [ "$logLevel" -gt 1 ]; then + echo "filelist=$filelist" + echo "opmode=$opmode" +fi + +ar_srcDirList=() +str_srcDirList="" +if [ "$srcdir" ]; then + str_srcDirList+=" $srcdir" +fi +if [ "$srcdirs" ]; then + str_srcDirList+=" $srcdirs" +fi +if [ "$recursivesrcdir" ]; then + result="$( findAllSrcDirectories recursivesrcdir )" + str_srcDirList+=" $result" +fi +if [ "$logLevel" -gt 1 ]; then + echo "infiles: filelist=$filelist" + echo " opmode: $opmode" +fi + +if [ "$logLevel" -gt 1 ]; then + echo "list for sources: str_srcDirList=${str_srcDirList}" + echo "using OBJDUMP=$OBJDUMP in Version $( $OBJDUMP -V)" +fi + +if [ "$logLevel" -gt 1 ]; then + ## during development, I like to interrupt here to check the above output and skip the rest + echo "starting in 5 seconds" && sleep 5 +fi + +# function to append dependencies (recursively) +append_deps() { + if [ "$logLevel" -gt 1 ]; then + echo "\$1=$1 + \$2=$2 " + sleep 2 + fi + local bn="`basename $1`" + if [ -e "$tmp/$bn" ]; then + return 0 + fi + if [ $# -eq 2 ]; then + path="$1" + else + path="" + for curPath in $( echo "${str_srcDirList}" | tr -s ' ' | tr ' ' '\n' ); do + counter=0 + result=$(find $curPath -name "$bn" | tail -n 1) + if [ ! -z $result ];then + path=$result + counter=$(expr $counter + 1) + fi + if [ "$logLevel" -gt 1 ]; then + if [ $counter == 0 ]; then + echo "could not find \$path for dll $bn, \$counter=$counter: searched $curPath" + else + echo "found path for dll $bn = $path, \$counter=$counter: searched $curPath" + fi + fi + done + if [ "$logLevel" -gt 1 ]; then + echo "path for dll $bn now is $path" + sleep 2 + fi + fi + echo "Processing $1" >&2 + if ! [ -e "$path" ]; then + if [ "$logLevel" -gt 1 ]; then + echo "path=$path| and we touch $tmp/$bn -> non existent in our src directories!" + sleep 4 + fi + touch "$tmp/$bn" + return 0 + fi + $OBJDUMP -p "$path" | grep 'DLL Name:' | cut -f3 -d' ' > "$tmp/$bn" + echo "executing: $OBJDUMP -p "$path" | grep 'DLL Name:' | cut -f3 -d' ' > "$tmp/$bn"" + for dll in `cat "$tmp/$bn" | tr '\n' ' '`; do + append_deps "$dll" + done + alldeps=$(printf "$alldeps\n%s" "$(cat $tmp/$bn)" | sort | uniq) +} + +process_enforced_deps(){ + enforcedDirectory=$1 + if [ ! -d $enforcedDirectory ]; then + echo "warning! \$enforcedDirectory=$enforcedDirectory is not valid" + if [ "$logLevel" -gt 1 ]; then + sleep 10 + fi + fi + # first we append the path to enforced dir to our list of source directories + # if we would do this file recursively, we should loop to find those and append them all to the list + str_srcDirList+=" $enforcedDirectory" + # now we search for the dll and exe files to be included + string=$( find $enforcedDirectory -maxdepth 1 -iregex '.*\(dll\|exe\)' | tr '\n' ' ' ) + if [ "$logLevel" -gt 1 ]; then + echo "enforcedDirectory=$enforcedDirectory" + echo "we found dlls and exes:$string" + sleep 4 + fi + # we hard copy it to DEST + cp -dpRxv "${enforcedDirectory}" "$destdir" +} + +# beginning of the main function +# we start with the enforced dlls and exe +if [ ! -z $enforce ]; then + for curFile in $enforce; do + echo "startig for file $curFile" + append_deps "$curFile" rel + process_enforced_deps "$curFile" + done +fi + +# then we start with our indir or infile list +for file in $filelist; do + echo "starting for file $file" + #sleep 4 + append_deps "$file" rel +done + +echo "I will now search for \$alldeps" +for debugOut in $( echo $alldeps | tr -s ' ' | tr '\n' ' '); do + echo "debugOut: $debugOut" +done +if [ "$logLevel" -eq 1 ]; then + echo "waiting 10 seconds until I proceed - so you can read my debugOut" + sleep 10 + + tmpStr=${str_srcDirList} + echo "\$alldeps has ${#alldeps[@]} elements" + echo "and \$str_srcDirList has ${#str_srcDirList} elements" + echo "waiting another 10 seconds" + #sleep 10 +fi + +for dll in `echo $alldeps | tr '\n' ' '`; do + counter=0 + for curFolder in $( echo "${str_srcDirList}" | tr -s ' ' | tr ' ' '\n'); do + if [ "$logLevel" -gt 1 ]; then + echo "search for dll $dll in curFolder $curFolder" + sleep 1 + fi + if [ -e "${curFolder}/${dll}" ]; then + counter=$(expr $counter + 1) + if [ $opmode == "copy" ]; then + cp -dpRxv "${curFolder}/${dll}" "$destdir" + elif [ $opmode == "print" ]; then + echo "found $dll in: ${curFolder}/${dll}" + else + echo "unknown opmode=$opmode" + fi + fi + done + if [ $counter == 0 ]; then + echo "Warning: \"$dll\" not found. \$counter=$counter." >&2 + else + echo "Found dll $dll in the list. \$counter=$counter" >&2 + fi +done + +rm -rf "$tmp" diff --git a/tools/copydlldeps.txt b/tools/copydlldeps.txt new file mode 100644 index 00000000..dc07f4d8 --- /dev/null +++ b/tools/copydlldeps.txt @@ -0,0 +1,58 @@ +== README of copydlldeps.sh == +This document was created 2016-02-05. It belongs to copydlldeps.sh + +I call it on the command line like: + +/share/mxe/tools/copydlldeps.sh --infile /home/mxeuser/test/i686-w64-mingw32.shared/Application.exe \ + --destdir /home/mxeuser/testdlls/ \ + --recursivesrcdir /home/mxeuser/mxe/usr/i686-w64-mingw32.shared/ \ + --srcdir /home/mxeuser/test/ \ + --copy \ + --enforce /home/mxeuser/mxe/usr/i686-w64-mingw32.shared/qt5/plugins/platforms/ \ + --objdump /home/mxeuser/mxe/usr/bin/i686-w64-mingw32.shared-objdump + +It got embedded in a build script like: + + +MXEPATH=/path/to/mxe +compiler=i686-w64-mingw32.shared +orgDir=/path/to/my/nsis/dll #nsis is then copying all dlls in there to the place where the exe is located + +if [ ! $( echo $compiler | grep -q "shared" ) ]; then + echo "\$compiler=$compiler and contains the word 'shared'" | tee -a $CURLOG + + echo "#===============================================# " | tee -a $CURLOG + echo "| Starting new MXE copydlldeps.sh by LHE DL5RCW | " | tee -a $CURLOG + echo "#===============================================# " | tee -a $CURLOG + echo "currently working in $( pwd ) " | tee -a $CURLOG + executable=$( find . -name "*.exe" | tail -n 1 ) +if [ -e $MXEPATH/usr/bin/$compiler-objdump ]; then + echo "now populating dir=${orgDir}/nsis/sharedLibs with dll dependencies of executable=$executable" | tee -a $CURLOG + $MXEPATH/tools/copydlldeps.sh --infile $executable \ + --destdir ${orgDir}/nsis/sharedLibs \ + --recursivesrcdir $MXEPATH/usr/$compiler/ \ + --enforce $MXEPATH/usr/$compiler/qt5/plugins/platforms/ \ + --copy \ + --objdump $MXEPATH/usr/bin/$compiler-objdump | tee -a $CURLOG +else + echo "now populating dir=${orgDir}/nsis/sharedLibs with dll dependencies of executable=$executable" | tee -a $CURLOG + $MXEPATH/tools/copydlldeps.sh --infile $executable \ + --destdir ${orgDir}/nsis/sharedLibs \ + --recursivesrcdir $MXEPATH/usr/$compiler/ \ + --enforce $MXEPATH/usr/$compiler/qt5/plugins/platforms/ \ + --copy | tee -a $CURLOG +fi + + + +== Additional hints == +=== objdump === +I checked if there is a mxe objdump. If not, I took the native one on my server. I actually do not know the difference but decided to include it in the script in case it is important to someone +=== enforce === +My application is using Qt5 and objdump did not return the needed qwindows.dll - so I enforce the platform folder. You may add multiple --enforce directories using --enforce /path/folder1 --enforce /path/folder2 --enforce /path/folder3 +They are NOT recursively copied, only flat. See: + string=$( find $enforcedDirectory -maxdepth 1 -iregex '.*\(dll\|exe\)' | tr '\n' ' ' ) + +If you would remove the -maxdepth 1, it would become recoursive. Does anyone need that? + + From d83968e04daff483423ddedc812b83e5e2e4e06f Mon Sep 17 00:00:00 2001 From: Pavel Vatagin Date: Sun, 7 Feb 2016 17:25:17 +0300 Subject: [PATCH 0436/1463] add package sparsehash --- index.html | 4 ++++ src/sparsehash.mk | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 src/sparsehash.mk diff --git a/index.html b/index.html index 9579f19d..3d9856d5 100644 --- a/index.html +++ b/index.html @@ -2477,6 +2477,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) sox SoX + + sparsehash + sparsehash + speex Speex diff --git a/src/sparsehash.mk b/src/sparsehash.mk new file mode 100644 index 00000000..d33f312d --- /dev/null +++ b/src/sparsehash.mk @@ -0,0 +1,26 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := sparsehash +$(PKG)_IGNORE := +$(PKG)_VERSION := 2.0.3 +$(PKG)_CHECKSUM := 05e986a5c7327796dad742182b2d10805a8d4f511ad090da0490f146c1ff7a8c +$(PKG)_SUBDIR := $(PKG)-$(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://github.com/$(PKG)/$(PKG)/archive/$($(PKG)_FILE) +$(PKG)_DEPS := gcc + +define $(PKG)_UPDATE + $(call MXE_GET_GITHUB_TAGS, sparsehash/sparsehash, sparsehash-) +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + $(MXE_CONFIGURE_OPTS) + + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install $(MXE_DISABLE_DOCS) + + $(INSTALL) '$(1)/hashtable_test.exe' '$(PREFIX)/$(TARGET)/bin/test-sparsehash.exe' + $(TARGET)-strip '$(PREFIX)/$(TARGET)/bin/test-sparsehash.exe' +endef From 9fe0f21d44179356398c6f0708cbaaec71a63895 Mon Sep 17 00:00:00 2001 From: dl5rcw Date: Sun, 7 Feb 2016 22:21:03 +0100 Subject: [PATCH 0437/1463] Rename copydlldeps.txt to copydlldeps.md --- tools/{copydlldeps.txt => copydlldeps.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tools/{copydlldeps.txt => copydlldeps.md} (100%) diff --git a/tools/copydlldeps.txt b/tools/copydlldeps.md similarity index 100% rename from tools/copydlldeps.txt rename to tools/copydlldeps.md From 8d4936fdbfa07d122fed78e96111912f3f297869 Mon Sep 17 00:00:00 2001 From: fiesh Date: Tue, 2 Feb 2016 15:08:20 +0100 Subject: [PATCH 0438/1463] add Coin bug fix from Gentoo --- src/coin-2-gcc-4.7.patch | 16 ++++++++++++++++ src/coin-test.cpp | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 src/coin-2-gcc-4.7.patch diff --git a/src/coin-2-gcc-4.7.patch b/src/coin-2-gcc-4.7.patch new file mode 100644 index 00000000..28a9d938 --- /dev/null +++ b/src/coin-2-gcc-4.7.patch @@ -0,0 +1,16 @@ +This file is part of MXE. +See index.html for further information. + +This patch was taken from Gentoo: +https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/coin/files/coin-3.1.3-gcc-4.7.patch?id=17d7c853393ff83e3422e48e9ad2810f23889bbf + +--- coin3-3.1.3.orig/include/Inventor/SbBasic.h ++++ coin3-3.1.3/include/Inventor/SbBasic.h +@@ -24,6 +24,7 @@ + * + \**************************************************************************/ + ++#include + #include + + /* ********************************************************************** */ diff --git a/src/coin-test.cpp b/src/coin-test.cpp index 0974407e..be5eacf2 100644 --- a/src/coin-test.cpp +++ b/src/coin-test.cpp @@ -3,7 +3,7 @@ * See index.html for further information. */ -#include +#include #include #include #include From 8e3cf079295d10a009b5d2f47f06f2ccbcf8dd1c Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 8 Feb 2016 21:46:14 +0100 Subject: [PATCH 0439/1463] curl: update --- src/curl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/curl.mk b/src/curl.mk index 9cf3dfd0..e00540cf 100644 --- a/src/curl.mk +++ b/src/curl.mk @@ -3,8 +3,8 @@ PKG := curl $(PKG)_IGNORE := -$(PKG)_VERSION := 7.47.0 -$(PKG)_CHECKSUM := f7789a806fef4e24ec3d4b70ca86ff145243bf19d03ab0eb5c64f18f1b2748d8 +$(PKG)_VERSION := 7.47.1 +$(PKG)_CHECKSUM := c9b2fd75417ff0a1d0cd1bb284d1d8d7a08963f945860c987d59ae0eb412aa01 $(PKG)_SUBDIR := curl-$($(PKG)_VERSION) $(PKG)_FILE := curl-$($(PKG)_VERSION).tar.lzma $(PKG)_URL := http://curl.haxx.se/download/$($(PKG)_FILE) From b947ff121ee6a0bbd72ffde39b5679eea58f7396 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Mon, 8 Feb 2016 21:04:07 +0000 Subject: [PATCH 0440/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index ab892465..10da5ec3 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -419,7 +419,7 @@ feel free to submit a pull request. curl - 7.47.0 + 7.47.1 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 3fa6a4d5..d02da508 100644 --- a/versions.json +++ b/versions.json @@ -37,7 +37,7 @@ "cryptopp": "5.6.3", "crystalhd": "1", "cunit": "2.1-3", - "curl": "7.47.0", + "curl": "7.47.1", "db": "6.1.26", "dbus": "1.11.0", "dcmtk": "3.6.0", From 8469f3aa46e7431757aa5ddda655dbc6409b6f19 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 9 Feb 2016 16:06:40 +0100 Subject: [PATCH 0441/1463] freetype: update --- src/freetype.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/freetype.mk b/src/freetype.mk index b282a164..274a2809 100644 --- a/src/freetype.mk +++ b/src/freetype.mk @@ -3,8 +3,8 @@ PKG := freetype $(PKG)_IGNORE := -$(PKG)_VERSION := 2.6.2 -$(PKG)_CHECKSUM := baf6bdef7cdcc12ac270583f76ef245efe936267dbecef835f02a3409fcbb892 +$(PKG)_VERSION := 2.6.3 +$(PKG)_CHECKSUM := 371e707aa522acf5b15ce93f11183c725b8ed1ee8546d7b3af549863045863a2 $(PKG)_SUBDIR := freetype-$($(PKG)_VERSION) $(PKG)_FILE := freetype-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/freetype/freetype2/$(shell echo '$($(PKG)_VERSION)' | cut -d . -f 1,2,3)/$($(PKG)_FILE) From e77a12061d98bb2ab1d30d43c6b8e2ecfb62c643 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 9 Feb 2016 16:07:00 +0100 Subject: [PATCH 0442/1463] libgcrypt: update --- src/libgcrypt.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libgcrypt.mk b/src/libgcrypt.mk index 7392fcc0..091b808d 100644 --- a/src/libgcrypt.mk +++ b/src/libgcrypt.mk @@ -3,8 +3,8 @@ PKG := libgcrypt $(PKG)_IGNORE := -$(PKG)_VERSION := 1.6.4 -$(PKG)_CHECKSUM := c9bc2c7fe2e5f4ea13b0c74f9d24bcbb1ad889bb39297d8082aebf23f4336026 +$(PKG)_VERSION := 1.6.5 +$(PKG)_CHECKSUM := f49ebc5842d455ae7019def33eb5a014a0f07a2a8353dc3aa50a76fd1dafa924 $(PKG)_SUBDIR := libgcrypt-$($(PKG)_VERSION) $(PKG)_FILE := libgcrypt-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://mirrors.dotsrc.org/gcrypt/libgcrypt/$($(PKG)_FILE) From 0c1c90900432efc46885e34debee6ec46fa5e5a6 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Tue, 9 Feb 2016 15:11:09 +0000 Subject: [PATCH 0443/1463] Update versions.json & build-matrix.html --- build-matrix.html | 6 +++--- versions.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 10da5ec3..356c07f0 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -629,7 +629,7 @@ feel free to submit a pull request. freetype - 2.6.2 + 2.6.3 ✓ ✓ ✓ @@ -639,7 +639,7 @@ feel free to submit a pull request. freetype-bootstrap - 2.6.2 + 2.6.3 ✓ ✓ ✓ @@ -1519,7 +1519,7 @@ feel free to submit a pull request. libgcrypt - 1.6.4 + 1.6.5 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index d02da508..95749277 100644 --- a/versions.json +++ b/versions.json @@ -58,8 +58,8 @@ "freeglut": "2.8.1", "freeimage": "3.15.4", "freetds": "0.95.75", - "freetype": "2.6.2", - "freetype-bootstrap": "2.6.2", + "freetype": "2.6.3", + "freetype-bootstrap": "2.6.3", "fribidi": "0.19.6", "ftgl": "2.1.3~rc5", "gc": "7.2e", @@ -147,7 +147,7 @@ "libffi": "3.2.1", "libftdi": "0.20", "libftdi1": "1.2", - "libgcrypt": "1.6.4", + "libgcrypt": "1.6.5", "libgda": "4.2.13", "libgdamm": "4.1.3", "libgee": "0.5.0", From 37ea726082c31dd90899a2d8e3d0e894f5dab90f Mon Sep 17 00:00:00 2001 From: dl5rcw Date: Wed, 10 Feb 2016 09:31:46 +0100 Subject: [PATCH 0444/1463] converting file to md format converting file from mediawiki to md format --- tools/copydlldeps.md | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/tools/copydlldeps.md b/tools/copydlldeps.md index dc07f4d8..1809e129 100644 --- a/tools/copydlldeps.md +++ b/tools/copydlldeps.md @@ -1,8 +1,9 @@ -== README of copydlldeps.sh == -This document was created 2016-02-05. It belongs to copydlldeps.sh +README of copydlldeps.sh +======================== +This document was created 2016-02-05. It belongs to copydlldeps.sh and is part of the MXE project. I call it on the command line like: - + /share/mxe/tools/copydlldeps.sh --infile /home/mxeuser/test/i686-w64-mingw32.shared/Application.exe \ --destdir /home/mxeuser/testdlls/ \ --recursivesrcdir /home/mxeuser/mxe/usr/i686-w64-mingw32.shared/ \ @@ -10,10 +11,9 @@ I call it on the command line like: --copy \ --enforce /home/mxeuser/mxe/usr/i686-w64-mingw32.shared/qt5/plugins/platforms/ \ --objdump /home/mxeuser/mxe/usr/bin/i686-w64-mingw32.shared-objdump - + It got embedded in a build script like: - MXEPATH=/path/to/mxe compiler=i686-w64-mingw32.shared orgDir=/path/to/my/nsis/dll #nsis is then copying all dlls in there to the place where the exe is located @@ -21,9 +21,9 @@ orgDir=/path/to/my/nsis/dll #nsis is then copying all dlls in there to the place if [ ! $( echo $compiler | grep -q "shared" ) ]; then echo "\$compiler=$compiler and contains the word 'shared'" | tee -a $CURLOG - echo "#===============================================# " | tee -a $CURLOG + echo "+-----------------------------------------------+ " | tee -a $CURLOG echo "| Starting new MXE copydlldeps.sh by LHE DL5RCW | " | tee -a $CURLOG - echo "#===============================================# " | tee -a $CURLOG + echo "+-----------------------------------------------+ " | tee -a $CURLOG echo "currently working in $( pwd ) " | tee -a $CURLOG executable=$( find . -name "*.exe" | tail -n 1 ) if [ -e $MXEPATH/usr/bin/$compiler-objdump ]; then @@ -42,17 +42,19 @@ else --enforce $MXEPATH/usr/$compiler/qt5/plugins/platforms/ \ --copy | tee -a $CURLOG fi - -== Additional hints == -=== objdump === +Additional hints +================ +objdump +------- I checked if there is a mxe objdump. If not, I took the native one on my server. I actually do not know the difference but decided to include it in the script in case it is important to someone -=== enforce === +enforce +------- My application is using Qt5 and objdump did not return the needed qwindows.dll - so I enforce the platform folder. You may add multiple --enforce directories using --enforce /path/folder1 --enforce /path/folder2 --enforce /path/folder3 They are NOT recursively copied, only flat. See: string=$( find $enforcedDirectory -maxdepth 1 -iregex '.*\(dll\|exe\)' | tr '\n' ' ' ) If you would remove the -maxdepth 1, it would become recoursive. Does anyone need that? - +2016-02-10 Lars Holger Engelhard - DL5RCW From 46e6911edc4a2d3da700dd93234e1510607edf69 Mon Sep 17 00:00:00 2001 From: dl5rcw Date: Wed, 10 Feb 2016 09:35:51 +0100 Subject: [PATCH 0445/1463] markdown with code blocks just noticed md + code blocks need these --- tools/copydlldeps.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/copydlldeps.md b/tools/copydlldeps.md index 1809e129..c8145ae1 100644 --- a/tools/copydlldeps.md +++ b/tools/copydlldeps.md @@ -4,6 +4,7 @@ This document was created 2016-02-05. It belongs to copydlldeps.sh and is part o I call it on the command line like: +``` /share/mxe/tools/copydlldeps.sh --infile /home/mxeuser/test/i686-w64-mingw32.shared/Application.exe \ --destdir /home/mxeuser/testdlls/ \ --recursivesrcdir /home/mxeuser/mxe/usr/i686-w64-mingw32.shared/ \ @@ -11,9 +12,11 @@ I call it on the command line like: --copy \ --enforce /home/mxeuser/mxe/usr/i686-w64-mingw32.shared/qt5/plugins/platforms/ \ --objdump /home/mxeuser/mxe/usr/bin/i686-w64-mingw32.shared-objdump +``` It got embedded in a build script like: +``` MXEPATH=/path/to/mxe compiler=i686-w64-mingw32.shared orgDir=/path/to/my/nsis/dll #nsis is then copying all dlls in there to the place where the exe is located @@ -42,7 +45,7 @@ else --enforce $MXEPATH/usr/$compiler/qt5/plugins/platforms/ \ --copy | tee -a $CURLOG fi - +``` Additional hints ================ From ebd54246cf76328d73f917ba7507231b1325931f Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 10 Feb 2016 18:57:35 +0300 Subject: [PATCH 0446/1463] Update copydlldeps.md --- tools/copydlldeps.md | 50 +++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/tools/copydlldeps.md b/tools/copydlldeps.md index c8145ae1..4d2eb228 100644 --- a/tools/copydlldeps.md +++ b/tools/copydlldeps.md @@ -1,8 +1,8 @@ README of copydlldeps.sh ======================== -This document was created 2016-02-05. It belongs to copydlldeps.sh and is part of the MXE project. +This document belongs to copydlldeps.sh and is a part of the MXE project. -I call it on the command line like: +It can be invoked on the command line like: ``` /share/mxe/tools/copydlldeps.sh --infile /home/mxeuser/test/i686-w64-mingw32.shared/Application.exe \ @@ -19,7 +19,7 @@ It got embedded in a build script like: ``` MXEPATH=/path/to/mxe compiler=i686-w64-mingw32.shared -orgDir=/path/to/my/nsis/dll #nsis is then copying all dlls in there to the place where the exe is located +orgDir=/path/to/my/nsis/dll # nsis is then copying all dlls in there to the place where the exe is located if [ ! $( echo $compiler | grep -q "shared" ) ]; then echo "\$compiler=$compiler and contains the word 'shared'" | tee -a $CURLOG @@ -28,36 +28,44 @@ if [ ! $( echo $compiler | grep -q "shared" ) ]; then echo "| Starting new MXE copydlldeps.sh by LHE DL5RCW | " | tee -a $CURLOG echo "+-----------------------------------------------+ " | tee -a $CURLOG echo "currently working in $( pwd ) " | tee -a $CURLOG - executable=$( find . -name "*.exe" | tail -n 1 ) -if [ -e $MXEPATH/usr/bin/$compiler-objdump ]; then - echo "now populating dir=${orgDir}/nsis/sharedLibs with dll dependencies of executable=$executable" | tee -a $CURLOG + executable=$( find . -name "*.exe" | tail -n 1 ) + sharedLibsDir="${orgDir}/nsis/sharedLibs" + echo "populating dir $sharedLibsDir with dll dependencies of $executable" | tee -a $CURLOG + OBJDUMP=objdump + if [ -e "$MXEPATH/usr/bin/$compiler-objdump" ]; then + OBJDUMP="$MXEPATH/usr/bin/$compiler-objdump" + fi $MXEPATH/tools/copydlldeps.sh --infile $executable \ - --destdir ${orgDir}/nsis/sharedLibs \ - --recursivesrcdir $MXEPATH/usr/$compiler/ \ - --enforce $MXEPATH/usr/$compiler/qt5/plugins/platforms/ \ + --destdir "$sharedLibsDir" \ + --recursivesrcdir "$MXEPATH/usr/$compiler/" \ + --enforce "$MXEPATH/usr/$compiler/qt5/plugins/platforms/" \ --copy \ - --objdump $MXEPATH/usr/bin/$compiler-objdump | tee -a $CURLOG -else - echo "now populating dir=${orgDir}/nsis/sharedLibs with dll dependencies of executable=$executable" | tee -a $CURLOG - $MXEPATH/tools/copydlldeps.sh --infile $executable \ - --destdir ${orgDir}/nsis/sharedLibs \ - --recursivesrcdir $MXEPATH/usr/$compiler/ \ - --enforce $MXEPATH/usr/$compiler/qt5/plugins/platforms/ \ - --copy | tee -a $CURLOG + --objdump "$OBJDUMP" \ + | tee -a $CURLOG fi ``` Additional hints ================ + objdump ------- -I checked if there is a mxe objdump. If not, I took the native one on my server. I actually do not know the difference but decided to include it in the script in case it is important to someone +I checked if there is a mxe objdump. If not, I took the native one on my server. +I actually do not know the difference but decided to include it in the script +in case it is important to someone. + enforce ------- -My application is using Qt5 and objdump did not return the needed qwindows.dll - so I enforce the platform folder. You may add multiple --enforce directories using --enforce /path/folder1 --enforce /path/folder2 --enforce /path/folder3 +My application is using Qt5 and objdump did not return the needed qwindows.dll - +so I enforce the platform folder. You may add multiple --enforce directories using +`--enforce /path/folder1 --enforce /path/folder2 --enforce /path/folder3`. + They are NOT recursively copied, only flat. See: + +```bash string=$( find $enforcedDirectory -maxdepth 1 -iregex '.*\(dll\|exe\)' | tr '\n' ' ' ) +``` -If you would remove the -maxdepth 1, it would become recoursive. Does anyone need that? +If you would remove the `-maxdepth 1`, it would become recoursive. -2016-02-10 Lars Holger Engelhard - DL5RCW +February, 2, 2016. Lars Holger Engelhard aka [DL5RCW](https://github.com/dl5rcw). From e498d6eeac2322ff3de9e06144198d0e1f75e9f5 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Thu, 11 Feb 2016 19:16:12 +0000 Subject: [PATCH 0447/1463] Update versions.json & build-matrix.html --- build-matrix.html | 20 +++++++++++++++----- versions.json | 1 + 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 356c07f0..b8773f76 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -3517,6 +3517,16 @@ feel free to submit a pull request. ✗ + + sparsehash + 2.0.3 + ✓ + ✓ + ✓ + ✓ + ✗ + + speex 1.2rc2 @@ -3989,14 +3999,14 @@ feel free to submit a pull request. -Total: 386 +Total: 387
    (+5 virtual +4 native-only) -383 -284 -366 -282 +384 +285 +367 +283 15 diff --git a/versions.json b/versions.json index 95749277..85fec7bb 100644 --- a/versions.json +++ b/versions.json @@ -347,6 +347,7 @@ "smpeg": "0.4.5+cvs20030824", "smpeg2": "2.0.0", "sox": "14.4.2", + "sparsehash": "2.0.3", "speex": "1.2rc2", "speexdsp": "1.2rc3", "sqlite": "3100200", From 867eb9e68e757213bae7065a85215218eda1c291 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Fri, 12 Feb 2016 15:47:47 +0100 Subject: [PATCH 0448/1463] freetds: update --- src/freetds.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/freetds.mk b/src/freetds.mk index 6d20f56c..429936e1 100644 --- a/src/freetds.mk +++ b/src/freetds.mk @@ -3,8 +3,8 @@ PKG := freetds $(PKG)_IGNORE := -$(PKG)_VERSION := 0.95.75 -$(PKG)_CHECKSUM := 23cbac96805730f7760256631561f65f88aab3cd4b6d1f5dae53721c79a02f81 +$(PKG)_VERSION := 0.95.84 +$(PKG)_CHECKSUM := 9c4de7f4e8dce0a7606004bb3b8d77b032efba2b583907af540492e222cc54ca $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := ftp://ftp.freetds.org/pub/$(PKG)/stable/$($(PKG)_FILE) From 04e1c349d96121bdeb91206aafaf464111f6f4bb Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Fri, 12 Feb 2016 14:54:29 +0000 Subject: [PATCH 0449/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index b8773f76..bd84e95f 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -619,7 +619,7 @@ feel free to submit a pull request. freetds - 0.95.75 + 0.95.84 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 85fec7bb..80724de6 100644 --- a/versions.json +++ b/versions.json @@ -57,7 +57,7 @@ "fontconfig": "2.11.1", "freeglut": "2.8.1", "freeimage": "3.15.4", - "freetds": "0.95.75", + "freetds": "0.95.84", "freetype": "2.6.3", "freetype-bootstrap": "2.6.3", "fribidi": "0.19.6", From 8417b59f26fb0ace0a9fae409b9a2dbe3772cb48 Mon Sep 17 00:00:00 2001 From: Pavel Vatagin Date: Sat, 13 Feb 2016 20:47:00 +0300 Subject: [PATCH 0450/1463] qjson: install pkg-config file --- src/qjson-1-fixes.patch | 22 ++++++++++++++++++++++ src/qjson-test.cpp | 7 +++++++ src/qjson.mk | 5 +++++ 3 files changed, 34 insertions(+) create mode 100644 src/qjson-1-fixes.patch create mode 100644 src/qjson-test.cpp diff --git a/src/qjson-1-fixes.patch b/src/qjson-1-fixes.patch new file mode 100644 index 00000000..98bf3938 --- /dev/null +++ b/src/qjson-1-fixes.patch @@ -0,0 +1,22 @@ +This file is part of MXE. +See index.html for further information. + +diff -Naur qjson-0.8.1.orig/CMakeLists.txt qjson-0.8.1/CMakeLists.txt +--- qjson-0.8.1.orig/CMakeLists.txt 2012-11-27 14:06:57.000000000 +0400 ++++ qjson-0.8.1/CMakeLists.txt 2016-02-13 03:00:18.725982532 +0300 +@@ -56,13 +56,13 @@ + set(LIBRARY_OUTPUT_PATH "${CMAKE_BINARY_DIR}/lib" ) + + # pkg-config +-IF (NOT WIN32) ++#IF (NOT WIN32) + CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/QJson.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/QJson.pc + @ONLY) + INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/QJson.pc + DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) +-ENDIF (NOT WIN32) ++#ENDIF (NOT WIN32) + + # Subdirs + ADD_SUBDIRECTORY(src) diff --git a/src/qjson-test.cpp b/src/qjson-test.cpp new file mode 100644 index 00000000..78c218b3 --- /dev/null +++ b/src/qjson-test.cpp @@ -0,0 +1,7 @@ +#include + +int main() +{ + QJson::Parser p; + return 0; +} diff --git a/src/qjson.mk b/src/qjson.mk index 76e2659e..375918d7 100644 --- a/src/qjson.mk +++ b/src/qjson.mk @@ -22,4 +22,9 @@ define $(PKG)_BUILD -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' $(MAKE) -C '$(1)/build' -j '$(JOBS)' install + + '$(TARGET)-g++' \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \ + `'$(TARGET)-pkg-config' QJson --cflags --libs` endef From 809ffe59869433927e9a1b20905901286c53bd2a Mon Sep 17 00:00:00 2001 From: Colin Bourassa Date: Sat, 6 Feb 2016 20:45:30 -0500 Subject: [PATCH 0451/1463] Add librosco 0.1.11 --- index.html | 4 ++++ src/librosco.mk | 30 ++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 src/librosco.mk diff --git a/index.html b/index.html index 3d9856d5..28e7a945 100644 --- a/index.html +++ b/index.html @@ -1845,6 +1845,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) librsvg librsvg + + librosco + librosco + librtmp librtmp diff --git a/src/librosco.mk b/src/librosco.mk new file mode 100644 index 00000000..207cf0a6 --- /dev/null +++ b/src/librosco.mk @@ -0,0 +1,30 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := librosco +$(PKG)_IGNORE := +$(PKG)_VERSION := 0.1.11 +$(PKG)_CHECKSUM := 48bb2d07c2575f39bdb6cf022889f20bd855eb9100bb19d4e2536a771198e3a4 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://github.com/colinbourassa/librosco/archive/$($(PKG)_VERSION).tar.gz +$(PKG)_DEPS := gcc + +define $(PKG)_UPDATE + $(call MXE_GET_GITHUB_TAGS, colinbourassa/librosco) +endef + +define $(PKG)_BUILD + mkdir '$(1)/build' + cd '$(1)/build' && '$(TARGET)-cmake' .. \ + -DBUILD_STATIC=$(if $(BUILD_STATIC),ON,OFF) \ + -DENABLE_DOC_INSTALL=off \ + -DENABLE_TESTAPP_INSTALL=off + + $(MAKE) -C '$(1)/build' -j '$(JOBS)' + $(MAKE) -C '$(1)/build' -j 1 install + + '$(TARGET)-gcc' $(1)/src/readmems.c \ + -o '$(PREFIX)/$(TARGET)/bin/test-librosco.exe' \ + `'$(TARGET)-pkg-config' --libs librosco` +endef From a4b8389dbca1991202197e9ec3ac183d2bbedce5 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sat, 13 Feb 2016 22:16:00 +0000 Subject: [PATCH 0452/1463] Update versions.json & build-matrix.html --- build-matrix.html | 20 +++++++++++++++----- versions.json | 1 + 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index bd84e95f..f7ec44e8 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -1917,6 +1917,16 @@ feel free to submit a pull request. ✗ + + librosco + 0.1.11 + ✓ + ✓ + ✓ + ✓ + ✗ + + librsvg 2.40.5 @@ -3999,14 +4009,14 @@ feel free to submit a pull request. -Total: 387 +Total: 388
    (+5 virtual +4 native-only) -384 -285 -367 -283 +385 +286 +368 +284 15 diff --git a/versions.json b/versions.json index 80724de6..96777787 100644 --- a/versions.json +++ b/versions.json @@ -187,6 +187,7 @@ "libpaper": "1.1.24+nmu4", "libplist": "1.12", "libpng": "1.6.21", + "librosco": "0.1.11", "librsvg": "2.40.5", "librtmp": "a107cef", "libsamplerate": "0.1.8", From cf76471c24c30bd897f8efd186e63a92509857c4 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sat, 13 Feb 2016 19:17:01 -0700 Subject: [PATCH 0453/1463] update glfw3 to 3.1.2 --- src/glfw3.mk | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/glfw3.mk b/src/glfw3.mk index 04025d14..86c3a869 100644 --- a/src/glfw3.mk +++ b/src/glfw3.mk @@ -3,19 +3,15 @@ PKG := glfw3 $(PKG)_IGNORE := -$(PKG)_VERSION := 3.1 -$(PKG)_CHECKSUM := 4948d5091d71a2249dc6d7e3effab2066089334844cea5cef0489b4a575b0bce +$(PKG)_VERSION := 3.1.2 +$(PKG)_CHECKSUM := 6ac642087682aaf7f8397761a41a99042b2c656498217a1c63ba9706d1eef122 $(PKG)_SUBDIR := glfw-$($(PKG)_VERSION) -$(PKG)_FILE := glfw-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/glfw/glfw/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://github.com/glfw/glfw/archive/$($(PKG)_VERSION).tar.gz $(PKG)_DEPS := gcc define $(PKG)_UPDATE - $(WGET) -q -O- 'http://sourceforge.net/projects/glfw/files/glfw/' | \ - $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \ - grep '^3\.' | \ - $(SORT) -V | \ - tail -1 + $(call MXE_GET_GITHUB_TAGS, glfw/glfw) endef define $(PKG)_BUILD From cc95f885fae8473d802f6ba0160b49a4c96a659b Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sun, 14 Feb 2016 04:06:53 +0000 Subject: [PATCH 0454/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index f7ec44e8..223d240b 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -799,7 +799,7 @@ feel free to submit a pull request. glfw3 - 3.1 + 3.1.2 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 96777787..b97b1169 100644 --- a/versions.json +++ b/versions.json @@ -75,7 +75,7 @@ "giflib": "5.0.5", "glew": "1.12.0", "glfw2": "2.7.9", - "glfw3": "3.1", + "glfw3": "3.1.2", "glib": "2.44.1", "glibmm": "2.42.0", "gmp": "6.1.0", From 575439bb404d72666694102637c909051ce57897 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 15 Feb 2016 22:38:06 +0100 Subject: [PATCH 0455/1463] sqlite: update --- src/sqlite.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sqlite.mk b/src/sqlite.mk index be927cc9..0a17e697 100644 --- a/src/sqlite.mk +++ b/src/sqlite.mk @@ -3,8 +3,8 @@ PKG := sqlite $(PKG)_IGNORE := -$(PKG)_VERSION := 3100200 -$(PKG)_CHECKSUM := a2b3b4bd1291ea7d6c8252f7edff36a4362f2f0e5d5370444ba6cbe313ae2971 +$(PKG)_VERSION := 3110000 +$(PKG)_CHECKSUM := 508d4dcbcf7a7181e95c717a1dc4ae3c0880b3d593be0c4b40abb6c3a0e201fb $(PKG)_SUBDIR := $(PKG)-autoconf-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-autoconf-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.sqlite.org/2016/$($(PKG)_FILE) From 58b83234fb068600ac5aa9c2f437b1bbe132014d Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Mon, 15 Feb 2016 21:41:07 +0000 Subject: [PATCH 0456/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 223d240b..bbbdd752 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -3559,7 +3559,7 @@ feel free to submit a pull request. sqlite - 3100200 + 3110000 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index b97b1169..4b797029 100644 --- a/versions.json +++ b/versions.json @@ -351,7 +351,7 @@ "sparsehash": "2.0.3", "speex": "1.2rc2", "speexdsp": "1.2rc3", - "sqlite": "3100200", + "sqlite": "3110000", "suitesparse": "4.2.1", "t4k_common": "0.1.1", "taglib": "1.10", From 57a6850a0f427fa25ec12fec2231ae640dff9f99 Mon Sep 17 00:00:00 2001 From: "Avi Halachmi (:avih)" Date: Mon, 15 Feb 2016 23:49:04 +0200 Subject: [PATCH 0457/1463] ffmpeg: update to 3.0 Also, ffmpeg doesn't support libvo-aacenc anymore. --- src/ffmpeg.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/ffmpeg.mk b/src/ffmpeg.mk index 14de3cc8..60c1a723 100644 --- a/src/ffmpeg.mk +++ b/src/ffmpeg.mk @@ -3,15 +3,15 @@ PKG := ffmpeg $(PKG)_IGNORE := -$(PKG)_VERSION := 2.8.4 -$(PKG)_CHECKSUM := 83cc8136a7845546062a43cda9ae3cf0a02f43ef5e434d2f997f055231a75f8e +$(PKG)_VERSION := 3.0 +$(PKG)_CHECKSUM := f19ff77a2f7f736a41dd1499eef4784bf3cb7461f07c13a268164823590113c0 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://www.ffmpeg.org/releases/$($(PKG)_FILE) $(PKG)_URL_2 := http://launchpad.net/ffmpeg/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_VERSION)/+download/$($(PKG)_FILE) $(PKG)_DEPS := gcc bzip2 gnutls lame libass libbluray libbs2b libcaca \ libvpx opencore-amr opus sdl speex theora vidstab \ - vo-aacenc vo-amrwbenc vorbis x264 xvidcore yasm zlib + vo-amrwbenc vorbis x264 xvidcore yasm zlib # DO NOT ADD fdk-aac OR openssl SUPPORT. # Although they are free softwares, their licenses are not compatible with @@ -59,7 +59,6 @@ define $(PKG)_BUILD --enable-libspeex \ --enable-libtheora \ --enable-libvidstab \ - --enable-libvo-aacenc \ --enable-libvo-amrwbenc \ --enable-libvorbis \ --enable-libvpx \ From ff84342c27a5e8badbbdfb58403e22635b78726e Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Mon, 15 Feb 2016 22:39:49 +0000 Subject: [PATCH 0458/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index bbbdd752..bbda1b2a 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -529,7 +529,7 @@ feel free to submit a pull request. ffmpeg - 2.8.4 + 3.0 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 4b797029..6c3ddb47 100644 --- a/versions.json +++ b/versions.json @@ -48,7 +48,7 @@ "expat": "2.1.0", "faad2": "2.7", "fdk-aac": "0.1.4", - "ffmpeg": "2.8.4", + "ffmpeg": "3.0", "fftw": "3.3.4", "file": "5.24", "flac": "1.3.1", From ad883ac8f94e693309034d87b870fea4f414ca8d Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Thu, 18 Feb 2016 17:38:02 +0300 Subject: [PATCH 0459/1463] Makefile: fix make clean target when $$WINEPREFIX directory doesn't exist --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d0c73c46..7668a704 100644 --- a/Makefile +++ b/Makefile @@ -620,7 +620,7 @@ BUILD_PKG_TMP_FILES := *-*.list mxe-*.tar.xz mxe-*.deb* wheezy jessie .PHONY: clean clean: - -chmod 0755 "$$WINEPREFIX" + @[ -d "$$WINEPREFIX" ] && chmod 0755 "$$WINEPREFIX" || true rm -rf $(call TMP_DIR,*) $(PREFIX) \ $(addprefix $(TOP_DIR)/, $(BUILD_PKG_TMP_FILES)) From f6d028fb02ae5959601cfae28a659ace0ac4c425 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 22 Feb 2016 03:38:51 +0300 Subject: [PATCH 0460/1463] openscenegraph: disable ffmpeg fix #1230 --- src/openscenegraph-1-fixes.patch | 27 +++++++++++++++++++++++++++ src/openscenegraph.mk | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/openscenegraph-1-fixes.patch b/src/openscenegraph-1-fixes.patch index 2e97c392..a372c1da 100644 --- a/src/openscenegraph-1-fixes.patch +++ b/src/openscenegraph-1-fixes.patch @@ -155,3 +155,30 @@ index 1111111..2222222 100644 macro(FIND_GSTREAMER_COMPONENT _component_prefix _pkgconfig_name _header _library) find_path(${_component_prefix}_INCLUDE_DIRS NAMES ${_header} + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Mon, 22 Feb 2016 03:35:28 +0300 +Subject: [PATCH] disable ffmpeg + +OpenSceneGraph is using removed features of ffmpeg, which have +been deprecated for 3+ years. + +See https://github.com/mxe/mxe/issues/1230#issuecomment-186936198 +Source of patch: http://forum.openscenegraph.org/viewtopic.php?t=10485 + +diff --git a/src/osgPlugins/CMakeLists.txt b/src/osgPlugins/CMakeLists.txt +index 1111111..2222222 100644 +--- a/src/osgPlugins/CMakeLists.txt ++++ b/src/osgPlugins/CMakeLists.txt +@@ -199,10 +199,6 @@ IF(XINE_FOUND) + ADD_SUBDIRECTORY(xine) + ENDIF() + +-IF(FFMPEG_FOUND AND OSG_CPP_EXCEPTIONS_AVAILABLE) +- ADD_SUBDIRECTORY(ffmpeg) +-ENDIF() +- + IF(GSTREAMER_FOUND AND GLIB_FOUND) + ADD_SUBDIRECTORY(gstreamer) + ENDIF() diff --git a/src/openscenegraph.mk b/src/openscenegraph.mk index c7551ec0..911554cc 100644 --- a/src/openscenegraph.mk +++ b/src/openscenegraph.mk @@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := 5c727d84755da276adf8c4a4a3a8ba9c9570fc4b4969f06f1d2e9f89b1e30 $(PKG)_SUBDIR := OpenSceneGraph-$($(PKG)_VERSION) $(PKG)_FILE := OpenSceneGraph-$($(PKG)_VERSION).zip $(PKG)_URL := http://trac.openscenegraph.org/downloads/developer_releases/$($(PKG)_FILE) -$(PKG)_DEPS := gcc boost curl dcmtk ffmpeg freetype gdal giflib gstreamer \ +$(PKG)_DEPS := gcc boost curl dcmtk freetype gdal giflib gstreamer \ gta jasper jpeg libpng openal openexr openthreads poppler \ qt tiff xine-lib zlib From d116580c981abd964ddf8f77d3057f64471bd52e Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 23 Feb 2016 10:34:01 +0100 Subject: [PATCH 0461/1463] harfbuzz: update --- src/harfbuzz.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/harfbuzz.mk b/src/harfbuzz.mk index d30bdffb..947ed335 100644 --- a/src/harfbuzz.mk +++ b/src/harfbuzz.mk @@ -3,8 +3,8 @@ PKG := harfbuzz $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1.2 -$(PKG)_CHECKSUM := 4a2c5790bd3db7c3ca8c02e4858f2fd592df7932c1d2fa9f6b99acbce0f8461f +$(PKG)_VERSION := 1.2.1 +$(PKG)_CHECKSUM := 0c189aa386c5ea8d7c315adf273f56f48f412081a367b3f92abc2d0855fa2226 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://www.freedesktop.org/software/$(PKG)/release/$($(PKG)_FILE) From 04cee2797ec40f380c80602b0336527b435dde7e Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 23 Feb 2016 10:34:26 +0100 Subject: [PATCH 0462/1463] libssh2: update --- src/libssh2.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libssh2.mk b/src/libssh2.mk index c66e949e..19b89c2e 100644 --- a/src/libssh2.mk +++ b/src/libssh2.mk @@ -3,8 +3,8 @@ PKG := libssh2 $(PKG)_IGNORE := -$(PKG)_VERSION := 1.6.0 -$(PKG)_CHECKSUM := 5a202943a34a1d82a1c31f74094f2453c207bf9936093867f41414968c8e8215 +$(PKG)_VERSION := 1.7.0 +$(PKG)_CHECKSUM := e4561fd43a50539a8c2ceb37841691baf03ecb7daf043766da1b112e4280d584 $(PKG)_SUBDIR := libssh2-$($(PKG)_VERSION) $(PKG)_FILE := libssh2-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.libssh2.org/download/$($(PKG)_FILE) From 89e4d7c0cbb2762dd01d69f1f97df79e1496058b Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Tue, 23 Feb 2016 09:36:22 +0000 Subject: [PATCH 0463/1463] Update versions.json & build-matrix.html --- build-matrix.html | 4 ++-- versions.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index bbda1b2a..df96fbb0 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -1049,7 +1049,7 @@ feel free to submit a pull request. harfbuzz - 1.1.2 + 1.2.1 ✓ ✓ ✓ @@ -1999,7 +1999,7 @@ feel free to submit a pull request. libssh2 - 1.6.0 + 1.7.0 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 6c3ddb47..55656563 100644 --- a/versions.json +++ b/versions.json @@ -100,7 +100,7 @@ "gtksourceview": "2.10.5", "gtksourceviewmm2": "2.10.3", "guile": "1.8.8", - "harfbuzz": "1.1.2", + "harfbuzz": "1.2.1", "hdf4": "4.2.10", "hdf5": "1.8.12", "hunspell": "1.3.3", @@ -195,7 +195,7 @@ "libsigc++": "2.4.0", "libsndfile": "1.0.25", "libsodium": "1.0.6", - "libssh2": "1.6.0", + "libssh2": "1.7.0", "libsvm": "3.20", "libtool": "2.4.4", "libtorrent-rasterbar": "1.0.7", From f11e66f36554e60dedd5cff8553aa927e520380f Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 23 Feb 2016 04:00:21 +0300 Subject: [PATCH 0464/1463] fix dependencies of build-matrix.html Dependencies of build-matrix.html were written without regarding plugins. It resulted in the following error on Debian Wheezy (which uses plugin "plugins/native/wheezy/"): $ make build-matrix.html make: *** No rule to make target `src/autoconf.mk', needed by `build-matrix.html'. Stop. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7668a704..3e0ed04f 100644 --- a/Makefile +++ b/Makefile @@ -701,7 +701,7 @@ cleanup-deps-style: || echo '*** Multi-line deps are mangled ***' && comm -3 tmp-$@-pre tmp-$@-post @rm -f $(TOP_DIR)/tmp-$@-* -build-matrix.html: $(foreach PKG,$(PKGS), $(TOP_DIR)/src/$(PKG).mk) +build-matrix.html: $(foreach 1,$(PKGS),$(PKG_MAKEFILES)) @echo '' > $@ @echo '' >> $@ @echo '' >> $@ From 3d699638d2241c4eae1ba25cb3903f391858b13a Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 24 Feb 2016 17:59:27 +0100 Subject: [PATCH 0465/1463] gdb: update --- src/gdb.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gdb.mk b/src/gdb.mk index 73dfc6e8..9e0d82dd 100644 --- a/src/gdb.mk +++ b/src/gdb.mk @@ -2,8 +2,8 @@ # See index.html for further information. PKG := gdb -$(PKG)_VERSION := 7.10.1 -$(PKG)_CHECKSUM := 25c72f3d41c7c8554d61cacbeacd5f40993276d2ccdec43279ac546e3993d6d5 +$(PKG)_VERSION := 7.11 +$(PKG)_CHECKSUM := 7a434116cb630d77bb40776e8f5d3937bed11dea56bafebb4d2bc5dd389fe5c1 $(PKG)_SUBDIR := gdb-$($(PKG)_VERSION) $(PKG)_FILE := gdb-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE) From 8dc33637e1444890246cdc05a483187f821aa08d Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Wed, 24 Feb 2016 17:02:44 +0000 Subject: [PATCH 0466/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index df96fbb0..9204f8f2 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -709,7 +709,7 @@ feel free to submit a pull request. gdb - 7.10.1 + 7.11 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 55656563..7512892b 100644 --- a/versions.json +++ b/versions.json @@ -66,7 +66,7 @@ "gcc": "4.9.3", "gd": "2.1.0", "gdal": "2.0.1", - "gdb": "7.10.1", + "gdb": "7.11", "gdk-pixbuf": "2.32.3", "gendef": "4.0.4", "geoip-database": "20150317-1", From 94c2ffda28a7f11232dbdbebaeb4ef1b96426be3 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Wed, 24 Feb 2016 19:47:09 +0300 Subject: [PATCH 0467/1463] qtbase: update patch for fixing `ar' error: `u' modifier ignored since `D' is the default (see `U') This error is shown during builds of end-user programs. --- src/qtbase-1-fixes.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/qtbase-1-fixes.patch b/src/qtbase-1-fixes.patch index 093e475e..e720936e 100644 --- a/src/qtbase-1-fixes.patch +++ b/src/qtbase-1-fixes.patch @@ -200,3 +200,22 @@ index 1111111..2222222 100644 add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED) !!ENDIF !!ENDIF + +From 3ebc085c4d7488df899f35e9ac63da819dffc1b9 Mon Sep 17 00:00:00 2001 +From: Boris Pek +Date: Wed, 24 Feb 2016 19:39:46 +0300 +Subject: [PATCH] Fix ar error: `u' modifier ignored since `D' is the default (see `U') + +diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf +index 1111111..2222222 100644 +--- a/mkspecs/win32-g++/qmake.conf ++++ b/mkspecs/win32-g++/qmake.conf +@@ -94,7 +94,7 @@ + QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain + + QMAKE_IDL = midl +-QMAKE_LIB = $${CROSS_COMPILE}ar -ru ++QMAKE_LIB = $${CROSS_COMPILE}ar -rc + QMAKE_RC = $${CROSS_COMPILE}windres + + QMAKE_STRIP = $${CROSS_COMPILE}strip From 44ceca8bc8a2fe6b7ac2fbaa200b9923a7c2e000 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Wed, 24 Feb 2016 19:33:17 +0300 Subject: [PATCH 0468/1463] gdal: 2.0.1 -> 2.0.2 --- src/gdal.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gdal.mk b/src/gdal.mk index e927ecf6..5e201700 100644 --- a/src/gdal.mk +++ b/src/gdal.mk @@ -3,8 +3,8 @@ PKG := gdal $(PKG)_IGNORE := -$(PKG)_VERSION := 2.0.1 -$(PKG)_CHECKSUM := b55f794768e104a2fd0304eaa61bb8bda3dc7c4e14f2c9d0913baca3e55b83ab +$(PKG)_VERSION := 2.0.2 +$(PKG)_CHECKSUM := db7722caf8d9dd798ec18012b9cacf40a518918466126a88b9fd277bd7d40cc4 $(PKG)_SUBDIR := gdal-$($(PKG)_VERSION) $(PKG)_FILE := gdal-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://download.osgeo.org/gdal/$($(PKG)_VERSION)/$($(PKG)_FILE) From 1eba720d141e20d7212134fbeb371f0d66c8e389 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Wed, 24 Feb 2016 23:51:29 +0000 Subject: [PATCH 0469/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 9204f8f2..e8003d89 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -699,7 +699,7 @@ feel free to submit a pull request. gdal - 2.0.1 + 2.0.2 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 7512892b..b8d0405d 100644 --- a/versions.json +++ b/versions.json @@ -65,7 +65,7 @@ "gc": "7.2e", "gcc": "4.9.3", "gd": "2.1.0", - "gdal": "2.0.1", + "gdal": "2.0.2", "gdb": "7.11", "gdk-pixbuf": "2.32.3", "gendef": "4.0.4", From b481c36d87755e8b503d28c4d8cb070f69981d57 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 27 Feb 2016 22:39:20 +0100 Subject: [PATCH 0470/1463] mingw-w64: update --- src/mingw-w64.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mingw-w64.mk b/src/mingw-w64.mk index 7e10f962..25adbb02 100644 --- a/src/mingw-w64.mk +++ b/src/mingw-w64.mk @@ -3,8 +3,8 @@ PKG := mingw-w64 $(PKG)_IGNORE := -$(PKG)_VERSION := 4.0.4 -$(PKG)_CHECKSUM := 89356a0aa8cf9f8b9dc8d92bc8dd01a131d4750c3acb30c6350a406316c42199 +$(PKG)_VERSION := 4.0.5 +$(PKG)_CHECKSUM := d4775e381202c5ecea7dbb21a1f247e4b3506509cb7d8b01bee6d83ee538e62c $(PKG)_SUBDIR := $(PKG)-v$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-v$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(PKG)-release/$($(PKG)_FILE) From 3a40df7ab314cf42dee08d375243562f96189f95 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 27 Feb 2016 22:39:33 +0100 Subject: [PATCH 0471/1463] harfbuzz: update --- src/harfbuzz.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/harfbuzz.mk b/src/harfbuzz.mk index 947ed335..8db47557 100644 --- a/src/harfbuzz.mk +++ b/src/harfbuzz.mk @@ -3,8 +3,8 @@ PKG := harfbuzz $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.1 -$(PKG)_CHECKSUM := 0c189aa386c5ea8d7c315adf273f56f48f412081a367b3f92abc2d0855fa2226 +$(PKG)_VERSION := 1.2.3 +$(PKG)_CHECKSUM := 8216d2404aaab7fde87be0365a90d64aa6c55928e104557cfcb37b54a096cb8c $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://www.freedesktop.org/software/$(PKG)/release/$($(PKG)_FILE) From 5b7965193f4a11e634196a7bf564936a5eba0b4e Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sat, 27 Feb 2016 21:41:20 +0000 Subject: [PATCH 0472/1463] Update versions.json & build-matrix.html --- build-matrix.html | 8 ++++---- versions.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index e8003d89..ef08133a 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -729,7 +729,7 @@ feel free to submit a pull request. gendef - 4.0.4 + 4.0.5 ✓ ✓ ✓ @@ -1049,7 +1049,7 @@ feel free to submit a pull request. harfbuzz - 1.2.1 + 1.2.3 ✓ ✓ ✓ @@ -2229,7 +2229,7 @@ feel free to submit a pull request. mingw-w64 - 4.0.4 + 4.0.5 ✗ ✗ ✗ @@ -3849,7 +3849,7 @@ feel free to submit a pull request. widl - 4.0.4 + 4.0.5 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index b8d0405d..21ce4d6e 100644 --- a/versions.json +++ b/versions.json @@ -68,7 +68,7 @@ "gdal": "2.0.2", "gdb": "7.11", "gdk-pixbuf": "2.32.3", - "gendef": "4.0.4", + "gendef": "4.0.5", "geoip-database": "20150317-1", "geos": "3.4.2", "gettext": "0.19.7", @@ -100,7 +100,7 @@ "gtksourceview": "2.10.5", "gtksourceviewmm2": "2.10.3", "guile": "1.8.8", - "harfbuzz": "1.2.1", + "harfbuzz": "1.2.3", "hdf4": "4.2.10", "hdf5": "1.8.12", "hunspell": "1.3.3", @@ -218,7 +218,7 @@ "lzo": "2.09", "matio": "1.5.2", "mdbtools": "0.7.1", - "mingw-w64": "4.0.4", + "mingw-w64": "4.0.5", "miniupnpc": "1.9", "minizip": "0b46a2b", "mman-win32": "b7ec370", @@ -380,7 +380,7 @@ "waf": "1.8.17", "wavpack": "4.75.2", "wget": "1.17.1", - "widl": "4.0.4", + "widl": "4.0.5", "winpcap": "4_1_3", "wt": "3.3.5", "wxwidgets": "3.0.2", From 5081fb9ab0ffd30759cdd10014b61cbd5f237238 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 21 Feb 2016 22:57:12 +0300 Subject: [PATCH 0473/1463] tor: fix linking errors if mman-win32 is installed --- plugins/apps/tor-1-fixes.patch | 50 ++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 plugins/apps/tor-1-fixes.patch diff --git a/plugins/apps/tor-1-fixes.patch b/plugins/apps/tor-1-fixes.patch new file mode 100644 index 00000000..9d9b4156 --- /dev/null +++ b/plugins/apps/tor-1-fixes.patch @@ -0,0 +1,50 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Sun, 21 Feb 2016 22:51:30 +0300 +Subject: [PATCH] do not use mman-win32 + +tor can be compiled without mman-win32, because it has own +implementation of mmap using Windows API. But if mman-win32 +is installed, tor tries to use it resulting in linking errors. +(In MXE mman-win32 installs DLLs even for static targets!) + +diff --git a/src/common/compat.c b/src/common/compat.c +index 1111111..2222222 100644 +--- a/src/common/compat.c ++++ b/src/common/compat.c +@@ -101,7 +101,7 @@ + #ifdef HAVE_SYS_UTIME_H + #include + #endif +-#ifdef HAVE_SYS_MMAN_H ++#if 0 + #include + #endif + #ifdef HAVE_SYS_SYSLIMITS_H +@@ -191,7 +191,7 @@ tor_rename(const char *path_old, const char *path_new) + sandbox_intern_string(path_new)); + } + +-#if defined(HAVE_SYS_MMAN_H) || defined(RUNNING_DOXYGEN) ++#if 0 + /** Try to create a memory mapping for filename and return it. On + * failure, return NULL. Sets errno properly, using ERANGE to mean + * "empty file". */ +diff --git a/src/common/compat.h b/src/common/compat.h +index 1111111..2222222 100644 +--- a/src/common/compat.h ++++ b/src/common/compat.h +@@ -285,7 +285,7 @@ typedef struct tor_mmap_t { + size_t size; /**< Size of the file. */ + + /* None of the fields below should be accessed from outside compat.c */ +-#ifdef HAVE_SYS_MMAN_H ++#if 0 + size_t mapping_size; /**< Size of the actual mapping. (This is this file + * size, rounded up to the nearest page.) */ + #elif defined _WIN32 From 963ad441e43ae4694c6e96e34042611598d67801 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Thu, 18 Feb 2016 01:29:17 +0300 Subject: [PATCH 0474/1463] lua: move common command to $(PKG)_BUILD_COMMON --- src/lua.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lua.mk b/src/lua.mk index 9d8e874b..5fc6afab 100644 --- a/src/lua.mk +++ b/src/lua.mk @@ -27,6 +27,8 @@ define $(PKG)_BUILD_COMMON echo 'Libs: -l$(PKG)';) \ > '$(PREFIX)/$(TARGET)/lib/pkgconfig/$(PKG).pc' + cp '$(1)/src/lua' '$(PREFIX)/$(TARGET)/bin/lua.exe' + '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-lua.exe' \ @@ -50,7 +52,7 @@ define $(PKG)_BUILD TO_BIN='lua.h' \ INSTALL='$(INSTALL)' \ install - cp '$(1)/src/lua' '$(PREFIX)/$(TARGET)/bin/lua.exe' + $($(PKG)_BUILD_COMMON) endef @@ -70,7 +72,7 @@ define $(PKG)_BUILD_SHARED INSTALL='$(INSTALL)' \ TO_LIB='liblua.dll.a' \ install - cp '$(1)/src/lua' '$(PREFIX)/$(TARGET)/bin/lua.exe' + $($(PKG)_BUILD_COMMON) endef From aa49f5265b21e2fb29690052d7d0450bd8dbdf5c Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Thu, 18 Feb 2016 01:32:20 +0300 Subject: [PATCH 0475/1463] lua: create .gitkeep files in empty directories Directories /lib/lua/5.3/ and /share/lua/5.3/ can be used by Lua modules installed by luarocks, for example. See https://gist.github.com/tonytheodore/4815252165e0f7eae740#file-build-pkg-only-deps2-L1350 --- src/lua.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lua.mk b/src/lua.mk index 5fc6afab..6452bf8b 100644 --- a/src/lua.mk +++ b/src/lua.mk @@ -20,6 +20,9 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD_COMMON + touch '$(PREFIX)/$(TARGET)/lib/lua/$($(PKG)_SHORTVER)/.gitkeep' + touch '$(PREFIX)/$(TARGET)/share/lua/$($(PKG)_SHORTVER)/.gitkeep' + #pkg-config file (echo 'Name: $(PKG)'; \ echo 'Version: $($(PKG)_VERSION)'; \ From f12c523d1fed486b1f95bc344ae3f28d8771a740 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 29 Feb 2016 11:16:48 +0300 Subject: [PATCH 0476/1463] remove libdca fix #1240 fix #1239 --- index.html | 4 - ...ca-1-mark-tables-as-static-constants.patch | 719 ------------------ ...rmalisation-factor-sqrt2+output-bias.patch | 112 --- ...heck-for-subframes-and-prim_channels.patch | 27 - ...shes-caused-by-invalid-32-bit-shifts.patch | 48 -- ...5-avoid-crashing-with-invalid-frames.patch | 31 - src/libdca-test.c | 23 - src/libdca.mk | 30 - 8 files changed, 994 deletions(-) delete mode 100644 src/libdca-1-mark-tables-as-static-constants.patch delete mode 100644 src/libdca-2-normalisation-factor-sqrt2+output-bias.patch delete mode 100644 src/libdca-3-sanity-check-for-subframes-and-prim_channels.patch delete mode 100644 src/libdca-4-fix-random-crashes-caused-by-invalid-32-bit-shifts.patch delete mode 100644 src/libdca-5-avoid-crashing-with-invalid-frames.patch delete mode 100644 src/libdca-test.c delete mode 100644 src/libdca.mk diff --git a/index.html b/index.html index 28e7a945..1ce19d5f 100644 --- a/index.html +++ b/index.html @@ -1629,10 +1629,6 @@ local-pkg-list: $(LOCAL_PKG_LIST) libcroco Libcroco - - libdca - libdca (formerly libdts) - libdnet libdnet diff --git a/src/libdca-1-mark-tables-as-static-constants.patch b/src/libdca-1-mark-tables-as-static-constants.patch deleted file mode 100644 index 4e4414da..00000000 --- a/src/libdca-1-mark-tables-as-static-constants.patch +++ /dev/null @@ -1,719 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Taken from libdca svn: svn://svn.videolan.org/libdca/trunk. - -r83 | gbazin | 2008-05-26 12:48:45 +0000 (Mon, 26 May 2008) | 1 line -Mark tables as static constants. Patch by Diego Flameeyes Petten?\195?\178 - ---- libdca.orig/libdca/tables_fir.h -+++ libdca/libdca/tables_fir.h -@@ -21,7 +21,7 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - --double fir_32bands_perfect[] = -+static const double fir_32bands_perfect[] = - { - +1.135985195E-010, - -6.022448247E-007, -@@ -537,7 +537,7 @@ - -1.135985195E-010 - }; - --double fir_32bands_nonperfect[] = -+static const double fir_32bands_nonperfect[] = - { - -1.390191784E-007, - -1.693738625E-007, -@@ -1053,7 +1053,7 @@ - +1.390191784E-007 - }; - --double lfe_fir_64[] = -+static const double lfe_fir_64[] = - { - 2.6584343868307770E-004, - 8.1793652498163280E-005, -@@ -1569,7 +1569,7 @@ - 2.6584343868307770E-004 - }; - --double lfe_fir_128[] = -+static const double lfe_fir_128[] = - { - 0.00053168571, - 0.00016358691, ---- libdca.orig/libdca/tables_huffman.h -+++ libdca/libdca/tables_huffman.h -@@ -29,7 +29,7 @@ - - } huff_entry_t; - --huff_entry_t bitalloc_a_12[] = -+static const huff_entry_t bitalloc_a_12[] = - { - { 1, 0, 1}, { 2, 2, 2}, { 3, 6, 3}, { 4, 14, 4}, - { 5, 30, 5}, { 6, 62, 6}, { 8, 255, 7}, { 8, 254, 8}, -@@ -37,7 +37,7 @@ - { 0, 0, 0} - }; - --huff_entry_t bitalloc_b_12[] = -+static const huff_entry_t bitalloc_b_12[] = - { - { 1, 1, 1}, { 2, 0, 2}, { 3, 2, 3}, { 5, 15, 4}, - { 5, 12, 5}, { 6, 29, 6}, { 7, 57, 7}, { 7, 56, 8}, -@@ -45,7 +45,7 @@ - { 0, 0, 0} - }; - --huff_entry_t bitalloc_c_12[] = -+static const huff_entry_t bitalloc_c_12[] = - { - { 2, 0, 1}, { 3, 7, 2}, { 3, 5, 3}, { 3, 4, 4}, - { 3, 2, 5}, { 4, 13, 6}, { 4, 12, 7}, { 4, 6, 8}, -@@ -53,7 +53,7 @@ - { 0, 0, 0} - }; - --huff_entry_t bitalloc_d_12[] = -+static const huff_entry_t bitalloc_d_12[] = - { - { 2, 3, 1}, { 2, 2, 2}, { 2, 0, 3}, { 3, 2, 4}, - { 4, 6, 5}, { 5, 14, 6}, { 6, 30, 7}, { 7, 62, 8}, -@@ -61,7 +61,7 @@ - { 0, 0, 0} - }; - --huff_entry_t bitalloc_e_12[] = -+static const huff_entry_t bitalloc_e_12[] = - { - { 1, 1, 1}, { 2, 0, 2}, { 3, 2, 3}, { 4, 6, 4}, - { 5, 14, 5}, { 7, 63, 6}, { 7, 61, 7}, { 8, 124, 8}, -@@ -69,7 +69,7 @@ - { 0, 0, 0} - }; - --huff_entry_t *bitalloc_12[] = -+static const huff_entry_t *const bitalloc_12[] = - { - bitalloc_a_12, - bitalloc_b_12, -@@ -78,7 +78,7 @@ - bitalloc_e_12 - }; - --huff_entry_t scales_a_129[] = -+static const huff_entry_t scales_a_129[] = - { - { 2, 1, 0}, { 3, 6, 1}, { 3, 5, -1}, { 3, 0, 2}, - { 4, 15, -2}, { 4, 8, 3}, { 4, 3, -3}, { 5, 28, 4}, -@@ -115,7 +115,7 @@ - {14, 15024,-64}, { 0, 0, 0} - }; - --huff_entry_t scales_b_129[] = -+static const huff_entry_t scales_b_129[] = - { - { 3, 3, 0}, { 3, 2, 1}, { 3, 1, -1}, { 4, 15, 2}, - { 4, 14, -2}, { 4, 12, 3}, { 4, 11, -3}, { 4, 10, 4}, -@@ -152,7 +152,7 @@ - {15, 3936,-64}, { 0, 0, 0} - }; - --huff_entry_t scales_c_129[] = -+static const huff_entry_t scales_c_129[] = - { - { 3, 4, 0}, { 3, 1, 1}, { 3, 0, -1}, { 4, 13, 2}, - { 4, 12, -2}, { 4, 7, 3}, { 4, 6, -3}, { 5, 31, 4}, -@@ -189,7 +189,7 @@ - {15, 20944,-64}, { 0, 0, 0} - }; - --huff_entry_t scales_d_129[] = -+static const huff_entry_t scales_d_129[] = - { - { 2, 0, 0}, { 3, 5, 1}, { 3, 4, -1}, { 4, 15, 2}, - { 4, 14, -2}, { 4, 7, 3}, { 4, 6, -3}, { 5, 26, 4}, -@@ -226,7 +226,7 @@ - {15, 28516,-64}, { 0, 0, 0} - }; - --huff_entry_t scales_e_129[] = -+static const huff_entry_t scales_e_129[] = - { - { 4, 14, 0}, { 4, 11, 1}, { 4, 10, -1}, { 4, 7, 2}, - { 4, 6, -2}, { 4, 3, 3}, { 4, 2, -3}, { 5, 31, 4}, -@@ -263,7 +263,7 @@ - {16, 57172,-64}, { 0, 0, 0} - }; - --huff_entry_t *scales_129[] = -+static const huff_entry_t *const scales_129[] = - { - scales_a_129, - scales_b_129, -@@ -272,36 +272,36 @@ - scales_e_129 - }; - --huff_entry_t bitalloc_a_3[] = -+static const huff_entry_t bitalloc_a_3[] = - { - { 1, 0, 0}, { 2, 2, 1}, { 2, 3, -1}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_a_4[] = -+static const huff_entry_t bitalloc_a_4[] = - { - { 1, 0, 0}, { 2, 2, 1}, { 3, 6, 2}, { 3, 7, 3}, - { 0, 0, 0} - }; - --huff_entry_t bitalloc_b_4[] = -+static const huff_entry_t bitalloc_b_4[] = - { - { 2, 2, 0}, { 3, 6, 1}, { 3, 7, 2}, { 1, 0, 3}, - { 0, 0, 0} - }; - --huff_entry_t bitalloc_c_4[] = -+static const huff_entry_t bitalloc_c_4[] = - { - { 3, 6, 0}, { 3, 7, 1}, { 1, 0, 2}, { 2, 2, 3}, - { 0, 0, 0} - }; - --huff_entry_t bitalloc_d_4[] = -+static const huff_entry_t bitalloc_d_4[] = - { - { 2, 0, 0}, { 2, 1, 1}, { 2, 2, 2}, { 2, 3, 3}, - { 0, 0, 0} - }; - --huff_entry_t *tmode[] = -+static const huff_entry_t *const tmode[] = - { - bitalloc_a_4, - bitalloc_b_4, -@@ -309,64 +309,64 @@ - bitalloc_d_4 - }; - --huff_entry_t bitalloc_a_5[] = -+static const huff_entry_t bitalloc_a_5[] = - { - { 1, 0, 0}, { 2, 2, 1}, { 3, 6, -1}, { 4, 14, 2}, - { 4, 15, -2}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_b_5[] = -+static const huff_entry_t bitalloc_b_5[] = - { - { 2, 2, 0}, { 2, 0, 1}, { 2, 1, -1}, { 3, 6, 2}, - { 3, 7, -2}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_c_5[] = -+static const huff_entry_t bitalloc_c_5[] = - { - { 1, 0, 0}, { 3, 4, 1}, { 3, 5, -1}, { 3, 6, 2}, - { 3, 7, -2}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_a_7[] = -+static const huff_entry_t bitalloc_a_7[] = - { - { 1, 0, 0}, { 3, 6, 1}, { 3, 5, -1}, { 3, 4, 2}, - { 4, 14, -2}, { 5, 31, 3}, { 5, 30, -3}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_b_7[] = -+static const huff_entry_t bitalloc_b_7[] = - { - { 2, 3, 0}, { 2, 1, 1}, { 2, 0, -1}, { 3, 4, 2}, - { 4, 11, -2}, { 5, 21, 3}, { 5, 20, -3}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_c_7[] = -+static const huff_entry_t bitalloc_c_7[] = - { - { 2, 3, 0}, { 2, 2, 1}, { 2, 1, -1}, { 4, 3, 2}, - { 4, 2, -2}, { 4, 1, 3}, { 4, 0, -3}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_a_9[] = -+static const huff_entry_t bitalloc_a_9[] = - { - { 1, 0, 0}, { 3, 7, 1}, { 3, 5, -1}, { 4, 13, 2}, - { 4, 9, -2}, { 4, 8, 3}, { 5, 25, -3}, { 6, 49, 4}, - { 6, 48, -4}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_b_9[] = -+static const huff_entry_t bitalloc_b_9[] = - { - { 2, 2, 0}, { 2, 0, 1}, { 3, 7, -1}, { 3, 3, 2}, - { 3, 2, -2}, { 5, 27, 3}, { 5, 26, -3}, { 5, 25, 4}, - { 5, 24, -4}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_c_9[] = -+static const huff_entry_t bitalloc_c_9[] = - { - { 2, 2, 0}, { 2, 0, 1}, { 3, 7, -1}, { 3, 6, 2}, - { 3, 2, -2}, { 4, 6, 3}, { 5, 15, -3}, { 6, 29, 4}, - { 6, 28, -4}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_a_13[] = -+static const huff_entry_t bitalloc_a_13[] = - { - { 1, 0, 0}, { 3, 4, 1}, { 4, 15, -1}, { 4, 13, 2}, - { 4, 12, -2}, { 4, 10, 3}, { 5, 29, -3}, { 5, 22, 4}, -@@ -374,7 +374,7 @@ - { 7, 112, -6}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_b_13[] = -+static const huff_entry_t bitalloc_b_13[] = - { - { 2, 0, 0}, { 3, 6, 1}, { 3, 5, -1}, { 3, 2, 2}, - { 4, 15, -2}, { 4, 9, 3}, { 4, 7, -3}, { 4, 6, 4}, -@@ -382,7 +382,7 @@ - { 6, 56, -6}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_c_13[] = -+static const huff_entry_t bitalloc_c_13[] = - { - { 3, 5, 0}, { 3, 4, 1}, { 3, 3, -1}, { 3, 2, 2}, - { 3, 0, -2}, { 4, 15, 3}, { 4, 14, -3}, { 4, 12, 4}, -@@ -390,7 +390,7 @@ - { 5, 4, -6}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_a_17[] = -+static const huff_entry_t bitalloc_a_17[] = - { - { 2, 1, 0}, { 3, 7, 1}, { 3, 6, -1}, { 3, 4, 2}, - { 3, 1, -2}, { 4, 11, 3}, { 4, 10, -3}, { 4, 0, 4}, -@@ -399,7 +399,7 @@ - {12, 340, -8}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_b_17[] = -+static const huff_entry_t bitalloc_b_17[] = - { - { 2, 0, 0}, { 3, 6, 1}, { 3, 5, -1}, { 3, 2, 2}, - { 4, 15, -2}, { 4, 9, 3}, { 4, 8, -3}, { 5, 29, 4}, -@@ -408,7 +408,7 @@ - { 8, 124, -8}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_c_17[] = -+static const huff_entry_t bitalloc_c_17[] = - { - { 3, 6, 0}, { 3, 4, 1}, { 3, 3, -1}, { 3, 0, 2}, - { 4, 15, -2}, { 4, 11, 3}, { 4, 10, -3}, { 4, 4, 4}, -@@ -417,7 +417,7 @@ - { 7, 44, -8}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_d_17[] = -+static const huff_entry_t bitalloc_d_17[] = - { - { 1, 0, 0}, { 3, 7, 1}, { 3, 6, -1}, { 4, 11, 2}, - { 4, 10, -2}, { 5, 19, 3}, { 5, 18, -3}, { 6, 35, 4}, -@@ -426,7 +426,7 @@ - { 9, 256, -8}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_e_17[] = -+static const huff_entry_t bitalloc_e_17[] = - { - { 1, 0, 0}, { 3, 5, 1}, { 3, 4, -1}, { 4, 12, 2}, - { 5, 31, -2}, { 5, 28, 3}, { 5, 27, -3}, { 6, 60, 4}, -@@ -435,7 +435,7 @@ - { 8, 232, -8}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_f_17[] = -+static const huff_entry_t bitalloc_f_17[] = - { - { 3, 6, 0}, { 3, 5, 1}, { 3, 4, -1}, { 3, 2, 2}, - { 3, 1, -2}, { 4, 15, 3}, { 4, 14, -3}, { 4, 6, 4}, -@@ -444,7 +444,7 @@ - { 8, 4, -8}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_g_17[] = -+static const huff_entry_t bitalloc_g_17[] = - { - { 2, 2, 0}, { 3, 7, 1}, { 3, 6, -1}, { 3, 1, 2}, - { 3, 0, -2}, { 4, 5, 3}, { 4, 4, -3}, { 5, 14, 4}, -@@ -453,7 +453,7 @@ - { 8, 96, -8}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_a_25[] = -+static const huff_entry_t bitalloc_a_25[] = - { - { 3, 6, 0}, { 3, 4, 1}, { 3, 3, -1}, { 3, 1, 2}, - { 3, 0, -2}, { 4, 15, 3}, { 4, 14, -3}, { 4, 5, 4}, -@@ -464,7 +464,7 @@ - {14, 10324,-12}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_b_25[] = -+static const huff_entry_t bitalloc_b_25[] = - { - { 3, 5, 0}, { 3, 2, 1}, { 3, 1, -1}, { 4, 15, 2}, - { 4, 14, -2}, { 4, 9, 3}, { 4, 8, -3}, { 4, 6, 4}, -@@ -475,7 +475,7 @@ - { 9, 28,-12}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_c_25[] = -+static const huff_entry_t bitalloc_c_25[] = - { - { 3, 1, 0}, { 4, 15, 1}, { 4, 14, -1}, { 4, 12, 2}, - { 4, 11, -2}, { 4, 9, 3}, { 4, 8, -3}, { 4, 6, 4}, -@@ -486,7 +486,7 @@ - { 8, 76,-12}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_d_25[] = -+static const huff_entry_t bitalloc_d_25[] = - { - { 2, 2, 0}, { 3, 7, 1}, { 3, 6, -1}, { 3, 1, 2}, - { 3, 0, -2}, { 4, 5, 3}, { 4, 4, -3}, { 5, 13, 4}, -@@ -497,7 +497,7 @@ - {12, 1920,-12}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_e_25[] = -+static const huff_entry_t bitalloc_e_25[] = - { - { 2, 3, 0}, { 3, 3, 1}, { 3, 2, -1}, { 4, 11, 2}, - { 4, 10, -2}, { 4, 1, 3}, { 4, 0, -3}, { 5, 17, 4}, -@@ -508,7 +508,7 @@ - { 8, 60,-12}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_f_25[] = -+static const huff_entry_t bitalloc_f_25[] = - { - { 3, 1, 0}, { 3, 0, 1}, { 4, 15, -1}, { 4, 14, 2}, - { 4, 13, -2}, { 4, 11, 3}, { 4, 10, -3}, { 4, 8, 4}, -@@ -519,7 +519,7 @@ - {10, 804,-12}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_g_25[] = -+static const huff_entry_t bitalloc_g_25[] = - { - { 2, 1, 0}, { 3, 6, 1}, { 3, 5, -1}, { 3, 0, 2}, - { 4, 15, -2}, { 4, 8, 3}, { 4, 3, -3}, { 5, 28, 4}, -@@ -530,7 +530,7 @@ - {10, 936,-12}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_a_33[] = -+static const huff_entry_t bitalloc_a_33[] = - { - { 3, 2, 0}, { 3, 1, 1}, { 3, 0, -1}, { 4, 14, 2}, - { 4, 13, -2}, { 4, 12, 3}, { 4, 11, -3}, { 4, 9, 4}, -@@ -543,7 +543,7 @@ - {13, 5504,-16}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_b_33[] = -+static const huff_entry_t bitalloc_b_33[] = - { - { 3, 1, 0}, { 4, 15, 1}, { 4, 14, -1}, { 4, 11, 2}, - { 4, 10, -2}, { 4, 8, 3}, { 4, 7, -3}, { 4, 4, 4}, -@@ -556,7 +556,7 @@ - {10, 780,-16}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_c_33[] = -+static const huff_entry_t bitalloc_c_33[] = - { - { 4, 13, 0}, { 4, 11, 1}, { 4, 10, -1}, { 4, 8, 2}, - { 4, 7, -2}, { 4, 4, 3}, { 4, 3, -3}, { 4, 2, 4}, -@@ -569,7 +569,7 @@ - { 9, 204,-16}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_d_33[] = -+static const huff_entry_t bitalloc_d_33[] = - { - { 2, 1, 0}, { 3, 6, 1}, { 3, 5, -1}, { 3, 0, 2}, - { 4, 15, -2}, { 4, 8, 3}, { 4, 3, -3}, { 5, 28, 4}, -@@ -582,7 +582,7 @@ - {14, 15096,-16}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_e_33[] = -+static const huff_entry_t bitalloc_e_33[] = - { - { 2, 2, 0}, { 3, 2, 1}, { 3, 1, -1}, { 4, 12, 2}, - { 4, 7, -2}, { 4, 0, 3}, { 5, 31, -3}, { 5, 27, 4}, -@@ -595,7 +595,7 @@ - { 9, 456,-16}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_f_33[] = -+static const huff_entry_t bitalloc_f_33[] = - { - { 4, 13, 0}, { 4, 12, 1}, { 4, 11, -1}, { 4, 9, 2}, - { 4, 8, -2}, { 4, 7, 3}, { 4, 6, -3}, { 4, 4, 4}, -@@ -608,7 +608,7 @@ - {11, 1828,-16}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_g_33[] = -+static const huff_entry_t bitalloc_g_33[] = - { - { 3, 6, 0}, { 3, 3, 1}, { 3, 2, -1}, { 4, 15, 2}, - { 4, 14, -2}, { 4, 9, 3}, { 4, 8, -3}, { 4, 1, 4}, -@@ -621,7 +621,7 @@ - {10, 644,-16}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_a_65[] = -+static const huff_entry_t bitalloc_a_65[] = - { - { 4, 6, 0}, { 4, 5, 1}, { 4, 4, -1}, { 4, 2, 2}, - { 4, 1, -2}, { 4, 0, 3}, { 5, 31, -3}, { 5, 29, 4}, -@@ -642,7 +642,7 @@ - {16, 40540,-32}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_b_65[] = -+static const huff_entry_t bitalloc_b_65[] = - { - { 4, 4, 0}, { 4, 2, 1}, { 4, 1, -1}, { 5, 30, 2}, - { 5, 29, -2}, { 5, 26, 3}, { 5, 25, -3}, { 5, 23, 4}, -@@ -663,7 +663,7 @@ - {12, 2700,-32}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_c_65[] = -+static const huff_entry_t bitalloc_c_65[] = - { - { 5, 28, 0}, { 5, 25, 1}, { 5, 24, -1}, { 5, 23, 2}, - { 5, 22, -2}, { 5, 19, 3}, { 5, 18, -3}, { 5, 16, 4}, -@@ -684,7 +684,7 @@ - {11, 1116,-32}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_d_65[] = -+static const huff_entry_t bitalloc_d_65[] = - { - { 3, 4, 0}, { 3, 1, 1}, { 3, 0, -1}, { 4, 13, 2}, - { 4, 12, -2}, { 4, 7, 3}, { 4, 6, -3}, { 5, 31, 4}, -@@ -705,7 +705,7 @@ - {15, 28848,-32}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_e_65[] = -+static const huff_entry_t bitalloc_e_65[] = - { - { 3, 4, 0}, { 3, 0, 1}, { 4, 15, -1}, { 4, 7, 2}, - { 4, 6, -2}, { 5, 29, 3}, { 5, 28, -3}, { 5, 23, 4}, -@@ -726,7 +726,7 @@ - {10, 812,-32}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_f_65[] = -+static const huff_entry_t bitalloc_f_65[] = - { - { 3, 6, 0}, { 3, 3, 1}, { 3, 2, -1}, { 4, 15, 2}, - { 4, 14, -2}, { 4, 9, 3}, { 4, 8, -3}, { 4, 1, 4}, -@@ -747,7 +747,7 @@ - {14, 4064,-32}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_g_65[] = -+static const huff_entry_t bitalloc_g_65[] = - { - { 4, 14, 0}, { 4, 11, 1}, { 4, 10, -1}, { 4, 8, 2}, - { 4, 6, -2}, { 4, 4, 3}, { 4, 3, -3}, { 4, 0, 4}, -@@ -768,7 +768,7 @@ - {11, 268,-32}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_a_129[] = -+static const huff_entry_t bitalloc_a_129[] = - { - { 4, 8, 0}, { 4, 10, 1}, { 4, 9, -1}, { 4, 0, 2}, - { 5, 31, -2}, { 5, 24, 3}, { 5, 23, -3}, { 5, 12, 4}, -@@ -805,7 +805,7 @@ - {11, 1632,-64}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_b_129[] = -+static const huff_entry_t bitalloc_b_129[] = - { - { 5, 10, 0}, { 5, 7, 1}, { 5, 6, -1}, { 5, 4, 2}, - { 5, 3, -2}, { 5, 0, 3}, { 6, 63, -3}, { 6, 60, 4}, -@@ -842,7 +842,7 @@ - {14, 10716,-64}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_c_129[] = -+static const huff_entry_t bitalloc_c_129[] = - { - { 6, 58, 0}, { 6, 55, 1}, { 6, 54, -1}, { 6, 52, 2}, - { 6, 51, -2}, { 6, 49, 3}, { 6, 48, -3}, { 6, 46, 4}, -@@ -879,7 +879,7 @@ - {13, 3676,-64}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_d_129[] = -+static const huff_entry_t bitalloc_d_129[] = - { - { 4, 9, 0}, { 4, 6, 1}, { 4, 5, -1}, { 4, 2, 2}, - { 4, 1, -2}, { 5, 30, 3}, { 5, 29, -3}, { 5, 26, 4}, -@@ -916,7 +916,7 @@ - {16, 42392,-64}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_e_129[] = -+static const huff_entry_t bitalloc_e_129[] = - { - { 5, 12, 0}, { 5, 11, 1}, { 5, 10, -1}, { 5, 9, 2}, - { 5, 8, -2}, { 5, 7, 3}, { 5, 6, -3}, { 5, 4, 4}, -@@ -953,7 +953,7 @@ - {16, 41276,-64}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_f_129[] = -+static const huff_entry_t bitalloc_f_129[] = - { - { 6, 56, 0}, { 6, 55, 1}, { 6, 54, -1}, { 6, 52, 2}, - { 6, 51, -2}, { 6, 50, 3}, { 6, 49, -3}, { 6, 48, 4}, -@@ -990,7 +990,7 @@ - {15, 30252,-64}, { 0, 0, 0} - }; - --huff_entry_t bitalloc_g_129[] = -+static const huff_entry_t bitalloc_g_129[] = - { - { 4, 0, 0}, { 5, 29, 1}, { 5, 28, -1}, { 5, 25, 2}, - { 5, 24, -2}, { 5, 21, 3}, { 5, 20, -3}, { 5, 17, 4}, -@@ -1027,7 +1027,7 @@ - {13, 7712,-64}, { 0, 0, 0} - }; - --huff_entry_t *bitalloc_select[11][8] = -+static const huff_entry_t *const bitalloc_select[11][8] = - { - { 0 }, - { bitalloc_a_3, 0 }, -@@ -1047,7 +1047,7 @@ - bitalloc_e_129, bitalloc_f_129, bitalloc_g_129, 0 }, - }; - --static int InverseQ( dca_state_t * state, huff_entry_t * huff ) -+static int InverseQ( dca_state_t * state, const huff_entry_t * huff ) - { - int value = 0; - int length = 0, j; ---- libdca.orig/libdca/tables_quantization.h -+++ libdca/libdca/tables_quantization.h -@@ -21,7 +21,7 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - --int scale_factor_quant6[] = -+static const int scale_factor_quant6[] = - { - 1, 2, 2, 3, 3, 4, 6, 7, - 10, 12, 16, 20, 26, 34, 44, 56, -@@ -33,7 +33,7 @@ - 1819701, 2344229, 3019952, 3890451, 5011872, 6456542, 8317638, 0 - }; - --int scale_factor_quant7[] = -+static const int scale_factor_quant7[] = - { - 1, 1, 2, 2, 2, 2, 3, 3, - 3, 4, 4, 5, 6, 7, 7, 8, -@@ -54,7 +54,7 @@ - }; - - /* 20bits unsigned fractional binary codes */ --int lossy_quant[] = -+static const int lossy_quant[] = - { - 0, 6710886, 4194304, 3355443, 2474639, 2097152, 1761608, 1426063, - 796918, 461373, 251658, 146801, 79692, 46137, 27263, 16777, -@@ -62,7 +62,7 @@ - 84, 42, 21, 0, 0, 0, 0, 0 - }; - --double lossy_quant_d[] = -+static const double lossy_quant_d[] = - { - 0, 1.6, 1.0, 0.8, 0.59, 0.50, 0.42, 0.34, - 0.19, 0.11, 0.06, 0.035, 0.019, 0.011, 0.0065, 0.0040, -@@ -71,7 +71,7 @@ - }; - - /* 20bits unsigned fractional binary codes */ --int lossless_quant[] = -+static const int lossless_quant[] = - { - 0, 4194304, 2097152, 1384120, 1048576, 696254, 524288, 348127, - 262144, 131072, 65431, 33026, 16450, 8208, 4100, 2049, -@@ -79,7 +79,7 @@ - 4, 2, 1, 0, 0, 0, 0, 0 - }; - --double lossless_quant_d[] = -+static const double lossless_quant_d[] = - { - 0, 1.0, 0.5, 0.33, 0.25, 0.166, 0.125, - 0.083, 0.0625, 0.03125, 0.0156, 7.874E-3, 3.922E-3, 1.957E-3, ---- libdca.orig/libdca/parse.c -+++ libdca/libdca/parse.c -@@ -548,7 +548,7 @@ - /* Scale factors */ - for (j = 0; j < state->prim_channels; j++) - { -- int *scale_table; -+ const int *scale_table; - int scale_sum; - - for (k = 0; k < state->subband_activity[j]; k++) -@@ -761,7 +761,7 @@ - int k, l; - int subsubframe = state->current_subsubframe; - -- double *quant_step_table; -+ const double *quant_step_table; - - /* FIXME */ - double subband_samples[DCA_PRIM_CHANNELS_MAX][DCA_SUBBANDS][8]; -@@ -1145,7 +1145,7 @@ - double samples_in[32][8], sample_t *samples_out, - double scale, sample_t bias) - { -- double *prCoeff; -+ const double *prCoeff; - int i, j, k; - double raXin[32]; - -@@ -1236,7 +1236,7 @@ - */ - - int nDeciFactor, k, J; -- double *prCoeff; -+ const double *prCoeff; - - int NumFIRCoef = 512; /* Number of FIR coefficients */ - int nInterpIndex = 0; /* Index to the interpolated samples */ diff --git a/src/libdca-2-normalisation-factor-sqrt2+output-bias.patch b/src/libdca-2-normalisation-factor-sqrt2+output-bias.patch deleted file mode 100644 index 2d4cdb56..00000000 --- a/src/libdca-2-normalisation-factor-sqrt2+output-bias.patch +++ /dev/null @@ -1,112 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Taken from libdca svn: svn://svn.videolan.org/libdca/trunk. - -r84 | gbazin | 2008-06-01 16:13:33 +0000 (Sun, 01 Jun 2008) | 3 lines - * libdca/parse.c: Change output normalisation factor from 3/2 to sqrt(2). - Thanks to Alexander E. Patrakov for finding that this is the proper normalisation factor. - Fixed a bug where the output bias wasn't applied when downmixing wasn't being done. - ---- libdca.orig/libdca/parse.c -+++ libdca/libdca/parse.c -@@ -59,12 +59,11 @@ - static int decode_blockcode (int code, int levels, int *values); - - static void qmf_32_subbands (dca_state_t * state, int chans, -- double samples_in[32][8], sample_t *samples_out, -- double rScale, sample_t bias); -+ double samples_in[32][8], sample_t *samples_out); - - static void lfe_interpolation_fir (int nDecimationSelect, int nNumDeciSample, - double *samples_in, sample_t *samples_out, -- double rScale, sample_t bias ); -+ sample_t bias); - - static void pre_calc_cosmod( dca_state_t * state ); - -@@ -123,7 +122,9 @@ - bitstream_get (state, 1); - - *frame_length = (bitstream_get (state, 7) + 1) * 32; -+ if (*frame_length < 6 * 32) return 0; - frame_size = bitstream_get (state, 14) + 1; -+ if (frame_size < 96) return 0; - if (!state->word_mode) frame_size = frame_size * 8 / 14 * 2; - - /* Audio channel arrangement */ -@@ -981,14 +982,7 @@ - /* 32 subbands QMF */ - for (k = 0; k < state->prim_channels; k++) - { -- /*static double pcm_to_float[8] = -- {32768.0, 32768.0, 524288.0, 524288.0, 0, 8388608.0, 8388608.0};*/ -- -- qmf_32_subbands (state, k, -- subband_samples[k], -- &state->samples[256*k], -- /*WTF ???*/ 32768.0*3/2/*pcm_to_float[state->source_pcm_res]*/, -- 0/*state->bias*/); -+ qmf_32_subbands (state, k, subband_samples[k], &state->samples[256*k]); - } - - /* Down/Up mixing */ -@@ -1000,6 +994,10 @@ - { - dca_downmix (state->samples, state->amode, state->output, state->bias, - state->clev, state->slev); -+ } else if (state->bias) -+ { -+ for ( k = 0; k < 256*state->prim_channels; k++ ) -+ state->samples[k] += state->bias; - } - - /* Generate LFE samples for this subsubframe FIXME!!! */ -@@ -1011,8 +1009,7 @@ - lfe_interpolation_fir (state->lfe, 2 * state->lfe, - state->lfe_data + lfe_samples + - 2 * state->lfe * subsubframe, -- &state->samples[256*i_channels], -- 8388608.0, state->bias); -+ &state->samples[256*i_channels], state->bias); - /* Outputs 20bits pcm samples */ - } - -@@ -1142,9 +1139,9 @@ - } - - static void qmf_32_subbands (dca_state_t * state, int chans, -- double samples_in[32][8], sample_t *samples_out, -- double scale, sample_t bias) -+ double samples_in[32][8], sample_t *samples_out) - { -+ static const double scale = 1.4142135623730951 /* sqrt(2) */ * 32768.0; - const double *prCoeff; - int i, j, k; - double raXin[32]; -@@ -1211,7 +1208,7 @@ - - /* Create 32 PCM output samples */ - for (i=0;i<32;i++) -- samples_out[nChIndex++] = subband_fir_hist2[i] / scale + bias; -+ samples_out[nChIndex++] = subband_fir_hist2[i] / scale; - - /* Update working arrays */ - for (i=511;i>=32;i--) -@@ -1225,7 +1222,7 @@ - - static void lfe_interpolation_fir (int nDecimationSelect, int nNumDeciSample, - double *samples_in, sample_t *samples_out, -- double scale, sample_t bias) -+ sample_t bias) - { - /* samples_in: An array holding decimated samples. - * Samples in current subframe starts from samples_in[0], -@@ -1235,6 +1232,7 @@ - * samples_out: An array holding interpolated samples - */ - -+ static const double scale = 8388608.0; - int nDeciFactor, k, J; - const double *prCoeff; - diff --git a/src/libdca-3-sanity-check-for-subframes-and-prim_channels.patch b/src/libdca-3-sanity-check-for-subframes-and-prim_channels.patch deleted file mode 100644 index 25bdb4c9..00000000 --- a/src/libdca-3-sanity-check-for-subframes-and-prim_channels.patch +++ /dev/null @@ -1,27 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Taken from libdca svn: svn://svn.videolan.org/libdca/trunk. - -r87 | sam | 2008-07-18 19:22:47 +0000 (Fri, 18 Jul 2008) | 2 lines - * parse.c: sanity check for subframes and prim_channels to avoid crashes - with invalid streams. - ---- libdca.orig/libdca/parse.c -+++ libdca/libdca/parse.c -@@ -305,8 +305,15 @@ - - /* Primary audio coding header */ - state->subframes = bitstream_get (state, 4) + 1; -+ -+ if (state->subframes > DCA_SUBFRAMES_MAX) -+ state->subframes = DCA_SUBFRAMES_MAX; -+ - state->prim_channels = bitstream_get (state, 3) + 1; - -+ if (state->prim_channels > DCA_PRIM_CHANNELS_MAX) -+ state->prim_channels = DCA_PRIM_CHANNELS_MAX; -+ - #ifdef DEBUG - fprintf (stderr, "subframes: %i\n", state->subframes); - fprintf (stderr, "prim channels: %i\n", state->prim_channels); diff --git a/src/libdca-4-fix-random-crashes-caused-by-invalid-32-bit-shifts.patch b/src/libdca-4-fix-random-crashes-caused-by-invalid-32-bit-shifts.patch deleted file mode 100644 index f247802d..00000000 --- a/src/libdca-4-fix-random-crashes-caused-by-invalid-32-bit-shifts.patch +++ /dev/null @@ -1,48 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Taken from libdca svn: svn://svn.videolan.org/libdca/trunk. - -r88 | sam | 2008-07-19 22:26:13 +0000 (Sat, 19 Jul 2008) | 2 lines - * bitstream.c: fix random crashes caused by invalid 32-bit shifts on 32-bit - values. - ---- libdca.orig/libdca/bitstream.c -+++ libdca/libdca/bitstream.c -@@ -25,6 +25,7 @@ - - #include "config.h" - -+#include - #include - - #include "dca.h" -@@ -46,7 +47,7 @@ - state->bigendian_mode = bigendian_mode; - bitstream_get (state, align * 8); - } --#include -+ - static inline void bitstream_fill_current (dca_state_t * state) - { - uint32_t tmp; -@@ -76,12 +77,14 @@ - - uint32_t dca_bitstream_get_bh (dca_state_t * state, uint32_t num_bits) - { -- uint32_t result; -- -- num_bits -= state->bits_left; -+ uint32_t result = 0; - -- result = ((state->current_word << (32 - state->bits_left)) >> -- (32 - state->bits_left)); -+ if (state->bits_left) -+ { -+ num_bits -= state->bits_left; -+ result = ((state->current_word << (32 - state->bits_left)) >> -+ (32 - state->bits_left)); -+ } - - if ( !state->word_mode && num_bits > 28 ) { - bitstream_fill_current (state); diff --git a/src/libdca-5-avoid-crashing-with-invalid-frames.patch b/src/libdca-5-avoid-crashing-with-invalid-frames.patch deleted file mode 100644 index cd144445..00000000 --- a/src/libdca-5-avoid-crashing-with-invalid-frames.patch +++ /dev/null @@ -1,31 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Taken from libdca svn: svn://svn.videolan.org/libdca/trunk. - -r89 | sam | 2008-07-19 22:26:17 +0000 (Sat, 19 Jul 2008) | 2 lines - * parse.c: avoid crashing with invalid frames setting a bitalloc_huffman - component to 7. - ---- libdca.orig/libdca/parse.c -+++ libdca/libdca/parse.c -@@ -364,7 +364,10 @@ - for (i = 0; i < state->prim_channels; i++) - { - state->bitalloc_huffman[i] = bitstream_get (state, 3); -- /* if (state->bitalloc_huffman[i] == 7) bailout */ -+ /* There might be a way not to trash the whole frame, but for -+ * now we must bail out or we will buffer overflow later. */ -+ if (state->bitalloc_huffman[i] == 7) -+ return 1; - #ifdef DEBUG - fprintf (stderr, "bit allocation quantizer: %i\n", - state->bitalloc_huffman[i]); -@@ -541,6 +544,7 @@ - k < state->vq_start_subband[j] && - state->bitalloc[j][k] > 0) - { -+ /* tmode cannot overflow since transient_huffman[j] < 4 */ - state->transition_mode[j][k] = InverseQ (state, - tmode[state->transient_huffman[j]]); - } diff --git a/src/libdca-test.c b/src/libdca-test.c deleted file mode 100644 index 3028f34e..00000000 --- a/src/libdca-test.c +++ /dev/null @@ -1,23 +0,0 @@ -/* - * This file is part of MXE. - * See index.html for further information. - */ - -#include -#include - -int main(int argc, char *argv[]) -{ - dca_state_t *state; - - (void)argc; - (void)argv; - - state = dca_init(0); - if (!state) { - return 1; - } - - dca_free(state); - return 0; -} diff --git a/src/libdca.mk b/src/libdca.mk deleted file mode 100644 index 1fde84b3..00000000 --- a/src/libdca.mk +++ /dev/null @@ -1,30 +0,0 @@ -# This file is part of MXE. -# See index.html for further information. - -PKG := libdca -$(PKG)_IGNORE := -$(PKG)_VERSION := 0.0.5 -$(PKG)_CHECKSUM := dba022e022109a5bacbe122d50917769ff27b64a7bba104bd38ced8de8510642 -$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) -$(PKG)_FILE := $($(PKG)_SUBDIR).tar.bz2 -$(PKG)_URL := http://download.videolan.org/pub/videolan/libdca/$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := gcc - -define $(PKG)_UPDATE - $(WGET) -q -O- 'https://www.videolan.org/developers/libdca.html' | \ - $(SED) -n 's,.*libdca-\([0-9][^"]*\)\.tar.*,\1,p' | \ - head -1 -endef - -define $(PKG)_BUILD - cd '$(1)' && ./configure \ - $(MXE_CONFIGURE_OPTS) \ - CFLAGS='-std=gnu89' - $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - - '$(TARGET)-gcc' \ - -W -Wall -Werror -ansi -pedantic \ - '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-libdca.exe' \ - `'$(TARGET)-pkg-config' libdca --cflags --libs` -endef From 459eba11f730c9c8b1a0be622af29aa145f1b160 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 1 Feb 2016 16:15:50 +1100 Subject: [PATCH 0477/1463] aspell: fix shared linking, disable pthreads, and add archlinux patches see: https://aur.archlinux.org/cgit/aur.git/tree/?h=mingw-w64-aspell fixes #1143 --- src/aspell-1-fixes.patch | 585 ++++++++++++++++++++++++++++++++++++++- src/aspell.mk | 11 +- 2 files changed, 582 insertions(+), 14 deletions(-) diff --git a/src/aspell-1-fixes.patch b/src/aspell-1-fixes.patch index d889428a..3f29c503 100644 --- a/src/aspell-1-fixes.patch +++ b/src/aspell-1-fixes.patch @@ -1,11 +1,582 @@ -diff -Naur aspell-0.60.6.1.orig/common/file_util.cpp aspell-0.60.6.1/common/file_util.cpp ---- aspell-0.60.6.1.orig/common/file_util.cpp 2011-07-03 01:09:08.000000000 +0400 -+++ aspell-0.60.6.1/common/file_util.cpp 2015-07-28 18:01:01.435865252 +0300 -@@ -26,6 +26,7 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore +Date: Sun, 31 Jan 2016 21:13:24 +1100 +Subject: [PATCH] add pthreads option + + +diff --git a/configure.ac b/configure.ac +index 1111111..2222222 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -64,6 +64,9 @@ AC_ARG_ENABLE(wide-curses, + AC_ARG_ENABLE(regex, + [ --disable-regex]) - #ifdef WIN32 ++AC_ARG_ENABLE(pthreads, ++ [ --disable-pthreads]) ++ + AC_ARG_ENABLE(compile-in-filters, + [ --enable-compile-in-filters]) -+#include "asc_ctype.hpp" - # include +@@ -254,6 +257,8 @@ AM_LANGINFO_CODESET + # # + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # + ++if test "$enable_pthreads" != "no" ++then + AC_SUBST(PTHREAD_LIB) + + AC_MSG_CHECKING(if posix mutexes are supported) +@@ -293,6 +298,7 @@ else + AC_MSG_WARN([Unable to find locking mechanism, Aspell will not be thread safe.]) + fi + ++fi + + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # + # # + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore +Date: Sun, 31 Jan 2016 20:10:22 +1100 +Subject: [PATCH] use namespace mingw + +taken from: +https://aur.archlinux.org/cgit/aur.git/plain/0001-use-namespace.mingw.patch?h=mingw-w64-aspell + +diff --git a/common/file_util.cpp b/common/file_util.cpp +index 1111111..2222222 100644 +--- a/common/file_util.cpp ++++ b/common/file_util.cpp +@@ -30,6 +30,7 @@ # define ACCESS _access # include + # include ++# include "asc_ctype.hpp" + + #else + +@@ -38,6 +39,7 @@ + + #endif + ++using namespace acommon; + + namespace acommon { + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore +Date: Sun, 31 Jan 2016 20:14:27 +1100 +Subject: [PATCH] printf mingw + +taken from: +https://aur.archlinux.org/cgit/aur.git/plain/0002-printf.mingw.patch?h=mingw-w64-aspell + +diff --git a/common/config.cpp b/common/config.cpp +index 1111111..2222222 100644 +--- a/common/config.cpp ++++ b/common/config.cpp +@@ -39,6 +39,9 @@ + #include "vararray.hpp" + #include "string_list.hpp" + ++#define printf printf ++#include "libintl.h" ++#undef printf + #include "gettext.h" + + #include "iostream.hpp" +diff --git a/modules/speller/default/language.cpp b/modules/speller/default/language.cpp +index 1111111..2222222 100644 +--- a/modules/speller/default/language.cpp ++++ b/modules/speller/default/language.cpp +@@ -24,6 +24,9 @@ + # include + #endif + ++#define printf printf ++#include "libintl.h" ++#undef printf + #include "gettext.h" + + namespace aspeller { +diff --git a/prog/aspell.cpp b/prog/aspell.cpp +index 1111111..2222222 100644 +--- a/prog/aspell.cpp ++++ b/prog/aspell.cpp +@@ -59,6 +59,9 @@ + #include "hash-t.hpp" + #include "hash_fun.hpp" + ++#define printf printf ++#include "libintl.h" ++#undef printf + #include "gettext.h" + + using namespace acommon; + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore +Date: Sun, 31 Jan 2016 20:15:48 +1100 +Subject: [PATCH] no-undefined mingw + +taken from: +https://aur.archlinux.org/cgit/aur.git/plain/0003-no-undefined-on.mingw.patch?h=mingw-w64-aspell + +diff --git a/Makefile.am b/Makefile.am +index 1111111..2222222 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -194,7 +194,7 @@ libaspell_la_SOURCES +=\ + else # not COMPILE_IN_FILTERS + + dynamic_optfiles += ${optfiles} +-filter_ldflags = -module -avoid-version ++filter_ldflags = -module -avoid-version -no-undefined + + ### Add name of filter library containing your filter. Name always + ### must look like lib-filter.la see development manual + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore +Date: Sun, 31 Jan 2016 20:16:41 +1100 +Subject: [PATCH] reloc mingw + +taken from: +https://aur.archlinux.org/cgit/aur.git/plain/0004-reloc.mingw.patch?h=mingw-w64-aspell + +diff --git a/common/config.cpp b/common/config.cpp +index 1111111..2222222 100644 +--- a/common/config.cpp ++++ b/common/config.cpp +@@ -22,6 +22,8 @@ + # include + #endif + ++#include "info.hpp" ++#include + #include "cache.hpp" + #include "asc_ctype.hpp" + #include "config.hpp" +@@ -310,6 +312,14 @@ namespace acommon { + const Entry * res = 0; + const Entry * cur = first_; + ++#ifdef ENABLE_W32_PREFIX ++ if (key == "prefix") ++ { ++ Entry *e = new Config::Entry(); ++ e->value = get_w32_prefix (); ++ return e; ++ } ++#endif + while (cur) { + if (cur->key == key && cur->action != NoOp) res = cur; + cur = cur->next; +diff --git a/common/info.cpp b/common/info.cpp +index 1111111..2222222 100644 +--- a/common/info.cpp ++++ b/common/info.cpp +@@ -39,6 +39,19 @@ + + #include "gettext.h" + ++#ifdef ENABLE_W32_PREFIX ++extern "C" { ++static HINSTANCE dll_hinstance; ++ ++BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) ++{ ++ if (fdwReason == DLL_PROCESS_ATTACH) ++ dll_hinstance = hinstDLL; ++ return TRUE; ++} ++} ++#endif ++ + namespace acommon { + + class Dir { +@@ -778,4 +791,60 @@ namespace acommon { + return data; + } + ++#ifdef ENABLE_W32_PREFIX ++ ++const char * ++get_w32_prefix () ++{ ++ ++ static char *wprefix = NULL; ++ ++/* ++ Entry * next; ++ String key; ++ String value; ++ String file; ++*/ ++ if (wprefix == NULL) ++ { ++ DWORD bsize = MAX_PATH; ++ DWORD l = bsize; ++ char *bslash, *slash; ++ char *buf = (char *) malloc (bsize); ++ while (l == bsize) ++ { ++ l = GetModuleFileNameA (dll_hinstance, buf, bsize); ++ if (l == 0) ++ { ++ DebugBreak (); ++ abort (); ++ } ++ if (l == bsize) ++ { ++ buf = (char *) realloc ((void *) buf, bsize * 2); ++ bsize *= 2; ++ l = bsize; ++ } ++ } ++ bslash = strrchr (buf, '\\'); ++ slash = strrchr (buf, '/'); ++ if (bslash > slash) ++ slash = bslash; ++ slash[0] = '\0'; ++ l = strlen (buf); ++ if (l > 3 && strcmp (&buf[l - 3], "bin") == 0) ++ { ++ bslash = strrchr (buf, '\\'); ++ slash = strrchr (buf, '/'); ++ if (bslash > slash) ++ slash = bslash; ++ slash[0] = '\0'; ++ } ++ wprefix = buf; ++ ++ } ++ return wprefix; ++} ++#endif ++ + } +diff --git a/common/info.hpp b/common/info.hpp +index 1111111..2222222 100644 +--- a/common/info.hpp ++++ b/common/info.hpp +@@ -140,8 +140,7 @@ namespace acommon { + }; + + +- +- ++ const char * get_w32_prefix (); + } + + #endif /* ASPELL_INFO__HPP */ + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore +Date: Sun, 31 Jan 2016 20:17:30 +1100 +Subject: [PATCH] w32 home + +taken from: +https://aur.archlinux.org/cgit/aur.git/plain/0005-w32-home.all.patch?h=mingw-w64-aspell + +diff --git a/common/config.cpp b/common/config.cpp +index 1111111..2222222 100644 +--- a/common/config.cpp ++++ b/common/config.cpp +@@ -664,6 +664,21 @@ namespace acommon { + } else { // sep == '|' + assert(replace[0] == '$'); + const char * env = getenv(replace.c_str()+1); ++ if (NULL == env && strcmp (replace.c_str() + 1, "HOME") == 0) ++ { ++ const char *hd, *hp; ++ hd = getenv("HOMEDRIVE"); ++ hp = getenv("HOMEPATH"); ++ if (hd && hp) ++ { ++ char tmpbuf[strlen ("HOME=") + strlen (hd) + strlen (hp) + 1]; ++ strcpy (tmpbuf, "HOME="); ++ strcpy (&tmpbuf[strlen ("HOME=")], hd); ++ strcpy (&tmpbuf[strlen ("HOME=") + strlen (hd)], hp); ++ putenv (tmpbuf); ++ env = getenv(replace.c_str()+1); ++ } ++ } + final_str += env ? env : second; + } + replace = ""; + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore +Date: Sun, 31 Jan 2016 20:18:24 +1100 +Subject: [PATCH] abort mingw + +taken from: +https://aur.archlinux.org/cgit/aur.git/plain/0006-abort.mingw.patch?h=mingw-w64-aspell + +diff --git a/common/config.cpp b/common/config.cpp +index 1111111..2222222 100644 +--- a/common/config.cpp ++++ b/common/config.cpp +@@ -623,7 +623,7 @@ namespace acommon { + + } else { + +- abort(); // this should not happen ++ DebugBreak(); // this should not happen + + } + +@@ -857,7 +857,7 @@ namespace acommon { + case ListClear: + return make_err(no_value_clear, entry->key); + default: +- abort(); // this shouldn't happen ++ DebugBreak(); // this shouldn't happen + } + } else { + entry->place_holder = -1; +diff --git a/common/itemize.cpp b/common/itemize.cpp +index 1111111..2222222 100644 +--- a/common/itemize.cpp ++++ b/common/itemize.cpp +@@ -12,6 +12,7 @@ + #include "mutable_container.hpp" + #include + #include ++#include + + //FIXME: it should be possible to escape ',' '+' '-' '!' so that they can + // appear in values +@@ -97,7 +98,7 @@ namespace acommon { + RET_ON_ERR(d.clear()); + break; + default: +- abort(); ++ DebugBreak(); + } + } + return no_err; +diff --git a/common/posib_err.cpp b/common/posib_err.cpp +index 1111111..2222222 100644 +--- a/common/posib_err.cpp ++++ b/common/posib_err.cpp +@@ -13,7 +13,7 @@ + #include "posib_err.hpp" + + #include "gettext.h" +- ++#include + + namespace acommon { + +@@ -100,7 +100,7 @@ namespace acommon { + fputs(_("Unhandled Error: "), stderr); + fputs(err_->err->mesg, stderr); + fputs("\n", stderr); +- abort(); ++ DebugBreak(); + } + #endif + +diff --git a/common/string_list.hpp b/common/string_list.hpp +index 1111111..2222222 100644 +--- a/common/string_list.hpp ++++ b/common/string_list.hpp +@@ -12,6 +12,7 @@ + #include "posib_err.hpp" + #include + #include ++#include + + namespace acommon { + +@@ -90,7 +91,7 @@ namespace acommon { + } + + bool empty() const { return first == 0; } +- unsigned int size() const { abort(); return 0; } ++ unsigned int size() const { DebugBreak(); return 0; } + + }; + +diff --git a/lib/find_speller.cpp b/lib/find_speller.cpp +index 1111111..2222222 100644 +--- a/lib/find_speller.cpp ++++ b/lib/find_speller.cpp +@@ -384,7 +384,7 @@ namespace acommon { + b_size.req_type = '+'; + } + if (!asc_isdigit(p[0]) || !asc_isdigit(p[1]) || p[2] != '\0') +- abort(); //FIXME: create an error condition here ++ DebugBreak(); //FIXME: create an error condition here + b_size.requested = atoi(p); + b_size.init(); + +diff --git a/modules/filter/tex.cpp b/modules/filter/tex.cpp +index 1111111..2222222 100644 +--- a/modules/filter/tex.cpp ++++ b/modules/filter/tex.cpp +@@ -24,6 +24,7 @@ + #include "string_enumeration.hpp" + + #include "gettext.h" ++#include + + namespace { + +diff --git a/modules/speller/default/data.cpp b/modules/speller/default/data.cpp +index 1111111..2222222 100644 +--- a/modules/speller/default/data.cpp ++++ b/modules/speller/default/data.cpp +@@ -17,6 +17,7 @@ + #include "vararray.hpp" + + #include "gettext.h" ++#include + + namespace aspeller { + +@@ -439,7 +440,7 @@ namespace aspeller { + w = new_default_replacement_dict(); + break; + default: +- abort(); ++ DebugBreak(); + } + + RET_ON_ERR(w->load(true_file_name, config, new_dicts, speller)); +diff --git a/modules/speller/default/phonetic.cpp b/modules/speller/default/phonetic.cpp +index 1111111..2222222 100644 +--- a/modules/speller/default/phonetic.cpp ++++ b/modules/speller/default/phonetic.cpp +@@ -7,6 +7,7 @@ + #include "file_util.hpp" + #include "file_data_util.hpp" + #include "clone_ptr-t.hpp" ++#include + + namespace aspeller { + +@@ -194,7 +195,7 @@ namespace aspeller { + } else if (name == lang->name()) { + sl = new PhonetSoundslike(lang); + } else { +- abort(); // FIXME ++ DebugBreak(); // FIXME + } + PosibErrBase pe = sl->setup(iconv); + if (pe.has_err()) { +diff --git a/modules/speller/default/readonly_ws.cpp b/modules/speller/default/readonly_ws.cpp +index 1111111..2222222 100644 +--- a/modules/speller/default/readonly_ws.cpp ++++ b/modules/speller/default/readonly_ws.cpp +@@ -55,6 +55,7 @@ using std::pair; + #include "iostream.hpp" + + #include "gettext.h" ++#include + + typedef unsigned int u32int; + static const u32int u32int_max = (u32int)-1; +@@ -102,7 +103,7 @@ static inline char * mmap_open(unsigned int, + + static inline void mmap_free(char *, unsigned int) + { +- abort(); ++ DebugBreak(); + } + + #endif +@@ -204,7 +205,7 @@ namespace { + InsensitiveHash hash; + InsensitiveEqual equal; + bool is_nonexistent(Value v) const {return v == u32int_max;} +- void make_nonexistent(const Value & v) const {abort();} ++ void make_nonexistent(const Value & v) const {DebugBreak();} + }; + typedef VectorHashTable WordLookup; + +diff --git a/modules/speller/default/speller_impl.cpp b/modules/speller/default/speller_impl.cpp +index 1111111..2222222 100644 +--- a/modules/speller/default/speller_impl.cpp ++++ b/modules/speller/default/speller_impl.cpp +@@ -380,7 +380,7 @@ namespace aspeller { + static PosibErr save_repl(SpellerImpl * m, bool value) { + // FIXME + // m->save_on_saveall(DataSet::Id(&m->personal_repl()), value); +- abort(); return no_err; ++ DebugBreak(); return no_err; + } + static PosibErr sug_mode(SpellerImpl * m, const char * mode) { + RET_ON_ERR(m->suggest_->set_mode(mode)); +@@ -683,7 +683,7 @@ namespace aspeller { + case Dict::multi_dict: + break; + default: +- abort(); ++ DebugBreak(); + } + save_on_saveall = false; + } +@@ -709,7 +709,7 @@ namespace aspeller { + + } else { + +- abort(); ++ DebugBreak(); + + } + break; +diff --git a/prog/aspell.cpp b/prog/aspell.cpp +index 1111111..2222222 100644 +--- a/prog/aspell.cpp ++++ b/prog/aspell.cpp +@@ -448,7 +448,7 @@ int main (int argc, const char *argv[]) + else if (action_str == "merge") + action = do_merge; + else +- abort(); // this should not happen ++ DebugBreak(); // this should not happen + + if (action != do_other) { + if (args.empty()) { +@@ -1498,7 +1498,7 @@ void dump (aspeller::Dict * lws, Convert * conv) + } + break; + default: +- abort(); ++ DebugBreak(); + } + } + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore +Date: Sun, 31 Jan 2016 20:19:16 +1100 +Subject: [PATCH] fix including langinfo + +taken from: +https://aur.archlinux.org/cgit/aur.git/plain/0007-fix-including-langinfo.patch?h=mingw-w64-aspell + +diff --git a/modules/speller/default/language.cpp b/modules/speller/default/language.cpp +index 1111111..2222222 100644 +--- a/modules/speller/default/language.cpp ++++ b/modules/speller/default/language.cpp +@@ -20,7 +20,7 @@ + #include "getdata.hpp" + #include "file_util.hpp" + +-#ifdef ENABLE_NLS ++#ifdef HAVE_LANGINFO_CODESET + # include + #endif + diff --git a/src/aspell.mk b/src/aspell.mk index 9074a601..c9af9875 100644 --- a/src/aspell.mk +++ b/src/aspell.mk @@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE) -$(PKG)_DEPS := gcc dlfcn-win32 +$(PKG)_DEPS := gcc dlfcn-win32 gettext define $(PKG)_UPDATE $(WGET) -q -O- 'http://ftp.gnu.org/gnu/aspell/' | \ @@ -17,16 +17,13 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD + cd '$(1)' && autoreconf -fi cd '$(1)' && ./configure \ $(MXE_CONFIGURE_OPTS) \ --enable-win32-relocatable \ --disable-curses \ - --disable-nls - - # libtool misses some dependency libs and there's no lt_cv* etc. options - # can be removed after 0.60.6.1 if recent libtool et al. is used - $(if $(BUILD_SHARED),\ - $(SED) -i 's#^postdeps="-#postdeps="-ldl -lpthread -#g' '$(1)/libtool') + --disable-pthreads \ + CPPFLAGS='-DENABLE_W32_PREFIX=1' $(MAKE) -C '$(1)' -j '$(JOBS)' install endef From 2c69e7a2c989043477e6a9513daedf2a119a4974 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 2 Feb 2016 16:06:25 +1100 Subject: [PATCH 0478/1463] aspell: disable dlopen --- src/aspell-1-fixes.patch | 53 ++++++++++++++++++++++++++++++++++++++++ src/aspell.mk | 5 ++-- 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/src/aspell-1-fixes.patch b/src/aspell-1-fixes.patch index 3f29c503..3ff19e1e 100644 --- a/src/aspell-1-fixes.patch +++ b/src/aspell-1-fixes.patch @@ -580,3 +580,56 @@ index 1111111..2222222 100644 # include #endif + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tony Theodore +Date: Tue, 2 Feb 2016 15:46:07 +1100 +Subject: [PATCH] add dlopen option + + +diff --git a/configure.ac b/configure.ac +index 1111111..2222222 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -58,6 +58,9 @@ AC_ARG_ENABLE(curses, + AC_ARG_ENABLE(curses-include, + [ --enable-curses-include=DIR]) + ++AC_ARG_ENABLE(dlopen, ++ [ --enable-dlopen]) ++ + AC_ARG_ENABLE(wide-curses, + AS_HELP_STRING([--disable-wide-curses],[disable wide char utf8 cursor control])) + +@@ -95,14 +98,17 @@ AC_LANG([C++]) + AM_PROG_CC_C_O + + AC_DISABLE_STATIC +-AC_LIBTOOL_DLOPEN + AC_PROG_LIBTOOL + ++if test "$enable_dlopen" = "yes" ++then + dnl DL stuff ++AC_LIBTOOL_DLOPEN + + AC_CHECK_HEADERS(dlfcn.h,,[enable_compile_in_filters=yes]) + AC_CHECK_FUNC(dlopen,, + AC_CHECK_LIB(dl, dlopen,,[enable_compile_in_filters=yes])) ++fi + + dnl + +@@ -165,9 +171,12 @@ then + AC_DEFINE(ENABLE_WIN32_RELOCATABLE, 1, [Defined if win32 relocation should be used]) + fi + ++if test "$enable_dlopen" = "yes" ++then + # DL stuff + AC_CHECK_HEADERS(dlfcn.h) + AC_CHECK_LIB(dl, dlopen) ++fi + + # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # + # # diff --git a/src/aspell.mk b/src/aspell.mk index c9af9875..1abe843e 100644 --- a/src/aspell.mk +++ b/src/aspell.mk @@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE) -$(PKG)_DEPS := gcc dlfcn-win32 gettext +$(PKG)_DEPS := gcc gettext define $(PKG)_UPDATE $(WGET) -q -O- 'http://ftp.gnu.org/gnu/aspell/' | \ @@ -17,11 +17,12 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && autoreconf -fi + cd '$(1)' && $(LIBTOOLIZE) && autoreconf -fi cd '$(1)' && ./configure \ $(MXE_CONFIGURE_OPTS) \ --enable-win32-relocatable \ --disable-curses \ + --disable-dlopen \ --disable-pthreads \ CPPFLAGS='-DENABLE_W32_PREFIX=1' From 62171e682f84f8fbc3ee34148d76324924581891 Mon Sep 17 00:00:00 2001 From: Pavel Vatagin Date: Tue, 2 Feb 2016 21:36:34 +1100 Subject: [PATCH 0479/1463] aspell: fix undefined reference to `libintl_dgettext' see: https://github.com/mxe/mxe/pull/1210#issuecomment-178471641 --- src/aspell.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/aspell.mk b/src/aspell.mk index 1abe843e..b0a233ac 100644 --- a/src/aspell.mk +++ b/src/aspell.mk @@ -26,5 +26,10 @@ define $(PKG)_BUILD --disable-pthreads \ CPPFLAGS='-DENABLE_W32_PREFIX=1' + # fix undefined reference to `libintl_dgettext' + # https://github.com/mxe/mxe/pull/1210#issuecomment-178471641 + $(if $(BUILD_SHARED),\ + $(SED) -i 's#^postdeps="-#postdeps="-lintl -#g' '$(1)/libtool') + $(MAKE) -C '$(1)' -j '$(JOBS)' install endef From cdc9ba9490c8790cd32138454e97eecc1ed73d60 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Mon, 29 Feb 2016 15:28:05 +0000 Subject: [PATCH 0480/1463] Update versions.json & build-matrix.html --- build-matrix.html | 20 +++++--------------- versions.json | 1 - 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index ef08133a..7e81cf04 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -1387,16 +1387,6 @@ feel free to submit a pull request. ✗ - - libdca - 0.0.5 - ✓ - ✓ - ✓ - ✓ - ✗ - - libdnet 1.11 @@ -4009,14 +3999,14 @@ feel free to submit a pull request. -Total: 388 +Total: 387
    (+5 virtual +4 native-only) -385 -286 -368 -284 +384 +285 +367 +283 15 diff --git a/versions.json b/versions.json index 21ce4d6e..d9f57bae 100644 --- a/versions.json +++ b/versions.json @@ -134,7 +134,6 @@ "libcdio-paranoia": "10.2+0.93+1", "libcomm14cux": "2.1.1", "libcroco": "0.6.2", - "libdca": "0.0.5", "libdnet": "1.11", "libdvbpsi": "1.2.0", "libdvdcss": "1.3.0", From 00d3395a5f2a42ff6fc4d197ab9467a2a5f7b2d4 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 1 Mar 2016 15:15:09 +0100 Subject: [PATCH 0481/1463] openssl: update --- src/openssl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openssl.mk b/src/openssl.mk index 350c2d3a..49796154 100644 --- a/src/openssl.mk +++ b/src/openssl.mk @@ -3,8 +3,8 @@ PKG := openssl $(PKG)_IGNORE := -$(PKG)_VERSION := 1.0.2f -$(PKG)_CHECKSUM := 932b4ee4def2b434f85435d9e3e19ca8ba99ce9a065a61524b429a9d5e9b2e9c +$(PKG)_VERSION := 1.0.2g +$(PKG)_CHECKSUM := b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33 $(PKG)_SUBDIR := openssl-$($(PKG)_VERSION) $(PKG)_FILE := openssl-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.openssl.org/source/$($(PKG)_FILE) From 861a30d87cb80f7a335f305659713357f9701e12 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 1 Mar 2016 15:15:24 +0100 Subject: [PATCH 0482/1463] vmime: update --- src/vmime.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vmime.mk b/src/vmime.mk index df47c5d4..20d1623b 100644 --- a/src/vmime.mk +++ b/src/vmime.mk @@ -3,8 +3,8 @@ PKG := vmime $(PKG)_IGNORE := -$(PKG)_VERSION := 156edf5 -$(PKG)_CHECKSUM := fc9342784ac660b6572a7cc2343e37293e59d499de4ccf141c947fbb732cee89 +$(PKG)_VERSION := baec395 +$(PKG)_CHECKSUM := 85e99c383287d8f32a5b198b72bd30a0cc4f9e866e67b1bb78cae21e68120949 $(PKG)_SUBDIR := kisli-vmime-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/kisli/vmime/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE) From 331bd3dc6ab9d9b83016e90b2d08d26a471d7644 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Tue, 1 Mar 2016 14:31:01 +0000 Subject: [PATCH 0483/1463] Update versions.json & build-matrix.html --- build-matrix.html | 4 ++-- versions.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 7e81cf04..13bffce0 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -2599,7 +2599,7 @@ feel free to submit a pull request. openssl - 1.0.2f + 1.0.2g ✓ ✓ ✓ @@ -3749,7 +3749,7 @@ feel free to submit a pull request. vmime - 156edf5 + baec395 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index d9f57bae..13bd3a91 100644 --- a/versions.json +++ b/versions.json @@ -255,7 +255,7 @@ "openjpeg": "2.1.0", "openmp-validation": "3.1", "openscenegraph": "3.4.0", - "openssl": "1.0.2f", + "openssl": "1.0.2g", "openthreads": "3.4.0", "opus": "1.1.1", "opusfile": "0.6", @@ -370,7 +370,7 @@ "vcdimager": "0.7.24", "vidstab": "0.98b", "vigra": "1.9.0", - "vmime": "156edf5", + "vmime": "baec395", "vo-aacenc": "0.1.3", "vo-amrwbenc": "0.1.3", "vorbis": "1.3.5", From c3624cdefb7ff0c4b69316c7c1b740b97f55e1db Mon Sep 17 00:00:00 2001 From: Martin Gerhardy Date: Thu, 3 Mar 2016 14:39:57 +0100 Subject: [PATCH 0484/1463] added test program for sdl2 --- src/sdl2-test.c | 22 ++++++++++++++++++++++ src/sdl2.mk | 6 ++++++ 2 files changed, 28 insertions(+) create mode 100644 src/sdl2-test.c diff --git a/src/sdl2-test.c b/src/sdl2-test.c new file mode 100644 index 00000000..fd25c4eb --- /dev/null +++ b/src/sdl2-test.c @@ -0,0 +1,22 @@ +/* + * This file is part of MXE. + * See index.html for further information. + */ + +#include + +int main(int argc, char *argv[]) +{ + SDL_Window* window = NULL; + + (void)argc; + (void)argv; + + if (SDL_Init(SDL_INIT_VIDEO) < 0) return 1; + + window = SDL_CreateWindow("MXE test", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 640, 480, SDL_WINDOW_SHOWN); + SDL_Delay(2000); + SDL_DestroyWindow(window); + SDL_Quit(); + return 0; +} diff --git a/src/sdl2.mk b/src/sdl2.mk index 6f40659c..8fbb59b7 100644 --- a/src/sdl2.mk +++ b/src/sdl2.mk @@ -27,4 +27,10 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install ln -sf '$(PREFIX)/$(TARGET)/bin/sdl2-config' '$(PREFIX)/bin/$(TARGET)-sdl2-config' + + '$(TARGET)-gcc' \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-sdl2.exe' \ + `'$(TARGET)-pkg-config' sdl2 --cflags --libs` + endef From e11179655df86ddde4ccae92ed0c9f6fbcc9698e Mon Sep 17 00:00:00 2001 From: Martin Gerhardy Date: Fri, 4 Sep 2015 16:07:05 +0200 Subject: [PATCH 0485/1463] new package subversion --- index.html | 4 ++ src/subversion-1-fixes.patch | 98 ++++++++++++++++++++++++++++++++++++ src/subversion-test.c | 8 +++ src/subversion.mk | 49 ++++++++++++++++++ 4 files changed, 159 insertions(+) create mode 100644 src/subversion-1-fixes.patch create mode 100644 src/subversion-test.c create mode 100644 src/subversion.mk diff --git a/index.html b/index.html index 1ce19d5f..4febb828 100644 --- a/index.html +++ b/index.html @@ -2497,6 +2497,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) suitesparse SuiteSparse + + subversion + subversion + t4k_common t4k_common diff --git a/src/subversion-1-fixes.patch b/src/subversion-1-fixes.patch new file mode 100644 index 00000000..6a3da24d --- /dev/null +++ b/src/subversion-1-fixes.patch @@ -0,0 +1,98 @@ +--- subversion-1.9.2/configure.ac 2015-07-27 01:03:10.000000000 +0200 ++++ subversion-1.9.2.new/configure.ac 2015-12-09 13:58:49.000000000 +0100 +@@ -467,9 +467,6 @@ + + dnl Mac OS specific features ------------------- + +-SVN_LIB_MACHO_ITERATE +-SVN_LIB_MACOS_PLIST +-SVN_LIB_MACOS_KEYCHAIN + + dnl APR_HAS_DSO ------------------- + +@@ -1271,7 +1268,6 @@ + # Python: Used for testsuite, and bindings + + +-PYTHON="`$abs_srcdir/build/find_python.sh`" + if test -z "$PYTHON"; then + AC_MSG_WARN([Python 2.7 or later is required to run the testsuite]) + AC_MSG_WARN([or to use the Subversion Python bindings]) + +--- subversion-1.9.2/subversion/libsvn_subr/config_win.c 2015-04-17 06:00:18.000000000 +0200 ++++ subversion-1.9.2.new/subversion/libsvn_subr/config_win.c 2015-12-10 09:49:11.645120955 +0100 +@@ -34,7 +34,7 @@ + #define WIN32_LEAN_AND_MEAN + /* winsock2.h includes windows.h */ + #include +-#include ++#include + + #include + +--- subversion-1.9.2/subversion/libsvn_subr/win32_xlate.c 2015-02-03 13:56:57.000000000 +0100 ++++ subversion-1.9.2.new/subversion/libsvn_subr/win32_xlate.c 2015-12-10 09:48:56.725192873 +0100 +@@ -36,7 +36,7 @@ + + /* winsock2.h includes windows.h */ + #include +-#include ++#include + #include + + #include +@@ -53,6 +53,8 @@ + + #include "svn_private_config.h" + ++#define INITGUID 1 ++DEFINE_GUID (IID_IMultiLanguage, 0x275c23e1,0x3747,0x11d0,0x9f,0xea,0x00,0xaa,0x00,0x3f,0x86,0x46); + static svn_atomic_t com_initialized = 0; + + /* Initializes COM and keeps COM available until process exit. +@@ -139,10 +139,12 @@ + return saved; /* probably SVN_ERR_ATOMIC_INIT_FAILURE */ + } + ++#if 0 + hr = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER, + &IID_IMultiLanguage, (void **) &mlang); + + if (FAILED(hr)) ++#endif + return APR_EGENERAL; + + /* Convert page name to wide string. */ +--- subversion-1.9.2/subversion/libsvn_subr/io.c 2015-09-11 06:00:13.000000000 +0200 ++++ subversion-1.9.2.new/subversion/libsvn_subr/io.c 2015-12-10 10:21:22.272463424 +0100 +@@ -1789,7 +1789,7 @@ + } + } + +- SVN_ERR(svn_utf__win32_utf8_to_utf16(&(const WCHAR*)buffer, source, ++ SVN_ERR(svn_utf__win32_utf8_to_utf16((const WCHAR**)&buffer, source, + prefix, result_pool)); + + /* Convert slashes to backslashes because the \\?\ path format +--- subversion-1.9.2/build/generator/gen_make.py 2015-07-27 01:03:10.000000000 +0200 ++++ subversion-1.9.2.new/build/generator/gen_make.py 2015-12-09 13:58:49.000000000 +0100 +@@ -633,7 +633,7 @@ + lib_required_private=[], + ) + # libsvn_foo -> -lsvn_foo +- data.lib_deps.append('-l%s' % lib_name.replace('lib', '', 1)) ++ data.lib_deps.append('-l%s-1' % lib_name.replace('lib', '', 1)) + for lib_dep in lib_deps.split(): + if lib_dep == 'apriconv': + # apriconv is part of apr-util, skip it +--- subversion-1.9.2/build/generator/templates/pkg-config.in.ezt 2016-02-11 15:48:52.204400231 +0100 ++++ subversion-1.9.2.new/build/generator/templates/pkg-config.in.ezt 2014-05-05 17:04:00.000000000 +0200 +@@ -1,7 +1,7 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + libdir=@libdir@ +-includedir=@includedir@ ++includedir=@includedir@/subversion-1 + + Name: [lib_name] + Description: [lib_desc] diff --git a/src/subversion-test.c b/src/subversion-test.c new file mode 100644 index 00000000..20211009 --- /dev/null +++ b/src/subversion-test.c @@ -0,0 +1,8 @@ +#include + +int main (void) { + if (svn_cmdline_init("mxe_test", stderr) != EXIT_SUCCESS) + return EXIT_FAILURE; + return EXIT_SUCCESS; +} + diff --git a/src/subversion.mk b/src/subversion.mk new file mode 100644 index 00000000..2ae14218 --- /dev/null +++ b/src/subversion.mk @@ -0,0 +1,49 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := subversion +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.9.2 +$(PKG)_CHECKSUM := 023da881139b4514647b6f8a830a244071034efcaad8c8e98c6b92393122b4eb +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 +$(PKG)_URL := http://mirror.23media.de/apache/$(PKG)/$($(PKG)_FILE) +$(PKG)_DEPS := gcc apr apr-util sqlite openssl + +define $(PKG)_UPDATE + $(WGET) -q -O- 'http://subversion.apache.org/download.cgi' | \ + $(SED) -n 's,.*#recommended-release">\([0-9][^<]*\)<.*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + cd '$(1)' && PKG_CONFIG=$(PREFIX)/bin/$(TARGET)-pkg-config && ./autogen.sh && ./configure \ + $(MXE_CONFIGURE_OPTS) \ + --disable-shared \ + --disable-mod-activation \ + --without-serf \ + --without-apr_memcache \ + --without-apxs \ + --without-jdk \ + --without-jikes \ + --without-swig \ + --with-sysroot=$(PREFIX)/$(TARGET) \ + --disable-javahl \ + --disable-nls \ + --without-gpg-agent \ + --with-gnome-keyring=no \ + PKG_CONFIG=$(PREFIX)/bin/$(TARGET)-pkg-config \ + --with-apr='$(PREFIX)/$(TARGET)' \ + --with-apr-util='$(PREFIX)/$(TARGET)' + $(MAKE) -C '$(1)' -j '$(JOBS)' \ + install-fsmod-lib install-ramod-lib install-lib install-include \ + LDFLAGS="-lversion -lole32 -luuid -no-undefined" \ + pkgconfig_dir="$(PREFIX)/$(TARGET)/lib/pkgconfig" \ + install + '$(TARGET)-gcc' \ + -mwindows -W -Wall -Werror -pedantic \ + '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-subversion.exe' \ + `'$(TARGET)-pkg-config' libsvn_client --cflags --libs` -lole32 +endef + +$(PKG)_BUILD_SHARED = From 2a51069caa176affbd09e0244601f424e0c16d75 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Fri, 4 Mar 2016 08:40:56 +0000 Subject: [PATCH 0486/1463] Update versions.json & build-matrix.html --- build-matrix.html | 16 +++++++++++++--- versions.json | 1 + 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 13bffce0..954eac2a 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -3557,6 +3557,16 @@ feel free to submit a pull request. ✗ + + subversion + 1.9.2 + ✓ + ✗ + ✓ + ✗ + ✗ + + suitesparse 4.2.1 @@ -3999,13 +4009,13 @@ feel free to submit a pull request. -Total: 387 +Total: 388
    (+5 virtual +4 native-only) -384 +385 285 -367 +368 283 15 diff --git a/versions.json b/versions.json index 13bd3a91..d662bc28 100644 --- a/versions.json +++ b/versions.json @@ -351,6 +351,7 @@ "speex": "1.2rc2", "speexdsp": "1.2rc3", "sqlite": "3110000", + "subversion": "1.9.2", "suitesparse": "4.2.1", "t4k_common": "0.1.1", "taglib": "1.10", From 0fde952cafef794cec17f42e2ad873a3509b2eff Mon Sep 17 00:00:00 2001 From: Martin Gerhardy Date: Thu, 3 Mar 2016 21:22:44 +0100 Subject: [PATCH 0487/1463] sdl2: update --- src/sdl2-1.patch | 128 ++++++++++++++++++++++++----------------------- src/sdl2.mk | 4 +- 2 files changed, 67 insertions(+), 65 deletions(-) diff --git a/src/sdl2-1.patch b/src/sdl2-1.patch index dd830a7f..ebefdb66 100644 --- a/src/sdl2-1.patch +++ b/src/sdl2-1.patch @@ -10,10 +10,10 @@ This patch has been taken from: https://bugzilla.libsdl.org/show_bug.cgi?id=1739 diff --git a/configure.in b/configure.in -index 3d8a2de..7afa09e 100644 +index f585d01..48bd9eb 100644 --- a/configure.in +++ b/configure.in -@@ -2406,7 +2406,7 @@ AC_HELP_STRING([--enable-directx], [use DirectX for Windows audio/video [[defaul +@@ -2585,7 +2585,7 @@ AC_HELP_STRING([--enable-directx], [use DirectX for Windows audio/video [[defaul # FIXME: latest Cygwin finds dinput headers, but we die on other win32 headers. # FIXME: ...so force it off for now. case "$host" in @@ -41,7 +41,7 @@ These fix compiles in a strictly shared build (with --disable-static) by always building libSDL2main.a and libSDL2_test.a staticly diff --git a/Makefile.in b/Makefile.in -index da42661..688847a 100644 +index b66e0f5..e1fc6a3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -33,10 +33,10 @@ TARGET = libSDL2.la @@ -56,27 +56,27 @@ index da42661..688847a 100644 +SDLTEST_TARGET = libSDL2_test.la SDLTEST_OBJECTS = @SDLTEST_OBJECTS@ - SRC_DIST = *.txt acinclude Android.mk autogen.sh android-project build-scripts cmake configure configure.in debian include Makefile.* sdl2-config.in sdl2.m4 sdl2.pc.in SDL2.spec.in src test VisualC.html VisualC Xcode Xcode-iOS -@@ -123,15 +123,13 @@ update-revision: + SRC_DIST = *.txt acinclude Android.mk autogen.sh android-project build-scripts cmake cmake_uninstall.cmake.in configure configure.in debian docs include Makefile.* sdl2-config.cmake.in sdl2-config.in sdl2.m4 sdl2.pc.in SDL2.spec.in src test VisualC.html VisualC VisualC-WinRT Xcode Xcode-iOS +@@ -138,15 +138,13 @@ update-revision: .PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d) $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS) -- $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) +- $(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) + $(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS) -- $(AR) cru $@ $(SDLMAIN_OBJECTS) -- $(RANLIB) $@ +- $(RUN_CMD_AR)$(AR) cru $@ $(SDLMAIN_OBJECTS) +- $(RUN_CMD_RANLIB)$(RANLIB) $@ + $(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS) -- $(AR) cru $@ $(SDLTEST_OBJECTS) -- $(RANLIB) $@ +- $(RUN_CMD_AR)$(AR) cru $@ $(SDLTEST_OBJECTS) +- $(RUN_CMD_RANLIB)$(RANLIB) $@ + $(LIBTOOL) --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static install: all install-bin install-hdrs install-lib install-data install-bin: -@@ -152,10 +150,8 @@ install-hdrs: update-revision +@@ -167,10 +165,8 @@ install-hdrs: update-revision install-lib: $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET) $(objects)/$(SDLTEST_TARGET) $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir) $(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(DESTDIR)$(libdir)/$(TARGET) @@ -90,10 +90,10 @@ index da42661..688847a 100644 $(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(datadir)/aclocal $(INSTALL) -m 644 $(srcdir)/sdl2.m4 $(DESTDIR)$(datadir)/aclocal/sdl2.m4 diff --git a/configure.in b/configure.in -index 7afa09e..34efcb0 100644 +index f585d01..48bd9eb 100644 --- a/configure.in +++ b/configure.in -@@ -3136,23 +3136,23 @@ done +@@ -3464,23 +3464,23 @@ done VERSION_OBJECTS=`echo $VERSION_SOURCES` VERSION_DEPENDS=`echo $VERSION_SOURCES` @@ -112,7 +112,7 @@ index 7afa09e..34efcb0 100644 SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\ -\\$(objects)/\\2.o: \\1/\\2.c\\\\ +\\$(objects)/\\2.lo: \\1/\\2.c\\\\ - \\$(LIBTOOL) --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` + \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES` SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES` @@ -121,7 +121,7 @@ index 7afa09e..34efcb0 100644 SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\ -\\$(objects)/\\2.o: \\1/\\2.c\\\\ +\\$(objects)/\\2.lo: \\1/\\2.c\\\\ - \\$(LIBTOOL) --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` + \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` # Set runtime shared library paths as needed -- @@ -135,10 +135,10 @@ Subject: [PATCH 3/4] suppress redeclarations diff --git a/src/render/direct3d11/SDL_render_d3d11.c b/src/render/direct3d11/SDL_render_d3d11.c -index dbffd50..d7376d8 100644 +index a48eace..0b01537 100644 --- a/src/render/direct3d11/SDL_render_d3d11.c +++ b/src/render/direct3d11/SDL_render_d3d11.c -@@ -131,6 +131,7 @@ typedef struct +@@ -136,6 +136,7 @@ typedef struct } D3D11_RenderData; @@ -146,7 +146,7 @@ index dbffd50..d7376d8 100644 /* Defined here so we don't have to include uuid.lib */ static const GUID IID_IDXGIFactory2 = { 0x50c83a1c, 0xe072, 0x4c48, { 0x87, 0xb0, 0x36, 0x30, 0xfa, 0x36, 0xa6, 0xd0 } }; static const GUID IID_IDXGIDevice1 = { 0x77db970f, 0x6276, 0x48ba, { 0xba, 0x28, 0x07, 0x01, 0x43, 0xb4, 0x39, 0x2c } }; -@@ -138,6 +139,7 @@ static const GUID IID_ID3D11Texture2D = { 0x6f15aaf2, 0xd208, 0x4e89, { 0x9a, 0x +@@ -144,6 +145,7 @@ static const GUID IID_ID3D11Texture2D = { 0x6f15aaf2, 0xd208, 0x4e89, { 0x9a, 0x static const GUID IID_ID3D11Device1 = { 0xa04bfb29, 0x08ef, 0x43d6, { 0xa4, 0x9c, 0xa9, 0xbd, 0xbd, 0xcb, 0xe6, 0x86 } }; static const GUID IID_ID3D11DeviceContext1 = { 0xbb2c6faa, 0xb5fb, 0x4082, { 0x8e, 0x6b, 0x38, 0x8b, 0x8c, 0xfa, 0x90, 0xe1 } }; static const GUID IID_ID3D11Debug = { 0x79cf2233, 0x7536, 0x4948, { 0x9d, 0x36, 0x1e, 0x46, 0x92, 0xdc, 0x57, 0x60 } }; @@ -169,7 +169,7 @@ diff --git a/src/render/direct3d11/SDL_render_d3d11.c b/src/render/direct3d11/SD index d7376d8..59272ae 100644 --- a/src/render/direct3d11/SDL_render_d3d11.c +++ b/src/render/direct3d11/SDL_render_d3d11.c -@@ -886,6 +886,14 @@ D3D11_DestroyRenderer(SDL_Renderer * renderer) +@@ -935,6 +937,14 @@ D3D11_DestroyRenderer(SDL_Renderer * renderer) SDL_free(renderer); } @@ -184,7 +184,7 @@ index d7376d8..59272ae 100644 static HRESULT D3D11_CreateBlendMode(SDL_Renderer * renderer, BOOL enableBlending, -@@ -912,7 +920,7 @@ D3D11_CreateBlendMode(SDL_Renderer * renderer, +@@ -961,7 +971,7 @@ D3D11_CreateBlendMode(SDL_Renderer * renderer, blendDesc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL; result = ID3D11Device_CreateBlendState(data->d3dDevice, &blendDesc, blendStateOutput); if (FAILED(result)) { @@ -193,7 +193,7 @@ index d7376d8..59272ae 100644 return result; } -@@ -994,14 +1002,14 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) +@@ -1043,14 +1053,14 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) result = CreateDXGIFactoryFunc(&IID_IDXGIFactory2, &data->dxgiFactory); if (FAILED(result)) { @@ -210,7 +210,7 @@ index d7376d8..59272ae 100644 goto done; } -@@ -1030,25 +1038,25 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) +@@ -1079,25 +1089,25 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) &d3dContext /* Returns the device immediate context. */ ); if (FAILED(result)) { @@ -240,7 +240,7 @@ index d7376d8..59272ae 100644 goto done; } -@@ -1057,7 +1065,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) +@@ -1106,7 +1116,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) */ result = IDXGIDevice1_SetMaximumFrameLatency(dxgiDevice, 1); if (FAILED(result)) { @@ -249,7 +249,7 @@ index d7376d8..59272ae 100644 goto done; } -@@ -1086,7 +1094,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) +@@ -1135,7 +1145,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) break; default: @@ -258,7 +258,7 @@ index d7376d8..59272ae 100644 result = E_FAIL; goto done; } -@@ -1099,7 +1107,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) +@@ -1148,7 +1158,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) &data->vertexShader ); if (FAILED(result)) { @@ -267,7 +267,7 @@ index d7376d8..59272ae 100644 goto done; } -@@ -1112,7 +1120,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) +@@ -1161,7 +1171,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) &data->inputLayout ); if (FAILED(result)) { @@ -276,7 +276,7 @@ index d7376d8..59272ae 100644 goto done; } -@@ -1124,7 +1132,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) +@@ -1173,7 +1183,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) &data->colorPixelShader ); if (FAILED(result)) { @@ -285,7 +285,7 @@ index d7376d8..59272ae 100644 goto done; } -@@ -1135,7 +1143,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) +@@ -1184,7 +1194,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) &data->texturePixelShader ); if (FAILED(result)) { @@ -294,7 +294,7 @@ index d7376d8..59272ae 100644 goto done; } -@@ -1146,7 +1154,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) +@@ -1195,7 +1205,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) &data->yuvPixelShader ); if (FAILED(result)) { @@ -303,7 +303,7 @@ index d7376d8..59272ae 100644 goto done; } -@@ -1161,7 +1169,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) +@@ -1210,7 +1220,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) &data->vertexShaderConstants ); if (FAILED(result)) { @@ -312,7 +312,7 @@ index d7376d8..59272ae 100644 goto done; } -@@ -1181,7 +1189,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) +@@ -1230,7 +1240,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) &data->nearestPixelSampler ); if (FAILED(result)) { @@ -321,7 +321,7 @@ index d7376d8..59272ae 100644 goto done; } -@@ -1191,7 +1199,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) +@@ -1240,7 +1250,7 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) &data->linearSampler ); if (FAILED(result)) { @@ -330,7 +330,7 @@ index d7376d8..59272ae 100644 goto done; } -@@ -1209,14 +1217,14 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) +@@ -1258,14 +1268,14 @@ D3D11_CreateDeviceResources(SDL_Renderer * renderer) rasterDesc.SlopeScaledDepthBias = 0.0f; result = ID3D11Device_CreateRasterizerState(data->d3dDevice, &rasterDesc, &data->mainRasterizer); if (FAILED(result)) { @@ -347,7 +347,7 @@ index d7376d8..59272ae 100644 goto done; } -@@ -1376,7 +1384,7 @@ D3D11_CreateSwapChain(SDL_Renderer * renderer, int w, int h) +@@ -1444,7 +1454,7 @@ D3D11_CreateSwapChain(SDL_Renderer * renderer, int w, int h) &data->swapChain ); if (FAILED(result)) { @@ -356,7 +356,7 @@ index d7376d8..59272ae 100644 goto done; } } else if (usingXAML) { -@@ -1386,18 +1394,18 @@ D3D11_CreateSwapChain(SDL_Renderer * renderer, int w, int h) +@@ -1454,18 +1464,18 @@ D3D11_CreateSwapChain(SDL_Renderer * renderer, int w, int h) NULL, &data->swapChain); if (FAILED(result)) { @@ -378,30 +378,32 @@ index d7376d8..59272ae 100644 result = E_FAIL; goto done; #endif -@@ -1416,11 +1424,11 @@ D3D11_CreateSwapChain(SDL_Renderer * renderer, int w, int h) +@@ -1484,13 +1494,13 @@ D3D11_CreateSwapChain(SDL_Renderer * renderer, int w, int h) &data->swapChain ); if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGIFactory2::CreateSwapChainForHwnd", result); -+ wrapper_SetErrorFromHRESULT(__FUNCTION__, "IDXGIFactory2::CreateSwapChainForHwnd", result); ++ wrapper_SetErrorFromHRESULT(__FUNCTION__ ,"IDXGIFactory2::CreateSwapChainForHwnd", result); goto done; } + + IDXGIFactory_MakeWindowAssociation(data->dxgiFactory, windowinfo.info.win.window, DXGI_MWA_NO_WINDOW_CHANGES); #else - SDL_SetError(__FUNCTION__", Unable to find something to attach a swap chain to"); + SDL_SetError("D3D11_CreateSwapChain, Unable to find something to attach a swap chain to"); goto done; #endif /* ifdef __WIN32__ / else */ } -@@ -1466,7 +1474,7 @@ D3D11_CreateWindowSizeDependentResources(SDL_Renderer * renderer) - 0 - ); - if (FAILED(result)) { +@@ -1545,7 +1555,7 @@ D3D11_CreateWindowSizeDependentResources(SDL_Renderer * renderer) + */ + goto done; + } else if (FAILED(result)) { - WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain::ResizeBuffers", result); + wrapper_SetErrorFromHRESULT(__FUNCTION__, "IDXGISwapChain::ResizeBuffers", result); goto done; } #endif -@@ -1487,7 +1495,7 @@ D3D11_CreateWindowSizeDependentResources(SDL_Renderer * renderer) +@@ -1576,7 +1586,7 @@ D3D11_CreateWindowSizeDependentResources(SDL_Renderer * renderer) if (data->swapEffect == DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL) { result = IDXGISwapChain1_SetRotation(data->swapChain, data->rotation); if (FAILED(result)) { @@ -410,7 +412,7 @@ index d7376d8..59272ae 100644 goto done; } } -@@ -1499,7 +1507,7 @@ D3D11_CreateWindowSizeDependentResources(SDL_Renderer * renderer) +@@ -1588,7 +1598,7 @@ D3D11_CreateWindowSizeDependentResources(SDL_Renderer * renderer) &backBuffer ); if (FAILED(result)) { @@ -419,7 +421,7 @@ index d7376d8..59272ae 100644 goto done; } -@@ -1510,7 +1518,7 @@ D3D11_CreateWindowSizeDependentResources(SDL_Renderer * renderer) +@@ -1599,7 +1609,7 @@ D3D11_CreateWindowSizeDependentResources(SDL_Renderer * renderer) &data->mainRenderTargetView ); if (FAILED(result)) { @@ -428,7 +430,7 @@ index d7376d8..59272ae 100644 goto done; } -@@ -1630,7 +1638,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) +@@ -1747,7 +1757,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) ); if (FAILED(result)) { D3D11_DestroyTexture(renderer, texture); @@ -437,7 +439,7 @@ index d7376d8..59272ae 100644 return -1; } -@@ -1648,7 +1656,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) +@@ -1765,7 +1775,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) ); if (FAILED(result)) { D3D11_DestroyTexture(renderer, texture); @@ -446,7 +448,7 @@ index d7376d8..59272ae 100644 return -1; } -@@ -1659,7 +1667,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) +@@ -1776,7 +1786,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) ); if (FAILED(result)) { D3D11_DestroyTexture(renderer, texture); @@ -455,7 +457,7 @@ index d7376d8..59272ae 100644 return -1; } } -@@ -1675,7 +1683,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) +@@ -1792,7 +1802,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) ); if (FAILED(result)) { D3D11_DestroyTexture(renderer, texture); @@ -464,7 +466,7 @@ index d7376d8..59272ae 100644 return -1; } -@@ -1687,7 +1695,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) +@@ -1804,7 +1814,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) ); if (FAILED(result)) { D3D11_DestroyTexture(renderer, texture); @@ -473,7 +475,7 @@ index d7376d8..59272ae 100644 return -1; } result = ID3D11Device_CreateShaderResourceView(rendererData->d3dDevice, -@@ -1697,7 +1705,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) +@@ -1814,7 +1824,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) ); if (FAILED(result)) { D3D11_DestroyTexture(renderer, texture); @@ -482,7 +484,7 @@ index d7376d8..59272ae 100644 return -1; } } -@@ -1714,7 +1722,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) +@@ -1831,7 +1841,7 @@ D3D11_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture) &textureData->mainTextureRenderTargetView); if (FAILED(result)) { D3D11_DestroyTexture(renderer, texture); @@ -491,7 +493,7 @@ index d7376d8..59272ae 100644 return -1; } } -@@ -1770,7 +1778,7 @@ D3D11_UpdateTextureInternal(D3D11_RenderData *rendererData, ID3D11Texture2D *tex +@@ -1887,7 +1897,7 @@ D3D11_UpdateTextureInternal(D3D11_RenderData *rendererData, ID3D11Texture2D *tex NULL, &stagingTexture); if (FAILED(result)) { @@ -500,7 +502,7 @@ index d7376d8..59272ae 100644 return -1; } -@@ -1783,7 +1791,7 @@ D3D11_UpdateTextureInternal(D3D11_RenderData *rendererData, ID3D11Texture2D *tex +@@ -1900,7 +1910,7 @@ D3D11_UpdateTextureInternal(D3D11_RenderData *rendererData, ID3D11Texture2D *tex &textureMemory ); if (FAILED(result)) { @@ -509,7 +511,7 @@ index d7376d8..59272ae 100644 SAFE_RELEASE(stagingTexture); return -1; } -@@ -1945,7 +1953,7 @@ D3D11_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture, +@@ -2062,7 +2072,7 @@ D3D11_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture, NULL, &textureData->stagingTexture); if (FAILED(result)) { @@ -518,7 +520,7 @@ index d7376d8..59272ae 100644 return -1; } -@@ -1958,7 +1966,7 @@ D3D11_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture, +@@ -2075,7 +2085,7 @@ D3D11_LockTexture(SDL_Renderer * renderer, SDL_Texture * texture, &textureMemory ); if (FAILED(result)) { @@ -527,7 +529,7 @@ index d7376d8..59272ae 100644 SAFE_RELEASE(textureData->stagingTexture); return -1; } -@@ -2240,7 +2248,7 @@ D3D11_UpdateVertexBuffer(SDL_Renderer *renderer, +@@ -2359,7 +2369,7 @@ D3D11_UpdateVertexBuffer(SDL_Renderer *renderer, &mappedResource ); if (FAILED(result)) { @@ -536,7 +538,7 @@ index d7376d8..59272ae 100644 return -1; } SDL_memcpy(mappedResource.pData, vertexData, dataSizeInBytes); -@@ -2264,7 +2272,7 @@ D3D11_UpdateVertexBuffer(SDL_Renderer *renderer, +@@ -2383,7 +2393,7 @@ D3D11_UpdateVertexBuffer(SDL_Renderer *renderer, &rendererData->vertexBuffer ); if (FAILED(result)) { @@ -545,7 +547,7 @@ index d7376d8..59272ae 100644 return -1; } -@@ -2734,7 +2742,7 @@ D3D11_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, +@@ -2853,7 +2863,7 @@ D3D11_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, &backBuffer ); if (FAILED(result)) { @@ -554,7 +556,7 @@ index d7376d8..59272ae 100644 goto done; } -@@ -2751,7 +2759,7 @@ D3D11_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, +@@ -2870,7 +2880,7 @@ D3D11_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, NULL, &stagingTexture); if (FAILED(result)) { @@ -563,7 +565,7 @@ index d7376d8..59272ae 100644 goto done; } -@@ -2783,7 +2791,7 @@ D3D11_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, +@@ -2902,7 +2912,7 @@ D3D11_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, 0, &textureMemory); if (FAILED(result)) { @@ -572,16 +574,16 @@ index d7376d8..59272ae 100644 goto done; } -@@ -2802,7 +2810,7 @@ D3D11_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, +@@ -2921,7 +2931,7 @@ D3D11_RenderReadPixels(SDL_Renderer * renderer, const SDL_Rect * rect, * Get the error message, and attach some extra data to it. */ char errorMessage[1024]; - SDL_snprintf(errorMessage, sizeof(errorMessage), __FUNCTION__ ", Convert Pixels failed: %s", SDL_GetError()); + SDL_snprintf(errorMessage, sizeof(errorMessage), "D3D11_RenderReadPixels, Convert Pixels failed: %s", SDL_GetError()); - SDL_SetError(errorMessage); + SDL_SetError("%s", errorMessage); goto done; } -@@ -2871,7 +2879,7 @@ D3D11_RenderPresent(SDL_Renderer * renderer) +@@ -2991,7 +3001,7 @@ D3D11_RenderPresent(SDL_Renderer * renderer) /* We probably went through a fullscreen <-> windowed transition */ D3D11_CreateWindowSizeDependentResources(renderer); } else { diff --git a/src/sdl2.mk b/src/sdl2.mk index 8fbb59b7..c2cb32b5 100644 --- a/src/sdl2.mk +++ b/src/sdl2.mk @@ -3,8 +3,8 @@ PKG := sdl2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.0.3 -$(PKG)_CHECKSUM := a5a69a6abf80bcce713fa873607735fe712f44276a7f048d60a61bb2f6b3c90c +$(PKG)_VERSION := 2.0.4 +$(PKG)_CHECKSUM := da55e540bf6331824153805d58b590a29c39d2d506c6d02fa409aedeab21174b $(PKG)_SUBDIR := SDL2-$($(PKG)_VERSION) $(PKG)_FILE := SDL2-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.libsdl.org/release/$($(PKG)_FILE) From c68061ca00c79ab5e1394d8bb3e5a3e8f00d7d98 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Fri, 4 Mar 2016 09:26:05 +0000 Subject: [PATCH 0488/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 954eac2a..c1d80fdc 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -3339,7 +3339,7 @@ feel free to submit a pull request. sdl2 - 2.0.3 + 2.0.4 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index d662bc28..51e704e7 100644 --- a/versions.json +++ b/versions.json @@ -329,7 +329,7 @@ "rubberband": "1.8.1", "rucksack": "3.1.0", "sdl": "1.2.15", - "sdl2": "2.0.3", + "sdl2": "2.0.4", "sdl2_gfx": "1.0.1", "sdl2_image": "2.0.0", "sdl2_mixer": "2.0.0", From c6136ab2698cc46ea61ed03597ce657ac3a16eb1 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Fri, 4 Mar 2016 19:22:01 +0100 Subject: [PATCH 0489/1463] gnutls: update --- src/gnutls.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gnutls.mk b/src/gnutls.mk index 679b59db..1ebe3418 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -2,8 +2,8 @@ # See index.html for further information. PKG := gnutls -$(PKG)_VERSION := 3.4.9 -$(PKG)_CHECKSUM := 48594fadba33d450f796ec69526cf2bce6ff9bc3dc90fbd7bf38dc3601f57c3f +$(PKG)_VERSION := 3.4.10 +$(PKG)_CHECKSUM := 6a32c2b4acbd33ff7eefcbd1357009da04c94c60146ef61320b6c076b1bdf59f $(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION) $(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://mirrors.dotsrc.org/gnupg/gnutls/v3.4/$($(PKG)_FILE) From cb59b3bc97f6b7042710bfe11d40de5021f94f6c Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Fri, 4 Mar 2016 19:22:18 +0100 Subject: [PATCH 0490/1463] sqlite: update --- src/sqlite.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sqlite.mk b/src/sqlite.mk index 0a17e697..1849657a 100644 --- a/src/sqlite.mk +++ b/src/sqlite.mk @@ -3,8 +3,8 @@ PKG := sqlite $(PKG)_IGNORE := -$(PKG)_VERSION := 3110000 -$(PKG)_CHECKSUM := 508d4dcbcf7a7181e95c717a1dc4ae3c0880b3d593be0c4b40abb6c3a0e201fb +$(PKG)_VERSION := 3110100 +$(PKG)_CHECKSUM := 533ff1d0271c2e666f01591271cef01a31648563affa0c95e80ef735077d4377 $(PKG)_SUBDIR := $(PKG)-autoconf-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-autoconf-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.sqlite.org/2016/$($(PKG)_FILE) From 5beb4d099c68f1d37af40ee63a6ef633056f0a73 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Fri, 4 Mar 2016 18:23:29 +0000 Subject: [PATCH 0491/1463] Update versions.json & build-matrix.html --- build-matrix.html | 4 ++-- versions.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index c1d80fdc..635eb7fe 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -839,7 +839,7 @@ feel free to submit a pull request. gnutls - 3.4.9 + 3.4.10 ✓ ✓ ✓ @@ -3549,7 +3549,7 @@ feel free to submit a pull request. sqlite - 3110000 + 3110100 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 51e704e7..24d6da10 100644 --- a/versions.json +++ b/versions.json @@ -79,7 +79,7 @@ "glib": "2.44.1", "glibmm": "2.42.0", "gmp": "6.1.0", - "gnutls": "3.4.9", + "gnutls": "3.4.10", "graphicsmagick": "1.3.21", "gsl": "1.16", "gsoap": "2.8.22", @@ -350,7 +350,7 @@ "sparsehash": "2.0.3", "speex": "1.2rc2", "speexdsp": "1.2rc3", - "sqlite": "3110000", + "sqlite": "3110100", "subversion": "1.9.2", "suitesparse": "4.2.1", "t4k_common": "0.1.1", From b0adf46568d2da62ec94c7712d95d0bca1913df9 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 5 Mar 2016 08:12:23 +0100 Subject: [PATCH 0492/1463] vmime: update --- src/vmime.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vmime.mk b/src/vmime.mk index 20d1623b..6e37fdda 100644 --- a/src/vmime.mk +++ b/src/vmime.mk @@ -3,8 +3,8 @@ PKG := vmime $(PKG)_IGNORE := -$(PKG)_VERSION := baec395 -$(PKG)_CHECKSUM := 85e99c383287d8f32a5b198b72bd30a0cc4f9e866e67b1bb78cae21e68120949 +$(PKG)_VERSION := d271534 +$(PKG)_CHECKSUM := aa71b46af1b169b3c50809813b9fd3129e55d99601bd78f86c47a099a484fa26 $(PKG)_SUBDIR := kisli-vmime-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/kisli/vmime/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE) From 372cf0e09f679684182fe3a019827265af056b6e Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sat, 5 Mar 2016 07:15:05 +0000 Subject: [PATCH 0493/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 635eb7fe..f596cfe1 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -3759,7 +3759,7 @@ feel free to submit a pull request. vmime - baec395 + d271534 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 24d6da10..db8dc419 100644 --- a/versions.json +++ b/versions.json @@ -371,7 +371,7 @@ "vcdimager": "0.7.24", "vidstab": "0.98b", "vigra": "1.9.0", - "vmime": "baec395", + "vmime": "d271534", "vo-aacenc": "0.1.3", "vo-amrwbenc": "0.1.3", "vorbis": "1.3.5", From 3b26de48c85eff9a73f7fb55f5172f77a98e4607 Mon Sep 17 00:00:00 2001 From: Thomas Danckaert Date: Thu, 3 Mar 2016 11:55:23 +0100 Subject: [PATCH 0494/1463] Add package 'coda'. https://stcorp.nl/coda "The Common Data Access toolbox (CODA) provides a set of interfaces for reading remote sensing data from earth observation data files. These interfaces consist of command line applications, libraries, interfaces to scientific applications (such as IDL and MATLAB), and interfaces to programming languages (such as C, Fortran, Python, and Java)." --- index.html | 4 ++++ src/coda-1-use-stdint.patch | 22 +++++++++++++++++++++ src/coda-test.c | 22 +++++++++++++++++++++ src/coda.mk | 38 +++++++++++++++++++++++++++++++++++++ 4 files changed, 86 insertions(+) create mode 100644 src/coda-1-use-stdint.patch create mode 100644 src/coda-test.c create mode 100644 src/coda.mk diff --git a/index.html b/index.html index 4febb828..f52a5742 100644 --- a/index.html +++ b/index.html @@ -1221,6 +1221,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) cminpack cminpack + + coda + CODA + coin Coin3D diff --git a/src/coda-1-use-stdint.patch b/src/coda-1-use-stdint.patch new file mode 100644 index 00000000..77e306a6 --- /dev/null +++ b/src/coda-1-use-stdint.patch @@ -0,0 +1,22 @@ +This file is part of MXE. +See index.html for further information. + +This patch has been taken from https://github.com/stcorp/coda/pull/9 + +diff --git a/libcoda/coda.h.in b/libcoda/coda.h.in +index 1587c61..b7dce21 100644 +--- a/libcoda/coda.h.in ++++ b/libcoda/coda.h.in +@@ -33,9 +33,9 @@ extern "C" + #ifdef WIN32 + #include + +-#if (_MSC_VER < 1600) +-/* For Visual Studio we can use stdint.h as of Visual Studio 2010 +- * For earlier versions we need to provide our own defines ++#if (_MSC_VER < 1600) && !defined(__MINGW32__) ++/* For Visual Studio > 2010 and MinGW we can use stdint.h ++ * For earlier versions of Visual Studio we need to provide our own defines + */ + #ifndef int8_t + #define int8_t signed char diff --git a/src/coda-test.c b/src/coda-test.c new file mode 100644 index 00000000..f5da7826 --- /dev/null +++ b/src/coda-test.c @@ -0,0 +1,22 @@ +/* + * This file is part of MXE. + * See index.html for further information. + */ + +#include +#include + +int main() { + + printf("Testing CODA version %s\n", libcoda_version); + + int rc = coda_init(); + + if (rc) { + printf("coda_init returned error '%d' -- '%s'", coda_errno, coda_errno_to_string(coda_errno) ); + } + + coda_done(); + + return 0; +} diff --git a/src/coda.mk b/src/coda.mk new file mode 100644 index 00000000..ecba7026 --- /dev/null +++ b/src/coda.mk @@ -0,0 +1,38 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := coda +$(PKG)_IGNORE := +$(PKG)_VERSION := 2.15.1 +$(PKG)_CHECKSUM := 51076ff958ec15633d741ea021761fc6d8c6492f931175c489288481e37ac810 +$(PKG)_SUBDIR := coda-$($(PKG)_VERSION) +$(PKG)_FILE := coda-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://github.com/stcorp/coda/releases/download/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := gcc + +define $(PKG)_UPDATE + echo 'TODO: write update script for $(PKG).' >&2; + echo $($(PKG)_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && ./configure \ + $(MXE_CONFIGURE_OPTS) \ + --disable-idl \ + --disable-matlab \ + --disable-python \ + --without-hdf5 \ + --without-hdf4 + + # Fortran includes are generated by the tool 'generate-finc', + # which needs to run natively: + cd '$(1)' && $(CC) -I . -o generate-finc fortran/generate-finc.c + + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install-libLTLIBRARIES install-nodist_includeHEADERS install-fortranDATA + + '$(TARGET)-gcc' \ + -std=c99 -W -Wall -Werror -pedantic \ + '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-coda.exe' \ + -lcoda +endef From b2878ca3604c82f664ba817b43507a1375b0e9c1 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Mon, 7 Mar 2016 18:48:48 +0000 Subject: [PATCH 0495/1463] Update versions.json & build-matrix.html --- build-matrix.html | 20 +++++++++++++++----- versions.json | 1 + 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index f596cfe1..8c5abb5b 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -357,6 +357,16 @@ feel free to submit a pull request. ✗ + + coda + 2.15.1 + ✓ + ✓ + ✓ + ✓ + ✗ + + coin 3.1.3 @@ -4009,14 +4019,14 @@ feel free to submit a pull request. -Total: 388 +Total: 389
    (+5 virtual +4 native-only) -385 -285 -368 -283 +386 +286 +369 +284 15 diff --git a/versions.json b/versions.json index db8dc419..c80a5b6d 100644 --- a/versions.json +++ b/versions.json @@ -31,6 +31,7 @@ "cloog": "0.18.1", "cmake": "3.0.2", "cminpack": "1.3.4", + "coda": "2.15.1", "coin": "3.1.3", "cpp-netlib": "0.11.2", "cppunit": "1.13.2", From 5bc77803ee200250d726eca5f313fdc388279d00 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 8 Mar 2016 08:47:37 +0100 Subject: [PATCH 0496/1463] dbus: update --- src/dbus.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dbus.mk b/src/dbus.mk index 50126a23..314f82bd 100644 --- a/src/dbus.mk +++ b/src/dbus.mk @@ -3,8 +3,8 @@ PKG := dbus $(PKG)_IGNORE := -$(PKG)_VERSION := 1.11.0 -$(PKG)_CHECKSUM := 6da762d768f061da720a2acfe0b481f31ef72f88aa10243922789c6ab19d5556 +$(PKG)_VERSION := 1.11.2 +$(PKG)_CHECKSUM := 5abc4c57686fa82669ad0039830788f9b03fdc4fff487f0ccf6c9d56ba2645c9 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://$(PKG).freedesktop.org/releases/$(PKG)/$($(PKG)_FILE) From 2c25a09c303267586355d3e47ea39549e5d8a6d9 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Tue, 8 Mar 2016 07:49:06 +0000 Subject: [PATCH 0497/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 8c5abb5b..ace5800b 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -449,7 +449,7 @@ feel free to submit a pull request. dbus - 1.11.0 + 1.11.2 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index c80a5b6d..d6065648 100644 --- a/versions.json +++ b/versions.json @@ -40,7 +40,7 @@ "cunit": "2.1-3", "curl": "7.47.1", "db": "6.1.26", - "dbus": "1.11.0", + "dbus": "1.11.2", "dcmtk": "3.6.0", "devil": "1.7.8", "dlfcn-win32": "1.0.0", From e1432d0d6f2d43d7b3b5e8ff71320e13aaa3e849 Mon Sep 17 00:00:00 2001 From: Pavel Vatagin Date: Mon, 7 Mar 2016 20:15:37 +0300 Subject: [PATCH 0498/1463] cryptopp: install pkg-config file --- src/cryptopp.mk | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/cryptopp.mk b/src/cryptopp.mk index d05597b0..4b199d15 100644 --- a/src/cryptopp.mk +++ b/src/cryptopp.mk @@ -33,5 +33,22 @@ define $(PKG)_BUILD $(INSTALL) '$(1)'$(if $(BUILD_STATIC),libcryptopp.a,libcryptopp.dll.a) '$(PREFIX)'/$(TARGET)/lib $(if $(BUILD_STATIC),,$(INSTALL) '$(1)'cryptopp.dll '$(PREFIX)'/$(TARGET)/bin) - $(TARGET)-g++ -w $(2).cpp -o '$(PREFIX)'/$(TARGET)/bin/test-cryptopp.exe -lcryptopp + # create pkg-config file + $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig' + (echo 'prefix=$(PREFIX)/$(TARGET)'; \ + echo 'exec_prefix=$${prefix}'; \ + echo 'libdir=$${exec_prefix}/lib'; \ + echo 'includedir=$${prefix}/include'; \ + echo ''; \ + echo 'Name: $(PKG)'; \ + echo 'Version: $($(PKG)_VERSION)'; \ + echo 'Description: Crypto++ Library'; \ + echo 'Libs: -L$${libdir} -lcryptopp'; \ + echo 'Cflags: -I$${includedir}';) \ + > '$(PREFIX)/$(TARGET)/lib/pkgconfig/$(PKG).pc' + + $(TARGET)-g++ \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \ + `$(TARGET)-pkg-config cryptopp --cflags --libs` endef From d6b49a2a78feaf58bd181790ce3294442252966e Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 8 Mar 2016 13:31:43 +0300 Subject: [PATCH 0499/1463] remove xine-lib --- index.html | 4 - src/openscenegraph.mk | 2 +- src/xine-lib-1-configure_ac.patch | 24 -- src/xine-lib-2-build_fixes.patch | 306 -------------------------- src/xine-lib-3-more_build_fixes.patch | 109 --------- src/xine-lib-4-mkdir.patch | 14 -- src/xine-lib.mk | 62 ------ 7 files changed, 1 insertion(+), 520 deletions(-) delete mode 100644 src/xine-lib-1-configure_ac.patch delete mode 100644 src/xine-lib-2-build_fixes.patch delete mode 100644 src/xine-lib-3-more_build_fixes.patch delete mode 100644 src/xine-lib-4-mkdir.patch delete mode 100644 src/xine-lib.mk diff --git a/index.html b/index.html index f52a5742..51b00221 100644 --- a/index.html +++ b/index.html @@ -2641,10 +2641,6 @@ local-pkg-list: $(LOCAL_PKG_LIST) xerces Xerces-C++ - - xine-lib - xine-lib - xmlrpc-c xmlrpc-c diff --git a/src/openscenegraph.mk b/src/openscenegraph.mk index 911554cc..de3fda27 100644 --- a/src/openscenegraph.mk +++ b/src/openscenegraph.mk @@ -10,7 +10,7 @@ $(PKG)_FILE := OpenSceneGraph-$($(PKG)_VERSION).zip $(PKG)_URL := http://trac.openscenegraph.org/downloads/developer_releases/$($(PKG)_FILE) $(PKG)_DEPS := gcc boost curl dcmtk freetype gdal giflib gstreamer \ gta jasper jpeg libpng openal openexr openthreads poppler \ - qt tiff xine-lib zlib + qt tiff zlib define $(PKG)_UPDATE $(WGET) -q -O- 'http://trac.openscenegraph.org/downloads/developer_releases/?C=M;O=D' | \ diff --git a/src/xine-lib-1-configure_ac.patch b/src/xine-lib-1-configure_ac.patch deleted file mode 100644 index c33a7b3c..00000000 --- a/src/xine-lib-1-configure_ac.patch +++ /dev/null @@ -1,24 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -diff -urN xine-lib-1.2.4/configure.ac xine-lib-1.2.4-patch/configure.ac ---- xine-lib-1.2.4/configure.ac 2013-09-20 16:04:44.000000000 +0300 -+++ xine-lib-1.2.4-patch/configure.ac 2013-12-17 11:45:43.657189416 +0200 -@@ -343,7 +343,7 @@ - AC_CHECK_HEADERS([alloca.h]) - AC_CHECK_HEADERS([assert.h byteswap.h dirent.h errno.h execinfo.h fcntl.h glob.h]) - AC_CHECK_HEADERS([libgen.h malloc.h netdb.h stdbool.h ucontext.h]) --AC_CHECK_HEADERS([sys/ioctl.h sys/mixer.h sys/mman.h sys/param.h sys/times.h sys/wait.h]) -+AC_CHECK_HEADERS([sys/mixer.h sys/mman-win32.h sys/param.h sys/times.h sys/wait.h]) - - dnl This is duplicative due to AC_HEADER_STDC, but src/input/vcd stuff needs to - dnl have HAVE_STDIO_H defined, or it won't compile. -@@ -378,7 +378,7 @@ - - AC_CACHE_CHECK([type of request parameter for ioctl()], [ac_cv_ioctl_request], [ - for ac_ioctl_request_type in "unsigned long" "int"; do -- AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include - int ioctl(int fd, $ac_ioctl_request_type request, ...);]], [[]])], - [ac_cv_ioctl_request=$ac_ioctl_request_type], []) - done diff --git a/src/xine-lib-2-build_fixes.patch b/src/xine-lib-2-build_fixes.patch deleted file mode 100644 index 6a020649..00000000 --- a/src/xine-lib-2-build_fixes.patch +++ /dev/null @@ -1,306 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -diff -urN xine-lib-1.2.4/configure.ac xine-lib-1.2.4-patch/configure.ac ---- xine-lib-1.2.4/configure.ac 2013-12-17 11:45:43.657189416 +0200 -+++ xine-lib-1.2.4-patch/configure.ac 2013-12-17 14:57:28.907822042 +0200 -@@ -544,7 +544,7 @@ - - if test "$WIN32_SYS" = "mingw32"; then - WIN32_INCLUDES='-I$(top_srcdir)/win32/include' -- LIBS="-lwinmm -lwsock32 $LIBS" -+ LIBS="-lwinmm -lwsock32 -lmman $LIBS" - LDFLAGS="-Wl,--enable-stdcall-fixup $LDFLAGS" - dnl iberty has been needed only in older versions - AC_CHECK_LIB(iberty, strncomp, [GOOM_LIBS="-liberty"]) -diff -urN xine-lib-1.2.4/include/xine/xine_internal.h xine-lib-1.2.4-patch/include/xine/xine_internal.h ---- xine-lib-1.2.4/include/xine/xine_internal.h 2013-09-18 13:04:54.000000000 +0300 -+++ xine-lib-1.2.4-patch/include/xine/xine_internal.h 2013-12-17 15:14:55.229127435 +0200 -@@ -55,6 +55,26 @@ - /* used by plugin loader */ - #define XINE_VERSION_CODE XINE_MAJOR_VERSION*10000+XINE_MINOR_VERSION*100+XINE_SUB_VERSION - -+// Add there to support them on MinGW -+#define timeradd(a, b, result) \ -+ do { \ -+ (result)->tv_sec = (a)->tv_sec + (b)->tv_sec; \ -+ (result)->tv_usec = (a)->tv_usec + (b)->tv_usec; \ -+ if ((result)->tv_usec >= 1000000L) { \ -+ ++(result)->tv_sec; \ -+ (result)->tv_usec -= 1000000L; \ -+ } \ -+ } while (0) -+ -+#define timersub(a, b, result) \ -+ do { \ -+ (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \ -+ (result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \ -+ if ((result)->tv_usec < 0) { \ -+ --(result)->tv_sec; \ -+ (result)->tv_usec += 1000000L; \ -+ } \ -+ } while (0) - - /* - * log constants -diff -urN xine-lib-1.2.4/include/xine/xineutils.h xine-lib-1.2.4-patch/include/xine/xineutils.h ---- xine-lib-1.2.4/include/xine/xineutils.h 2013-09-18 13:04:54.000000000 +0300 -+++ xine-lib-1.2.4-patch/include/xine/xineutils.h 2013-12-20 12:29:33.465030673 +0200 -@@ -119,8 +119,8 @@ - - - /* Optimized/fast memcpy */ -- --extern void *(* xine_fast_memcpy)(void *to, const void *from, size_t len) XINE_PROTECTED; -+//extern void *xine_fast_memcpy(void *to, const void *from, size_t len); -+#define xine_fast_memcpy(a, b, c) memcpy(a, b, c) - - /* - * Debug stuff -diff -urN xine-lib-1.2.4/misc/Makefile.am xine-lib-1.2.4-patch/misc/Makefile.am ---- xine-lib-1.2.4/misc/Makefile.am 2012-02-05 21:17:01.000000000 +0200 -+++ xine-lib-1.2.4-patch/misc/Makefile.am 2013-12-19 09:20:56.937982071 +0200 -@@ -21,7 +21,7 @@ - pkgconfig_DATA=libxine.pc - - xine_list_@XINE_SERIES@_SOURCES = xine-list.c --xine_list_@XINE_SERIES@_LDADD = $(XINE_LIB) -+xine_list_@XINE_SERIES@_LDADD = $(XINE_LIB) $(top_builddir)/src/xine-utils/libxineutils.la - - fontdir = $(pkgdatadir)/fonts - dist_font_DATA = \ -diff -urN xine-lib-1.2.4/src/audio_dec/xine_lpcm_decoder.c xine-lib-1.2.4-patch/src/audio_dec/xine_lpcm_decoder.c ---- xine-lib-1.2.4/src/audio_dec/xine_lpcm_decoder.c 2013-09-18 13:04:54.000000000 +0300 -+++ xine-lib-1.2.4-patch/src/audio_dec/xine_lpcm_decoder.c 2013-12-17 15:18:20.459131654 +0200 -@@ -41,7 +41,11 @@ - #include - #include - #include -+#ifdef __MINGW32__ -+#include -+#else - #include /* htons */ -+#endif - #include /* ntohs */ - - #include -diff -urN xine-lib-1.2.4/src/demuxers/demux_ts.c xine-lib-1.2.4-patch/src/demuxers/demux_ts.c ---- xine-lib-1.2.4/src/demuxers/demux_ts.c 2013-09-23 23:56:56.000000000 +0300 -+++ xine-lib-1.2.4-patch/src/demuxers/demux_ts.c 2013-12-18 12:04:09.269573623 +0200 -@@ -146,7 +146,11 @@ - #include - #include - #include --#include -+#ifdef __MINGW32__ -+#include -+#else -+#include /* htons */ -+#endif - - #ifdef HAVE_FFMPEG_AVUTIL_H - # include -diff -urN xine-lib-1.2.4/src/input/libdvdnav/dvdnav_internal.h xine-lib-1.2.4-patch/src/input/libdvdnav/dvdnav_internal.h ---- xine-lib-1.2.4/src/input/libdvdnav/dvdnav_internal.h 2009-11-30 23:28:34.000000000 +0200 -+++ xine-lib-1.2.4-patch/src/input/libdvdnav/dvdnav_internal.h 2013-12-18 11:56:09.153450165 +0200 -@@ -64,11 +64,11 @@ - /* pthread_mutex_* wrapper for win32 */ - #include - #include --typedef CRITICAL_SECTION pthread_mutex_t; --#define pthread_mutex_init(a, b) InitializeCriticalSection(a) --#define pthread_mutex_lock(a) EnterCriticalSection(a) --#define pthread_mutex_unlock(a) LeaveCriticalSection(a) --#define pthread_mutex_destroy(a) -+// typedef CRITICAL_SECTION pthread_mutex_t; -+// #define pthread_mutex_init(a, b) InitializeCriticalSection(a) -+// #define pthread_mutex_lock(a) EnterCriticalSection(a) -+// #define pthread_mutex_unlock(a) LeaveCriticalSection(a) -+// #define pthread_mutex_destroy(a) - - #include /* read() */ - #define lseek64 _lseeki64 -diff -urN xine-lib-1.2.4/src/post/deinterlace/speedy.c xine-lib-1.2.4-patch/src/post/deinterlace/speedy.c ---- xine-lib-1.2.4/src/post/deinterlace/speedy.c 2012-05-26 23:49:59.000000000 +0300 -+++ xine-lib-1.2.4-patch/src/post/deinterlace/speedy.c 2013-12-20 12:24:59.608986588 +0200 -@@ -1392,28 +1392,28 @@ - } - #endif - -- --#define speedy_memcpy_c xine_fast_memcpy --#define speedy_memcpy_mmx xine_fast_memcpy --#define speedy_memcpy_mmxext xine_fast_memcpy -+//#undef xine_fast_memcpy -+//#define speedy_memcpy_c xine_fast_memcpy -+//#define speedy_memcpy_mmx xine_fast_memcpy -+//#define speedy_memcpy_mmxext xine_fast_memcpy - - - static void blit_packed422_scanline_c( uint8_t *dest, const uint8_t *src, int width ) - { -- speedy_memcpy_c( dest, src, width*2 ); -+ memcpy( dest, src, width*2 ); - } - - #if defined(ARCH_X86) || defined(ARCH_X86_64) - static void blit_packed422_scanline_mmx( uint8_t *dest, const uint8_t *src, int width ) - { -- speedy_memcpy_mmx( dest, src, width*2 ); -+ memcpy( dest, src, width*2 ); - } - #endif - - #if defined(ARCH_X86) || defined(ARCH_X86_64) - static void blit_packed422_scanline_mmxext( uint8_t *dest, const uint8_t *src, int width ) - { -- speedy_memcpy_mmxext( dest, src, width*2 ); -+ memcpy( dest, src, width*2 ); - } - #endif - -@@ -2602,7 +2602,8 @@ - kill_chroma_packed422_inplace_scanline = kill_chroma_packed422_inplace_scanline_c; - mirror_packed422_inplace_scanline = mirror_packed422_inplace_scanline_c; - halfmirror_packed422_inplace_scanline = halfmirror_packed422_inplace_scanline_c; -- speedy_memcpy = speedy_memcpy_c; -+ speedy_memcpy = memcpy; -+ //speedy_memcpy = speedy_memcpy_c; - diff_packed422_block8x8 = diff_packed422_block8x8_c; - a8_subpix_blit_scanline = a8_subpix_blit_scanline_c; - quarter_blit_vertical_packed422_scanline = quarter_blit_vertical_packed422_scanline_c; -@@ -2644,7 +2645,8 @@ - invert_colour_packed422_inplace_scanline = invert_colour_packed422_inplace_scanline_mmx; - vfilter_chroma_121_packed422_scanline = vfilter_chroma_121_packed422_scanline_mmx; - vfilter_chroma_332_packed422_scanline = vfilter_chroma_332_packed422_scanline_mmx; -- speedy_memcpy = speedy_memcpy_mmxext; -+ //speedy_memcpy = speedy_memcpy_mmxext; -+ speedy_memcpy = memcpy; - } else if( speedy_accel & MM_ACCEL_X86_MMX ) { - if( verbose ) { - printf( "speedycode: Using MMX optimized functions.\n" ); -@@ -2660,7 +2662,8 @@ - invert_colour_packed422_inplace_scanline = invert_colour_packed422_inplace_scanline_mmx; - vfilter_chroma_121_packed422_scanline = vfilter_chroma_121_packed422_scanline_mmx; - vfilter_chroma_332_packed422_scanline = vfilter_chroma_332_packed422_scanline_mmx; -- speedy_memcpy = speedy_memcpy_mmx; -+ //speedy_memcpy = speedy_memcpy_mmx; -+ speedy_memcpy = memcpy; - } else { - if( verbose ) { - printf( "speedycode: No MMX or MMXEXT support detected, using C fallbacks.\n" ); -diff -urN xine-lib-1.2.4/src/vdr/input_vdr.c xine-lib-1.2.4-patch/src/vdr/input_vdr.c ---- xine-lib-1.2.4/src/vdr/input_vdr.c 2013-09-18 13:04:54.000000000 +0300 -+++ xine-lib-1.2.4-patch/src/vdr/input_vdr.c 2013-12-20 12:23:36.313756861 +0200 -@@ -28,13 +28,13 @@ - #include - #include - #include --#include -+// #include - #include - #include - - #include - #include --#include -+// #include - #include - - #define LOG_MODULE "input_vdr" -@@ -1919,7 +1919,7 @@ - filename = strdup(filename); - - _x_mrl_unescape (filename); -- this->fh = xine_open_cloexec(filename, O_RDONLY | O_NONBLOCK); -+ this->fh = xine_open_cloexec(filename, O_RDONLY); - - lprintf("filename '%s'\n", filename); - -@@ -1934,7 +1934,7 @@ - } - - { -- struct pollfd poll_fh = { this->fh, POLLIN, 0 }; -+ /*struct pollfd poll_fh = { this->fh, POLLIN, 0 }; - - int r = poll(&poll_fh, 1, 300); - if (1 != r) -@@ -1945,10 +1945,10 @@ - _("timeout expired during setup phase")); - free (filename); - return 0; -- } -+ }*/ - } - -- fcntl(this->fh, F_SETFL, ~O_NONBLOCK & fcntl(this->fh, F_GETFL, 0)); -+ //fcntl(this->fh, F_SETFL, ~O_NONBLOCK & fcntl(this->fh, F_GETFL, 0)); - - /* eat initial handshake byte */ - { -@@ -2098,7 +2098,7 @@ - if ((this->fh = vdr_plugin_open_socket(this, host, port + 0)) == -1) - return 0; - -- fcntl(this->fh, F_SETFL, ~O_NONBLOCK & fcntl(this->fh, F_GETFL, 0)); -+ //fcntl(this->fh, F_SETFL, ~O_NONBLOCK & fcntl(this->fh, F_GETFL, 0)); - - if ((this->fh_control = vdr_plugin_open_socket(this, host, port + 1)) == -1) - return 0; -diff -urN xine-lib-1.2.4/src/video_dec/libjpeg.c xine-lib-1.2.4-patch/src/video_dec/libjpeg.c ---- xine-lib-1.2.4/src/video_dec/libjpeg.c 2012-11-23 22:08:21.000000000 +0200 -+++ xine-lib-1.2.4-patch/src/video_dec/libjpeg.c 2013-12-18 10:01:45.755428630 +0200 -@@ -26,6 +26,7 @@ - #endif - - -+ - #include - #include - #include -@@ -33,6 +34,7 @@ - #include - #include - #include -+#include - - #define LOG_MODULE "jpeg_video_decoder" - #define LOG_VERBOSE -diff -urN xine-lib-1.2.4/src/xine-utils/memcpy.c xine-lib-1.2.4-patch/src/xine-utils/memcpy.c ---- xine-lib-1.2.4/src/xine-utils/memcpy.c 2013-09-18 19:58:32.000000000 +0300 -+++ xine-lib-1.2.4-patch/src/xine-utils/memcpy.c 2013-12-20 12:30:01.733448201 +0200 -@@ -55,7 +55,7 @@ - #include - #include "../xine-engine/xine_private.h" - --void *(* xine_fast_memcpy)(void *to, const void *from, size_t len); -+ - - /* Original comments from mplayer (file: aclib.c) - This part of code was taken by me from Linux-2.4.3 and slightly modified -@@ -558,7 +558,7 @@ - && (config_flags & memcpy_method[method].cpu_require) == - memcpy_method[method].cpu_require ) { - lprintf("using %s memcpy()\n", memcpy_method[method].name ); -- xine_fast_memcpy = memcpy_method[method].function; -+ // xine_fast_memcpy = memcpy_method[method].function; - return; - } else { - xprintf(xine, XINE_VERBOSITY_DEBUG, "xine: will probe memcpy on startup\n" ); -@@ -603,13 +603,13 @@ - (config_flags & memcpy_method[best].cpu_require) == - memcpy_method[best].cpu_require ) { - lprintf("using %s memcpy()\n", memcpy_method[best].name ); -- xine_fast_memcpy = memcpy_method[best].function; -+ // xine_fast_memcpy = memcpy_method[best].function; - return; - } - - best = 0; - -- xine_fast_memcpy = memcpy; -+ // xine_fast_memcpy = memcpy; - - if( (buf1 = malloc(BUFSIZE)) == NULL ) - return; diff --git a/src/xine-lib-3-more_build_fixes.patch b/src/xine-lib-3-more_build_fixes.patch deleted file mode 100644 index c023f951..00000000 --- a/src/xine-lib-3-more_build_fixes.patch +++ /dev/null @@ -1,109 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -diff -urN xine-lib-1.2.4/src/combined/wavpack_decoder.c xine-lib-1.2.4-patch/src/combined/wavpack_decoder.c ---- xine-lib-1.2.4/src/combined/wavpack_decoder.c 2013-09-18 13:04:54.000000000 +0300 -+++ xine-lib-1.2.4-patch/src/combined/wavpack_decoder.c 2014-01-01 12:45:31.120873116 +0200 -@@ -27,6 +27,7 @@ - #define LOG_MODULE "decode_wavpack" - #define LOG_VERBOSE - -+#include - #include - #include - #include "bswap.h" -diff -urN xine-lib-1.2.4/src/input/input_cdda.c xine-lib-1.2.4-patch/src/input/input_cdda.c ---- xine-lib-1.2.4/src/input/input_cdda.c 2013-09-18 13:04:54.000000000 +0300 -+++ xine-lib-1.2.4-patch/src/input/input_cdda.c 2014-01-01 12:42:52.954879392 +0200 -@@ -56,6 +56,7 @@ - #include - #include - #include -+#include - - #include - -diff -urN xine-lib-1.2.4/src/vdr/input_vdr.c xine-lib-1.2.4-patch/src/vdr/input_vdr.c ---- xine-lib-1.2.4/src/vdr/input_vdr.c 2014-01-01 12:52:41.000000000 +0200 -+++ xine-lib-1.2.4-patch/src/vdr/input_vdr.c 2014-01-01 12:49:36.935863362 +0200 -@@ -1760,7 +1760,7 @@ - if (this->event_queue) - xine_event_dispose_queue(this->event_queue); - -- if (this->rpc_thread) -+ /* if (this->rpc_thread) - { - struct timespec abstime; - int ms_to_time_out = 10000; -@@ -1799,12 +1799,12 @@ - xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("%s: joining rpc thread ...\n"), LOG_MODULE); - pthread_join(this->rpc_thread, 0); - xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("%s: rpc thread joined.\n"), LOG_MODULE); -- } -+ }*/ - - pthread_cond_destroy(&this->rpc_thread_shutdown_cond); - pthread_mutex_destroy(&this->rpc_thread_shutdown_lock); - -- if (this->metronom_thread) -+ /*if (this->metronom_thread) - { - xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("%s: joining metronom thread ...\n"), LOG_MODULE); - -@@ -1814,12 +1814,6 @@ - this->metronom_thread_request = -1; - this->metronom_thread_reply = 0; - pthread_cond_broadcast(&this->metronom_thread_request_cond); --/* -- pthread_mutex_unlock(&this->metronom_thread_lock); -- -- pthread_mutex_lock(&this->metronom_thread_lock); -- if (!this->metronom_thread_reply) --*/ - pthread_cond_wait(&this->metronom_thread_reply_cond, &this->metronom_thread_lock); - pthread_mutex_unlock(&this->metronom_thread_lock); - -@@ -1827,7 +1821,7 @@ - - pthread_join(this->metronom_thread, 0); - xprintf(this->stream->xine, XINE_VERBOSITY_LOG, _("%s: metronom thread joined.\n"), LOG_MODULE); -- } -+ }*/ - - pthread_mutex_destroy(&this->metronom_thread_lock); - pthread_cond_destroy(&this->metronom_thread_request_cond); -diff -urN xine-lib-1.2.4/src/xine-engine/scratch.c xine-lib-1.2.4-patch/src/xine-engine/scratch.c ---- xine-lib-1.2.4/src/xine-engine/scratch.c 2013-09-18 13:04:54.000000000 +0300 -+++ xine-lib-1.2.4-patch/src/xine-engine/scratch.c 2014-01-01 12:36:59.724893408 +0200 -@@ -40,20 +40,20 @@ - scratch_printf (scratch_buffer_t *this, const char *format, va_list argp) - { - time_t t; -- struct tm tm; -+ struct tm *tm; - size_t l; - - pthread_mutex_lock (&this->lock); - - time (&t); -- localtime_r (&t, &tm); -+ tm = localtime (&t); - - if ( ! this->lines[this->cur] ) - this->lines[this->cur] = malloc(SCRATCH_LINE_LEN_MAX+1); - if ( ! this->lines[this->cur] ) - return; - -- l = strftime (this->lines[this->cur], SCRATCH_LINE_LEN_MAX, "%X: ", &tm); -+ l = strftime (this->lines[this->cur], SCRATCH_LINE_LEN_MAX, "%X: ", tm); - vsnprintf (this->lines[this->cur] + l, SCRATCH_LINE_LEN_MAX - l, format, argp); - - lprintf ("printing format %s to line %d\n", format, this->cur); -diff -urN xine-lib-1.2.4/src/xine-utils/Makefile.am xine-lib-1.2.4-patch/src/xine-utils/Makefile.am ---- xine-lib-1.2.4/src/xine-utils/Makefile.am 2012-02-05 21:17:03.000000000 +0200 -+++ xine-lib-1.2.4-patch/src/xine-utils/Makefile.am 2014-01-01 12:36:33.466894450 +0200 -@@ -37,3 +37,4 @@ - noinst_PROGRAMS = xmltest - xmltest_SOURCES = xmllexer.c xmlparser.c - xmltest_CFLAGS = -DLOG -DXINE_XML_PARSER_TEST $(AM_CFLAGS) -+xmltest_LDFLAGS = $(top_builddir)/lib/libxineposix.la diff --git a/src/xine-lib-4-mkdir.patch b/src/xine-lib-4-mkdir.patch deleted file mode 100644 index 84407a86..00000000 --- a/src/xine-lib-4-mkdir.patch +++ /dev/null @@ -1,14 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -diff -urN xine-lib-1.2.4/lib/os_internal.h xine-lib-1.2.4-patch/lib/os_internal.h ---- xine-lib-1.2.4/lib/os_internal.h 2012-02-05 21:17:00.000000000 +0200 -+++ xine-lib-1.2.4-patch/lib/os_internal.h 2014-01-03 19:05:56.643793781 +0200 -@@ -260,6 +260,7 @@ - # ifdef __MINGW64__ - # define mkdir(A, B) mkdir((A)) - # else -+ _CRTIMP int __cdecl _mkdir(const char *_Path); - # define mkdir(A, B) _mkdir((A)) - # endif - diff --git a/src/xine-lib.mk b/src/xine-lib.mk deleted file mode 100644 index cff4b5b4..00000000 --- a/src/xine-lib.mk +++ /dev/null @@ -1,62 +0,0 @@ -# This file is part of MXE. -# See index.html for further information. - -PKG := xine-lib -$(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.6 -$(PKG)_CHECKSUM := bd041d738817c7c0c6392a3c0e5bda5a664a47e035135b5a449364f8c9b6a005 -$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) -$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz -$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/xine/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) -$(PKG)_DEPS := gcc a52dec faad2 ffmpeg flac fontconfig freetype graphicsmagick \ - libcdio libiconv libmad libmng libmodplug libmpcdec mman-win32 \ - pthreads sdl speex theora vcdimager vorbis wavpack zlib - -define $(PKG)_UPDATE - $(WGET) -q -O- 'http://www.xine-project.org/releases' | \ - $(SED) -e 's, Date: Tue, 8 Mar 2016 15:34:40 +0000 Subject: [PATCH 0500/1463] Update versions.json & build-matrix.html --- build-matrix.html | 16 +++------------- versions.json | 1 - 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index ace5800b..bcd5da7e 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -3927,16 +3927,6 @@ feel free to submit a pull request. ✗ - - xine-lib - 1.2.6 - ✓ - ✗ - ✓ - ✗ - ✗ - - xmlrpc-c d4364f4 @@ -4019,13 +4009,13 @@ feel free to submit a pull request. -Total: 389 +Total: 388
    (+5 virtual +4 native-only) -386 +385 286 -369 +368 284 15 diff --git a/versions.json b/versions.json index d6065648..b3e0043e 100644 --- a/versions.json +++ b/versions.json @@ -388,7 +388,6 @@ "x264": "20151011-2245", "xapian-core": "1.2.21", "xerces": "3.1.2", - "xine-lib": "1.2.6", "xmlrpc-c": "d4364f4", "xmlwrapp": "0.7.0", "xorg-macros": "1.19.0", From 307ffac820344441a2a1054cf992c891c290a48d Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 14 Mar 2016 09:45:13 +0100 Subject: [PATCH 0501/1463] expat: update --- src/expat.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/expat.mk b/src/expat.mk index 0e7acb6e..65822fc5 100644 --- a/src/expat.mk +++ b/src/expat.mk @@ -3,10 +3,10 @@ PKG := expat $(PKG)_IGNORE := -$(PKG)_VERSION := 2.1.0 -$(PKG)_CHECKSUM := 823705472f816df21c8f6aa026dd162b280806838bb55b3432b0fb1fcca7eb86 +$(PKG)_VERSION := 2.1.1 +$(PKG)_CHECKSUM := aff584e5a2f759dcfc6d48671e9529f6afe1e30b0cd6a4cec200cbe3f793de67 $(PKG)_SUBDIR := expat-$($(PKG)_VERSION) -$(PKG)_FILE := expat-$($(PKG)_VERSION).tar.gz +$(PKG)_FILE := expat-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/expat/expat/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc From b5112e51a312e8b45ff91a42faf85eb6fd421d61 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Mon, 14 Mar 2016 08:48:32 +0000 Subject: [PATCH 0502/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index bcd5da7e..ca0b245e 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -509,7 +509,7 @@ feel free to submit a pull request. expat - 2.1.0 + 2.1.1 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index b3e0043e..9e6e0935 100644 --- a/versions.json +++ b/versions.json @@ -46,7 +46,7 @@ "dlfcn-win32": "1.0.0", "eigen": "3.2.5", "exiv2": "0.25", - "expat": "2.1.0", + "expat": "2.1.1", "faad2": "2.7", "fdk-aac": "0.1.4", "ffmpeg": "3.0", From ea2d4d2080e356cd0f3c234df0401a39205effa9 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 16 Mar 2016 15:39:54 +0100 Subject: [PATCH 0503/1463] qtxlsxwriter: Qt 5.6 compatibility --- src/qtxlsxwriter-1.patch | 47 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 src/qtxlsxwriter-1.patch diff --git a/src/qtxlsxwriter-1.patch b/src/qtxlsxwriter-1.patch new file mode 100644 index 00000000..5a470180 --- /dev/null +++ b/src/qtxlsxwriter-1.patch @@ -0,0 +1,47 @@ +From a50811ed7fcf98e53aab7f10b1e1348716a34ecc Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Sat, 13 Jun 2015 22:05:54 +0200 +Subject: [PATCH 1/2] avoid shadowing member + +The parameter row shadows the member method row(), which generates +warning or error. + +diff --git a/src/xlsx/xlsxcellreference.h b/src/xlsx/xlsxcellreference.h +index 6a917c2..db20806 100644 +--- a/src/xlsx/xlsxcellreference.h ++++ b/src/xlsx/xlsxcellreference.h +@@ -41,7 +41,7 @@ public: + QString toString(bool row_abs=false, bool col_abs=false) const; + static CellReference fromString(const QString &cell); + bool isValid() const; +- inline void setRow(int row) { _row = row; } ++ inline void setRow(int arow) { _row = arow; } + inline void setColumn(int col) { _column = col; } + inline int row() const { return _row; } + inline int column() const { return _column; } +-- +2.5.0 + + +From 789f259bd86ef817be1e8b9343621a1865479654 Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Wed, 16 Mar 2016 15:38:08 +0100 +Subject: [PATCH 2/2] fix QList to QVector conversion failure + + +diff --git a/src/xlsx/xlsxzipreader.cpp b/src/xlsx/xlsxzipreader.cpp +index 7b63a98..38772c3 100644 +--- a/src/xlsx/xlsxzipreader.cpp ++++ b/src/xlsx/xlsxzipreader.cpp +@@ -48,7 +48,7 @@ ZipReader::~ZipReader() + + void ZipReader::init() + { +- QList allFiles = m_reader->fileInfoList(); ++ const QVector allFiles = m_reader->fileInfoList(); + foreach (const QZipReader::FileInfo &fi, allFiles) { + if (fi.isFile) + m_filePaths.append(fi.filePath); +-- +2.5.0 + From f6b440461885129a4fd6162db02f88a41ffdb11a Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 16 Mar 2016 10:39:25 +0100 Subject: [PATCH 0504/1463] upgrade to Qt 5.6.0 removed modules: qtquick1 qtwebkit new modules: qtquickcontrols2 qtwebview --- index.html | 10 ++-- src/qtactiveqt.mk | 2 +- src/qtbase-1-fixes.patch | 86 +++++++++++++++++++----------- src/qtbase.mk | 6 +-- src/{qtquick1.mk => qtcanvas3d.mk} | 12 ++--- src/qtconnectivity.mk | 2 +- src/qtdeclarative.mk | 2 +- src/qtenginio.mk | 10 ++-- src/qtgraphicaleffects.mk | 2 +- src/qtimageformats.mk | 2 +- src/qtlocation.mk | 2 +- src/qtmultimedia-1.patch | 29 ++++++++++ src/qtmultimedia.mk | 2 +- src/qtquickcontrols.mk | 2 +- src/qtquickcontrols2.mk | 23 ++++++++ src/qtscript.mk | 2 +- src/qtsensors.mk | 2 +- src/qtserialport.mk | 2 +- src/qtsvg.mk | 2 +- src/qttools.mk | 2 +- src/qttranslations.mk | 2 +- src/qtwebchannel.mk | 2 +- src/qtwebengine.mk | 4 +- src/qtwebkit.mk | 25 --------- src/qtwebsockets.mk | 2 +- src/qtwebview.mk | 23 ++++++++ src/qtwinextras.mk | 2 +- src/qtxmlpatterns.mk | 2 +- 28 files changed, 172 insertions(+), 92 deletions(-) rename src/{qtquick1.mk => qtcanvas3d.mk} (57%) create mode 100644 src/qtmultimedia-1.patch create mode 100644 src/qtquickcontrols2.mk delete mode 100644 src/qtwebkit.mk create mode 100644 src/qtwebview.mk diff --git a/index.html b/index.html index 51b00221..06e27302 100644 --- a/index.html +++ b/index.html @@ -2281,6 +2281,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) qtbase Qt + + qtcanvas3d + Qt + qtconnectivity Qt @@ -2310,11 +2314,11 @@ local-pkg-list: $(LOCAL_PKG_LIST) Qt - qtquick1 + qtquickcontrols Qt - qtquickcontrols + qtquickcontrols2 Qt @@ -2362,7 +2366,7 @@ local-pkg-list: $(LOCAL_PKG_LIST) Qt - qtwebkit + qtwebview Qt diff --git a/src/qtactiveqt.mk b/src/qtactiveqt.mk index a7039fee..2e6fd6bf 100644 --- a/src/qtactiveqt.mk +++ b/src/qtactiveqt.mk @@ -4,7 +4,7 @@ PKG := qtactiveqt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 753c734183f33066030667101361f347ecca1445bc1bfe846e49f577a42cbf25 +$(PKG)_CHECKSUM := 6adc7be3859d2c0e54ed7edf6caa35e3863dfa3d476ea40cd9acf7c965ca3277 $(PKG)_SUBDIR = $(subst qtbase,qtactiveqt,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtactiveqt,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtactiveqt,$(qtbase_URL)) diff --git a/src/qtbase-1-fixes.patch b/src/qtbase-1-fixes.patch index e720936e..e7541357 100644 --- a/src/qtbase-1-fixes.patch +++ b/src/qtbase-1-fixes.patch @@ -3,16 +3,16 @@ See index.html for further information. Contains ad hoc patches for cross building. -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 54b168c305f54e60de0e32501b166faa7f5913e0 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 6 Aug 2015 23:35:08 +0200 -Subject: [PATCH] fix qwindows plugin linking with system-freetype (MXE +Subject: [PATCH 1/8] fix qwindows plugin linking with system-freetype (MXE specific) Change-Id: I8783e3ab2d19011b083dd3c471107298a17293c4 diff --git a/src/3rdparty/freetype_dependency.pri b/src/3rdparty/freetype_dependency.pri -index 1111111..2222222 100644 +index 39280de..e152b0d 100644 --- a/src/3rdparty/freetype_dependency.pri +++ b/src/3rdparty/freetype_dependency.pri @@ -4,4 +4,5 @@ contains(QT_CONFIG, freetype) { @@ -21,16 +21,19 @@ index 1111111..2222222 100644 include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri) + win32:shared:LIBS_PRIVATE += -lfreetype } +-- +2.5.0 -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 + +From 26b89d11b4e51d3aa2aab14dd52216ef8b1c7950 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 21 Jun 2014 13:12:49 +0200 -Subject: [PATCH] use pkg-config for harfbuzz (MXE specific) +Subject: [PATCH 2/8] use pkg-config for harfbuzz (MXE specific) Change-Id: Id4e4c37d68b63c9f480d72a561d95d4d2a5ded50 diff --git a/config.tests/unix/harfbuzz/harfbuzz.pro b/config.tests/unix/harfbuzz/harfbuzz.pro -index 1111111..2222222 100644 +index 32edd6e..a7f2c28 100644 --- a/config.tests/unix/harfbuzz/harfbuzz.pro +++ b/config.tests/unix/harfbuzz/harfbuzz.pro @@ -1,3 +1,4 @@ @@ -40,7 +43,7 @@ index 1111111..2222222 100644 +CONFIG += link_pkgconfig +PKGCONFIG += harfbuzz diff --git a/src/3rdparty/harfbuzz_dependency.pri b/src/3rdparty/harfbuzz_dependency.pri -index 1111111..2222222 100644 +index 7443368..c24e684 100644 --- a/src/3rdparty/harfbuzz_dependency.pri +++ b/src/3rdparty/harfbuzz_dependency.pri @@ -2,5 +2,6 @@ contains(QT_CONFIG, harfbuzz) { @@ -51,16 +54,19 @@ index 1111111..2222222 100644 + CONFIG += link_pkgconfig + PKGCONFIG += harfbuzz } +-- +2.5.0 + -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From fa5ca49b4ffc1911a597b294ef2d4b5ecb983cad Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 8 Dec 2014 14:15:12 +0100 -Subject: [PATCH] fix oci config test on windows +Subject: [PATCH 3/8] fix oci config test on windows Change-Id: If1ce2241682259ca495b0ba68bf18410f8548922 diff --git a/config.tests/unix/oci/oci.pro b/config.tests/unix/oci/oci.pro -index 1111111..2222222 100644 +index 3ffda1d..39b6f3759 100644 --- a/config.tests/unix/oci/oci.pro +++ b/config.tests/unix/oci/oci.pro @@ -1,3 +1,3 @@ @@ -68,19 +74,22 @@ index 1111111..2222222 100644 CONFIG -= qt dylib -LIBS += -lclntsh +!win32:LIBS += -lclntsh +-- +2.5.0 + -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 7fd641a032c7b4ce1b14d7ca02da646b0a0c34d5 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 6 Aug 2015 13:24:56 +0200 -Subject: [PATCH] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows +Subject: [PATCH 4/8] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows Change-Id: I53c110ef40e3d14cc49fa23aa5d294611cac2ffa diff --git a/configure b/configure -index 1111111..2222222 100755 +index 7651e29..4a4b478 100755 --- a/configure +++ b/configure -@@ -4464,7 +4464,7 @@ fi +@@ -4575,7 +4575,7 @@ fi [ "$XPLATFORM_ANDROID" = "yes" ] && QMakeVar add styles "android" # check IPC support @@ -89,16 +98,19 @@ index 1111111..2222222 100755 # SYSV IPC is not supported - check POSIX IPC if compileTest unix/ipc_posix "ipc_posix" ; then QCONFIG_FLAGS="$QCONFIG_FLAGS QT_POSIX_IPC" +-- +2.5.0 -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 + +From 959d3a71bced8c00967a16f23c6f9305e56fafcd Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 6 Oct 2015 09:53:20 +0200 -Subject: [PATCH] fix building mysql driver under mingw +Subject: [PATCH 5/8] fix building mysql driver under mingw Change-Id: I9c4e821d5b3a6919566c6b684cb4916827feb6a9 diff --git a/src/sql/drivers/mysql/qsql_mysql.pri b/src/sql/drivers/mysql/qsql_mysql.pri -index 1111111..2222222 100644 +index 3cfb614..8b7063f 100644 --- a/src/sql/drivers/mysql/qsql_mysql.pri +++ b/src/sql/drivers/mysql/qsql_mysql.pri @@ -4,7 +4,7 @@ SOURCES += $$PWD/qsql_mysql.cpp @@ -110,11 +122,14 @@ index 1111111..2222222 100644 isEmpty(QT_LFLAGS_MYSQL) { !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) { use_libmysqlclient_r:LIBS += -lmysqlclient_r +-- +2.5.0 + -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From a6f45e15cf19e29afc5f42d1e87feb2b4f7e9532 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 18 Oct 2015 23:11:28 +0300 -Subject: [PATCH] configure: fix log corruption with option -v +Subject: [PATCH 6/8] configure: fix log corruption with option -v This bug occurs if ./configure is called with -v on systems on which fd proc entries point to the files/devices they are open @@ -150,10 +165,10 @@ Reviewed-by: Thiago Macieira (cherry picked from commit 45fe3f1cde1e516d1ddccddb5e33ea4316497c36) diff --git a/configure b/configure -index 1111111..2222222 100755 +index 4a4b478..a5c0fd5 100755 --- a/configure +++ b/configure -@@ -3571,10 +3571,9 @@ END { +@@ -3639,10 +3639,9 @@ END { print "DEFAULT_LIBDIRS=\"/lib\n/usr/lib\"\n"; }' @@ -165,13 +180,16 @@ index 1111111..2222222 100755 +eval "$awkprog_result" +[ "$OPT_VERBOSE" = "yes" ] && echo "$awkprog_result" - #setup the build parts - if [ -z "$CFG_BUILD_PARTS" ]; then + echo "Done running configuration tests." + +-- +2.5.0 + -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 6064564099df17f7cddded8ec0c68d9e57d29ae9 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 26 Aug 2015 12:45:43 +0100 -Subject: [PATCH] cmake: Rearrange STATIC vs INTERFACE targets +Subject: [PATCH 7/8] cmake: Rearrange STATIC vs INTERFACE targets Otherwise we attempt to add_library(Qt5::UiPlugin STATIC IMPORTED) for header-only modules when building Qt5 statically. @@ -180,7 +198,7 @@ Source: https://git.io/vzWJz See also: https://github.com/mxe/mxe/issues/1185 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 1111111..2222222 100644 +index d2358ca..6b1dc95 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -222,13 +222,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) @@ -200,17 +218,22 @@ index 1111111..2222222 100644 add_library(Qt5::$${CMAKE_MODULE_NAME} SHARED IMPORTED) !!ENDIF !!ENDIF +-- +2.5.0 + -From 3ebc085c4d7488df899f35e9ac63da819dffc1b9 Mon Sep 17 00:00:00 2001 +From e74803bac8aa2fd2106f678b2b11584fdb582bc3 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Wed, 24 Feb 2016 19:39:46 +0300 -Subject: [PATCH] Fix ar error: `u' modifier ignored since `D' is the default (see `U') +Subject: [PATCH 8/8] Fix ar error: `u' modifier ignored since `D' is the + default (see `U') + diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf -index 1111111..2222222 100644 +index 61963c7..25cf750 100644 --- a/mkspecs/win32-g++/qmake.conf +++ b/mkspecs/win32-g++/qmake.conf -@@ -94,7 +94,7 @@ +@@ -104,7 +104,7 @@ QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2 QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain QMAKE_IDL = midl @@ -219,3 +242,6 @@ index 1111111..2222222 100644 QMAKE_RC = $${CROSS_COMPILE}windres QMAKE_STRIP = $${CROSS_COMPILE}strip +-- +2.5.0 + diff --git a/src/qtbase.mk b/src/qtbase.mk index f2c6bf21..f2c64f01 100644 --- a/src/qtbase.mk +++ b/src/qtbase.mk @@ -3,11 +3,11 @@ PKG := qtbase $(PKG)_IGNORE := -$(PKG)_VERSION := 5.5.1 -$(PKG)_CHECKSUM := dfa4e8a4d7e4c6b69285e7e8833eeecd819987e1bdbe5baa6b6facd4420de916 +$(PKG)_VERSION := 5.6.0 +$(PKG)_CHECKSUM := 6efa8a5c559e92b2e526d48034e858023d5fd3c39115ac1bfd3bb65834dbd67a $(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz -$(PKG)_URL := http://download.qt.io/official_releases/qt/5.5/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) +$(PKG)_URL := http://download.qt.io/official_releases/qt/5.6/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) $(PKG)_DEPS := gcc dbus fontconfig freetds freetype harfbuzz jpeg libpng libmysqlclient openssl pcre postgresql sqlite zlib define $(PKG)_UPDATE diff --git a/src/qtquick1.mk b/src/qtcanvas3d.mk similarity index 57% rename from src/qtquick1.mk rename to src/qtcanvas3d.mk index d9493062..dca97f2a 100644 --- a/src/qtquick1.mk +++ b/src/qtcanvas3d.mk @@ -1,14 +1,14 @@ # This file is part of MXE. # See index.html for further information. -PKG := qtquick1 +PKG := qtcanvas3d $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := c812a7e59a8b9f0a87693181059933e15fef04bc875b6486cd653be1b9b51f2c -$(PKG)_SUBDIR = $(subst qtbase,qtquick1,$(qtbase_SUBDIR)) -$(PKG)_FILE = $(subst qtbase,qtquick1,$(qtbase_FILE)) -$(PKG)_URL = $(subst qtbase,qtquick1,$(qtbase_URL)) -$(PKG)_DEPS := gcc qtbase qtscript qtsvg qttools qtxmlpatterns +$(PKG)_CHECKSUM := 66add59e826a0161f4a4dc3ec0b44c17fad1451390b4f7c67af23ee7429d9ecf +$(PKG)_SUBDIR = $(subst qtbase,qtcanvas3d,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtcanvas3d,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtcanvas3d,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase qtdeclarative define $(PKG)_UPDATE echo $(qtbase_VERSION) diff --git a/src/qtconnectivity.mk b/src/qtconnectivity.mk index 30104527..31a48395 100644 --- a/src/qtconnectivity.mk +++ b/src/qtconnectivity.mk @@ -4,7 +4,7 @@ PKG := qtconnectivity $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 3637e6def8582fc0fb3684179b93650720ba2da1311a560d358296153f245023 +$(PKG)_CHECKSUM := 0c5cb0c100006759b6954a36e7dc66f8f1ac2b61b3f639152cf6ecb8d48a40eb $(PKG)_SUBDIR = $(subst qtbase,qtconnectivity,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtconnectivity,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtconnectivity,$(qtbase_URL)) diff --git a/src/qtdeclarative.mk b/src/qtdeclarative.mk index 57d08e59..d1223953 100644 --- a/src/qtdeclarative.mk +++ b/src/qtdeclarative.mk @@ -4,7 +4,7 @@ PKG := qtdeclarative $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 5fd14eefb83fff36fb17681693a70868f6aaf6138603d799c16466a094b26791 +$(PKG)_CHECKSUM := 8c55f053f0e348577b56da541af74d02d0f2b61c9a6c15152b03dad03dfde04c $(PKG)_SUBDIR = $(subst qtbase,qtdeclarative,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtdeclarative,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtdeclarative,$(qtbase_URL)) diff --git a/src/qtenginio.mk b/src/qtenginio.mk index 51b89c87..83e566e6 100644 --- a/src/qtenginio.mk +++ b/src/qtenginio.mk @@ -3,11 +3,11 @@ PKG := qtenginio $(PKG)_IGNORE := -$(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := a79936bd5b6a35aba28dd282291b28c8fa869b8d86652c62efe5e268d94defe2 -$(PKG)_SUBDIR = $(subst qtbase,qtenginio,$(qtbase_SUBDIR)) -$(PKG)_FILE = $(subst qtbase,qtenginio,$(qtbase_FILE)) -$(PKG)_URL = $(subst qtbase,qtenginio,$(qtbase_URL)) +$(PKG)_VERSION = 1.6.0 +$(PKG)_CHECKSUM := 627ddcfbbfc3ec1a83c9dbb5f24287b5cd6cb5d3b9d09af4d1c444c6ac147f0c +$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz +$(PKG)_URL := $(subst $(qtbase_FILE),$($(PKG)_FILE),$(qtbase_URL)) $(PKG)_DEPS := gcc qtbase define $(PKG)_UPDATE diff --git a/src/qtgraphicaleffects.mk b/src/qtgraphicaleffects.mk index 12c867f5..5706c266 100644 --- a/src/qtgraphicaleffects.mk +++ b/src/qtgraphicaleffects.mk @@ -4,7 +4,7 @@ PKG := qtgraphicaleffects $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 9bca0f8db3a4289eceebfa9504915440fe3fa6301d90b65705e4ece528c12d47 +$(PKG)_CHECKSUM := 01e911fdcf85a13b927cba341d15a0baeead3eba85c4532b1b45bb5c334416e8 $(PKG)_SUBDIR = $(subst qtbase,qtgraphicaleffects,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtgraphicaleffects,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtgraphicaleffects,$(qtbase_URL)) diff --git a/src/qtimageformats.mk b/src/qtimageformats.mk index dab188c3..e76cd37c 100644 --- a/src/qtimageformats.mk +++ b/src/qtimageformats.mk @@ -4,7 +4,7 @@ PKG := qtimageformats $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := c97fee00c602f9f089fea480546d6e9d61a2b2297c2f163bfd9f8aba92b754a5 +$(PKG)_CHECKSUM := 2c854275a689a513ba24f4266cc6017d76875336671c2c8801b4b7289081bada $(PKG)_SUBDIR = $(subst qtbase,qtimageformats,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtimageformats,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtimageformats,$(qtbase_URL)) diff --git a/src/qtlocation.mk b/src/qtlocation.mk index 57c3d9e5..f3542036 100644 --- a/src/qtlocation.mk +++ b/src/qtlocation.mk @@ -4,7 +4,7 @@ PKG := qtlocation $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 1fe948cb87649f4450be921cf3cdefc311595a80ef6a7a7b7484901baa0d6316 +$(PKG)_CHECKSUM := 360e1519d0fcafe4f86923d224e76d56dd785dfb0e1a19fd2e2b0016799653c9 $(PKG)_SUBDIR = $(subst qtbase,qtlocation,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtlocation,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtlocation,$(qtbase_URL)) diff --git a/src/qtmultimedia-1.patch b/src/qtmultimedia-1.patch new file mode 100644 index 00000000..82471da0 --- /dev/null +++ b/src/qtmultimedia-1.patch @@ -0,0 +1,29 @@ +From a0ac50f7a95b3f66519fac62e892b98376576036 Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Wed, 16 Mar 2016 15:18:00 +0100 +Subject: [PATCH] fix include case + +Change-Id: I135deca455ca2ff6bb3969aca990fe9d1c2dd345 + +diff --git a/src/plugins/common/evr/evrdefs.h b/src/plugins/common/evr/evrdefs.h +index 3b2c253..7b1af05 100644 +--- a/src/plugins/common/evr/evrdefs.h ++++ b/src/plugins/common/evr/evrdefs.h +@@ -35,12 +35,12 @@ + #define EVRDEFS_H + + #include +-#include ++#include + #include + #include + #include + #include +-#include ++#include + + extern const CLSID clsid_EnhancedVideoRenderer; + extern const GUID mr_VIDEO_RENDER_SERVICE; +-- +2.5.0 + diff --git a/src/qtmultimedia.mk b/src/qtmultimedia.mk index 9a955393..df798fc9 100644 --- a/src/qtmultimedia.mk +++ b/src/qtmultimedia.mk @@ -4,7 +4,7 @@ PKG := qtmultimedia $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 7cc7ca99f41587c188303670499e5c75101f9a8cb6178e8f29cc941e637d957f +$(PKG)_CHECKSUM := 103f99d6cd266f5c4485546a75ef0c6ee7e88dc901a0be21447cf89159370686 $(PKG)_SUBDIR = $(subst qtbase,qtmultimedia,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtmultimedia,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtmultimedia,$(qtbase_URL)) diff --git a/src/qtquickcontrols.mk b/src/qtquickcontrols.mk index 8fd41511..46a2d6b3 100644 --- a/src/qtquickcontrols.mk +++ b/src/qtquickcontrols.mk @@ -4,7 +4,7 @@ PKG := qtquickcontrols $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 1b7a8389d656066c629bd2cb520b39a7eb041d184b567dd1b9639b88d841fcf0 +$(PKG)_CHECKSUM := ec0896792f2a08d109ab3791aa4e47747aab22ebfad281005c4bf8f26f9f788b $(PKG)_SUBDIR = $(subst qtbase,qtquickcontrols,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtquickcontrols,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtquickcontrols,$(qtbase_URL)) diff --git a/src/qtquickcontrols2.mk b/src/qtquickcontrols2.mk new file mode 100644 index 00000000..e7fc90c9 --- /dev/null +++ b/src/qtquickcontrols2.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qtquickcontrols2 +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := 59ec6ea2282931bc0d0748b3979a52e1a322e7ef8d1e5490b8a34931e8b9fee0 +$(PKG)_SUBDIR = $(subst qtbase,qtquickcontrols2,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtquickcontrols2,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtquickcontrols2,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase qtdeclarative + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + # invoke qmake with removed debug options as a workaround for + # https://bugreports.qt-project.org/browse/QTBUG-30898 + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/src/qtscript.mk b/src/qtscript.mk index efc5649f..d8ce6df8 100644 --- a/src/qtscript.mk +++ b/src/qtscript.mk @@ -4,7 +4,7 @@ PKG := qtscript $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := cd46dddd998f22bcb06447e0407fef81f7052f25bc770b1c27625654cee828fd +$(PKG)_CHECKSUM := ac7475197d9a0f3c7284f002390e2427fef84ec90dc590630431a848099c5042 $(PKG)_SUBDIR = $(subst qtbase,qtscript,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtscript,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtscript,$(qtbase_URL)) diff --git a/src/qtsensors.mk b/src/qtsensors.mk index 90ba5cc6..2ace18df 100644 --- a/src/qtsensors.mk +++ b/src/qtsensors.mk @@ -4,7 +4,7 @@ PKG := qtsensors $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 5d264fc0729a5d7679bd4eb8d7a0a9b142ed38d09fa68fc7dfe57f64afc8eeea +$(PKG)_CHECKSUM := 518f392fec5e01aaa7f95e9141678cc99b02ed067ebbd24c38c1420067c59c2e $(PKG)_SUBDIR = $(subst qtbase,qtsensors,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtsensors,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtsensors,$(qtbase_URL)) diff --git a/src/qtserialport.mk b/src/qtserialport.mk index b4d993b1..0f12d860 100644 --- a/src/qtserialport.mk +++ b/src/qtserialport.mk @@ -4,7 +4,7 @@ PKG := qtserialport $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := a034dbfb023db1b9b9de54390f7e76a48c1d1eb12533b0ffd574505c99968f7a +$(PKG)_CHECKSUM := 16ee7fb66bb997df674a12a7a5a1450e2a2b860c8d34d237f3631d9f60853c1f $(PKG)_SUBDIR = $(subst qtbase,qtserialport,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtserialport,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtserialport,$(qtbase_URL)) diff --git a/src/qtsvg.mk b/src/qtsvg.mk index ea0ae808..6aa713d9 100644 --- a/src/qtsvg.mk +++ b/src/qtsvg.mk @@ -4,7 +4,7 @@ PKG := qtsvg $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := f7f588be48befd9ccab5a6086832551b8899e8bed9e603ddea979581e05a91c7 +$(PKG)_CHECKSUM := 798799319138bb40b6187f4ecc1099956a0d62148f78512e9cb085d1fa5f641f $(PKG)_SUBDIR = $(subst qtbase,qtsvg,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtsvg,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtsvg,$(qtbase_URL)) diff --git a/src/qttools.mk b/src/qttools.mk index a6bce29b..d2ec8647 100644 --- a/src/qttools.mk +++ b/src/qttools.mk @@ -4,7 +4,7 @@ PKG := qttools $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 4361f6ce49717058160908297841a18b94645cec593d1b48fb126c9d06c87bfd +$(PKG)_CHECKSUM := 0d244c61bbe5505cb94310e980b06ef13dd573511e80ccbdc060f71d5462219d $(PKG)_SUBDIR = $(subst qtbase,qttools,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttools,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttools,$(qtbase_URL)) diff --git a/src/qttranslations.mk b/src/qttranslations.mk index e4193a3c..16673367 100644 --- a/src/qttranslations.mk +++ b/src/qttranslations.mk @@ -4,7 +4,7 @@ PKG := qttranslations $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 41f800710f0bc6ca263f1e54f1fa22be7043962999304e73ce9887ebefc7a4c6 +$(PKG)_CHECKSUM := 9809351f0922b2d91aeb5d8e5756665eea0b2cbcaab74a570f6e5bf08574cd49 $(PKG)_SUBDIR = $(subst qtbase,qttranslations,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttranslations,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttranslations,$(qtbase_URL)) diff --git a/src/qtwebchannel.mk b/src/qtwebchannel.mk index a0cd4a8a..136b25be 100644 --- a/src/qtwebchannel.mk +++ b/src/qtwebchannel.mk @@ -4,7 +4,7 @@ PKG := qtwebchannel $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 7f4295ee57cd4ecba3cb263452d2a08d501b45c9a2b8b7794b6a97d7652f15d0 +$(PKG)_CHECKSUM := c25424935e866e77f31e5ebc50fc97eaedd4d77f6e967bfc59ce7fa6a7b4c14f $(PKG)_SUBDIR = $(subst qtbase,qtwebchannel,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtwebchannel,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtwebchannel,$(qtbase_URL)) diff --git a/src/qtwebengine.mk b/src/qtwebengine.mk index 2f2bd54f..bc1c60fa 100644 --- a/src/qtwebengine.mk +++ b/src/qtwebengine.mk @@ -4,11 +4,11 @@ PKG := qtwebengine $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 7c4d328dd305991aaf0c3450615f4a8e5d80152194bee6f5925bd8d3477e2b90 +$(PKG)_CHECKSUM := 8aa2b5ad6c9f98a781aa99303eab3a40bbe74d26a543eea6b4145f5f47c76a03 $(PKG)_SUBDIR = $(subst qtbase,qtwebengine,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtwebengine,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtwebengine,$(qtbase_URL)) -$(PKG)_DEPS := gcc qtbase qtquickcontrols qtwebkit +$(PKG)_DEPS := gcc qtbase qtquickcontrols define $(PKG)_UPDATE echo $(qtbase_VERSION) diff --git a/src/qtwebkit.mk b/src/qtwebkit.mk deleted file mode 100644 index c502e197..00000000 --- a/src/qtwebkit.mk +++ /dev/null @@ -1,25 +0,0 @@ -# This file is part of MXE. -# See index.html for further information. - -PKG := qtwebkit -$(PKG)_IGNORE := -$(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 77583f9dbd3e6ad874386df71b165dc3ce88efdabbc6e5d97a959ee2187d6d69 -$(PKG)_SUBDIR = $(subst qtbase,qtwebkit,$(qtbase_SUBDIR)) -$(PKG)_FILE = $(subst qtbase,qtwebkit,$(qtbase_FILE)) -$(PKG)_URL = $(subst qtbase,qtwebkit,$(qtbase_URL)) -$(PKG)_DEPS := gcc qtbase qtmultimedia qtquick1 sqlite - -define $(PKG)_UPDATE - echo $(qtbase_VERSION) -endef - -define $(PKG)_BUILD_SHARED - # looks for build tools with .exe suffix and tries to use win_flex - $(SED) -i 's,\.exe,,' '$(1)/Tools/qmake/mkspecs/features/functions.prf' - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' FLEX=flex CONFIG-='debug debug_and_release' - $(MAKE) -C '$(1)' -j '$(JOBS)' - $(MAKE) -C '$(1)' -j 1 install -endef diff --git a/src/qtwebsockets.mk b/src/qtwebsockets.mk index 8ea0f6f2..60a898ad 100644 --- a/src/qtwebsockets.mk +++ b/src/qtwebsockets.mk @@ -4,7 +4,7 @@ PKG := qtwebsockets $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := cf4e834a867b90337188be504ef20184c52666370f721e704952988f8cb12deb +$(PKG)_CHECKSUM := 268ab869fe3d0d22abd9668851155db79aff2f386bc448051b6ef477841d719f $(PKG)_SUBDIR = $(subst qtbase,qtwebsockets,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtwebsockets,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtwebsockets,$(qtbase_URL)) diff --git a/src/qtwebview.mk b/src/qtwebview.mk new file mode 100644 index 00000000..fa239998 --- /dev/null +++ b/src/qtwebview.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qtwebview +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := a48fa53e9e012102774c3faa6c99113918442f891952cd97ef67e05544800b57 +$(PKG)_SUBDIR = $(subst qtbase,qtwebview,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtwebview,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtwebview,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + # invoke qmake with removed debug options as a workaround for + # https://bugreports.qt-project.org/browse/QTBUG-30898 + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/src/qtwinextras.mk b/src/qtwinextras.mk index ed40f507..9a307197 100644 --- a/src/qtwinextras.mk +++ b/src/qtwinextras.mk @@ -4,7 +4,7 @@ PKG := qtwinextras $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := cb00d2ac7a6039fe1119d458f16f319882cb9a250f4caea55657edcde38d851f +$(PKG)_CHECKSUM := 58951c5334a7dc7f9c3fd62747c1420cced6318dec9ec845a3d14b1e10a8bb93 $(PKG)_SUBDIR = $(subst qtbase,qtwinextras,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtwinextras,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtwinextras,$(qtbase_URL)) diff --git a/src/qtxmlpatterns.mk b/src/qtxmlpatterns.mk index 07126a29..c628e52d 100644 --- a/src/qtxmlpatterns.mk +++ b/src/qtxmlpatterns.mk @@ -4,7 +4,7 @@ PKG := qtxmlpatterns $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := b537eb0252988e3805a32a16c65038973371d647baf246fdf703bde725d0e8ec +$(PKG)_CHECKSUM := baed1b3bd3f010b8c4a96b4ca7a595b665d43d2e5758b55a364dbc9f2ac819d4 $(PKG)_SUBDIR = $(subst qtbase,qtxmlpatterns,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtxmlpatterns,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtxmlpatterns,$(qtbase_URL)) From 0d3383e03342789c9c4af79b648c997d7f052eb1 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Wed, 16 Mar 2016 21:22:08 +0000 Subject: [PATCH 0505/1463] Update versions.json & build-matrix.html --- build-matrix.html | 80 ++++++++++++++++++++++++++--------------------- versions.json | 49 +++++++++++++++-------------- 2 files changed, 70 insertions(+), 59 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index ca0b245e..91a47101 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -2999,7 +2999,7 @@ feel free to submit a pull request. qt5 - 5.5.1 + 5.6.0 ✗ ✗ ✗ @@ -3009,7 +3009,7 @@ feel free to submit a pull request. qtactiveqt - 5.5.1 + 5.6.0 ✓ ✓ ✓ @@ -3019,7 +3019,17 @@ feel free to submit a pull request. qtbase - 5.5.1 + 5.6.0 + ✓ + ✓ + ✓ + ✓ + ✗ + + + + qtcanvas3d + 5.6.0 ✓ ✓ ✓ @@ -3029,7 +3039,7 @@ feel free to submit a pull request. qtconnectivity - 5.5.1 + 5.6.0 ✓ ✓ ✓ @@ -3039,7 +3049,7 @@ feel free to submit a pull request. qtdeclarative - 5.5.1 + 5.6.0 ✓ ✓ ✓ @@ -3049,7 +3059,7 @@ feel free to submit a pull request. qtenginio - 5.5.1 + 1.6.0 ✓ ✓ ✓ @@ -3059,7 +3069,7 @@ feel free to submit a pull request. qtgraphicaleffects - 5.5.1 + 5.6.0 ✓ ✓ ✓ @@ -3069,7 +3079,7 @@ feel free to submit a pull request. qtimageformats - 5.5.1 + 5.6.0 ✓ ✓ ✓ @@ -3079,7 +3089,7 @@ feel free to submit a pull request. qtlocation - 5.5.1 + 5.6.0 ✓ ✓ ✓ @@ -3089,7 +3099,7 @@ feel free to submit a pull request. qtmultimedia - 5.5.1 + 5.6.0 ✓ ✓ ✓ @@ -3098,8 +3108,8 @@ feel free to submit a pull request. - qtquick1 - 5.5.1 + qtquickcontrols + 5.6.0 ✓ ✓ ✓ @@ -3108,8 +3118,8 @@ feel free to submit a pull request. - qtquickcontrols - 5.5.1 + qtquickcontrols2 + 5.6.0 ✓ ✓ ✓ @@ -3119,7 +3129,7 @@ feel free to submit a pull request. qtscript - 5.5.1 + 5.6.0 ✓ ✓ ✓ @@ -3129,7 +3139,7 @@ feel free to submit a pull request. qtsensors - 5.5.1 + 5.6.0 ✓ ✓ ✓ @@ -3139,7 +3149,7 @@ feel free to submit a pull request. qtserialport - 5.5.1 + 5.6.0 ✓ ✓ ✓ @@ -3169,7 +3179,7 @@ feel free to submit a pull request. qtsvg - 5.5.1 + 5.6.0 ✓ ✓ ✓ @@ -3189,7 +3199,7 @@ feel free to submit a pull request. qttools - 5.5.1 + 5.6.0 ✓ ✓ ✓ @@ -3199,7 +3209,7 @@ feel free to submit a pull request. qttranslations - 5.5.1 + 5.6.0 ✓ ✓ ✓ @@ -3209,7 +3219,7 @@ feel free to submit a pull request. qtwebchannel - 5.5.1 + 5.6.0 ✓ ✓ ✓ @@ -3219,7 +3229,7 @@ feel free to submit a pull request. qtwebengine - 5.5.1 + 5.6.0 ✓ ✓ ✓ @@ -3228,18 +3238,18 @@ feel free to submit a pull request. - qtwebkit - 5.5.1 - ✗ + qtwebsockets + 5.6.0 + ✓ + ✓ ✓ - ✗ ✓ ✗ - qtwebsockets - 5.5.1 + qtwebview + 5.6.0 ✓ ✓ ✓ @@ -3249,7 +3259,7 @@ feel free to submit a pull request. qtwinextras - 5.5.1 + 5.6.0 ✓ ✓ ✓ @@ -3269,7 +3279,7 @@ feel free to submit a pull request. qtxmlpatterns - 5.5.1 + 5.6.0 ✓ ✓ ✓ @@ -4009,14 +4019,14 @@ feel free to submit a pull request. -Total: 388 +Total: 389
    (+5 virtual +4 native-only) -385 -286 -368 -284 +387 +287 +370 +285 15 diff --git a/versions.json b/versions.json index 9e6e0935..7938c234 100644 --- a/versions.json +++ b/versions.json @@ -295,34 +295,35 @@ "qscintilla2": "2.8.4", "qt": "4.8.7", "qt3d": "bcdbf04b74cc7ded4d7b2471347f51b54ff8584b", - "qt5": "5.5.1", - "qtactiveqt": "5.5.1", - "qtbase": "5.5.1", - "qtconnectivity": "5.5.1", - "qtdeclarative": "5.5.1", - "qtenginio": "5.5.1", - "qtgraphicaleffects": "5.5.1", - "qtimageformats": "5.5.1", - "qtlocation": "5.5.1", - "qtmultimedia": "5.5.1", - "qtquick1": "5.5.1", - "qtquickcontrols": "5.5.1", - "qtscript": "5.5.1", - "qtsensors": "5.5.1", - "qtserialport": "5.5.1", + "qt5": "5.6.0", + "qtactiveqt": "5.6.0", + "qtbase": "5.6.0", + "qtcanvas3d": "5.6.0", + "qtconnectivity": "5.6.0", + "qtdeclarative": "5.6.0", + "qtenginio": "1.6.0", + "qtgraphicaleffects": "5.6.0", + "qtimageformats": "5.6.0", + "qtlocation": "5.6.0", + "qtmultimedia": "5.6.0", + "qtquickcontrols": "5.6.0", + "qtquickcontrols2": "5.6.0", + "qtscript": "5.6.0", + "qtsensors": "5.6.0", + "qtserialport": "5.6.0", "qtserialport_qt4": "5c3b6cc770", "qtservice": "ad9bc46", - "qtsvg": "5.5.1", + "qtsvg": "5.6.0", "qtsystems": "4e3a7ed", - "qttools": "5.5.1", - "qttranslations": "5.5.1", - "qtwebchannel": "5.5.1", - "qtwebengine": "5.5.1", - "qtwebkit": "5.5.1", - "qtwebsockets": "5.5.1", - "qtwinextras": "5.5.1", + "qttools": "5.6.0", + "qttranslations": "5.6.0", + "qtwebchannel": "5.6.0", + "qtwebengine": "5.6.0", + "qtwebsockets": "5.6.0", + "qtwebview": "5.6.0", + "qtwinextras": "5.6.0", "qtxlsxwriter": "ad90b6a2c21b300138ceb9fe9030a5917230f92d", - "qtxmlpatterns": "5.5.1", + "qtxmlpatterns": "5.6.0", "qwt": "6.1.1", "qwt_qt4": "6.1.1", "qwtplot3d": "0.2.7", From 0a41edc3276960c8ba7ef9d5bb47af57c432f5c5 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 17 Mar 2016 11:43:58 +0100 Subject: [PATCH 0506/1463] index.html: fix sorting --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 06e27302..2d4eee36 100644 --- a/index.html +++ b/index.html @@ -2366,11 +2366,11 @@ local-pkg-list: $(LOCAL_PKG_LIST) Qt - qtwebview + qtwebsockets Qt - qtwebsockets + qtwebview Qt From 3aff78326531c8b8d99fc881c25773075596c404 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 17 Mar 2016 13:35:57 +0100 Subject: [PATCH 0507/1463] vmime: update --- src/vmime.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vmime.mk b/src/vmime.mk index 6e37fdda..6b184b79 100644 --- a/src/vmime.mk +++ b/src/vmime.mk @@ -3,8 +3,8 @@ PKG := vmime $(PKG)_IGNORE := -$(PKG)_VERSION := d271534 -$(PKG)_CHECKSUM := aa71b46af1b169b3c50809813b9fd3129e55d99601bd78f86c47a099a484fa26 +$(PKG)_VERSION := 7425d91 +$(PKG)_CHECKSUM := 1dc0e292adaf33acba507769a0cd54e5940bb1f716783639f020e2b2877b5215 $(PKG)_SUBDIR := kisli-vmime-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/kisli/vmime/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE) From 93092291a09f82f838a42bc5fd14ddf271202ab0 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Thu, 17 Mar 2016 13:02:19 +0000 Subject: [PATCH 0508/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 91a47101..3c598c05 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -3779,7 +3779,7 @@ feel free to submit a pull request. vmime - d271534 + 7425d91 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 7938c234..9a7d7fc8 100644 --- a/versions.json +++ b/versions.json @@ -373,7 +373,7 @@ "vcdimager": "0.7.24", "vidstab": "0.98b", "vigra": "1.9.0", - "vmime": "d271534", + "vmime": "7425d91", "vo-aacenc": "0.1.3", "vo-amrwbenc": "0.1.3", "vorbis": "1.3.5", From 19c5b346ed2ae1efd43ceb17d89218ab147731d8 Mon Sep 17 00:00:00 2001 From: Martin Gerhardy Date: Fri, 18 Mar 2016 09:47:02 +0100 Subject: [PATCH 0509/1463] subversion: added archive url to package see issue "subversion can't be downloaded #1261" --- src/subversion.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/subversion.mk b/src/subversion.mk index 2ae14218..17bd5402 100644 --- a/src/subversion.mk +++ b/src/subversion.mk @@ -7,7 +7,8 @@ $(PKG)_VERSION := 1.9.2 $(PKG)_CHECKSUM := 023da881139b4514647b6f8a830a244071034efcaad8c8e98c6b92393122b4eb $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 -$(PKG)_URL := http://mirror.23media.de/apache/$(PKG)/$($(PKG)_FILE) +$(PKG)_URL := http://archive.apache.org/dist/subversion/$($(PKG)_FILE) +$(PKG)_URL_2 := http://mirror.23media.de/apache/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc apr apr-util sqlite openssl define $(PKG)_UPDATE From 0a89a58bb7ed0a660f035ed479e199608933dc4d Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Fri, 18 Mar 2016 14:17:55 +0100 Subject: [PATCH 0510/1463] qtimageformats: add dependencies jasper and libwebp --- src/qtimageformats.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qtimageformats.mk b/src/qtimageformats.mk index e76cd37c..cfe44f42 100644 --- a/src/qtimageformats.mk +++ b/src/qtimageformats.mk @@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := 2c854275a689a513ba24f4266cc6017d76875336671c2c8801b4b7289081b $(PKG)_SUBDIR = $(subst qtbase,qtimageformats,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtimageformats,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtimageformats,$(qtbase_URL)) -$(PKG)_DEPS := gcc libmng qtbase tiff +$(PKG)_DEPS := gcc jasper libmng libwebp qtbase tiff define $(PKG)_UPDATE echo $(qtbase_VERSION) From 3d9f6e1d16350bb169dcd0ce0d9dda2c16dafbba Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 17 Mar 2016 11:41:32 +0100 Subject: [PATCH 0511/1463] qtwebkit: restore package The Qt project decided to publish the qtwebkit tarball as a "community release". --- index.html | 4 ++++ src/qtwebkit.mk | 25 +++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 src/qtwebkit.mk diff --git a/index.html b/index.html index 2d4eee36..34066782 100644 --- a/index.html +++ b/index.html @@ -2365,6 +2365,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) qtwebengine Qt + + qtwebkit + Qt + qtwebsockets Qt diff --git a/src/qtwebkit.mk b/src/qtwebkit.mk new file mode 100644 index 00000000..6c7af6c0 --- /dev/null +++ b/src/qtwebkit.mk @@ -0,0 +1,25 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qtwebkit +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := d5c4daac8eef1b24290cda59db432ccc390761af17661f64f3028482647521a1 +$(PKG)_SUBDIR = $(subst qtbase,qtwebkit,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtwebkit,$(qtbase_FILE)) +$(PKG)_URL = $(subst /submodules/,/,$(subst official_releases/qt,community_releases,$(subst qtbase,qtwebkit,$(qtbase_URL)))) +$(PKG)_DEPS := gcc qtbase qtmultimedia sqlite + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD_SHARED + # looks for build tools with .exe suffix and tries to use win_flex + $(SED) -i 's,\.exe,,' '$(1)/Tools/qmake/mkspecs/features/functions.prf' + # invoke qmake with removed debug options as a workaround for + # https://bugreports.qt-project.org/browse/QTBUG-30898 + cd '$(1)' && mkdir -p .git && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' FLEX=flex CONFIG-='debug debug_and_release' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef From 48e4de4f706c860fd94f9569a09c685154e68062 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sat, 19 Mar 2016 13:53:08 +0000 Subject: [PATCH 0512/1463] Update versions.json & build-matrix.html --- build-matrix.html | 16 +++++++++++++--- versions.json | 1 + 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 3c598c05..fec17f20 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -3237,6 +3237,16 @@ feel free to submit a pull request. ✗ + + qtwebkit + 5.6.0 + ✗ + ✓ + ✗ + ✓ + ✗ + + qtwebsockets 5.6.0 @@ -4019,14 +4029,14 @@ feel free to submit a pull request. -Total: 389 +Total: 390
    (+5 virtual +4 native-only) 387 -287 +288 370 -285 +286 15 diff --git a/versions.json b/versions.json index 9a7d7fc8..0271ac24 100644 --- a/versions.json +++ b/versions.json @@ -319,6 +319,7 @@ "qttranslations": "5.6.0", "qtwebchannel": "5.6.0", "qtwebengine": "5.6.0", + "qtwebkit": "5.6.0", "qtwebsockets": "5.6.0", "qtwebview": "5.6.0", "qtwinextras": "5.6.0", From 50471a81b77885921008b226db74a789dd5bd34f Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 19 Mar 2016 15:44:03 +0100 Subject: [PATCH 0513/1463] new package: qtofficeopenxml --- index.html | 4 ++++ src/qtofficeopenxml-1.patch | 22 ++++++++++++++++++++++ src/qtofficeopenxml.mk | 20 ++++++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 src/qtofficeopenxml-1.patch create mode 100644 src/qtofficeopenxml.mk diff --git a/index.html b/index.html index 34066782..5f363f7a 100644 --- a/index.html +++ b/index.html @@ -2313,6 +2313,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) qtmultimedia Qt + + qtofficeopenxml + QtOfficeOpenXml + qtquickcontrols Qt diff --git a/src/qtofficeopenxml-1.patch b/src/qtofficeopenxml-1.patch new file mode 100644 index 00000000..2312c989 --- /dev/null +++ b/src/qtofficeopenxml-1.patch @@ -0,0 +1,22 @@ +From 57c93e64b512b24c1ca983a91c18c1e4bb158d2a Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Sat, 19 Mar 2016 15:37:43 +0100 +Subject: [PATCH] fix typo/build failure + + +diff --git a/src/officeopenxml/sml/smlworkbook.cpp b/src/officeopenxml/sml/smlworkbook.cpp +index dfa8e13..74432db 100644 +--- a/src/officeopenxml/sml/smlworkbook.cpp ++++ b/src/officeopenxml/sml/smlworkbook.cpp +@@ -37,7 +37,7 @@ QString Workbook::bookView(const QString &attribute) const + return QString(); + if (!bookViews_raw[0].contains(attribute)) + return QString(); +- return bookViews_raw[0][attribute].toInt(); ++ return bookViews_raw[0][attribute]; + } + + void Workbook::setBookView(const QString &attribute, const QString &val) +-- +2.5.0 + diff --git a/src/qtofficeopenxml.mk b/src/qtofficeopenxml.mk new file mode 100644 index 00000000..efc2b4ed --- /dev/null +++ b/src/qtofficeopenxml.mk @@ -0,0 +1,20 @@ +# This file is part of MXE. +# See index.html for further information. +PKG := qtofficeopenxml +$(PKG)_IGNORE := +$(PKG)_VERSION := 02dda4a46f92a843eaba5f5a021952860eadfe01 +$(PKG)_CHECKSUM := 50f989b2af404e8a9a20b46b3ca4955093ad295cb61f0cfb42fa06480d1fbad2 +$(PKG)_SUBDIR := QtOfficeOpenXml-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://github.com/dbzhang800/QtOfficeOpenXml/archive/$($(PKG)_VERSION).tar.gz +$(PKG)_DEPS := gcc qtbase + +$(PKG)_UPDATE = $(call MXE_GET_GITHUB_SHA, dbzhang800/QtOfficeOpenXml, master) + +define $(PKG)_BUILD + # invoke qmake with removed debug options as a workaround for + # https://bugreports.qt-project.org/browse/QTBUG-30898 + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef From 8ae971a5e9e37f7f7faabcb0868585308246d3af Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sat, 19 Mar 2016 14:50:02 +0000 Subject: [PATCH 0514/1463] Update versions.json & build-matrix.html --- build-matrix.html | 20 +++++++++++++++----- versions.json | 1 + 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index fec17f20..6f88fcc1 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -3107,6 +3107,16 @@ feel free to submit a pull request. ✗ + + qtofficeopenxml + 02dda4a46f92… + ✓ + ✓ + ✓ + ✓ + ✗ + + qtquickcontrols 5.6.0 @@ -4029,14 +4039,14 @@ feel free to submit a pull request. -Total: 390 +Total: 391
    (+5 virtual +4 native-only) -387 -288 -370 -286 +388 +289 +371 +287 15 diff --git a/versions.json b/versions.json index 0271ac24..bbbb1955 100644 --- a/versions.json +++ b/versions.json @@ -306,6 +306,7 @@ "qtimageformats": "5.6.0", "qtlocation": "5.6.0", "qtmultimedia": "5.6.0", + "qtofficeopenxml": "02dda4a46f92a843eaba5f5a021952860eadfe01", "qtquickcontrols": "5.6.0", "qtquickcontrols2": "5.6.0", "qtscript": "5.6.0", From 2db02c13183c002476c4d2eda92ae3e106f47d87 Mon Sep 17 00:00:00 2001 From: Pavel Vatagin Date: Sun, 13 Mar 2016 16:56:51 +0300 Subject: [PATCH 0515/1463] copydlldeps.sh: fix #1226 (case insensitive) --- tools/copydlldeps.sh | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/tools/copydlldeps.sh b/tools/copydlldeps.sh index 23b31caa..fa0b8218 100755 --- a/tools/copydlldeps.sh +++ b/tools/copydlldeps.sh @@ -356,21 +356,27 @@ fi for dll in `echo $alldeps | tr '\n' ' '`; do counter=0 + lower_dll=`echo $dll | tr '[:upper:]' '[:lower:]'` + if [ $lower_dll == $dll ]; then + lower_dll="" + fi for curFolder in $( echo "${str_srcDirList}" | tr -s ' ' | tr ' ' '\n'); do if [ "$logLevel" -gt 1 ]; then echo "search for dll $dll in curFolder $curFolder" sleep 1 - fi - if [ -e "${curFolder}/${dll}" ]; then - counter=$(expr $counter + 1) - if [ $opmode == "copy" ]; then - cp -dpRxv "${curFolder}/${dll}" "$destdir" - elif [ $opmode == "print" ]; then - echo "found $dll in: ${curFolder}/${dll}" - else - echo "unknown opmode=$opmode" - fi - fi + fi + for the_dll in $dll $lower_dll; do + if [ -e "${curFolder}/${the_dll}" ]; then + counter=$(expr $counter + 1) + if [ $opmode == "copy" ]; then + cp -dpRxv "${curFolder}/${the_dll}" "$destdir" + elif [ $opmode == "print" ]; then + echo "found $dll in: ${curFolder}/${the_dll}" + else + echo "unknown opmode=$opmode" + fi + fi + done done if [ $counter == 0 ]; then echo "Warning: \"$dll\" not found. \$counter=$counter." >&2 From 2dd817b395a30cbae8e841b61ed1dd0d6e3ca585 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 21 Mar 2016 01:11:38 +0300 Subject: [PATCH 0516/1463] nonetwork: print message from replaced functions See https://github.com/mxe/mxe/issues/1269 --- tools/nonetwork.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tools/nonetwork.c b/tools/nonetwork.c index d203fb2d..fb3dafb8 100644 --- a/tools/nonetwork.c +++ b/tools/nonetwork.c @@ -4,33 +4,44 @@ // License: MIT #include +#include + +static void print_message() { + fprintf(stderr, "Don't use network from MXE build rules!\n"); +} int connect(int sock, const void *addr, unsigned int len) { + print_message(); errno = 13; // EACCES, Permission denied return -1; } void *gethostbyname(const char *name) { + print_message(); return 0; } int getaddrinfo(const char *node, const char *service, const void *hints, void **res) { + print_message(); return -4; // EAI_FAIL } void freeaddrinfo(void *res) { + print_message(); } int getnameinfo(const void * sa, unsigned int salen, char * host, unsigned int hostlen, char * serv, unsigned int servlen, int flags) { + print_message(); return -4; // EAI_FAIL } struct hostent *gethostbyaddr(const void *addr, unsigned int len, int type) { + print_message(); return 0; } From dae6af8e838bfa597974d164eba7bfb5550d46d4 Mon Sep 17 00:00:00 2001 From: Pavel Vatagin Date: Mon, 21 Mar 2016 23:27:34 +0300 Subject: [PATCH 0517/1463] add package qtsparkle --- index.html | 4 ++++ src/qtsparkle_qt4-test.cpp | 18 ++++++++++++++++ src/qtsparkle_qt4.mk | 43 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+) create mode 100644 src/qtsparkle_qt4-test.cpp create mode 100644 src/qtsparkle_qt4.mk diff --git a/index.html b/index.html index 5f363f7a..70ccdfb5 100644 --- a/index.html +++ b/index.html @@ -2345,6 +2345,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) qtservice Qt Solutions + + qtsparkle_qt4 + qtsparkle + qtsvg Qt diff --git a/src/qtsparkle_qt4-test.cpp b/src/qtsparkle_qt4-test.cpp new file mode 100644 index 00000000..a72b0346 --- /dev/null +++ b/src/qtsparkle_qt4-test.cpp @@ -0,0 +1,18 @@ +/* + * This file is part of MXE. + * See index.html for further information. + */ + +#include +#include +#include + +int main() +{ + QWidget w; + qtsparkle::Updater* updater = new qtsparkle::Updater( + QUrl("http://www.example.com/sparkle.xml"), &w); + updater->SetVersion("1.0"); + + return 0; +} diff --git a/src/qtsparkle_qt4.mk b/src/qtsparkle_qt4.mk new file mode 100644 index 00000000..bf194b6b --- /dev/null +++ b/src/qtsparkle_qt4.mk @@ -0,0 +1,43 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qtsparkle_qt4 +$(PKG)_IGNORE := +$(PKG)_VERSION := 8882e6ef86cdb79db7932307309d005411fd0c20 +$(PKG)_CHECKSUM := 86f6f010356e05e6efb956b5643ce587ffbbae45e8e7dc1b25b4b1dcf865b5f3 +$(PKG)_SUBDIR := qtsparkle-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://github.com/davidsansome/qtsparkle/archive/$($(PKG)_VERSION).tar.gz +$(PKG)_DEPS := gcc qt + +define $(PKG)_UPDATE + $(call MXE_GET_GITHUB_TAGS, davidsansome/qtsparkle) +endef + +define $(PKG)_BUILD + mkdir '$(1).build' + cd '$(1).build' && '$(TARGET)-cmake' '$(1)' \ + -DBUILD_STATIC=$(CMAKE_STATIC_BOOL) + $(MAKE) -C '$(1).build' -j '$(JOBS)' + $(MAKE) -C '$(1).build' -j 1 install + + # create pkg-config file + $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig' + (echo 'prefix=$(PREFIX)/$(TARGET)'; \ + echo 'exec_prefix=$${prefix}'; \ + echo 'libdir=$${exec_prefix}/lib'; \ + echo 'includedir=$${prefix}/include'; \ + echo ''; \ + echo 'Name: $(PKG)'; \ + echo 'Version: '; \ + echo 'Description: $(PKG)'; \ + echo 'Requires: QtCore QtGui QtNetwork QtXml'; \ + echo 'Libs: -L$${libdir} -lqtsparkle'; \ + echo 'Cflags: -I$${includedir}';) \ + > '$(PREFIX)/$(TARGET)/lib/pkgconfig/$(PKG).pc' + + $(TARGET)-g++ \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \ + `$(TARGET)-pkg-config $(PKG) --cflags --libs` +endef From 726d6af5cfadfd6798215c7ba11f0b2befe48f7b Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Mon, 21 Mar 2016 20:37:19 +0000 Subject: [PATCH 0518/1463] Update versions.json & build-matrix.html --- build-matrix.html | 20 +++++++++++++++----- versions.json | 1 + 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 6f88fcc1..2fd29004 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -3187,6 +3187,16 @@ feel free to submit a pull request. ✗ + + qtsparkle_qt4 + 8882e6ef86cd… + ✓ + ✓ + ✓ + ✓ + ✗ + + qtsvg 5.6.0 @@ -4039,14 +4049,14 @@ feel free to submit a pull request. -Total: 391 +Total: 392
    (+5 virtual +4 native-only) -388 -289 -371 -287 +389 +290 +372 +288 15 diff --git a/versions.json b/versions.json index bbbb1955..e67a6230 100644 --- a/versions.json +++ b/versions.json @@ -314,6 +314,7 @@ "qtserialport": "5.6.0", "qtserialport_qt4": "5c3b6cc770", "qtservice": "ad9bc46", + "qtsparkle_qt4": "8882e6ef86cdb79db7932307309d005411fd0c20", "qtsvg": "5.6.0", "qtsystems": "4e3a7ed", "qttools": "5.6.0", From 039d02de7b2f08a4a3a12b1252ea32c87ef695ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Laval?= Date: Wed, 23 Mar 2016 15:31:37 -0400 Subject: [PATCH 0519/1463] mman-win32: re-enable static build after changes in ca5bba6 --- src/mman-win32.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mman-win32.mk b/src/mman-win32.mk index 5312f6a2..e3b537db 100644 --- a/src/mman-win32.mk +++ b/src/mman-win32.mk @@ -15,7 +15,8 @@ $(PKG)_UPDATE = $(call MXE_GET_GITHUB_SHA, witwall/mman-win32, master) | $(SED) define $(PKG)_BUILD mkdir '$(1).build' cd '$(1).build' && '$(TARGET)-cmake' '$(1)'\ - -DBUILD_TESTS=OFF + -DBUILD_TESTS=OFF \ + $(if $(BUILD_STATIC),-DBUILD_SHARED_LIBS=OFF) $(MAKE) -C '$(1).build' -j '$(JOBS)' $(MAKE) -C '$(1).build' -j 1 install From 07b3cb0d1616f599dd807448299d29cd977e3b87 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 23 Mar 2016 21:34:38 +0100 Subject: [PATCH 0520/1463] curl: update --- src/curl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/curl.mk b/src/curl.mk index e00540cf..c6aa19b8 100644 --- a/src/curl.mk +++ b/src/curl.mk @@ -3,8 +3,8 @@ PKG := curl $(PKG)_IGNORE := -$(PKG)_VERSION := 7.47.1 -$(PKG)_CHECKSUM := c9b2fd75417ff0a1d0cd1bb284d1d8d7a08963f945860c987d59ae0eb412aa01 +$(PKG)_VERSION := 7.48.0 +$(PKG)_CHECKSUM := df764ca663a6589280fd6ac0adb24051ef26cfefef24451f28f99eb7338894d6 $(PKG)_SUBDIR := curl-$($(PKG)_VERSION) $(PKG)_FILE := curl-$($(PKG)_VERSION).tar.lzma $(PKG)_URL := http://curl.haxx.se/download/$($(PKG)_FILE) From 40e481f6ab744bf4c5d5aadd8a59b281d6147984 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Wed, 23 Mar 2016 20:35:45 +0000 Subject: [PATCH 0521/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 2fd29004..580eeca6 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -429,7 +429,7 @@ feel free to submit a pull request. curl - 7.47.1 + 7.48.0 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index e67a6230..d63efcbc 100644 --- a/versions.json +++ b/versions.json @@ -38,7 +38,7 @@ "cryptopp": "5.6.3", "crystalhd": "1", "cunit": "2.1-3", - "curl": "7.47.1", + "curl": "7.48.0", "db": "6.1.26", "dbus": "1.11.2", "dcmtk": "3.6.0", From f117a71504cfae6e6f922ed2dfd76a252c69b916 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 24 Mar 2016 10:51:42 +0100 Subject: [PATCH 0522/1463] vmime: update --- src/vmime.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vmime.mk b/src/vmime.mk index 6b184b79..182a0efe 100644 --- a/src/vmime.mk +++ b/src/vmime.mk @@ -3,8 +3,8 @@ PKG := vmime $(PKG)_IGNORE := -$(PKG)_VERSION := 7425d91 -$(PKG)_CHECKSUM := 1dc0e292adaf33acba507769a0cd54e5940bb1f716783639f020e2b2877b5215 +$(PKG)_VERSION := 14011ca +$(PKG)_CHECKSUM := 566d5517e184fd529c22b3dd54caec6750e55054d65c95ea186bab13a84431c8 $(PKG)_SUBDIR := kisli-vmime-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/kisli/vmime/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE) From 53666085c95e362fc40bdb351a66a89690777698 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Thu, 24 Mar 2016 12:17:12 +0000 Subject: [PATCH 0523/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 580eeca6..fdb44647 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -3809,7 +3809,7 @@ feel free to submit a pull request. vmime - 7425d91 + 14011ca ✓ ✓ ✓ diff --git a/versions.json b/versions.json index d63efcbc..0d4bb952 100644 --- a/versions.json +++ b/versions.json @@ -376,7 +376,7 @@ "vcdimager": "0.7.24", "vidstab": "0.98b", "vigra": "1.9.0", - "vmime": "7425d91", + "vmime": "14011ca", "vo-aacenc": "0.1.3", "vo-amrwbenc": "0.1.3", "vorbis": "1.3.5", From 4d73354c64669386b3b3e34af4d1bb0c3af5e43c Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sat, 26 Mar 2016 14:17:36 +0300 Subject: [PATCH 0524/1463] nonetwork: new line before the message and flush fflush(stderr) may be needed: http://mailman.linuxchix.org/pipermail/courses/2002-August/000691.html --- tools/nonetwork.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/nonetwork.c b/tools/nonetwork.c index fb3dafb8..fc95b6a9 100644 --- a/tools/nonetwork.c +++ b/tools/nonetwork.c @@ -7,7 +7,9 @@ #include static void print_message() { - fprintf(stderr, "Don't use network from MXE build rules!\n"); + fflush(stderr); + fprintf(stderr, "\nDon't use network from MXE build rules!\n"); + fflush(stderr); } int connect(int sock, const void *addr, unsigned int len) { From 2ea89ec8680584aac874e17aff650a2161a4d216 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 28 Mar 2016 15:32:28 +0200 Subject: [PATCH 0525/1463] vmime: update --- src/vmime.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vmime.mk b/src/vmime.mk index 182a0efe..535d2932 100644 --- a/src/vmime.mk +++ b/src/vmime.mk @@ -3,8 +3,8 @@ PKG := vmime $(PKG)_IGNORE := -$(PKG)_VERSION := 14011ca -$(PKG)_CHECKSUM := 566d5517e184fd529c22b3dd54caec6750e55054d65c95ea186bab13a84431c8 +$(PKG)_VERSION := 4d76e8a +$(PKG)_CHECKSUM := 2987613997a3f5992372b668bb122de11e63d4827acb0c4951fe0792207603d9 $(PKG)_SUBDIR := kisli-vmime-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/kisli/vmime/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE) From 27d2c93b1eb6cac1e0076ddb02307fc04a1bdf8c Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Mon, 28 Mar 2016 13:38:13 +0000 Subject: [PATCH 0526/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index fdb44647..337bc21d 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -3809,7 +3809,7 @@ feel free to submit a pull request. vmime - 14011ca + 4d76e8a ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 0d4bb952..45ce0069 100644 --- a/versions.json +++ b/versions.json @@ -376,7 +376,7 @@ "vcdimager": "0.7.24", "vidstab": "0.98b", "vigra": "1.9.0", - "vmime": "14011ca", + "vmime": "4d76e8a", "vo-aacenc": "0.1.3", "vo-amrwbenc": "0.1.3", "vorbis": "1.3.5", From 393c30d1a0a714265497a18f201a77d23f589f74 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 29 Mar 2016 21:15:53 +0200 Subject: [PATCH 0527/1463] sqlite: update --- src/sqlite.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sqlite.mk b/src/sqlite.mk index 1849657a..0f776e15 100644 --- a/src/sqlite.mk +++ b/src/sqlite.mk @@ -3,8 +3,8 @@ PKG := sqlite $(PKG)_IGNORE := -$(PKG)_VERSION := 3110100 -$(PKG)_CHECKSUM := 533ff1d0271c2e666f01591271cef01a31648563affa0c95e80ef735077d4377 +$(PKG)_VERSION := 3120000 +$(PKG)_CHECKSUM := 53ecdbb5287af673eca3710c5f6c2305e73bb2d034f2a28770bea2be92ed269e $(PKG)_SUBDIR := $(PKG)-autoconf-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-autoconf-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.sqlite.org/2016/$($(PKG)_FILE) From 576f8f85fe1a0cfb2697022572c67c8156efeae1 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Tue, 29 Mar 2016 19:21:30 +0000 Subject: [PATCH 0528/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 337bc21d..395f9a3d 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -3599,7 +3599,7 @@ feel free to submit a pull request. sqlite - 3110100 + 3120000 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 45ce0069..3c97131b 100644 --- a/versions.json +++ b/versions.json @@ -355,7 +355,7 @@ "sparsehash": "2.0.3", "speex": "1.2rc2", "speexdsp": "1.2rc3", - "sqlite": "3110100", + "sqlite": "3120000", "subversion": "1.9.2", "suitesparse": "4.2.1", "t4k_common": "0.1.1", From c734f8d84d8dc2053a5e73682880ebe564e10005 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 5 Apr 2016 16:52:23 +0200 Subject: [PATCH 0529/1463] update: mingw-w64 --- src/mingw-w64.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mingw-w64.mk b/src/mingw-w64.mk index 25adbb02..5bdaf53a 100644 --- a/src/mingw-w64.mk +++ b/src/mingw-w64.mk @@ -3,8 +3,8 @@ PKG := mingw-w64 $(PKG)_IGNORE := -$(PKG)_VERSION := 4.0.5 -$(PKG)_CHECKSUM := d4775e381202c5ecea7dbb21a1f247e4b3506509cb7d8b01bee6d83ee538e62c +$(PKG)_VERSION := 4.0.6 +$(PKG)_CHECKSUM := 0c407394b0d8635553f4fbca674cdfe446aac223e90b4010603d863e4bdd015c $(PKG)_SUBDIR := $(PKG)-v$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-v$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(PKG)-release/$($(PKG)_FILE) From 12ea6f40fb365ca60e62741cbd0da47f71cedef8 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Tue, 5 Apr 2016 15:27:43 +0000 Subject: [PATCH 0530/1463] Update versions.json & build-matrix.html --- build-matrix.html | 6 +++--- versions.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 395f9a3d..366f9a04 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -739,7 +739,7 @@ feel free to submit a pull request. gendef - 4.0.5 + 4.0.6 ✓ ✓ ✓ @@ -2229,7 +2229,7 @@ feel free to submit a pull request. mingw-w64 - 4.0.5 + 4.0.6 ✗ ✗ ✗ @@ -3899,7 +3899,7 @@ feel free to submit a pull request. widl - 4.0.5 + 4.0.6 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 3c97131b..60b509fc 100644 --- a/versions.json +++ b/versions.json @@ -69,7 +69,7 @@ "gdal": "2.0.2", "gdb": "7.11", "gdk-pixbuf": "2.32.3", - "gendef": "4.0.5", + "gendef": "4.0.6", "geoip-database": "20150317-1", "geos": "3.4.2", "gettext": "0.19.7", @@ -218,7 +218,7 @@ "lzo": "2.09", "matio": "1.5.2", "mdbtools": "0.7.1", - "mingw-w64": "4.0.5", + "mingw-w64": "4.0.6", "miniupnpc": "1.9", "minizip": "0b46a2b", "mman-win32": "b7ec370", @@ -385,7 +385,7 @@ "waf": "1.8.17", "wavpack": "4.75.2", "wget": "1.17.1", - "widl": "4.0.5", + "widl": "4.0.6", "winpcap": "4_1_3", "wt": "3.3.5", "wxwidgets": "3.0.2", From faae3bb8eb5058f7deafb40316affb582ae3a7ad Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 6 Apr 2016 08:47:23 +0200 Subject: [PATCH 0531/1463] vmime: update --- src/vmime.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vmime.mk b/src/vmime.mk index 535d2932..411b140b 100644 --- a/src/vmime.mk +++ b/src/vmime.mk @@ -3,8 +3,8 @@ PKG := vmime $(PKG)_IGNORE := -$(PKG)_VERSION := 4d76e8a -$(PKG)_CHECKSUM := 2987613997a3f5992372b668bb122de11e63d4827acb0c4951fe0792207603d9 +$(PKG)_VERSION := b1c2d4b +$(PKG)_CHECKSUM := db41773878fcd11de44999cb5eba6e4f43e7135bc64c1fd82ad2ef2cb0d24cf1 $(PKG)_SUBDIR := kisli-vmime-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/kisli/vmime/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE) From d9c3273ed526549c80b58ace8843dd3037698139 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Wed, 6 Apr 2016 06:59:25 +0000 Subject: [PATCH 0532/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 366f9a04..f973b1eb 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -3809,7 +3809,7 @@ feel free to submit a pull request. vmime - 4d76e8a + b1c2d4b ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 60b509fc..e07291bb 100644 --- a/versions.json +++ b/versions.json @@ -376,7 +376,7 @@ "vcdimager": "0.7.24", "vidstab": "0.98b", "vigra": "1.9.0", - "vmime": "4d76e8a", + "vmime": "b1c2d4b", "vo-aacenc": "0.1.3", "vo-amrwbenc": "0.1.3", "vorbis": "1.3.5", From 6d952d80e69ee7efbb9b09639ad543024d5c04f5 Mon Sep 17 00:00:00 2001 From: Firat Akandere Date: Wed, 6 Apr 2016 16:06:43 +0300 Subject: [PATCH 0533/1463] Update the sha256 checksum --- src/qtwebkit.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qtwebkit.mk b/src/qtwebkit.mk index 6c7af6c0..1a758eb9 100644 --- a/src/qtwebkit.mk +++ b/src/qtwebkit.mk @@ -4,7 +4,7 @@ PKG := qtwebkit $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := d5c4daac8eef1b24290cda59db432ccc390761af17661f64f3028482647521a1 +$(PKG)_CHECKSUM := 9ca72373841f3a868a7bcc696956cdb0ad7f5e678c693659f6f0b919fdd16dfe $(PKG)_SUBDIR = $(subst qtbase,qtwebkit,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtwebkit,$(qtbase_FILE)) $(PKG)_URL = $(subst /submodules/,/,$(subst official_releases/qt,community_releases,$(subst qtbase,qtwebkit,$(qtbase_URL)))) From ff8dddbe1b4fa0ab557949525856ecec8654f772 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 6 Apr 2016 22:31:53 +0300 Subject: [PATCH 0534/1463] glib: consolidate and unify patches --- src/glib-1-fixes.patch | 108 ++++++++++-------- ...emove-runtime-warning-gtkapplication.patch | 24 ---- 2 files changed, 59 insertions(+), 73 deletions(-) delete mode 100644 src/glib-2-remove-runtime-warning-gtkapplication.patch diff --git a/src/glib-1-fixes.patch b/src/glib-1-fixes.patch index 0e54d86a..c3897702 100644 --- a/src/glib-1-fixes.patch +++ b/src/glib-1-fixes.patch @@ -3,14 +3,14 @@ See index.html for further information. Contains ad hoc patches for cross building. -From 544cc902caf39c937bbac7c9f7b07f5fcb869d81 Mon Sep 17 00:00:00 2001 -From: MXE +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "fix@me" Date: Thu, 23 Sep 2010 21:42:46 +0200 -Subject: [PATCH 1/6] fix tool paths +Subject: [PATCH] fix tool paths diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in -index 275fc01..ac09887 100644 +index 1111111..2222222 100644 --- a/glib-2.0.pc.in +++ b/glib-2.0.pc.in @@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@ @@ -26,21 +26,18 @@ index 275fc01..ac09887 100644 Name: GLib Description: C Utility Library --- -2.3.2 (Apple Git-55) - -From 10e38774090ee198d7f70e80f7dd29ef18dcd9d9 Mon Sep 17 00:00:00 2001 -From: MXE +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "fix@me" Date: Fri, 15 Jun 2012 15:25:01 +0200 -Subject: [PATCH 2/6] Avoid DllMain symbol conflict when linking statically +Subject: [PATCH] Avoid DllMain symbol conflict when linking statically diff --git a/gio/giomodule.c b/gio/giomodule.c -index 510f652..f66ca9b 100644 +index 1111111..2222222 100644 --- a/gio/giomodule.c +++ b/gio/giomodule.c -@@ -904,14 +904,12 @@ extern GType g_gtk_notification_backend_get_type (void); +@@ -918,14 +918,12 @@ extern GType g_gtk_notification_backend_get_type (void); static HMODULE gio_dll = NULL; @@ -57,7 +54,7 @@ index 510f652..f66ca9b 100644 DWORD fdwReason, LPVOID lpvReserved) { -@@ -921,8 +919,6 @@ DllMain (HINSTANCE hinstDLL, +@@ -935,8 +933,6 @@ DllMain (HINSTANCE hinstDLL, return TRUE; } @@ -67,7 +64,7 @@ index 510f652..f66ca9b 100644 _g_io_win32_get_module (void) { diff --git a/glib/glib-init.c b/glib/glib-init.c -index 24efe9d..6fb9e25 100644 +index 1111111..2222222 100644 --- a/glib/glib-init.c +++ b/glib/glib-init.c @@ -237,14 +237,14 @@ glib_init (void) @@ -87,21 +84,18 @@ index 24efe9d..6fb9e25 100644 DWORD fdwReason, LPVOID lpvReserved) { --- -2.3.2 (Apple Git-55) - -From ca4e5a60cc9176279bd27a44c679e18666fac5e6 Mon Sep 17 00:00:00 2001 -From: MXE +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "fix@me" Date: Fri, 15 Jun 2012 15:27:22 +0200 -Subject: [PATCH 3/6] Allow building without inotify support +Subject: [PATCH] Allow building without inotify support diff --git a/configure.ac b/configure.ac -index 4a904a4..427d9e2 100644 +index 1111111..2222222 100644 --- a/configure.ac +++ b/configure.ac -@@ -1669,10 +1669,16 @@ dnl ***************************** +@@ -1659,10 +1659,16 @@ dnl ***************************** dnl ** Check for inotify (GIO) ** dnl ***************************** inotify_support=no @@ -118,19 +112,16 @@ index 4a904a4..427d9e2 100644 AM_CONDITIONAL(HAVE_INOTIFY, [test "$inotify_support" = "yes"]) --- -2.3.2 (Apple Git-55) - -From 024bc122e81e418096281400b4b5340a7949eca1 Mon Sep 17 00:00:00 2001 -From: MXE +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "fix@me" Date: Fri, 15 Jun 2012 15:28:14 +0200 -Subject: [PATCH 4/6] Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF. +Subject: [PATCH] Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF. Backported from upstream diff --git a/configure.ac b/configure.ac -index 427d9e2..afb6232 100644 +index 1111111..2222222 100644 --- a/configure.ac +++ b/configure.ac @@ -499,6 +499,8 @@ LT_INIT([disable-static win32-dll]) @@ -142,18 +133,15 @@ index 427d9e2..afb6232 100644 AS_IF([test "$glib_native_win32" = "yes"], [ if test x$enable_static = xyes -a x$enable_shared = xyes; then --- -2.3.2 (Apple Git-55) - -From bb1a73677634f3a70dbe5baac36ba8e6acf4f4cd Mon Sep 17 00:00:00 2001 -From: MXE +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "fix@me" Date: Fri, 15 Jun 2012 15:29:06 +0200 -Subject: [PATCH 5/6] Link with dnsapi +Subject: [PATCH] Link with dnsapi diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in -index 899af0c..b8308f8 100644 +index 1111111..2222222 100644 --- a/gio-2.0.pc.in +++ b/gio-2.0.pc.in @@ -13,6 +13,6 @@ Description: glib I/O library @@ -164,22 +152,19 @@ index 899af0c..b8308f8 100644 +Libs: -L${libdir} -lgio-2.0 -ldnsapi -liphlpapi Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@ @SELINUX_LIBS@ @COCOA_LIBS@ @CARBON_LIBS@ Cflags: --- -2.3.2 (Apple Git-55) - -From bb796f32a497ef983e2e7483cab25b6142e15630 Mon Sep 17 00:00:00 2001 -From: MXE +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "fix@me" Date: Fri, 15 Jun 2012 15:29:38 +0200 -Subject: [PATCH 6/6] Ensure globals are initialized even when DllMain is not - being run +Subject: [PATCH] Ensure globals are initialized even when DllMain is not being + run diff --git a/glib/gmain.c b/glib/gmain.c -index 30fac70..736cb57 100644 +index 1111111..2222222 100644 --- a/glib/gmain.c +++ b/glib/gmain.c -@@ -2566,12 +2566,15 @@ g_get_real_time (void) +@@ -2577,12 +2577,15 @@ g_get_real_time (void) #if defined (G_OS_WIN32) static ULONGLONG (*g_GetTickCount64) (void) = NULL; static guint32 g_win32_tick_epoch = 0; @@ -195,7 +180,7 @@ index 30fac70..736cb57 100644 g_GetTickCount64 = NULL; kernel32 = GetModuleHandle ("KERNEL32.DLL"); if (kernel32 != NULL) -@@ -2630,6 +2633,9 @@ g_get_monotonic_time (void) +@@ -2641,6 +2644,9 @@ g_get_monotonic_time (void) * timeBeginPeriod() to increase it as much as they want */ @@ -206,7 +191,7 @@ index 30fac70..736cb57 100644 { guint32 ticks_as_32bit; diff --git a/glib/gthread-win32.c b/glib/gthread-win32.c -index 275ecc6..8285187 100644 +index 1111111..2222222 100644 --- a/glib/gthread-win32.c +++ b/glib/gthread-win32.c @@ -116,18 +116,28 @@ typedef struct @@ -544,6 +529,31 @@ index 275ecc6..8285187 100644 if (!g_thread_lookup_native_funcs ()) g_thread_xp_init (); --- -2.3.2 (Apple Git-55) +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Wed, 6 Apr 2016 22:24:43 +0300 +Subject: [PATCH] Remove an annoying runtime warning + +that pops up when using GtkApplication in Gtk+ 3 programs. + +diff --git a/gio/gdbusaddress.c b/gio/gdbusaddress.c +index 1111111..2222222 100644 +--- a/gio/gdbusaddress.c ++++ b/gio/gdbusaddress.c +@@ -1325,6 +1325,7 @@ __declspec(dllexport) void CALLBACK g_win32_run_session_bus (HWND hwnd, HINSTANC + __declspec(dllexport) void CALLBACK + g_win32_run_session_bus (HWND hwnd, HINSTANCE hinst, char *cmdline, int nCmdShow) + { ++ /* + GDBusDaemon *daemon; + GMainLoop *loop; + const char *address; +@@ -1354,6 +1355,7 @@ g_win32_run_session_bus (HWND hwnd, HINSTANCE hinst, char *cmdline, int nCmdShow + + g_main_loop_unref (loop); + g_object_unref (daemon); ++ */ + } + + static gchar * diff --git a/src/glib-2-remove-runtime-warning-gtkapplication.patch b/src/glib-2-remove-runtime-warning-gtkapplication.patch deleted file mode 100644 index 3d47602d..00000000 --- a/src/glib-2-remove-runtime-warning-gtkapplication.patch +++ /dev/null @@ -1,24 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Remove an annoying runtime warning that pops up when using GtkApplication -in Gtk+ 3 programs. - ---- a/gio/gdbusaddress.c 2014-06-28 19:02:43.000000000 +0200 -+++ b/gio/gdbusaddress.c 2015-08-12 20:26:45.931228430 +0200 -@@ -1325,6 +1325,7 @@ - __declspec(dllexport) void CALLBACK - g_win32_run_session_bus (HWND hwnd, HINSTANCE hinst, char *cmdline, int nCmdShow) - { -+ /* - GDBusDaemon *daemon; - GMainLoop *loop; - const char *address; -@@ -1354,6 +1355,7 @@ - - g_main_loop_unref (loop); - g_object_unref (daemon); -+ */ - } - - static gchar * From 43833e444c35008b11f75686ec192901b09151de Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 6 Apr 2016 22:35:23 +0300 Subject: [PATCH 0535/1463] glib: recover authors of patches --- src/glib-1-fixes.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/glib-1-fixes.patch b/src/glib-1-fixes.patch index c3897702..5ee42be6 100644 --- a/src/glib-1-fixes.patch +++ b/src/glib-1-fixes.patch @@ -4,7 +4,7 @@ See index.html for further information. Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "fix@me" +From: Mark Brand Date: Thu, 23 Sep 2010 21:42:46 +0200 Subject: [PATCH] fix tool paths @@ -28,7 +28,7 @@ index 1111111..2222222 100644 Description: C Utility Library From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "fix@me" +From: Hans Petter Jansson Date: Fri, 15 Jun 2012 15:25:01 +0200 Subject: [PATCH] Avoid DllMain symbol conflict when linking statically @@ -86,7 +86,7 @@ index 1111111..2222222 100644 { From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "fix@me" +From: Hans Petter Jansson Date: Fri, 15 Jun 2012 15:27:22 +0200 Subject: [PATCH] Allow building without inotify support @@ -114,7 +114,7 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "fix@me" +From: Hans Petter Jansson Date: Fri, 15 Jun 2012 15:28:14 +0200 Subject: [PATCH] Make sure STDC_HEADERS is set for AC_CHECK_ALIGNOF. Backported from upstream @@ -135,7 +135,7 @@ index 1111111..2222222 100644 if test x$enable_static = xyes -a x$enable_shared = xyes; then From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "fix@me" +From: Hans Petter Jansson Date: Fri, 15 Jun 2012 15:29:06 +0200 Subject: [PATCH] Link with dnsapi @@ -154,7 +154,7 @@ index 1111111..2222222 100644 Cflags: From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: "fix@me" +From: Hans Petter Jansson Date: Fri, 15 Jun 2012 15:29:38 +0200 Subject: [PATCH] Ensure globals are initialized even when DllMain is not being run @@ -531,8 +531,8 @@ index 1111111..2222222 100644 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Wed, 6 Apr 2016 22:24:43 +0300 +From: Gerardo Ballabio +Date: Sun, 16 Aug 2015 13:18:24 +0200 Subject: [PATCH] Remove an annoying runtime warning that pops up when using GtkApplication in Gtk+ 3 programs. From d0523b769ee037c960ff4386817c780aa3267348 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 6 Apr 2016 22:42:19 +0300 Subject: [PATCH 0536/1463] fix error "won't overwrite defined macro" on OSX See https://github.com/mxe/mxe/issues/1281 --- src/glib-1-fixes.patch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/glib-1-fixes.patch b/src/glib-1-fixes.patch index 5ee42be6..d1cdbad5 100644 --- a/src/glib-1-fixes.patch +++ b/src/glib-1-fixes.patch @@ -557,3 +557,26 @@ index 1111111..2222222 100644 } static gchar * + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: aquiles2k +Date: Wed, 6 Apr 2016 22:39:53 +0300 +Subject: [PATCH] fix error "won't overwrite defined macro" on OSX + +See https://github.com/mxe/mxe/issues/1281 + +diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4 +index 1111111..2222222 100644 +--- a/m4macros/glib-gettext.m4 ++++ b/m4macros/glib-gettext.m4 +@@ -36,8 +36,8 @@ dnl We go to great lengths to make sure that aclocal won't + dnl try to pull in the installed version of these macros + dnl when running aclocal in the glib directory. + dnl +-m4_copy([AC_DEFUN],[glib_DEFUN]) +-m4_copy([AC_REQUIRE],[glib_REQUIRE]) ++m4_copy_force([AC_DEFUN],[glib_DEFUN]) ++m4_copy_force([AC_REQUIRE],[glib_REQUIRE]) + dnl + dnl At the end, if we're not within glib, we'll define the public + dnl definitions in terms of our private definitions. From 4736fa393adeec0c2ff3a11a77fee3d2e70f6963 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 6 Apr 2016 22:43:06 +0300 Subject: [PATCH 0537/1463] add pkgconfig to the requirements on OSX close #1281 --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 70ccdfb5..f94210bc 100644 --- a/index.html +++ b/index.html @@ -779,7 +779,7 @@ USE_OSGPLUGIN(<plugin2>) 

    sudo port install \
     autoconf automake bison coreutils flex gettext \
     gdk-pixbuf2 glib2 gsed intltool libffi libtool \
-    openssl p5-xml-parser p7zip scons wget xz
    + openssl p5-xml-parser p7zip pkgconfig scons wget xz
    Method 2 - Rudix

    From e7ce1f43003f40cbec2cdb63bae860c9318a8cfc Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 6 Apr 2016 22:54:14 +0300 Subject: [PATCH 0538/1463] enable native build of luajit in plugin "apps" --- plugins/apps/luajit.mk | 7 +++++++ src/luajit.mk | 8 ++++++++ 2 files changed, 15 insertions(+) create mode 100644 plugins/apps/luajit.mk diff --git a/plugins/apps/luajit.mk b/plugins/apps/luajit.mk new file mode 100644 index 00000000..1fcfe9b3 --- /dev/null +++ b/plugins/apps/luajit.mk @@ -0,0 +1,7 @@ +# This file is part of MXE. +# See index.html for further information. + +# enable native build of luajit for wrk +# leave build rule in src/luajit.mk for other uses (i.e. build-pkg) + +luajit_TARGETS := $(BUILD) $(MXE_TARGETS) diff --git a/src/luajit.mk b/src/luajit.mk index 73457e96..d2d63cac 100644 --- a/src/luajit.mk +++ b/src/luajit.mk @@ -9,6 +9,7 @@ $(PKG)_SUBDIR := LuaJIT-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_URL := http://luajit.org/download/$($(PKG)_FILE) $(PKG)_DEPS := gcc dlfcn-win32 +$(PKG)_DEPS_$(BUILD) := define $(PKG)_BUILD $(MAKE) -C '$(1)' -j '$(JOBS)' \ @@ -21,6 +22,13 @@ define $(PKG)_BUILD install endef +define $(PKG)_BUILD_$(BUILD) + $(MAKE) -C '$(1)' -j '$(JOBS)' \ + BUILDMODE=static \ + PREFIX='$(PREFIX)/$(BUILD)' \ + install +endef + # gcc -m64 is only available on 64-bit machines ifeq (,$(findstring 64,$(BUILD))) $(PKG)_BUILD_x86_64-w64-mingw32 = From 953d77597a67e3c97c5c44849907a8c2e88f710a Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 6 Apr 2016 22:54:46 +0300 Subject: [PATCH 0539/1463] add variable luajit_ABIVER=5.1 The name of libluajit-5.1.a can be generated from this variable. --- src/luajit.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/src/luajit.mk b/src/luajit.mk index d2d63cac..0b8a2822 100644 --- a/src/luajit.mk +++ b/src/luajit.mk @@ -4,6 +4,7 @@ PKG := luajit $(PKG)_IGNORE := $(PKG)_VERSION := 2.0.4 +$(PKG)_ABIVER := 5.1 $(PKG)_CHECKSUM := 620fa4eb12375021bef6e4f237cbd2dd5d49e56beb414bee052c746beef1807d $(PKG)_SUBDIR := LuaJIT-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz From eb685487944db1eab03e46eb4a224783b42bd6fa Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Thu, 24 Mar 2016 00:56:52 +0300 Subject: [PATCH 0540/1463] add package "wrk" to plugins/apps wrk is modern HTTP benchmarking tool. --- plugins/apps/wrk-1-fixes.patch | 679 +++++++++++++++++++++++++++++++++ plugins/apps/wrk.mk | 32 ++ 2 files changed, 711 insertions(+) create mode 100644 plugins/apps/wrk-1-fixes.patch create mode 100644 plugins/apps/wrk.mk diff --git a/plugins/apps/wrk-1-fixes.patch b/plugins/apps/wrk-1-fixes.patch new file mode 100644 index 00000000..a01fced0 --- /dev/null +++ b/plugins/apps/wrk-1-fixes.patch @@ -0,0 +1,679 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Sun, 20 Mar 2016 16:36:20 +0100 +Subject: [PATCH] rename conflicting constants + + +diff --git a/src/net.c b/src/net.c +index 1111111..2222222 100644 +--- a/src/net.c ++++ b/src/net.c +@@ -7,29 +7,29 @@ + #include "net.h" + + status sock_connect(connection *c) { +- return OK; ++ return WRK_OK; + } + + status sock_close(connection *c) { +- return OK; ++ return WRK_OK; + } + + status sock_read(connection *c, size_t *n) { + ssize_t r = read(c->fd, c->buf, sizeof(c->buf)); + *n = (size_t) r; +- return r >= 0 ? OK : ERROR; ++ return r >= 0 ? WRK_OK : WRK_ERROR; + } + + status sock_write(connection *c, char *buf, size_t len, size_t *n) { + ssize_t r; + if ((r = write(c->fd, buf, len)) == -1) { + switch (errno) { +- case EAGAIN: return RETRY; +- default: return ERROR; ++ case EAGAIN: return WRK_RETRY; ++ default: return WRK_ERROR; + } + } + *n = (size_t) r; +- return OK; ++ return WRK_OK; + } + + size_t sock_readable(connection *c) { +diff --git a/src/net.h b/src/net.h +index 1111111..2222222 100644 +--- a/src/net.h ++++ b/src/net.h +@@ -7,9 +7,9 @@ + #include "wrk.h" + + typedef enum { +- OK, +- ERROR, +- RETRY ++ WRK_OK, ++ WRK_ERROR, ++ WRK_RETRY + } status; + + struct sock { +diff --git a/src/ssl.c b/src/ssl.c +index 1111111..2222222 100644 +--- a/src/ssl.c ++++ b/src/ssl.c +@@ -54,44 +54,44 @@ status ssl_connect(connection *c) { + SSL_set_fd(c->ssl, c->fd); + if ((r = SSL_connect(c->ssl)) != 1) { + switch (SSL_get_error(c->ssl, r)) { +- case SSL_ERROR_WANT_READ: return RETRY; +- case SSL_ERROR_WANT_WRITE: return RETRY; +- default: return ERROR; ++ case SSL_ERROR_WANT_READ: return WRK_RETRY; ++ case SSL_ERROR_WANT_WRITE: return WRK_RETRY; ++ default: return WRK_ERROR; + } + } +- return OK; ++ return WRK_OK; + } + + status ssl_close(connection *c) { + SSL_shutdown(c->ssl); + SSL_clear(c->ssl); +- return OK; ++ return WRK_OK; + } + + status ssl_read(connection *c, size_t *n) { + int r; + if ((r = SSL_read(c->ssl, c->buf, sizeof(c->buf))) <= 0) { + switch (SSL_get_error(c->ssl, r)) { +- case SSL_ERROR_WANT_READ: return RETRY; +- case SSL_ERROR_WANT_WRITE: return RETRY; +- default: return ERROR; ++ case SSL_ERROR_WANT_READ: return WRK_RETRY; ++ case SSL_ERROR_WANT_WRITE: return WRK_RETRY; ++ default: return WRK_ERROR; + } + } + *n = (size_t) r; +- return OK; ++ return WRK_OK; + } + + status ssl_write(connection *c, char *buf, size_t len, size_t *n) { + int r; + if ((r = SSL_write(c->ssl, buf, len)) <= 0) { + switch (SSL_get_error(c->ssl, r)) { +- case SSL_ERROR_WANT_READ: return RETRY; +- case SSL_ERROR_WANT_WRITE: return RETRY; +- default: return ERROR; ++ case SSL_ERROR_WANT_READ: return WRK_RETRY; ++ case SSL_ERROR_WANT_WRITE: return WRK_RETRY; ++ default: return WRK_ERROR; + } + } + *n = (size_t) r; +- return OK; ++ return WRK_OK; + } + + size_t ssl_readable(connection *c) { +diff --git a/src/wrk.c b/src/wrk.c +index 1111111..2222222 100644 +--- a/src/wrk.c ++++ b/src/wrk.c +@@ -349,9 +349,9 @@ static void socket_connected(aeEventLoop *loop, int fd, void *data, int mask) { + connection *c = data; + + switch (sock.connect(c)) { +- case OK: break; +- case ERROR: goto error; +- case RETRY: return; ++ case WRK_OK: break; ++ case WRK_ERROR: goto error; ++ case WRK_RETRY: return; + } + + http_parser_init(&c->parser, HTTP_RESPONSE); +@@ -384,9 +384,9 @@ static void socket_writeable(aeEventLoop *loop, int fd, void *data, int mask) { + size_t n; + + switch (sock.write(c, buf, len, &n)) { +- case OK: break; +- case ERROR: goto error; +- case RETRY: return; ++ case WRK_OK: break; ++ case WRK_ERROR: goto error; ++ case WRK_RETRY: return; + } + + c->written += n; +@@ -408,9 +408,9 @@ static void socket_readable(aeEventLoop *loop, int fd, void *data, int mask) { + + do { + switch (sock.read(c, &n)) { +- case OK: break; +- case ERROR: goto error; +- case RETRY: return; ++ case WRK_OK: break; ++ case WRK_ERROR: goto error; ++ case WRK_RETRY: return; + } + + if (http_parser_execute(&c->parser, &parser_settings, c->buf, n) != n) goto error; + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Sun, 20 Mar 2016 21:34:38 +0100 +Subject: [PATCH] rename zcalloc (conflict with zlib) + + +diff --git a/src/stats.c b/src/stats.c +index 1111111..2222222 100644 +--- a/src/stats.c ++++ b/src/stats.c +@@ -9,7 +9,7 @@ + + stats *stats_alloc(uint64_t max) { + uint64_t limit = max + 1; +- stats *s = zcalloc(sizeof(stats) + sizeof(uint64_t) * limit); ++ stats *s = zmalloc_calloc(sizeof(stats) + sizeof(uint64_t) * limit); + s->limit = limit; + s->min = UINT64_MAX; + return s; +diff --git a/src/wrk.c b/src/wrk.c +index 1111111..2222222 100644 +--- a/src/wrk.c ++++ b/src/wrk.c +@@ -88,7 +88,7 @@ int main(int argc, char **argv) { + + statistics.latency = stats_alloc(cfg.timeout * 1000); + statistics.requests = stats_alloc(MAX_THREAD_RATE_S); +- thread *threads = zcalloc(cfg.threads * sizeof(thread)); ++ thread *threads = zmalloc_calloc(cfg.threads * sizeof(thread)); + + lua_State *L = script_create(cfg.script, url, headers); + if (!script_resolve(L, host, service)) { +@@ -204,7 +204,7 @@ void *thread_main(void *arg) { + script_request(thread->L, &request, &length); + } + +- thread->cs = zcalloc(thread->connections * sizeof(connection)); ++ thread->cs = zmalloc_calloc(thread->connections * sizeof(connection)); + connection *c = thread->cs; + + for (uint64_t i = 0; i < thread->connections; i++, c++) { +@@ -436,7 +436,7 @@ static char *copy_url_part(char *url, struct http_parser_url *parts, enum http_p + if (parts->field_set & (1 << field)) { + uint16_t off = parts->field_data[field].off; + uint16_t len = parts->field_data[field].len; +- part = zcalloc(len + 1 * sizeof(char)); ++ part = zmalloc_calloc(len + 1 * sizeof(char)); + memcpy(part, &url[off], len); + } + +diff --git a/src/zmalloc.c b/src/zmalloc.c +index 1111111..2222222 100644 +--- a/src/zmalloc.c ++++ b/src/zmalloc.c +@@ -107,7 +107,7 @@ void *zmalloc(size_t size) { + #endif + } + +-void *zcalloc(size_t size) { ++void *zmalloc_calloc(size_t size) { + void *ptr = calloc(1, size+PREFIX_SIZE); + + if (!ptr) zmalloc_oom(size); +diff --git a/src/zmalloc.h b/src/zmalloc.h +index 1111111..2222222 100644 +--- a/src/zmalloc.h ++++ b/src/zmalloc.h +@@ -67,7 +67,7 @@ + #endif + + void *zmalloc(size_t size); +-void *zcalloc(size_t size); ++void *zmalloc_calloc(size_t size); + void *zrealloc(void *ptr, size_t size); + void zfree(void *ptr); + char *zstrdup(const char *s); + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Tue, 22 Mar 2016 23:04:35 +0100 +Subject: [PATCH] allow to specify EXTRA_CFLAGS and EXTRA_LIBS + + +diff --git a/Makefile b/Makefile +index 1111111..2222222 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,5 +1,5 @@ +-CFLAGS := -std=c99 -Wall -O2 -D_REENTRANT +-LIBS := -lpthread -lm -lcrypto -lssl ++CFLAGS := -std=c99 -Wall -O2 -D_REENTRANT $(EXTRA_CFLAGS) ++LIBS := -lpthread -lm -lcrypto -lssl $(EXTRA_LIBS) + + TARGET := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo unknown) + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Tue, 22 Mar 2016 23:05:26 +0100 +Subject: [PATCH] reorder -lssl and -lcrypto + +See http://stackoverflow.com/a/27136346 + +diff --git a/Makefile b/Makefile +index 1111111..2222222 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,5 +1,5 @@ + CFLAGS := -std=c99 -Wall -O2 -D_REENTRANT $(EXTRA_CFLAGS) +-LIBS := -lpthread -lm -lcrypto -lssl $(EXTRA_LIBS) ++LIBS := -lpthread -lm -lssl -lcrypto $(EXTRA_LIBS) + + TARGET := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo unknown) + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Tue, 22 Mar 2016 23:14:32 +0100 +Subject: [PATCH] option to use external installation of LuaJIT + +LUA_PATH is provided to avoid changing directory to LuaJIT's tree. + +diff --git a/Makefile b/Makefile +index 1111111..2222222 100644 +--- a/Makefile ++++ b/Makefile +@@ -25,9 +25,11 @@ ODIR := obj + OBJ := $(patsubst %.c,$(ODIR)/%.o,$(SRC)) $(ODIR)/bytecode.o + + LDIR = deps/luajit/src +-LIBS := -lluajit $(LIBS) +-CFLAGS += -I$(LDIR) +-LDFLAGS += -L$(LDIR) ++LUA_PATH = $(LDIR)/?.lua # for luajit -b to work ++LUAJIT = $(LDIR)/luajit ++LUAJIT_A = $(LDIR)/libluajit.a ++LUAJIT_I = $(LDIR) ++CFLAGS += -I$(LUAJIT_I) + + all: $(BIN) + +@@ -37,16 +39,16 @@ clean: + + $(BIN): $(OBJ) + @echo LINK $(BIN) +- @$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) ++ @$(CC) $(LDFLAGS) -o $@ $^ $(LUAJIT_A) $(LIBS) + +-$(OBJ): config.h Makefile $(LDIR)/libluajit.a | $(ODIR) ++$(OBJ): config.h Makefile $(LUAJIT_A) | $(ODIR) + + $(ODIR): + @mkdir -p $@ + + $(ODIR)/bytecode.o: src/wrk.lua + @echo LUAJIT $< +- @$(SHELL) -c 'cd $(LDIR) && ./luajit -b $(CURDIR)/$< $(CURDIR)/$@' ++ @LUA_PATH=$(LUA_PATH) $(LUAJIT) -b $(CURDIR)/$< $(CURDIR)/$@ + + $(ODIR)/%.o : %.c + @echo CC $< + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Tue, 22 Mar 2016 23:21:51 +0100 +Subject: [PATCH] embed bytecode via header instead of object file + +Embedding via object file requires -Wl,-E which doesn't work on MinGW. +Embedding via header is more portable. + +diff --git a/.gitignore b/.gitignore +index 1111111..2222222 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -1,6 +1,7 @@ + *.o + *.a + wrk ++src/bytecode.h + + deps/luajit/src/host/buildvm + deps/luajit/src/host/buildvm_arch.h +diff --git a/Makefile b/Makefile +index 1111111..2222222 100644 +--- a/Makefile ++++ b/Makefile +@@ -11,10 +11,8 @@ else ifeq ($(TARGET), darwin) + else ifeq ($(TARGET), linux) + CFLAGS += -D_POSIX_C_SOURCE=200112L -D_BSD_SOURCE + LIBS += -ldl +- LDFLAGS += -Wl,-E + else ifeq ($(TARGET), freebsd) + CFLAGS += -D_DECLARE_C99_LDBL_MATH +- LDFLAGS += -Wl,-E + endif + + SRC := wrk.c net.c ssl.c aprintf.c stats.c script.c units.c \ +@@ -22,7 +20,7 @@ SRC := wrk.c net.c ssl.c aprintf.c stats.c script.c units.c \ + BIN := wrk + + ODIR := obj +-OBJ := $(patsubst %.c,$(ODIR)/%.o,$(SRC)) $(ODIR)/bytecode.o ++OBJ := $(patsubst %.c,$(ODIR)/%.o,$(SRC)) + + LDIR = deps/luajit/src + LUA_PATH = $(LDIR)/?.lua # for luajit -b to work +@@ -41,12 +39,12 @@ $(BIN): $(OBJ) + @echo LINK $(BIN) + @$(CC) $(LDFLAGS) -o $@ $^ $(LUAJIT_A) $(LIBS) + +-$(OBJ): config.h Makefile $(LUAJIT_A) | $(ODIR) ++$(OBJ): config.h bytecode.h Makefile $(LUAJIT_A) | $(ODIR) + + $(ODIR): + @mkdir -p $@ + +-$(ODIR)/bytecode.o: src/wrk.lua ++src/bytecode.h: src/wrk.lua + @echo LUAJIT $< + @LUA_PATH=$(LUA_PATH) $(LUAJIT) -b $(CURDIR)/$< $(CURDIR)/$@ + +diff --git a/src/script.c b/src/script.c +index 1111111..2222222 100644 +--- a/src/script.c ++++ b/src/script.c +@@ -5,6 +5,7 @@ + #include "script.h" + #include "http_parser.h" + #include "zmalloc.h" ++#include "bytecode.h" + + typedef struct { + char *name; +@@ -48,7 +49,17 @@ static const struct luaL_reg threadlib[] = { + lua_State *script_create(char *file, char *url, char **headers) { + lua_State *L = luaL_newstate(); + luaL_openlibs(L); +- (void) luaL_dostring(L, "wrk = require \"wrk\""); ++ ++ // Taken from http://stackoverflow.com/a/19426724 ++ lua_getglobal(L, "package"); ++ lua_getfield(L, -1, "preload"); ++ luaL_loadbuffer(L, luaJIT_BC_wrk, luaJIT_BC_wrk_SIZE, NULL); ++ lua_setfield(L, -2, "wrk"); ++ lua_pop(L, 2); ++ ++ if (luaL_dostring(L, "wrk = require \"wrk\"")) { ++ fprintf(stderr, "Error in wrk.lua: %s\n", lua_tostring(L, -1)); ++ } + + luaL_newmetatable(L, "wrk.addr"); + luaL_register(L, NULL, addrlib); + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Tue, 22 Mar 2016 23:28:09 +0100 +Subject: [PATCH] use send/recv for sockets instead of write/read + +write/read returns Bad file descriptor for sockets in MinGW. + +diff --git a/src/net.c b/src/net.c +index 1111111..2222222 100644 +--- a/src/net.c ++++ b/src/net.c +@@ -15,14 +15,14 @@ status sock_close(connection *c) { + } + + status sock_read(connection *c, size_t *n) { +- ssize_t r = read(c->fd, c->buf, sizeof(c->buf)); ++ ssize_t r = recv(c->fd, c->buf, sizeof(c->buf), 0); + *n = (size_t) r; + return r >= 0 ? WRK_OK : WRK_ERROR; + } + + status sock_write(connection *c, char *buf, size_t len, size_t *n) { + ssize_t r; +- if ((r = write(c->fd, buf, len)) == -1) { ++ if ((r = send(c->fd, buf, len, 0)) == -1) { + switch (errno) { + case EAGAIN: return WRK_RETRY; + default: return WRK_ERROR; + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Wed, 23 Mar 2016 22:48:52 +0100 +Subject: [PATCH] compatibility with MinGW + + +diff --git a/Makefile b/Makefile +index 1111111..2222222 100644 +--- a/Makefile ++++ b/Makefile +@@ -13,6 +13,8 @@ else ifeq ($(TARGET), linux) + LIBS += -ldl + else ifeq ($(TARGET), freebsd) + CFLAGS += -D_DECLARE_C99_LDBL_MATH ++else ifeq ($(TARGET), mingw) ++ CFLAGS += -D_POSIX_C_SOURCE=200112L -D_BSD_SOURCE + endif + + SRC := wrk.c net.c ssl.c aprintf.c stats.c script.c units.c \ +diff --git a/src/ae.c b/src/ae.c +index 1111111..2222222 100644 +--- a/src/ae.c ++++ b/src/ae.c +@@ -35,7 +35,11 @@ + #include + #include + #include ++#ifndef __WIN32__ + #include ++#else ++#include ++#endif + #include + #include + #include +@@ -395,6 +399,7 @@ int aeProcessEvents(aeEventLoop *eventLoop, int flags) + return processed; /* return the number of processed file/time events */ + } + ++#ifndef __WIN32__ + /* Wait for millseconds until the given file descriptor becomes + * writable/readable/exception */ + int aeWait(int fd, int mask, long long milliseconds) { +@@ -416,6 +421,7 @@ int aeWait(int fd, int mask, long long milliseconds) { + return retval; + } + } ++#endif + + void aeMain(aeEventLoop *eventLoop) { + eventLoop->stop = 0; +diff --git a/src/main.h b/src/main.h +index 1111111..2222222 100644 +--- a/src/main.h ++++ b/src/main.h +@@ -6,8 +6,14 @@ + #include + #include + #include ++#ifndef __WIN32__ + #include + #include ++#include ++#else ++#include ++#include ++#endif + #include + #include + #include +@@ -17,7 +23,6 @@ + #include + #include + #include +-#include + + #include "ssl.h" + #include "aprintf.h" +diff --git a/src/net.c b/src/net.c +index 1111111..2222222 100644 +--- a/src/net.c ++++ b/src/net.c +@@ -2,7 +2,12 @@ + + #include + #include ++ ++#ifndef __WIN32__ + #include ++#else ++#include ++#endif + + #include "net.h" + +@@ -33,7 +38,13 @@ status sock_write(connection *c, char *buf, size_t len, size_t *n) { + } + + size_t sock_readable(connection *c) { ++#ifndef __WIN32__ + int n, rc; + rc = ioctl(c->fd, FIONREAD, &n); ++#else ++ unsigned long n; ++ int rc; ++ rc = ioctlsocket(c->fd, FIONREAD, &n); ++#endif + return rc == -1 ? 0 : n; + } +diff --git a/src/wrk.c b/src/wrk.c +index 1111111..2222222 100644 +--- a/src/wrk.c ++++ b/src/wrk.c +@@ -57,6 +57,14 @@ static void usage() { + } + + int main(int argc, char **argv) { ++#ifdef __WIN32__ ++ WSADATA wsaData; ++ if (WSAStartup(0x202, &wsaData) != 0) { ++ fprintf(stderr, "Failed to initialize WSA\n"); ++ exit(1); ++ } ++#endif ++ + char *url, **headers = zmalloc(argc * sizeof(char *)); + struct http_parser_url parts = {}; + +@@ -83,7 +91,9 @@ int main(int argc, char **argv) { + sock.readable = ssl_readable; + } + ++#ifndef __WIN32__ + signal(SIGPIPE, SIG_IGN); ++#endif + signal(SIGINT, SIG_IGN); + + statistics.latency = stats_alloc(cfg.timeout * 1000); +@@ -99,7 +109,12 @@ int main(int argc, char **argv) { + + for (uint64_t i = 0; i < cfg.threads; i++) { + thread *t = &threads[i]; ++#ifndef __WIN32__ + t->loop = aeCreateEventLoop(10 + cfg.connections * 3); ++#else ++ // fd on Windows doesn't start from 1 ++ t->loop = aeCreateEventLoop(10000); ++#endif + t->connections = cfg.connections / cfg.threads; + + t->L = script_create(cfg.script, url, headers); +@@ -122,12 +137,16 @@ int main(int argc, char **argv) { + } + } + ++#ifndef __WIN32__ + struct sigaction sa = { + .sa_handler = handler, + .sa_flags = 0, + }; + sigfillset(&sa.sa_mask); + sigaction(SIGINT, &sa, NULL); ++#else ++ signal(SIGINT, handler); ++#endif + + char *time = format_time_s(cfg.duration); + printf("Running %s test @ %s\n", time, url); +@@ -231,18 +250,34 @@ static int connect_socket(thread *thread, connection *c) { + struct addrinfo *addr = thread->addr; + struct aeEventLoop *loop = thread->loop; + int fd, flags; ++#ifdef __WIN32__ ++ unsigned long non_blocking; ++#endif + + fd = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol); + ++#ifndef __WIN32__ + flags = fcntl(fd, F_GETFL, 0); + fcntl(fd, F_SETFL, flags | O_NONBLOCK); ++#else ++ non_blocking = 1; ++ ioctlsocket(fd, FIONBIO, &non_blocking); ++#endif + + if (connect(fd, addr->ai_addr, addr->ai_addrlen) == -1) { ++#ifndef __WIN32__ + if (errno != EINPROGRESS) goto error; ++#else ++ if (WSAGetLastError() != WSAEWOULDBLOCK) goto error; ++#endif + } + + flags = 1; +- setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &flags, sizeof(flags)); ++ setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, ++#ifdef __WIN32__ ++ (const char*) ++#endif ++ &flags, sizeof(flags)); + + flags = AE_READABLE | AE_WRITABLE; + if (aeCreateFileEvent(loop, fd, flags, socket_connected, c) == AE_OK) { +diff --git a/src/wrk.h b/src/wrk.h +index 1111111..2222222 100644 +--- a/src/wrk.h ++++ b/src/wrk.h +@@ -5,8 +5,14 @@ + #include + #include + #include ++ ++#ifndef __WIN32__ + #include + #include ++#else ++#include ++#include // addrinfo ++#endif + + #include + #include diff --git a/plugins/apps/wrk.mk b/plugins/apps/wrk.mk new file mode 100644 index 00000000..751d246b --- /dev/null +++ b/plugins/apps/wrk.mk @@ -0,0 +1,32 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := wrk +$(PKG)_IGNORE := +$(PKG)_VERSION := 4.0.1 +$(PKG)_CHECKSUM := c03bbc283836cb4b706eb6bfd18e724a8ce475e2c16154c13c6323a845b4327d +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://github.com/wg/wrk/archive/$($(PKG)_VERSION).tar.gz +$(PKG)_DEPS := gcc luajit openssl pthreads + +define $(PKG)_UPDATE + $(call MXE_GET_GITHUB_TAGS, wg/wrk) +endef + +define $(PKG)_BUILD + $(MAKE) \ + -C '$(1)' \ + -j '$(JOBS)' \ + CC='$(TARGET)-gcc' \ + TARGET='mingw' \ + LUAJIT='$(PREFIX)/$(BUILD)/bin/luajit' \ + LUA_PATH='$(PREFIX)/$(BUILD)/share/luajit-$(luajit_VERSION)/?.lua' \ + LUAJIT_A='$(PREFIX)/$(TARGET)/lib/libluajit-$(luajit_ABIVER).a' \ + LUAJIT_I='$(PREFIX)/$(TARGET)/include/luajit-$(call SHORT_PKG_VERSION,luajit)/' \ + EXTRA_LIBS='-lz -lws2_32 -lgdi32' \ + BIN='wrk.exe' + cp '$(1)/wrk.exe' '$(PREFIX)/$(TARGET)/bin/' +endef + +$(PKG)_BUILD_SHARED = From 0e0cd0c09dcce95a240a26ddc359968f9de6be57 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 6 Apr 2016 23:20:46 +0300 Subject: [PATCH 0541/1463] fix qtbase on Wheezy (don't use c++1y) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The error: `g++: error: unrecognized command line option ‘-std=c++1y’` Full log: https://gist.github.com/147a8e697b4be73dad0218598dab2608 The problem was solved by setting C++ version to C++11 explicitly. --- src/qtbase.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qtbase.mk b/src/qtbase.mk index f2c64f01..e4575be3 100644 --- a/src/qtbase.mk +++ b/src/qtbase.mk @@ -26,6 +26,7 @@ define $(PKG)_BUILD SYBASE_LIBS="-lsybdb `'$(TARGET)-pkg-config' --libs-only-l gnutls` -liconv -lws2_32" \ ./configure \ -opensource \ + -c++std c++11 \ -confirm-license \ -xplatform win32-g++ \ -device-option CROSS_COMPILE=${TARGET}- \ From be3663ad7f1afb25270acf54c1bb2fe95a29c54e Mon Sep 17 00:00:00 2001 From: Pavel Vatagin Date: Wed, 23 Mar 2016 23:09:15 +0300 Subject: [PATCH 0542/1463] add package googletest and update protobuf --- index.html | 6 +++++- src/googletest.mk | 15 +++++++++++++++ src/protobuf.mk | 19 +++++++++---------- 3 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 src/googletest.mk diff --git a/index.html b/index.html index f94210bc..59d08ca9 100644 --- a/index.html +++ b/index.html @@ -1417,6 +1417,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) gnutls GnuTLS + + googletest + Google Test + graphicsmagick GraphicsMagick @@ -2239,7 +2243,7 @@ local-pkg-list: $(LOCAL_PKG_LIST) protobuf - protobuf + protobuf pthreads diff --git a/src/googletest.mk b/src/googletest.mk new file mode 100644 index 00000000..e5a902f1 --- /dev/null +++ b/src/googletest.mk @@ -0,0 +1,15 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := googletest +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.7.0 +$(PKG)_CHECKSUM := f73a6546fdf9fce9ff93a5015e0333a8af3062a152a9ad6bcb772c96687016cc +$(PKG)_SUBDIR := $(PKG)-release-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://github.com/google/$(PKG)/archive/release-$($(PKG)_VERSION).tar.gz +$(PKG)_DEPS := + +define $(PKG)_UPDATE + $(call MXE_GET_GITHUB_TAGS, google/googletest, release-) +endef diff --git a/src/protobuf.mk b/src/protobuf.mk index eeabc2c8..3a5051a3 100644 --- a/src/protobuf.mk +++ b/src/protobuf.mk @@ -3,23 +3,22 @@ PKG := protobuf $(PKG)_IGNORE := -$(PKG)_VERSION := 2.5.0 -$(PKG)_CHECKSUM := 13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677 +$(PKG)_VERSION := 2.6.1 +$(PKG)_CHECKSUM := 2667b7cda4a6bc8a09e5463adf3b5984e08d94e72338277affa8594d8b6e5cd1 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) -$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 -$(PKG)_URL := http://protobuf.googlecode.com/files/$($(PKG)_FILE) -$(PKG)_DEPS := gcc zlib +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://github.com/google/$(PKG)/archive/$($(PKG)_VERSION).tar.gz +$(PKG)_DEPS := gcc zlib googletest define $(PKG)_UPDATE - $(WGET) -q -O- 'http://code.google.com/p/protobuf/downloads/list?sort=-uploaded' | \ - $(SED) -n 's,.*protobuf-\([0-9][^<]*\)\.tar.*,\1,p' | \ - grep -v 'rc' | \ - head -1 + $(call MXE_GET_GITHUB_TAGS, google/protobuf, v) endef define $(PKG)_BUILD + $(call PREPARE_PKG_SOURCE,googletest,$(1)) + cd '$(1)' && mv googletest-release-$(googletest_VERSION)/ gtest # First step: Build for host system in order to create "protoc" binary. - cd '$(1)' && ./configure \ + cd '$(1)' && ./autogen.sh && ./configure \ --disable-shared $(MAKE) -C '$(1)' -j '$(JOBS)' cp '$(1)/src/protoc' '$(PREFIX)/bin/$(TARGET)-protoc' From d11555c7602c854d8c9d10826d7d119852b68522 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Thu, 7 Apr 2016 21:22:06 +0000 Subject: [PATCH 0543/1463] Update versions.json & build-matrix.html --- build-matrix.html | 14 ++++++++++++-- versions.json | 3 ++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index f973b1eb..40c42f83 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -857,6 +857,16 @@ feel free to submit a pull request. ✗ + + googletest + 1.7.0 + ✗ + ✗ + ✗ + ✗ + ✗ + + graphicsmagick 1.3.21 @@ -2919,7 +2929,7 @@ feel free to submit a pull request. protobuf - 2.5.0 + 2.6.1 ✓ ✓ ✓ @@ -4050,7 +4060,7 @@ feel free to submit a pull request. Total: 392 -
    (+5 virtual +
    (+6 virtual +4 native-only) 389 diff --git a/versions.json b/versions.json index e07291bb..0789ec31 100644 --- a/versions.json +++ b/versions.json @@ -81,6 +81,7 @@ "glibmm": "2.42.0", "gmp": "6.1.0", "gnutls": "3.4.10", + "googletest": "1.7.0", "graphicsmagick": "1.3.21", "gsl": "1.16", "gsoap": "2.8.22", @@ -287,7 +288,7 @@ "postgresql": "9.2.4", "primesieve": "5.5.0", "proj": "4.9.1", - "protobuf": "2.5.0", + "protobuf": "2.6.1", "pthreads": "POSIX 1003.1-2001", "qdbm": "1.8.78", "qhttpengine": "0.1.0", From 9ba1b57e4bb9b3c1a0f24130e5eab95b3f688351 Mon Sep 17 00:00:00 2001 From: darealshinji Date: Fri, 8 Apr 2016 19:25:22 +0200 Subject: [PATCH 0544/1463] add package djvulibre --- index.html | 4 + src/djvulibre-1-skip-desktopfiles.patch | 16 +++ src/djvulibre-2-exe-file-extension.patch | 144 +++++++++++++++++++++++ src/djvulibre-3-precision.patch | 93 +++++++++++++++ src/djvulibre.mk | 29 +++++ 5 files changed, 286 insertions(+) create mode 100644 src/djvulibre-1-skip-desktopfiles.patch create mode 100644 src/djvulibre-2-exe-file-extension.patch create mode 100644 src/djvulibre-3-precision.patch create mode 100644 src/djvulibre.mk diff --git a/index.html b/index.html index 59d08ca9..6da3d462 100644 --- a/index.html +++ b/index.html @@ -1265,6 +1265,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) devil DevIL + + djvulibre + DjVuLibre + dlfcn-win32 POSIX dlfcn wrapper for Windows diff --git a/src/djvulibre-1-skip-desktopfiles.patch b/src/djvulibre-1-skip-desktopfiles.patch new file mode 100644 index 00000000..1c6065e1 --- /dev/null +++ b/src/djvulibre-1-skip-desktopfiles.patch @@ -0,0 +1,16 @@ +This file is part of MXE. +See index.html for further information. + +Desktop files not needed for MXE. + +--- a/Makefile.in ++++ b/Makefile.in +@@ -32,7 +32,7 @@ + @XML_YES@SUBDIRS_XML = xmltools + @XML_NO@SUBDIRS_XML = + +-SUBDIRS_LAST = desktopfiles ++@DESKTOP_YES@SUBDIRS_LAST = desktopfiles + + SUBDIRS = ${SUBDIRS_FIRST} ${SUBDIRS_XML} ${SUBDIRS_I18N} ${SUBDIRS_LAST} + diff --git a/src/djvulibre-2-exe-file-extension.patch b/src/djvulibre-2-exe-file-extension.patch new file mode 100644 index 00000000..843c41b9 --- /dev/null +++ b/src/djvulibre-2-exe-file-extension.patch @@ -0,0 +1,144 @@ +This file is part of MXE. +See index.html for further information. + +Add .exe to binary filenames. + +--- a/tools/Makefile.in ++++ b/tools/Makefile.in +@@ -28,6 +28,8 @@ + libdir = @libdir@ + mandir = @mandir@ + ++EXEEXT = @EXEEXT@ ++ + CC = @CC@ + CXX = @CXX@ + RM = @RM@ +@@ -60,10 +62,10 @@ + + SUBDIRS = jb2cmp + +-PROGRAMS = bzz c44 cjb2 cpaldjvu csepdjvu \ +- ddjvu djvm djvmcvt djvudump \ +- djvups djvuextract djvumake \ +- djvused djvutxt djvuserve ++PROGRAMS = bzz$(EXEEXT) c44$(EXEEXT) cjb2$(EXEEXT) cpaldjvu$(EXEEXT) csepdjvu$(EXEEXT) \ ++ ddjvu$(EXEEXT) djvm$(EXEEXT) djvmcvt$(EXEEXT) djvudump$(EXEEXT) \ ++ djvups$(EXEEXT) djvuextract$(EXEEXT) djvumake$(EXEEXT) \ ++ djvused$(EXEEXT) djvutxt$(EXEEXT) djvuserve$(EXEEXT) + + SCRIPTS = djvudigital any2djvu + +@@ -117,63 +119,63 @@ + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} annotate.o ${LIBDJVU} ${LIBS} + +-bzz: bzz.o ++bzz$(EXEEXT): bzz.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} bzz.o ${LIBDJVU} ${LIBS} + +-c44: c44.o ++c44$(EXEEXT): c44.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} c44.o ${LIBDJVU} ${LIBS} + +-cjb2: cjb2.o ${JB2OBJS} ++cjb2$(EXEEXT): cjb2.o ${JB2OBJS} + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} cjb2.o ${JB2OBJS} ${LIBDJVU} ${MORELIBS} + +-cpaldjvu: cpaldjvu.o ${JB2OBJS} ++cpaldjvu$(EXEEXT): cpaldjvu.o ${JB2OBJS} + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} cpaldjvu.o ${JB2OBJS} ${LIBDJVU} ${LIBS} + +-csepdjvu: csepdjvu.o ${JB2OBJS} ++csepdjvu$(EXEEXT): csepdjvu.o ${JB2OBJS} + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} csepdjvu.o ${JB2OBJS} ${LIBDJVU} ${LIBS} + +-ddjvu: ddjvu.o tiff2pdf.o ++ddjvu$(EXEEXT): ddjvu.o tiff2pdf.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} ddjvu.o tiff2pdf.o ${LIBDJVU} ${MORELIBS} + +-djvm: djvm.o ++djvm$(EXEEXT): djvm.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvm.o ${LIBDJVU} ${LIBS} + +-djvmcvt: djvmcvt.o ++djvmcvt$(EXEEXT): djvmcvt.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvmcvt.o ${LIBDJVU} ${LIBS} + +-djvudump: djvudump.o ++djvudump$(EXEEXT): djvudump.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvudump.o ${LIBDJVU} ${LIBS} + +-djvups: djvups.o ++djvups$(EXEEXT): djvups.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvups.o ${LIBDJVU} ${LIBS} + +-djvuextract: djvuextract.o ++djvuextract$(EXEEXT): djvuextract.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvuextract.o ${LIBDJVU} ${LIBS} + +-djvumake: djvumake.o ++djvumake$(EXEEXT): djvumake.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvumake.o ${LIBDJVU} ${LIBS} + +-djvused: djvused.o ++djvused$(EXEEXT): djvused.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvused.o ${LIBDJVU} ${LIBS} + +-djvutxt: djvutxt.o ++djvutxt$(EXEEXT): djvutxt.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvutxt.o ${LIBDJVU} ${LIBS} + +-djvuserve: djvuserve.o ++djvuserve$(EXEEXT): djvuserve.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvuserve.o ${LIBDJVU} ${LIBS} + +--- a/xmltools/Makefile.in ++++ b/xmltools/Makefile.in +@@ -28,6 +28,8 @@ + libdir = @libdir@ + mandir = @mandir@ + ++EXEEXT = @EXEEXT@ ++ + CC = @CC@ + CXX = @CXX@ + RM = @RM@ +@@ -55,7 +57,7 @@ + CFLAGS = ${FLAGS} @CPPFLAGS@ @CFLAGS@ + CXXFLAGS = ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@ + +-PROGRAMS = djvutoxml djvuxmlparser ++PROGRAMS = djvutoxml$(EXEEXT) djvuxmlparser$(EXEEXT) + + all: ${PROGRAMS} djvuxml.1 + +@@ -97,11 +99,11 @@ + sed < ${srcdir}/djvuxml.1.in > djvuxml.1 \ + -e 's,DATADIR,${datadir},' + +-djvutoxml: djvutoxml.o ++djvutoxml$(EXEEXT): djvutoxml.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvutoxml.o ${LIBDJVU} ${LIBS} + +-djvuxmlparser: djvuxmlparser.o ++djvuxmlparser$(EXEEXT): djvuxmlparser.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvuxmlparser.o ${LIBDJVU} ${LIBS} + diff --git a/src/djvulibre-3-precision.patch b/src/djvulibre-3-precision.patch new file mode 100644 index 00000000..0d63f2b0 --- /dev/null +++ b/src/djvulibre-3-precision.patch @@ -0,0 +1,93 @@ +This file is part of MXE. +See index.html for further information. + +Source: https://github.com/msys2/MINGW-packages/tree/master/mingw-w64-djvulibre + +--- a/libdjvu/DjVuPort.cpp ++++ b/libdjvu/DjVuPort.cpp +@@ -466,11 +466,11 @@ + // Sort in depth order + int max_dist=0; + for(pos=set;pos;++pos) +- if (max_dist < (int)(long)set[pos]) +- max_dist = (int)(long)set[pos]; ++ if (max_dist < (int)(size_t)set[pos]) ++ max_dist = (int)(size_t)set[pos]; + GArray > lists(0,max_dist); + for(pos=set;pos;++pos) +- lists[(int)(long)set[pos]].append(set.key(pos)); ++ lists[(int)(size_t)set[pos]].append(set.key(pos)); + for(int dist=0;dist<=max_dist;dist++) + for(pos=lists[dist];pos;++pos) + { +--- a/libdjvu/GBitmap.cpp ++++ b/libdjvu/GBitmap.cpp +@@ -469,7 +469,7 @@ + { + if (!monitorptr) + { +- unsigned long x = (unsigned long)this; ++ size_t x = (size_t)this; + monitorptr = &monitors[(x^(x>>5)) % NMONITORS]; + } + } +--- a/libdjvu/GContainer.h ++++ b/libdjvu/GContainer.h +@@ -178,7 +178,7 @@ + static inline unsigned int + hash(const void * const & x) + { +- return (unsigned long) x; ++ return (unsigned long)((size_t) x); + } + + /** Hashing function (float). */ +--- a/libdjvu/IW44EncodeCodec.cpp ++++ b/libdjvu/IW44EncodeCodec.cpp +@@ -310,7 +310,7 @@ + static inline void + mmx_fv_1 ( short* &q, short* e, int s, int s3 ) + { +- while (q Date: Sat, 9 Apr 2016 10:56:15 +0200 Subject: [PATCH 0545/1463] sqlite: update --- src/sqlite.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sqlite.mk b/src/sqlite.mk index 0f776e15..e0412776 100644 --- a/src/sqlite.mk +++ b/src/sqlite.mk @@ -3,8 +3,8 @@ PKG := sqlite $(PKG)_IGNORE := -$(PKG)_VERSION := 3120000 -$(PKG)_CHECKSUM := 53ecdbb5287af673eca3710c5f6c2305e73bb2d034f2a28770bea2be92ed269e +$(PKG)_VERSION := 3120100 +$(PKG)_CHECKSUM := 1c038519862b3983b0475f3ed3143ce4bbfcd21bfbd0741192f415838c831a7c $(PKG)_SUBDIR := $(PKG)-autoconf-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-autoconf-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.sqlite.org/2016/$($(PKG)_FILE) From 4accc990de7741f4d5aa37e368a732f3d47d803a Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sat, 9 Apr 2016 08:57:08 +0000 Subject: [PATCH 0546/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 40c42f83..dcecb040 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -3609,7 +3609,7 @@ feel free to submit a pull request. sqlite - 3120000 + 3120100 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 0789ec31..46fdf938 100644 --- a/versions.json +++ b/versions.json @@ -356,7 +356,7 @@ "sparsehash": "2.0.3", "speex": "1.2rc2", "speexdsp": "1.2rc3", - "sqlite": "3120000", + "sqlite": "3120100", "subversion": "1.9.2", "suitesparse": "4.2.1", "t4k_common": "0.1.1", From ba11af0c8e3708b60f892417ed756ace963ef4f7 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sat, 9 Apr 2016 12:47:35 +0200 Subject: [PATCH 0547/1463] djvulibre: rename VERSION_ to SHORTVER --- src/djvulibre.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/djvulibre.mk b/src/djvulibre.mk index 90034896..b02ea928 100644 --- a/src/djvulibre.mk +++ b/src/djvulibre.mk @@ -3,12 +3,12 @@ PKG := djvulibre $(PKG)_IGNORE := 3.5.27 -$(PKG)_VERSION_ := 3.5.25 -$(PKG)_VERSION := $($(PKG)_VERSION_).3 +$(PKG)_SHORTVER := 3.5.25 +$(PKG)_VERSION := $($(PKG)_SHORTVER).3 $(PKG)_CHECKSUM := 898d7ed6dd2fa311a521baa95407a91b20a872d80c45e8245442d64f142cb1e0 -$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION_) +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_SHORTVER) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://sourceforge.net/projects/djvu/files/DjVuLibre/$($(PKG)_VERSION_)/$($(PKG)_FILE)/download +$(PKG)_URL := https://sourceforge.net/projects/djvu/files/DjVuLibre/$($(PKG)_SHORTVER)/$($(PKG)_FILE)/download $(PKG)_DEPS := gcc jpeg tiff zlib define $(PKG)_UPDATE From 4a7b59e06748a6c4e754aaa0f30781d18b7bd015 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sat, 9 Apr 2016 12:48:19 +0200 Subject: [PATCH 0548/1463] djvulibre: use macro SOURCEFORGE_MIRROR --- src/djvulibre.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/djvulibre.mk b/src/djvulibre.mk index b02ea928..0b3f43e0 100644 --- a/src/djvulibre.mk +++ b/src/djvulibre.mk @@ -8,7 +8,7 @@ $(PKG)_VERSION := $($(PKG)_SHORTVER).3 $(PKG)_CHECKSUM := 898d7ed6dd2fa311a521baa95407a91b20a872d80c45e8245442d64f142cb1e0 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_SHORTVER) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://sourceforge.net/projects/djvu/files/DjVuLibre/$($(PKG)_SHORTVER)/$($(PKG)_FILE)/download +$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/djvu/DjVuLibre/$($(PKG)_SHORTVER)/$($(PKG)_FILE) $(PKG)_DEPS := gcc jpeg tiff zlib define $(PKG)_UPDATE From f3908f8ad87a54f875ac726ba12806c1c7498084 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sat, 9 Apr 2016 12:55:06 +0200 Subject: [PATCH 0549/1463] djvulibre: consolidate patches --- src/djvulibre-1-fixes.patch | 281 +++++++++++++++++++++++ src/djvulibre-1-skip-desktopfiles.patch | 16 -- src/djvulibre-2-exe-file-extension.patch | 144 ------------ src/djvulibre-3-precision.patch | 93 -------- 4 files changed, 281 insertions(+), 253 deletions(-) create mode 100644 src/djvulibre-1-fixes.patch delete mode 100644 src/djvulibre-1-skip-desktopfiles.patch delete mode 100644 src/djvulibre-2-exe-file-extension.patch delete mode 100644 src/djvulibre-3-precision.patch diff --git a/src/djvulibre-1-fixes.patch b/src/djvulibre-1-fixes.patch new file mode 100644 index 00000000..eba6e5ef --- /dev/null +++ b/src/djvulibre-1-fixes.patch @@ -0,0 +1,281 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: darealshinji +Date: Sat, 9 Apr 2016 12:50:15 +0200 +Subject: [PATCH] skip desktopfiles + +Desktop files not needed for MXE. + +diff --git a/Makefile.in b/Makefile.in +index 1111111..2222222 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -32,7 +32,7 @@ SUBDIRS_FIRST = libdjvu tools + @XML_YES@SUBDIRS_XML = xmltools + @XML_NO@SUBDIRS_XML = + +-SUBDIRS_LAST = desktopfiles ++@DESKTOP_YES@SUBDIRS_LAST = desktopfiles + + SUBDIRS = ${SUBDIRS_FIRST} ${SUBDIRS_XML} ${SUBDIRS_I18N} ${SUBDIRS_LAST} + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: darealshinji +Date: Sat, 9 Apr 2016 12:50:50 +0200 +Subject: [PATCH] Add .exe to binary filenames + + +diff --git a/tools/Makefile.in b/tools/Makefile.in +index 1111111..2222222 100644 +--- a/tools/Makefile.in ++++ b/tools/Makefile.in +@@ -28,6 +28,8 @@ datadir = @datadir@ + libdir = @libdir@ + mandir = @mandir@ + ++EXEEXT = @EXEEXT@ ++ + CC = @CC@ + CXX = @CXX@ + RM = @RM@ +@@ -60,10 +62,10 @@ CXXFLAGS = ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@ + + SUBDIRS = jb2cmp + +-PROGRAMS = bzz c44 cjb2 cpaldjvu csepdjvu \ +- ddjvu djvm djvmcvt djvudump \ +- djvups djvuextract djvumake \ +- djvused djvutxt djvuserve ++PROGRAMS = bzz$(EXEEXT) c44$(EXEEXT) cjb2$(EXEEXT) cpaldjvu$(EXEEXT) csepdjvu$(EXEEXT) \ ++ ddjvu$(EXEEXT) djvm$(EXEEXT) djvmcvt$(EXEEXT) djvudump$(EXEEXT) \ ++ djvups$(EXEEXT) djvuextract$(EXEEXT) djvumake$(EXEEXT) \ ++ djvused$(EXEEXT) djvutxt$(EXEEXT) djvuserve$(EXEEXT) + + SCRIPTS = djvudigital any2djvu + +@@ -117,63 +119,63 @@ annotate: annotate.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} annotate.o ${LIBDJVU} ${LIBS} + +-bzz: bzz.o ++bzz$(EXEEXT): bzz.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} bzz.o ${LIBDJVU} ${LIBS} + +-c44: c44.o ++c44$(EXEEXT): c44.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} c44.o ${LIBDJVU} ${LIBS} + +-cjb2: cjb2.o ${JB2OBJS} ++cjb2$(EXEEXT): cjb2.o ${JB2OBJS} + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} cjb2.o ${JB2OBJS} ${LIBDJVU} ${MORELIBS} + +-cpaldjvu: cpaldjvu.o ${JB2OBJS} ++cpaldjvu$(EXEEXT): cpaldjvu.o ${JB2OBJS} + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} cpaldjvu.o ${JB2OBJS} ${LIBDJVU} ${LIBS} + +-csepdjvu: csepdjvu.o ${JB2OBJS} ++csepdjvu$(EXEEXT): csepdjvu.o ${JB2OBJS} + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} csepdjvu.o ${JB2OBJS} ${LIBDJVU} ${LIBS} + +-ddjvu: ddjvu.o tiff2pdf.o ++ddjvu$(EXEEXT): ddjvu.o tiff2pdf.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} ddjvu.o tiff2pdf.o ${LIBDJVU} ${MORELIBS} + +-djvm: djvm.o ++djvm$(EXEEXT): djvm.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvm.o ${LIBDJVU} ${LIBS} + +-djvmcvt: djvmcvt.o ++djvmcvt$(EXEEXT): djvmcvt.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvmcvt.o ${LIBDJVU} ${LIBS} + +-djvudump: djvudump.o ++djvudump$(EXEEXT): djvudump.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvudump.o ${LIBDJVU} ${LIBS} + +-djvups: djvups.o ++djvups$(EXEEXT): djvups.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvups.o ${LIBDJVU} ${LIBS} + +-djvuextract: djvuextract.o ++djvuextract$(EXEEXT): djvuextract.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvuextract.o ${LIBDJVU} ${LIBS} + +-djvumake: djvumake.o ++djvumake$(EXEEXT): djvumake.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvumake.o ${LIBDJVU} ${LIBS} + +-djvused: djvused.o ++djvused$(EXEEXT): djvused.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvused.o ${LIBDJVU} ${LIBS} + +-djvutxt: djvutxt.o ++djvutxt$(EXEEXT): djvutxt.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvutxt.o ${LIBDJVU} ${LIBS} + +-djvuserve: djvuserve.o ++djvuserve$(EXEEXT): djvuserve.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvuserve.o ${LIBDJVU} ${LIBS} + +diff --git a/xmltools/Makefile.in b/xmltools/Makefile.in +index 1111111..2222222 100644 +--- a/xmltools/Makefile.in ++++ b/xmltools/Makefile.in +@@ -28,6 +28,8 @@ datadir = @datadir@ + libdir = @libdir@ + mandir = @mandir@ + ++EXEEXT = @EXEEXT@ ++ + CC = @CC@ + CXX = @CXX@ + RM = @RM@ +@@ -55,7 +57,7 @@ LIBS= @LDFLAGS@ @LIBS@ + CFLAGS = ${FLAGS} @CPPFLAGS@ @CFLAGS@ + CXXFLAGS = ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@ + +-PROGRAMS = djvutoxml djvuxmlparser ++PROGRAMS = djvutoxml$(EXEEXT) djvuxmlparser$(EXEEXT) + + all: ${PROGRAMS} djvuxml.1 + +@@ -97,11 +99,11 @@ djvuxml.1: ${srcdir}/djvuxml.1.in + sed < ${srcdir}/djvuxml.1.in > djvuxml.1 \ + -e 's,DATADIR,${datadir},' + +-djvutoxml: djvutoxml.o ++djvutoxml$(EXEEXT): djvutoxml.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvutoxml.o ${LIBDJVU} ${LIBS} + +-djvuxmlparser: djvuxmlparser.o ++djvuxmlparser$(EXEEXT): djvuxmlparser.o + ${LIBTOOL} --mode=link \ + ${CXX} -o $@ ${CXXFLAGS} djvuxmlparser.o ${LIBDJVU} ${LIBS} + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: darealshinji +Date: Sat, 9 Apr 2016 12:52:55 +0200 +Subject: [PATCH] precision + +Source: https://github.com/msys2/MINGW-packages/tree/master/mingw-w64-djvulibre + +diff --git a/libdjvu/DjVuPort.cpp b/libdjvu/DjVuPort.cpp +index 1111111..2222222 100644 +--- a/libdjvu/DjVuPort.cpp ++++ b/libdjvu/DjVuPort.cpp +@@ -466,11 +466,11 @@ DjVuPortcaster::compute_closure(const DjVuPort * src, GPList &list, bo + // Sort in depth order + int max_dist=0; + for(pos=set;pos;++pos) +- if (max_dist < (int)(long)set[pos]) +- max_dist = (int)(long)set[pos]; ++ if (max_dist < (int)(size_t)set[pos]) ++ max_dist = (int)(size_t)set[pos]; + GArray > lists(0,max_dist); + for(pos=set;pos;++pos) +- lists[(int)(long)set[pos]].append(set.key(pos)); ++ lists[(int)(size_t)set[pos]].append(set.key(pos)); + for(int dist=0;dist<=max_dist;dist++) + for(pos=lists[dist];pos;++pos) + { +diff --git a/libdjvu/GBitmap.cpp b/libdjvu/GBitmap.cpp +index 1111111..2222222 100644 +--- a/libdjvu/GBitmap.cpp ++++ b/libdjvu/GBitmap.cpp +@@ -469,7 +469,7 @@ GBitmap::share() + { + if (!monitorptr) + { +- unsigned long x = (unsigned long)this; ++ size_t x = (size_t)this; + monitorptr = &monitors[(x^(x>>5)) % NMONITORS]; + } + } +diff --git a/libdjvu/GContainer.h b/libdjvu/GContainer.h +index 1111111..2222222 100644 +--- a/libdjvu/GContainer.h ++++ b/libdjvu/GContainer.h +@@ -178,7 +178,7 @@ hash(const unsigned long & x) + static inline unsigned int + hash(const void * const & x) + { +- return (unsigned long) x; ++ return (unsigned long)((size_t) x); + } + + /** Hashing function (float). */ +diff --git a/libdjvu/IW44EncodeCodec.cpp b/libdjvu/IW44EncodeCodec.cpp +index 1111111..2222222 100644 +--- a/libdjvu/IW44EncodeCodec.cpp ++++ b/libdjvu/IW44EncodeCodec.cpp +@@ -310,7 +310,7 @@ static const int d16[] = {16,16}; + static inline void + mmx_fv_1 ( short* &q, short* e, int s, int s3 ) + { +- while (q djvuxml.1 \ - -e 's,DATADIR,${datadir},' - --djvutoxml: djvutoxml.o -+djvutoxml$(EXEEXT): djvutoxml.o - ${LIBTOOL} --mode=link \ - ${CXX} -o $@ ${CXXFLAGS} djvutoxml.o ${LIBDJVU} ${LIBS} - --djvuxmlparser: djvuxmlparser.o -+djvuxmlparser$(EXEEXT): djvuxmlparser.o - ${LIBTOOL} --mode=link \ - ${CXX} -o $@ ${CXXFLAGS} djvuxmlparser.o ${LIBDJVU} ${LIBS} - diff --git a/src/djvulibre-3-precision.patch b/src/djvulibre-3-precision.patch deleted file mode 100644 index 0d63f2b0..00000000 --- a/src/djvulibre-3-precision.patch +++ /dev/null @@ -1,93 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Source: https://github.com/msys2/MINGW-packages/tree/master/mingw-w64-djvulibre - ---- a/libdjvu/DjVuPort.cpp -+++ b/libdjvu/DjVuPort.cpp -@@ -466,11 +466,11 @@ - // Sort in depth order - int max_dist=0; - for(pos=set;pos;++pos) -- if (max_dist < (int)(long)set[pos]) -- max_dist = (int)(long)set[pos]; -+ if (max_dist < (int)(size_t)set[pos]) -+ max_dist = (int)(size_t)set[pos]; - GArray > lists(0,max_dist); - for(pos=set;pos;++pos) -- lists[(int)(long)set[pos]].append(set.key(pos)); -+ lists[(int)(size_t)set[pos]].append(set.key(pos)); - for(int dist=0;dist<=max_dist;dist++) - for(pos=lists[dist];pos;++pos) - { ---- a/libdjvu/GBitmap.cpp -+++ b/libdjvu/GBitmap.cpp -@@ -469,7 +469,7 @@ - { - if (!monitorptr) - { -- unsigned long x = (unsigned long)this; -+ size_t x = (size_t)this; - monitorptr = &monitors[(x^(x>>5)) % NMONITORS]; - } - } ---- a/libdjvu/GContainer.h -+++ b/libdjvu/GContainer.h -@@ -178,7 +178,7 @@ - static inline unsigned int - hash(const void * const & x) - { -- return (unsigned long) x; -+ return (unsigned long)((size_t) x); - } - - /** Hashing function (float). */ ---- a/libdjvu/IW44EncodeCodec.cpp -+++ b/libdjvu/IW44EncodeCodec.cpp -@@ -310,7 +310,7 @@ - static inline void - mmx_fv_1 ( short* &q, short* e, int s, int s3 ) - { -- while (q Date: Sat, 9 Apr 2016 14:32:21 +0300 Subject: [PATCH 0550/1463] vmime: use MXE CMake wrapper --- src/vmime.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/vmime.mk b/src/vmime.mk index 411b140b..93d747a5 100644 --- a/src/vmime.mk +++ b/src/vmime.mk @@ -16,8 +16,7 @@ define $(PKG)_BUILD # The following hint is probably needed for ICU: # -DICU_LIBRARIES="`'$(TARGET)-pkg-config' --libs-only-l icu-i18n`" - cd '$(1)' && cmake \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + cd '$(1)' && '$(TARGET)-cmake' \ -DCMAKE_AR='$(PREFIX)/bin/$(TARGET)-ar' \ -DCMAKE_RANLIB='$(PREFIX)/bin/$(TARGET)-ranlib' \ -DVMIME_HAVE_MESSAGING_PROTO_SENDMAIL=False \ From dd141e15c289b2e0fb65b6611488a7188cb9d73d Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sat, 9 Apr 2016 14:32:51 +0300 Subject: [PATCH 0551/1463] vmime: use macros CMAKE_{STATIC,SHARED}_BOOL --- src/vmime.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vmime.mk b/src/vmime.mk index 93d747a5..5ddbf591 100644 --- a/src/vmime.mk +++ b/src/vmime.mk @@ -22,8 +22,8 @@ define $(PKG)_BUILD -DVMIME_HAVE_MESSAGING_PROTO_SENDMAIL=False \ -DVMIME_HAVE_MLANG_H=False \ -DCMAKE_CXX_FLAGS='-DWINVER=0x0501 -DAI_ADDRCONFIG=0x0400 -DIPV6_V6ONLY=27' \ - -DVMIME_BUILD_STATIC_LIBRARY=$(if $(BUILD_STATIC),ON,OFF) \ - -DVMIME_BUILD_SHARED_LIBRARY=$(if $(BUILD_SHARED),ON,OFF) \ + -DVMIME_BUILD_STATIC_LIBRARY=$(CMAKE_STATIC_BOOL) \ + -DVMIME_BUILD_SHARED_LIBRARY=$(CMAKE_SHARED_BOOL) \ -DVMIME_BUILD_SAMPLES=OFF \ -DVMIME_BUILD_DOCUMENTATION=OFF \ -DCMAKE_MODULE_PATH='$(1)/cmake' \ From f2126a826eb5b9efa4709eb6d30aa4845a1abe5b Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sat, 9 Apr 2016 14:43:18 +0300 Subject: [PATCH 0552/1463] vmime: install with -j 1 --- src/vmime.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vmime.mk b/src/vmime.mk index 5ddbf591..5fe95f8b 100644 --- a/src/vmime.mk +++ b/src/vmime.mk @@ -37,7 +37,7 @@ define $(PKG)_BUILD $(MAKE) -C '$(1)' -j '$(JOBS)' $(SED) -i 's,^\(Libs.private:.* \)$(PREFIX)/$(TARGET)/lib/libiconv\.a,\1-liconv,g' $(1)/vmime.pc $(if $(BUILD_STATIC),$(SED) -i 's/^\(Cflags:.* \)/\1 -DVMIME_STATIC /g' $(1)/vmime.pc) - $(MAKE) -C '$(1)' install + $(MAKE) -C '$(1)' -j 1 install $(if $(BUILD_SHARED),$(INSTALL) -m644 '$(1)/build/bin/libvmime.dll' '$(PREFIX)/$(TARGET)/bin/') $(SED) -i 's/posix/windows/g;' '$(1)/examples/example6.cpp' From f6fb419f2314596e64e9402da8f9c3ed62b5d97c Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 9 Apr 2016 14:43:43 +0300 Subject: [PATCH 0553/1463] vmime: patch vmime.pc after installation See https://github.com/mxe/mxe/pull/1279#issuecomment-207769271 --- src/vmime.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vmime.mk b/src/vmime.mk index 5fe95f8b..9fa63d93 100644 --- a/src/vmime.mk +++ b/src/vmime.mk @@ -35,9 +35,9 @@ define $(PKG)_BUILD . $(MAKE) -C '$(1)' -j '$(JOBS)' - $(SED) -i 's,^\(Libs.private:.* \)$(PREFIX)/$(TARGET)/lib/libiconv\.a,\1-liconv,g' $(1)/vmime.pc - $(if $(BUILD_STATIC),$(SED) -i 's/^\(Cflags:.* \)/\1 -DVMIME_STATIC /g' $(1)/vmime.pc) $(MAKE) -C '$(1)' -j 1 install + $(SED) -i 's,^\(Libs.private:.* \)$(PREFIX)/$(TARGET)/lib/libiconv\.a,\1-liconv,g' '$(PREFIX)/$(TARGET)/lib/pkgconfig/vmime.pc' + $(if $(BUILD_STATIC),$(SED) -i 's/^\(Cflags:.* \)/\1 -DVMIME_STATIC /g' '$(PREFIX)/$(TARGET)/lib/pkgconfig/vmime.pc') $(if $(BUILD_SHARED),$(INSTALL) -m644 '$(1)/build/bin/libvmime.dll' '$(PREFIX)/$(TARGET)/bin/') $(SED) -i 's/posix/windows/g;' '$(1)/examples/example6.cpp' From 160aef002f961c4d72d86b3b4b8c4b71705195ee Mon Sep 17 00:00:00 2001 From: Pavel Vatagin Date: Sat, 9 Apr 2016 15:27:30 +0300 Subject: [PATCH 0554/1463] add package libsoup --- index.html | 4 +++ src/gst-plugins-good.mk | 2 +- src/libsoup-1-fixes.patch | 57 +++++++++++++++++++++++++++++++++++++++ src/libsoup-test.c | 17 ++++++++++++ src/libsoup.mk | 30 +++++++++++++++++++++ 5 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 src/libsoup-1-fixes.patch create mode 100644 src/libsoup-test.c create mode 100644 src/libsoup.mk diff --git a/index.html b/index.html index 59d08ca9..a9da23f5 100644 --- a/index.html +++ b/index.html @@ -1877,6 +1877,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) libsodium libsodium + + libsoup + libsoup + libssh2 libssh2 diff --git a/src/gst-plugins-good.mk b/src/gst-plugins-good.mk index f65b3ef5..f62ad023 100644 --- a/src/gst-plugins-good.mk +++ b/src/gst-plugins-good.mk @@ -9,7 +9,7 @@ $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE) $(PKG)_DEPS := gcc cairo flac glib gst-plugins-base gstreamer jpeg \ - liboil libpng libshout libxml2 speex taglib wavpack + liboil libpng libshout libsoup libxml2 speex taglib wavpack $(PKG)_UPDATE = $(subst gstreamer/refs,gst-plugins-good/refs,$(gstreamer_UPDATE)) diff --git a/src/libsoup-1-fixes.patch b/src/libsoup-1-fixes.patch new file mode 100644 index 00000000..56110385 --- /dev/null +++ b/src/libsoup-1-fixes.patch @@ -0,0 +1,57 @@ +This file is part of MXE. +See index.html for further information. + +diff -Naur libsoup-2.54.0.1.orig/autogen.sh libsoup-2.54.0.1/autogen.sh +--- libsoup-2.54.0.1.orig/autogen.sh 2016-03-23 15:19:17.000000000 +0300 ++++ libsoup-2.54.0.1/autogen.sh 2016-04-09 18:29:05.799748895 +0300 +@@ -19,13 +19,6 @@ + exit 1 + fi + +-GTKDOCIZE=`which gtkdocize` +-if test -z $GTKDOCIZE; then +- echo "*** No GTK-Doc found, please install it ***" +- exit 1 +-fi +- +-gtkdocize || exit $? + intltoolize --automake --copy + autoreconf --force --install --verbose + +diff -Naur libsoup-2.54.0.1.orig/docs/reference/Makefile.am libsoup-2.54.0.1/docs/reference/Makefile.am +--- libsoup-2.54.0.1.orig/docs/reference/Makefile.am 2016-03-23 15:19:17.000000000 +0300 ++++ libsoup-2.54.0.1/docs/reference/Makefile.am 2016-04-09 18:30:33.644569273 +0300 +@@ -77,7 +77,6 @@ + $(GLIB_LIBS) + + # include common portion ... +-include $(top_srcdir)/gtk-doc.make + + # kludges + $(srcdir)/tmpl/*.sgml: +diff -Naur libsoup-2.54.0.1.orig/Makefile.am libsoup-2.54.0.1/Makefile.am +--- libsoup-2.54.0.1.orig/Makefile.am 2016-03-23 15:19:17.000000000 +0300 ++++ libsoup-2.54.0.1/Makefile.am 2016-04-09 22:41:40.604386782 +0300 +@@ -1,7 +1,7 @@ + ## Process this file with automake to produce Makefile.in + ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} + +-SUBDIRS = libsoup po tests examples docs build/win32 ++SUBDIRS = libsoup tests docs build/win32 + + EXTRA_DIST = \ + data/effective_tld_names.dat \ +diff -Naur libsoup-2.54.0.1.orig/tests/test-utils.c libsoup-2.54.0.1/tests/test-utils.c +--- libsoup-2.54.0.1.orig/tests/test-utils.c 2016-03-23 15:19:17.000000000 +0300 ++++ libsoup-2.54.0.1/tests/test-utils.c 2016-04-09 18:31:51.741646290 +0300 +@@ -215,10 +215,6 @@ + return; + apache_running = FALSE; + +- if (pid) { +- while (kill (pid, 0) == 0) +- g_usleep (100); +- } + } + + #endif /* HAVE_APACHE */ diff --git a/src/libsoup-test.c b/src/libsoup-test.c new file mode 100644 index 00000000..140d604d --- /dev/null +++ b/src/libsoup-test.c @@ -0,0 +1,17 @@ +/* + * This file is part of MXE. + * See index.html for further information. + */ + +#include + +int main() +{ + SoupServer *server; + GError *error; + + server = soup_server_new (SOUP_SERVER_SERVER_HEADER, "simple-httpd ", SOUP_SERVER_TLS_CERTIFICATE, NULL, NULL); + soup_server_listen_all (server, 1234, SOUP_SERVER_LISTEN_HTTPS, &error); + + return 0; +} diff --git a/src/libsoup.mk b/src/libsoup.mk new file mode 100644 index 00000000..d748694c --- /dev/null +++ b/src/libsoup.mk @@ -0,0 +1,30 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := libsoup +$(PKG)_IGNORE := libsoup-pre% +$(PKG)_VERSION := 2.54.0.1 +$(PKG)_APIVER := 2.4 +$(PKG)_CHECKSUM := b466c68e6575ca5ed170da60cc316c562a96db5dba5345a6043f740201afa8f4 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://github.com/GNOME/$(PKG)/archive/$($(PKG)_VERSION).tar.gz +$(PKG)_DEPS := gcc glib libxml2 sqlite + +define $(PKG)_UPDATE + $(call MXE_GET_GITHUB_TAGS, GNOME/libsoup) +endef + +define $(PKG)_BUILD + cd '$(1)' && NOCONFIGURE=1 ./autogen.sh + cd '$(1)' && ./configure \ + $(MXE_CONFIGURE_OPTS) \ + --disable-vala + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install + + $(TARGET)-gcc \ + -W -Wall -Werror -ansi \ + '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \ + `$(TARGET)-pkg-config $(PKG)-$($(PKG)_APIVER) --cflags --libs` +endef From 985e313bde02d16e375edca40a9bd41473112d22 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sat, 9 Apr 2016 21:59:19 +0300 Subject: [PATCH 0555/1463] libsoup: use MXE aclocal macros --- src/libsoup.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libsoup.mk b/src/libsoup.mk index d748694c..7ff6df53 100644 --- a/src/libsoup.mk +++ b/src/libsoup.mk @@ -16,7 +16,10 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && NOCONFIGURE=1 ./autogen.sh + cd '$(1)' && \ + NOCONFIGURE=1 \ + ACLOCAL_FLAGS=-I'$(PREFIX)/$(TARGET)/share/aclocal' \ + ./autogen.sh cd '$(1)' && ./configure \ $(MXE_CONFIGURE_OPTS) \ --disable-vala From fd0012b864aa6d536352222d7ba3ebba7c54230f Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sat, 9 Apr 2016 23:52:50 +0000 Subject: [PATCH 0556/1463] Update versions.json & build-matrix.html --- build-matrix.html | 20 +++++++++++++++----- versions.json | 1 + 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index dcecb040..26d0fe46 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -2007,6 +2007,16 @@ feel free to submit a pull request. ✗ + + libsoup + 2.54.0.1 + ✓ + ✓ + ✓ + ✓ + ✗ + + libssh2 1.7.0 @@ -4059,14 +4069,14 @@ feel free to submit a pull request. -Total: 392 +Total: 393
    (+6 virtual +4 native-only) -389 -290 -372 -288 +390 +291 +373 +289 15 diff --git a/versions.json b/versions.json index 46fdf938..219da42d 100644 --- a/versions.json +++ b/versions.json @@ -196,6 +196,7 @@ "libsigc++": "2.4.0", "libsndfile": "1.0.25", "libsodium": "1.0.6", + "libsoup": "2.54.0.1", "libssh2": "1.7.0", "libsvm": "3.20", "libtool": "2.4.4", From cbbb43b7d44ea0fbe2d8efd03d741c6d20bb931b Mon Sep 17 00:00:00 2001 From: darealshinji Date: Sun, 10 Apr 2016 07:02:01 +0200 Subject: [PATCH 0557/1463] djvulibre test program --- src/djvulibre-test.c | 17 +++++++++++++++++ src/djvulibre.mk | 8 +++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 src/djvulibre-test.c diff --git a/src/djvulibre-test.c b/src/djvulibre-test.c new file mode 100644 index 00000000..51889a2c --- /dev/null +++ b/src/djvulibre-test.c @@ -0,0 +1,17 @@ +/* + * This file is part of MXE. + * See index.html for further information. + */ + +#include + +int main(int argc, char *argv[]) +{ + ddjvu_context_t *djvu_test; + (void)argc; + + djvu_test = ddjvu_context_create(argv[0]); + ddjvu_context_release(djvu_test); + + return 0; +} diff --git a/src/djvulibre.mk b/src/djvulibre.mk index 0b3f43e0..8827123a 100644 --- a/src/djvulibre.mk +++ b/src/djvulibre.mk @@ -22,7 +22,13 @@ define $(PKG)_BUILD $(MXE_CONFIGURE_OPTS) \ --disable-desktopfiles $(MAKE) -C '$(1)' -j '$(JOBS)' - $(MAKE) -C '$(1)' -j 1 install + $(MAKE) -C '$(1)/libdjvu' -j 1 install-lib \ + install-include install-pkgconfig + + '$(TARGET)-g++' \ + -W -Wall -Werror -pedantic -DDLL_EXPORT \ + '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \ + `'$(TARGET)-pkg-config' ddjvuapi --libs` endef $(PKG)_BUILD_SHARED = From 683fcb6cded29c39651bc9d47c7b11e69ac447bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=BCllenhaupt?= Date: Sun, 10 Apr 2016 11:25:19 +0200 Subject: [PATCH 0558/1463] cmake: update to 3.5.1 --- src/cmake.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cmake.mk b/src/cmake.mk index f99868e0..7e6071ba 100644 --- a/src/cmake.mk +++ b/src/cmake.mk @@ -3,8 +3,8 @@ PKG := cmake $(PKG)_IGNORE := -$(PKG)_VERSION := 3.0.2 -$(PKG)_CHECKSUM := 6b4ea61eadbbd9bec0ccb383c29d1f4496eacc121ef7acf37c7a24777805693e +$(PKG)_VERSION := 3.5.1 +$(PKG)_CHECKSUM := 93d651a754bcf6f0124669646391dd5774c0fc4d407c384e3ae76ef9a60477e8 $(PKG)_SUBDIR := cmake-$($(PKG)_VERSION) $(PKG)_FILE := cmake-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.cmake.org/files/v$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) From efff981373b928c0dfc728fcf9c3c69541590353 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 10 Apr 2016 16:41:40 +0200 Subject: [PATCH 0559/1463] djvulibre: enable shared targets Patch "fix linking errors in shared builds" fixes i686-w64-mingw32.shared. Change of djvulibre.mk fixes x86_64-w64-mingw32.shared by changing deplibs check method to "objdump". See the explanations below. On Wheezy (at least) "file" returns "data" for x86-64 object files from libmsvcp60.a. Therefore the check fails with the following message: *** Warning: linker path does not have real file for library -lmsvcp60. *** I have the capability to make that library automatically link in when *** you link to this library. But I can only do this if you have a *** shared version of the library, which you do not appear to have *** because I did check the linker path looking for a file starting *** with libmsvcp60 and none of the candidates passed a file format test *** using a file magic. Last file checked: /home/mxe/mxe-djvulibre/usr/lib/gcc/x86_64-w64-mingw32.shared/4.9.3/../../../../x86_64-w64-mingw32.shared/lib//libmsvcp60.a *** The inter-library dependencies that have been dropped here will be *** automatically added whenever a program is linked with this library *** or is declared to -dlopen it. *** Since this library must not contain undefined symbols, *** because either the platform does not support them or *** it was explicitly requested with -no-undefined, *** libtool will only create a static version of it. Then it compiled static library and failed when compiling djvulibre-test.c because of missing -ljpeg. --- src/djvulibre-1-fixes.patch | 30 ++++++++++++++++++++++++++++++ src/djvulibre.mk | 8 ++++---- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/src/djvulibre-1-fixes.patch b/src/djvulibre-1-fixes.patch index eba6e5ef..b19b52c0 100644 --- a/src/djvulibre-1-fixes.patch +++ b/src/djvulibre-1-fixes.patch @@ -279,3 +279,33 @@ index 1111111..2222222 100644 p += 1; // Cast and return return (short**)p; + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Sun, 10 Apr 2016 14:58:05 +0200 +Subject: [PATCH] fix linking errors in shared builds + +> the presence +> of any one __declspec(dllexport) in any object file disables the +> auto-export feature, so if you declare any symbol dllexport you have to +> mark them all (or explicily -Wl,--export-all-symbols.) + +See http://mingw-users.1079350.n2.nabble.com/MinGW-produces-incorrect-dll-a-files-tp1109211p1109231.html + +./configure adds -Wl,--export-all-symbols if host matches "*-mingw32", +but MXE's host is "i686-w64-mingw32.shared". This patch changes the +pattern to "*-mingw32*". + +diff --git a/configure b/configure +index 1111111..2222222 100755 +--- a/configure ++++ b/configure +@@ -2927,7 +2927,7 @@ DLLFLAGS= + + # Special cases + case "$host" in +- *-mingw32) ++ *-mingw32*) + DLLFLAGS="$DLLFLAGS -Wl,--export-all-symbols" + LIBS=-lmsvcp60 + ;; diff --git a/src/djvulibre.mk b/src/djvulibre.mk index 8827123a..3e4e09a2 100644 --- a/src/djvulibre.mk +++ b/src/djvulibre.mk @@ -20,7 +20,10 @@ endef define $(PKG)_BUILD cd '$(1)' && CPPFLAGS='-DDLL_EXPORT' ./configure \ $(MXE_CONFIGURE_OPTS) \ - --disable-desktopfiles + --disable-desktopfiles \ + $(if $(BUILD_SHARED),\ + lt_cv_deplibs_check_method='file_magic file format (pe-i386|pe-x86-64)' \ + lt_cv_file_magic_cmd='$$OBJDUMP -f') $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)/libdjvu' -j 1 install-lib \ install-include install-pkgconfig @@ -30,6 +33,3 @@ define $(PKG)_BUILD '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \ `'$(TARGET)-pkg-config' ddjvuapi --libs` endef - -$(PKG)_BUILD_SHARED = - From c520ddd67bd019691fcc112097cfc870e2f733e5 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 10 Apr 2016 23:28:19 +0300 Subject: [PATCH 0560/1463] djvulibre: call autoreconf -fi, not change options Changes of ./configure were moved to ./configure.ac to preserve them after `autoreconf -fi`. See https://github.com/mxe/mxe/pull/1286#discussion_r59139912 --- src/djvulibre-1-fixes.patch | 10 +++++----- src/djvulibre.mk | 7 ++----- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/djvulibre-1-fixes.patch b/src/djvulibre-1-fixes.patch index b19b52c0..89d92c9b 100644 --- a/src/djvulibre-1-fixes.patch +++ b/src/djvulibre-1-fixes.patch @@ -296,11 +296,11 @@ See http://mingw-users.1079350.n2.nabble.com/MinGW-produces-incorrect-dll-a-file but MXE's host is "i686-w64-mingw32.shared". This patch changes the pattern to "*-mingw32*". -diff --git a/configure b/configure -index 1111111..2222222 100755 ---- a/configure -+++ b/configure -@@ -2927,7 +2927,7 @@ DLLFLAGS= +diff --git a/configure.ac b/configure.ac +index 1111111..2222222 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -69,7 +69,7 @@ AC_SUBST(DLLFLAGS) # Special cases case "$host" in diff --git a/src/djvulibre.mk b/src/djvulibre.mk index 3e4e09a2..c61eb4b6 100644 --- a/src/djvulibre.mk +++ b/src/djvulibre.mk @@ -18,12 +18,9 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && CPPFLAGS='-DDLL_EXPORT' ./configure \ + cd '$(1)' && autoreconf -fi && CPPFLAGS='-DDLL_EXPORT' ./configure \ $(MXE_CONFIGURE_OPTS) \ - --disable-desktopfiles \ - $(if $(BUILD_SHARED),\ - lt_cv_deplibs_check_method='file_magic file format (pe-i386|pe-x86-64)' \ - lt_cv_file_magic_cmd='$$OBJDUMP -f') + --disable-desktopfiles $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)/libdjvu' -j 1 install-lib \ install-include install-pkgconfig From 87163ff7be3c7a7e86a850e688012f3e52baf038 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 11 Apr 2016 03:30:08 +0300 Subject: [PATCH 0561/1463] add "make shell" command It provides interactive shell with the environment of MXE build. --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 3e0ed04f..81a6fdad 100644 --- a/Makefile +++ b/Makefile @@ -460,6 +460,10 @@ $(NONET_LIB): $(TOP_DIR)/tools/nonetwork.c | $(PREFIX)/$(BUILD)/lib/.gitkeep @echo '[build nonetwork lib]' @$(BUILD_CC) -shared -fPIC $(NONET_CFLAGS) -o $@ $< +.PHONY: shell +shell: + $(PRELOAD) $(SHELL) + define PKG_TARGET_RULE .PHONY: $(1) $(1): $(PREFIX)/$(3)/installed/$(1) From f15fad9e8fe5ad856208f8ee8c3fadd994cb7a7b Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 11 Apr 2016 20:09:40 +1000 Subject: [PATCH 0562/1463] libsoup: disable gssapi On OSX, native `/usr/bin/krb5-config` is detected and tries to enable gssapi. --- src/libsoup.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libsoup.mk b/src/libsoup.mk index 7ff6df53..c1392c46 100644 --- a/src/libsoup.mk +++ b/src/libsoup.mk @@ -22,7 +22,8 @@ define $(PKG)_BUILD ./autogen.sh cd '$(1)' && ./configure \ $(MXE_CONFIGURE_OPTS) \ - --disable-vala + --disable-vala \ + --without-gssapi $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install From 632085f2f7d7aa9ae525a72f41ffae281a0ca760 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 11 Apr 2016 21:04:18 +1000 Subject: [PATCH 0563/1463] add `nonetwork` lib to `shell` target dependencies --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 81a6fdad..edec8adc 100644 --- a/Makefile +++ b/Makefile @@ -461,7 +461,7 @@ $(NONET_LIB): $(TOP_DIR)/tools/nonetwork.c | $(PREFIX)/$(BUILD)/lib/.gitkeep @$(BUILD_CC) -shared -fPIC $(NONET_CFLAGS) -o $@ $< .PHONY: shell -shell: +shell: $(NONET_LIB) $(PRELOAD) $(SHELL) define PKG_TARGET_RULE From fccefe20cc0ca929208f7203d69044cf43782fd4 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 11 Apr 2016 14:55:30 +0200 Subject: [PATCH 0564/1463] gnutls: update --- src/gnutls.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gnutls.mk b/src/gnutls.mk index 1ebe3418..83d9a81d 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -2,8 +2,8 @@ # See index.html for further information. PKG := gnutls -$(PKG)_VERSION := 3.4.10 -$(PKG)_CHECKSUM := 6a32c2b4acbd33ff7eefcbd1357009da04c94c60146ef61320b6c076b1bdf59f +$(PKG)_VERSION := 3.4.11 +$(PKG)_CHECKSUM := 70ef9c9f95822d363036c6e6b5479750e5b7fc34f50e750c3464a98ec65a9ab8 $(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION) $(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://mirrors.dotsrc.org/gnupg/gnutls/v3.4/$($(PKG)_FILE) From be764c4040150d684d82cf43163553377cfcff79 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 11 Apr 2016 14:55:42 +0200 Subject: [PATCH 0565/1463] mpfr: update --- src/mpfr.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mpfr.mk b/src/mpfr.mk index 43fe8c04..4214b403 100644 --- a/src/mpfr.mk +++ b/src/mpfr.mk @@ -3,8 +3,8 @@ PKG := mpfr $(PKG)_IGNORE := -$(PKG)_VERSION := 3.1.3 -$(PKG)_CHECKSUM := 6835a08bd992c8257641791e9a6a2b35b02336c8de26d0a8577953747e514a16 +$(PKG)_VERSION := 3.1.4 +$(PKG)_CHECKSUM := 761413b16d749c53e2bfd2b1dfaa3b027b0e793e404b90b5fbaeef60af6517f5 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE) From 739394eacd50e7661090b0bcf078a627bcf822bb Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Mon, 11 Apr 2016 12:57:30 +0000 Subject: [PATCH 0566/1463] Update versions.json & build-matrix.html --- build-matrix.html | 4 ++-- versions.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 26d0fe46..30bed74a 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -849,7 +849,7 @@ feel free to submit a pull request. gnutls - 3.4.10 + 3.4.11 ✓ ✓ ✓ @@ -2299,7 +2299,7 @@ feel free to submit a pull request. mpfr - 3.1.3 + 3.1.4 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 219da42d..261311c3 100644 --- a/versions.json +++ b/versions.json @@ -80,7 +80,7 @@ "glib": "2.44.1", "glibmm": "2.42.0", "gmp": "6.1.0", - "gnutls": "3.4.10", + "gnutls": "3.4.11", "googletest": "1.7.0", "graphicsmagick": "1.3.21", "gsl": "1.16", @@ -225,7 +225,7 @@ "minizip": "0b46a2b", "mman-win32": "b7ec370", "mpc": "1.0.2", - "mpfr": "3.1.3", + "mpfr": "3.1.4", "mpg123": "1.22.4", "muparser": "2.2.5", "muparserx": "4.0.4", From a08491c8bae45f269f09071a2d7ea166ccd92c1f Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Mon, 11 Apr 2016 14:27:39 +0000 Subject: [PATCH 0567/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 30bed74a..8a46156b 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -339,7 +339,7 @@ feel free to submit a pull request. cmake - 3.0.2 + 3.5.1 ✗ ✗ ✗ diff --git a/versions.json b/versions.json index 261311c3..ee4d0a04 100644 --- a/versions.json +++ b/versions.json @@ -29,7 +29,7 @@ "chromaprint": "1.1", "cimg": "1.6.3", "cloog": "0.18.1", - "cmake": "3.0.2", + "cmake": "3.5.1", "cminpack": "1.3.4", "coda": "2.15.1", "coin": "3.1.3", From 580828183a8c888f3e5454a2171faf292d998ff4 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 11 Apr 2016 21:06:46 +1000 Subject: [PATCH 0568/1463] clarify rationale for env whitelist entries * add EDITOR, PS1, TERM for basic functionality of interactive shells * separate mxe related variables * identify source of ACLOCAL_PATH and LD_LIBRARY_PATH --- Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index edec8adc..3f846bf8 100644 --- a/Makefile +++ b/Makefile @@ -155,8 +155,15 @@ endef PRELOAD_VARS := LD_PRELOAD DYLD_FORCE_FLAT_NAMESPACE DYLD_INSERT_LIBRARIES # use a minimal whitelist of safe environment variables -# HOME is needed for ~/.gitconfig for patch-tool-mxe -ENV_WHITELIST := PATH HOME LANG MAKE% MXE% %PROXY %proxy LD_LIBRARY_PATH $(PRELOAD_VARS) ACLOCAL_PATH +# basic working shell environment and mxe variables +# see http://www.linuxfromscratch.org/lfs/view/stable/chapter04/settingenvironment.html +ENV_WHITELIST := EDITOR HOME LANG PATH %PROXY %proxy PS1 TERM +ENV_WHITELIST += MAKE% MXE% $(PRELOAD_VARS) + +# OS/Distro related issues - "unsafe" but practical +# 1. https://github.com/mxe/mxe/issues/697 +ENV_WHITELIST += ACLOCAL_PATH LD_LIBRARY_PATH + unexport $(filter-out $(ENV_WHITELIST),$(shell env | cut -d '=' -f1)) # disable wine with readonly directory (created by mxe-conf) From 043e7aea85992e24b215eeb4f67f7ccb940366a3 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 12 Apr 2016 12:26:09 +1000 Subject: [PATCH 0569/1463] blas, lapack: remove -fdefault-integer-8 FFLAGS (#1258) * only required for octave build: - https://www.gnu.org/software/octave/doc/interpreter/Compiling-Octave-with-64_002dbit-Indexing.html * closes #1247 --- src/blas.mk | 3 +-- src/lapack.mk | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/blas.mk b/src/blas.mk index e6c8232f..1beca513 100644 --- a/src/blas.mk +++ b/src/blas.mk @@ -19,8 +19,7 @@ define $(PKG)_BUILD FORTRAN='$(TARGET)-gfortran' \ RANLIB='$(TARGET)-ranlib' \ ARCH='$(TARGET)-ar' \ - BLASLIB='libblas.a' \ - OPTS=$(if $(findstring x86_64,$(TARGET)),-fdefault-integer-8) + BLASLIB='libblas.a' $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib' $(if $(BUILD_STATIC), \ diff --git a/src/lapack.mk b/src/lapack.mk index 8735ad0a..2b4712ef 100644 --- a/src/lapack.mk +++ b/src/lapack.mk @@ -22,7 +22,6 @@ define $(PKG)_BUILD -DCMAKE_AR='$(PREFIX)/bin/$(TARGET)-ar' \ -DCMAKE_RANLIB='$(PREFIX)/bin/$(TARGET)-ranlib' \ -DLAPACKE=ON \ - -DCMAKE_Fortran_FLAGS=$(if $(findstring x86_64,$(TARGET)),-fdefault-integer-8) \ . cp '$(1)/LAPACKE/include/lapacke_mangling_with_flags.h' '$(1)/LAPACKE/include/lapacke_mangling.h' $(MAKE) -C '$(1)/SRC' -j '$(JOBS)' install From 03433feaafb79e40c69953c7845de32d9548b60d Mon Sep 17 00:00:00 2001 From: Volker Diels-Grabsch Date: Tue, 12 Apr 2016 08:03:19 +0200 Subject: [PATCH 0570/1463] Remove obsolete article link That page no longer exists and already was replaced with a redirect to MXE anyway. --- index.html | 5 ----- 1 file changed, 5 deletions(-) diff --git a/index.html b/index.html index a9da23f5..eb58ac02 100644 --- a/index.html +++ b/index.html @@ -4240,11 +4240,6 @@ endef and Linux Today -

  • - Cross Compiling for Win32 -
    - Overview of win32 cross compiling -
  • MinGW cross compiler for Linux build environment
    From dbb7240d36b38bb1daa40e79eee6f1fbd3892d88 Mon Sep 17 00:00:00 2001 From: Volker Diels-Grabsch Date: Tue, 12 Apr 2016 08:08:37 +0200 Subject: [PATCH 0571/1463] Link to blog article "Cross-compiling Krita using MXE" --- index.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/index.html b/index.html index eb58ac02..ba79f2d5 100644 --- a/index.html +++ b/index.html @@ -4232,6 +4232,12 @@ endef

    Related articles

      +
    • + Cross-compiling Krita using MXE +
      + Experience report of the + Krita project +
    • Cross compilers, the new wave
      From d4967e7892b9c925d679cc98026a6c20290fdb79 Mon Sep 17 00:00:00 2001 From: Volker Diels-Grabsch Date: Tue, 12 Apr 2016 08:18:42 +0200 Subject: [PATCH 0572/1463] Add Krita to the list of projects that use MXE --- index.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/index.html b/index.html index ba79f2d5..4d487259 100644 --- a/index.html +++ b/index.html @@ -4307,6 +4307,9 @@ endef
    • Hugor
      • +
    • + Krita +
    • Lightspark
      • From a7e50dbde1deeaf3a8b104b9094a46c3625dce28 Mon Sep 17 00:00:00 2001 From: Volker Diels-Grabsch Date: Tue, 12 Apr 2016 08:20:42 +0200 Subject: [PATCH 0573/1463] Move section "Related articles" before section "Related projects" --- index.html | 62 +++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/index.html b/index.html index 4d487259..d0b76274 100644 --- a/index.html +++ b/index.html @@ -4172,6 +4172,37 @@ endef
    +

    Related articles

    + + +

    Related projects

      @@ -4228,37 +4259,6 @@ endef Creates binary packages, runs on both Linux and Windows
    - -

    Related articles

    - -
    From c351cdd43d8ba4956a90ca071e3585af25998678 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 13 Apr 2016 00:13:44 +1000 Subject: [PATCH 0574/1463] add native build of `patch` for darwin (#1295) same as #1170, MacPorts has `gpatch` but Homebrew and Rudix don't --- plugins/native/darwin/patch.mk | 1 + 1 file changed, 1 insertion(+) create mode 120000 plugins/native/darwin/patch.mk diff --git a/plugins/native/darwin/patch.mk b/plugins/native/darwin/patch.mk new file mode 120000 index 00000000..71213520 --- /dev/null +++ b/plugins/native/darwin/patch.mk @@ -0,0 +1 @@ +../patch.mk \ No newline at end of file From 65f5e062bec8a03fc152b7cd4419daaccfa68bd4 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 11 Apr 2016 03:11:11 +0300 Subject: [PATCH 0575/1463] add libuv --- index.html | 4 ++++ src/libuv-1-fixes.patch | 27 +++++++++++++++++++++++++++ src/libuv-test.c | 15 +++++++++++++++ src/libuv.mk | 28 ++++++++++++++++++++++++++++ 4 files changed, 74 insertions(+) create mode 100644 src/libuv-1-fixes.patch create mode 100644 src/libuv-test.c create mode 100644 src/libuv.mk diff --git a/index.html b/index.html index d0b76274..2f5ad684 100644 --- a/index.html +++ b/index.html @@ -1909,6 +1909,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) libusb1 LibUsb-1.0 + + libuv + libuv + libvpx vpx diff --git a/src/libuv-1-fixes.patch b/src/libuv-1-fixes.patch new file mode 100644 index 00000000..bc34a022 --- /dev/null +++ b/src/libuv-1-fixes.patch @@ -0,0 +1,27 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Mon, 11 Apr 2016 02:02:54 +0200 +Subject: [PATCH] set Libs in pc-file + +They are already defined in Makefile.am, but are not passed +(only -lpthread is passed). + +According to http://stackoverflow.com/a/30960268 passing LIBS from +Makefile.am to libuv.pc is impossible, as it is not fully-expanded. + +diff --git a/libuv.pc.in b/libuv.pc.in +index 1111111..2222222 100644 +--- a/libuv.pc.in ++++ b/libuv.pc.in +@@ -7,5 +7,5 @@ Name: @PACKAGE_NAME@ + Version: @PACKAGE_VERSION@ + Description: multi-platform support library with a focus on asynchronous I/O. + +-Libs: -L${libdir} -luv @LIBS@ ++Libs: -L${libdir} -luv -lpthread -lws2_32 -lpsapi -liphlpapi -lshell32 -luserenv + Cflags: -I${includedir} diff --git a/src/libuv-test.c b/src/libuv-test.c new file mode 100644 index 00000000..a31bf88a --- /dev/null +++ b/src/libuv-test.c @@ -0,0 +1,15 @@ +#include +#include +#include + +int main() { + uv_loop_t *loop = malloc(sizeof(uv_loop_t)); + uv_loop_init(loop); + + printf("Now quitting.\n"); + uv_run(loop, UV_RUN_DEFAULT); + + uv_loop_close(loop); + free(loop); + return 0; +} diff --git a/src/libuv.mk b/src/libuv.mk new file mode 100644 index 00000000..5dd70a2c --- /dev/null +++ b/src/libuv.mk @@ -0,0 +1,28 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := libuv +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.8.0 +$(PKG)_CHECKSUM := 6511f734da4fe082dacf85967606d600b7bce557bb9b2f0d2539193535323125 +$(PKG)_SUBDIR := $(PKG)-v$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-v$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://dist.libuv.org/dist/v$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := gcc + +define $(PKG)_UPDATE + $(call MXE_GET_GITHUB_TAGS, libuv/libuv, v) +endef + +define $(PKG)_BUILD + cd '$(1)' && sh autogen.sh + cd '$(1)' && ./configure \ + $(MXE_CONFIGURE_OPTS) + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install + + '$(TARGET)-gcc' \ + -W -Wall -Werror -pedantic \ + '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \ + `'$(TARGET)-pkg-config' $(PKG) --libs` +endef From 6c36b8acb4b683d97f2caf9141464a3532761663 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 12 Apr 2016 11:09:11 +1000 Subject: [PATCH 0576/1463] libuv: set LIBS in configure.ac instead of Makefile.am --- src/libuv-1-fixes.patch | 46 +++++++++++++++++++++++++---------------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/src/libuv-1-fixes.patch b/src/libuv-1-fixes.patch index bc34a022..6a5a1970 100644 --- a/src/libuv-1-fixes.patch +++ b/src/libuv-1-fixes.patch @@ -4,24 +4,34 @@ See index.html for further information. Contains ad hoc patches for cross building. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Mon, 11 Apr 2016 02:02:54 +0200 -Subject: [PATCH] set Libs in pc-file +From: Tony Theodore +Date: Tue, 12 Apr 2016 11:06:36 +1000 +Subject: [PATCH] set LIBS in configure.ac instead of Makefile.am -They are already defined in Makefile.am, but are not passed -(only -lpthread is passed). -According to http://stackoverflow.com/a/30960268 passing LIBS from -Makefile.am to libuv.pc is impossible, as it is not fully-expanded. - -diff --git a/libuv.pc.in b/libuv.pc.in +diff --git a/Makefile.am b/Makefile.am +index 1111111..2222222 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -45,7 +45,6 @@ include_HEADERS += include/uv-win.h include/tree.h + AM_CPPFLAGS += -I$(top_srcdir)/src/win \ + -DWIN32_LEAN_AND_MEAN \ + -D_WIN32_WINNT=0x0600 +-LIBS += -lws2_32 -lpsapi -liphlpapi -lshell32 -luserenv + libuv_la_SOURCES += src/win/async.c \ + src/win/atomicops-inl.h \ + src/win/core.c \ +diff --git a/configure.ac b/configure.ac index 1111111..2222222 100644 ---- a/libuv.pc.in -+++ b/libuv.pc.in -@@ -7,5 +7,5 @@ Name: @PACKAGE_NAME@ - Version: @PACKAGE_VERSION@ - Description: multi-platform support library with a focus on asynchronous I/O. - --Libs: -L${libdir} -luv @LIBS@ -+Libs: -L${libdir} -luv -lpthread -lws2_32 -lpsapi -liphlpapi -lshell32 -luserenv - Cflags: -I${includedir} +--- a/configure.ac ++++ b/configure.ac +@@ -58,6 +58,9 @@ AM_CONDITIONAL([NETBSD], [AS_CASE([$host_os],[netbsd*], [true], [false]) + AM_CONDITIONAL([OPENBSD], [AS_CASE([$host_os],[openbsd*], [true], [false])]) + AM_CONDITIONAL([SUNOS], [AS_CASE([$host_os],[solaris*], [true], [false])]) + AM_CONDITIONAL([WINNT], [AS_CASE([$host_os],[mingw*], [true], [false])]) ++AS_CASE([$host_os],[mingw*], [ ++ LIBS="$LIBS -lws2_32 -lpsapi -liphlpapi -lshell32 -luserenv" ++]) + AC_CHECK_HEADERS([sys/ahafs_evProds.h]) + AC_CHECK_PROG(PKG_CONFIG, pkg-config, yes) + AM_CONDITIONAL([HAVE_PKG_CONFIG], [test "x$PKG_CONFIG" != "x"]) From dd34cf8e0abe0aae19b92e1b1b9cffc5ba9fdaf0 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 12 Apr 2016 21:00:26 +0300 Subject: [PATCH 0577/1463] libwebsockets: fix download URL and updater --- src/libwebsockets.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/libwebsockets.mk b/src/libwebsockets.mk index 6368e394..70d5db1b 100644 --- a/src/libwebsockets.mk +++ b/src/libwebsockets.mk @@ -7,13 +7,11 @@ $(PKG)_VERSION := 1.4-chrome43-firefox-36 $(PKG)_CHECKSUM := e11492477e582ef0b1a6ea2f18d81a9619b449170a3a5c43f32a9468461a9798 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://git.libwebsockets.org/cgi-bin/cgit/libwebsockets/snapshot/$($(PKG)_FILE) +$(PKG)_URL := https://github.com/warmcat/libwebsockets/archive/v$($(PKG)_VERSION).tar.gz $(PKG)_DEPS := gcc openssl zlib define $(PKG)_UPDATE - $(WGET) -q -O- 'http://git.libwebsockets.org/cgi-bin/cgit/libwebsockets/' | \ - $(SED) -n 's,.*libwebsockets-\([0-9][^"]*\)\.tar.*,\1,p' | \ - head -1 + $(call MXE_GET_GITHUB_TAGS, warmcat/libwebsockets, \(v\|.[^0-9].*\)) endef define $(PKG)_BUILD From 6c263dd33a4940020841f630ff6c7d4ed871df6e Mon Sep 17 00:00:00 2001 From: Rafal Zawadzki Date: Wed, 13 Apr 2016 19:25:52 +0200 Subject: [PATCH 0578/1463] Update SFML to the 2.3.2 version --- src/sfml.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sfml.mk b/src/sfml.mk index 810a1891..1ba24d44 100644 --- a/src/sfml.mk +++ b/src/sfml.mk @@ -3,8 +3,8 @@ PKG := sfml $(PKG)_IGNORE := -$(PKG)_VERSION := 2.3.1 -$(PKG)_CHECKSUM := 5c610bd5db3ecd9984f58b038f2eebc1b8856773d50c58cd55b4daf0fe94e120 +$(PKG)_VERSION := 2.3.2 +$(PKG)_CHECKSUM := 03fe79943c48222037f1126a581b12c95a4dd53168881907964695c5ec3dc395 $(PKG)_SUBDIR := SFML-$($(PKG)_VERSION) $(PKG)_FILE := SFML-$($(PKG)_VERSION)-sources.zip $(PKG)_URL := http://sfml-dev.org/download/sfml/$($(PKG)_VERSION)/$($(PKG)_FILE) From 390d1c9da797b508d240eabb26023fa078736246 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 13 Apr 2016 21:48:24 +0200 Subject: [PATCH 0579/1463] vmime: update --- src/vmime.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vmime.mk b/src/vmime.mk index 9fa63d93..aed2e2c3 100644 --- a/src/vmime.mk +++ b/src/vmime.mk @@ -3,8 +3,8 @@ PKG := vmime $(PKG)_IGNORE := -$(PKG)_VERSION := b1c2d4b -$(PKG)_CHECKSUM := db41773878fcd11de44999cb5eba6e4f43e7135bc64c1fd82ad2ef2cb0d24cf1 +$(PKG)_VERSION := 87b0525 +$(PKG)_CHECKSUM := bd3b3c71f25c493a60dbe9e0f86b9c48fc43c0d7af3fb1a4aa6843422c6c1440 $(PKG)_SUBDIR := kisli-vmime-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/kisli/vmime/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE) From d09c67e1f031ead458f3479f903f4e9dc2cbdfb9 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Wed, 13 Apr 2016 21:19:46 +0000 Subject: [PATCH 0580/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 8a46156b..8b5858f0 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -3829,7 +3829,7 @@ feel free to submit a pull request. vmime - b1c2d4b + 87b0525 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index ee4d0a04..611d495d 100644 --- a/versions.json +++ b/versions.json @@ -378,7 +378,7 @@ "vcdimager": "0.7.24", "vidstab": "0.98b", "vigra": "1.9.0", - "vmime": "b1c2d4b", + "vmime": "87b0525", "vo-aacenc": "0.1.3", "vo-amrwbenc": "0.1.3", "vorbis": "1.3.5", From 6e43cabf54d6ad007d2cbda2337ccc337094718a Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Thu, 14 Apr 2016 04:11:59 +0000 Subject: [PATCH 0581/1463] Update versions.json & build-matrix.html --- build-matrix.html | 20 +++++++++++++++----- versions.json | 1 + 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 8b5858f0..cb84fb5c 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -2087,6 +2087,16 @@ feel free to submit a pull request. ✗ + + libuv + 1.8.0 + ✓ + ✓ + ✓ + ✓ + ✗ + + libvpx 1.5.0 @@ -4069,14 +4079,14 @@ feel free to submit a pull request. -Total: 393 +Total: 394
    (+6 virtual +4 native-only) -390 -291 -373 -289 +391 +292 +374 +290 15 diff --git a/versions.json b/versions.json index 611d495d..2e7480a3 100644 --- a/versions.json +++ b/versions.json @@ -204,6 +204,7 @@ "libunistring": "0.9.4", "libusb": "1.2.6.0", "libusb1": "1.0.19", + "libuv": "1.8.0", "libvpx": "1.5.0", "libwebp": "0.4.4", "libwebsockets": "1.4-chrome43-firefox-36", From 158a0e3e11587e09e17f02a4e817f235408cb9ab Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Thu, 14 Apr 2016 04:38:04 +0000 Subject: [PATCH 0582/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index cb84fb5c..f270512f 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -3559,7 +3559,7 @@ feel free to submit a pull request. sfml - 2.3.1 + 2.3.2 ✓ ✗ ✓ diff --git a/versions.json b/versions.json index 2e7480a3..bb86b27e 100644 --- a/versions.json +++ b/versions.json @@ -351,7 +351,7 @@ "sdl_rwhttp": "0.2.0", "sdl_sound": "1.0.3", "sdl_ttf": "2.0.11", - "sfml": "2.3.1", + "sfml": "2.3.2", "smpeg": "0.4.5+cvs20030824", "smpeg2": "2.0.0", "sox": "14.4.2", From f2736334b0fa0f44279d2019ba554a2963f8824f Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Thu, 14 Apr 2016 01:40:09 +0300 Subject: [PATCH 0583/1463] libical: fix updater --- src/libical.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libical.mk b/src/libical.mk index b64ca0d7..6b7e4085 100644 --- a/src/libical.mk +++ b/src/libical.mk @@ -10,8 +10,7 @@ $(PKG)_URL := https://github.com/$(PKG)/$(PKG)/releases/download/v$($(PKG)_ $(PKG)_DEPS := gcc icu4c define $(PKG)_UPDATE - echo 'TODO: Updates for package libical need to be written.' >&2; - echo $(libical_VERSION) + $(call MXE_GET_GITHUB_TAGS, libical/libical, v) endef define $(PKG)_BUILD From c2ad0bc4ca65c6ab5ef78dfa44fb9a473af0023e Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Thu, 14 Apr 2016 01:53:42 +0300 Subject: [PATCH 0584/1463] libical: update to version 2.0.0 --- src/libical-1-fixes.patch | 133 ++++++++++++++++++++++++++++++++++++++ src/libical.mk | 4 +- 2 files changed, 135 insertions(+), 2 deletions(-) create mode 100644 src/libical-1-fixes.patch diff --git a/src/libical-1-fixes.patch b/src/libical-1-fixes.patch new file mode 100644 index 00000000..bcf149a8 --- /dev/null +++ b/src/libical-1-fixes.patch @@ -0,0 +1,133 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Wed, 13 Apr 2016 20:54:43 +0300 +Subject: [PATCH] fix definitions of gmtime/gmtime_r + +Fix the following error: +config.h:508:37: error: expected initializer before '?' token + +The error is caused by the following combination: + + #include + #define gmtime_r(tp,tmp) ((gmtime(tp))?(*(tmp)=*(gmtime(tp)),(tmp)):0) + #include + +time.h declares and defines gmtime_r. Because of the macro, the definition +of gmtime_r is broken. This commit moves time.h before the macro define. + +diff --git a/config.h.cmake b/config.h.cmake +index 1111111..2222222 100644 +--- a/config.h.cmake ++++ b/config.h.cmake +@@ -495,6 +495,7 @@ typedef ssize_t IO_SSIZE_T; + #endif + #endif + ++#include + /* gmtime_r - thread safe gmtime() really only needed on Unix */ + #if !defined(HAVE_GMTIME_R) + #if !defined(_WIN32) +@@ -507,7 +508,6 @@ typedef ssize_t IO_SSIZE_T; + /* FYI: The gmtime() in Microsoft's C library is MT-safe */ + #define gmtime_r(tp,tmp) (gmtime(tp)?(*(tmp)=*gmtime(tp),(tmp)):0) + #endif +-#include + + /* localtime_r - thread safe localtime() really only needed on Unix */ + #if !defined(HAVE_LOCALTIME_R) + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Thu, 14 Apr 2016 01:33:47 +0300 +Subject: [PATCH] test, examples: fix linking with static library + +Fix errors like the following: + +> No rule to make target `bin/libical-static.lib', +> needed by `src/test/copycluster.exe'. + +diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt +index 1111111..2222222 100644 +--- a/examples/CMakeLists.txt ++++ b/examples/CMakeLists.txt +@@ -23,19 +23,11 @@ add_dependencies(doesnothing ical icalss icalvcal) + if(NOT STATIC_ONLY) + target_link_libraries(doesnothing ical icalss icalvcal) + else() +- if(NOT WIN32) +- target_link_libraries(doesnothing +- ${CMAKE_BINARY_DIR}/lib/libical.a +- ${CMAKE_BINARY_DIR}/lib/libicalss.a +- ${CMAKE_BINARY_DIR}/lib/libicalvcal.a +- ) +- else() +- target_link_libraries(doesnothing +- ${CMAKE_BINARY_DIR}/bin/libical-static.lib +- ${CMAKE_BINARY_DIR}/bin/libicalss-static.lib +- ${CMAKE_BINARY_DIR}/bin/libicalvcal-static.lib +- ) +- endif() ++ target_link_libraries(doesnothing ++ ical-static ++ icalss-static ++ icalvcal-static ++ ) + target_link_libraries(doesnothing ${CMAKE_THREAD_LIBS_INIT}) + if(ICU_FOUND) + target_link_libraries(doesnothing ${ICU_LIBRARY}) +diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt +index 1111111..2222222 100644 +--- a/src/test/CMakeLists.txt ++++ b/src/test/CMakeLists.txt +@@ -50,19 +50,11 @@ macro(buildme _name _srcs) + endif() + else() + add_dependencies(${_name} ical-static icalss-static icalvcal-static) +- if(NOT WIN32) +- target_link_libraries(${_name} +- ${CMAKE_BINARY_DIR}/lib/libical.a +- ${CMAKE_BINARY_DIR}/lib/libicalss.a +- ${CMAKE_BINARY_DIR}/lib/libicalvcal.a +- ) +- else() +- target_link_libraries(${_name} +- ${CMAKE_BINARY_DIR}/bin/libical-static.lib +- ${CMAKE_BINARY_DIR}/bin/libicalss-static.lib +- ${CMAKE_BINARY_DIR}/bin/libicalvcal-static.lib +- ) +- endif() ++ target_link_libraries(${_name} ++ ical-static ++ icalss-static ++ icalvcal-static ++ ) + target_link_libraries(${_name} ${CMAKE_THREAD_LIBS_INIT}) + if(ICU_FOUND) + target_link_libraries(${_name} ${ICU_LIBRARY}) +@@ -74,17 +66,10 @@ macro(buildme _name _srcs) + target_link_libraries(${_name} ${BDB_LIBRARY}) + endif() + if(WITH_CXX_BINDINGS) +- if(NOT WIN32) +- target_link_libraries(${_name} +- ${CMAKE_BINARY_DIR}/lib/libical_cxx.a +- ${CMAKE_BINARY_DIR}/lib/libicalss_cxx.a +- ) +- else() +- target_link_libraries(${_name} +- ${CMAKE_BINARY_DIR}/bin/libical_cxx-static.lib +- ${CMAKE_BINARY_DIR}/bin/libicalss_cxx-static.lib +- ) +- endif() ++ target_link_libraries(${_name} ++ ical_cxx-static ++ icalss_cxx-static ++ ) + endif() + endif() + endmacro() diff --git a/src/libical.mk b/src/libical.mk index 6b7e4085..f1106cbd 100644 --- a/src/libical.mk +++ b/src/libical.mk @@ -2,8 +2,8 @@ # See index.html for further information. PKG := libical -$(PKG)_VERSION := 1.0.1 -$(PKG)_CHECKSUM := 089ce3c42d97fbd7a5d4b3c70adbdd82115dd306349c1f5c46a8fb3f8c949592 +$(PKG)_VERSION := 2.0.0 +$(PKG)_CHECKSUM := 654c11f759c19237be39f6ad401d917e5a05f36f1736385ed958e60cf21456da $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/$(PKG)/$(PKG)/releases/download/v$($(PKG)_VERSION)//$($(PKG)_FILE) From 6580c1553fb93e160a03224a1ffee506e440c023 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Thu, 14 Apr 2016 08:31:14 +0000 Subject: [PATCH 0585/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index f270512f..d72462f3 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -1659,7 +1659,7 @@ feel free to submit a pull request. libical - 1.0.1 + 2.0.0 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index bb86b27e..4e352990 100644 --- a/versions.json +++ b/versions.json @@ -161,7 +161,7 @@ "libgsf": "1.14.30", "libharu": "2.2.1", "libiberty": "2.25.1", - "libical": "1.0.1", + "libical": "2.0.0", "libiconv": "1.14", "libid3tag": "0.15.1b", "libidn": "1.32", From 9776c05d46eaf5f035a93bfc54d7145550be3258 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 16 Apr 2016 12:22:18 +1000 Subject: [PATCH 0586/1463] add GNU Tar to requirements and specify OS X packages needed for `build-pkg.lua`, installed as: - `gtar` on Homebrew - `gnutar` on MacPorts and Rudix so will be selected by `tool` function --- index.html | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index 2f5ad684..9976f2a0 100644 --- a/index.html +++ b/index.html @@ -571,6 +571,10 @@ USE_OSGPLUGIN(<plugin2>) GNU Sed + + GNU Tar + + Intltool ≥ 0.40 @@ -778,7 +782,7 @@ USE_OSGPLUGIN(<plugin2>) 
    sudo port install \
     autoconf automake bison coreutils flex gettext \
-    gdk-pixbuf2 glib2 gsed intltool libffi libtool \
+    gdk-pixbuf2 glib2 gnutar gsed intltool libffi libtool \
     openssl p5-xml-parser p7zip pkgconfig scons wget xz
    Method 2 - Rudix
    @@ -789,7 +793,7 @@ USE_OSGPLUGIN(<plugin2>) 
    sudo rudix install \
     autoconf automake coreutils gettext glib intltool \
-    libtool p7zip scons sed wget xz
    + libtool p7zip scons sed tar wget xz

    Note: gdk-pixbuf2 is not installed in method 2, so you can not build gtk3. Other packages may be @@ -804,7 +808,7 @@ USE_OSGPLUGIN(<plugin2>) 

    brew install \
     autoconf automake coreutils gdk-pixbuf gettext \
-    gnu-sed intltool libtool p7zip wget xz
    + gnu-sed gnu-tar intltool libtool p7zip wget xz

    Some formulae are keg-only From 6c01e8a36698904a6b880409f97bb7e283373845 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 16 Apr 2016 09:26:16 +0200 Subject: [PATCH 0587/1463] libgcrypt: update --- src/libgcrypt-1-fixes.patch | 98 ++++++++++++++++++++++++--- src/libgcrypt-2-no-git.patch | 34 ---------- src/libgcrypt-3-no-serial-tests.patch | 48 ------------- src/libgcrypt.mk | 4 +- 4 files changed, 91 insertions(+), 93 deletions(-) delete mode 100644 src/libgcrypt-2-no-git.patch delete mode 100644 src/libgcrypt-3-no-serial-tests.patch diff --git a/src/libgcrypt-1-fixes.patch b/src/libgcrypt-1-fixes.patch index 51f8e3d9..3a1ee37f 100644 --- a/src/libgcrypt-1-fixes.patch +++ b/src/libgcrypt-1-fixes.patch @@ -3,28 +3,29 @@ See index.html for further information. Contains ad hoc patches for cross building. -From 51d564de8fec65610977732baf46987db3dd2f1c Mon Sep 17 00:00:00 2001 -From: MXE +From 6e118d36f8c15474065fe357446cf288cdc1e179 Mon Sep 17 00:00:00 2001 +From: Tony Theodore Date: Thu, 4 Dec 2014 15:07:43 +1100 -Subject: [PATCH] Taken from: +Subject: [PATCH 1/3] fix for mingw cross building +Taken from: https://aur.archlinux.org/packages/mingw-w64-libgcrypt/ diff --git a/acinclude.m4 b/acinclude.m4 -index 0791b84..b520db1 100644 +index 96be833..9e14e12 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -102,7 +102,9 @@ AC_DEFUN([GNUPG_SYS_SYMBOL_UNDERSCORE], [tmp_do_check="no" case "${host}" in - *-mingw32*) + i?86-mingw32* | i?86-*-mingw32*) - ac_cv_sys_symbol_underscore=yes + if test "x$ac_cv_sys_symbol_underscore" = x ; then + ac_cv_sys_symbol_underscore=yes + fi ;; - i386-emx-os2 | i[3456]86-pc-os2*emx | i386-pc-msdosdjgpp) - ac_cv_sys_symbol_underscore=yes + x86_64-*-mingw32*) + ac_cv_sys_symbol_underscore=no diff --git a/mpi/generic/mpi-asm-defs.h b/mpi/generic/mpi-asm-defs.h index e607806..4c57111 100644 --- a/mpi/generic/mpi-asm-defs.h @@ -108,7 +109,7 @@ index 898ca47..afd1a1f 100644 /* Define stuff for longlong.h. */ diff --git a/src/libgcrypt.def b/src/libgcrypt.def -index a90efce..b5f476d 100644 +index 067cb84..df71bba 100644 --- a/src/libgcrypt.def +++ b/src/libgcrypt.def @@ -1,3 +1,4 @@ @@ -125,5 +126,84 @@ index a90efce..b5f476d 100644 gcry_control @2 -- -1.9.3 (Apple Git-50) +2.7.4 + + +From 9ff9c0ae66b9f51decfda8dffa2024d8dbaa9fe6 Mon Sep 17 00:00:00 2001 +From: Saikrishna Arcot +Date: Fri, 12 Jun 2015 14:53:55 -0700 +Subject: [PATCH 2/3] Don't call git to determine the revision. + + +diff --git a/configure.ac b/configure.ac +index f683e21..d43c012 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -38,13 +38,10 @@ m4_define(mym4_version_micro, [0]) + # processing is done by autoconf and not during the configure run. + m4_define(mym4_version, + [mym4_version_major.mym4_version_minor.mym4_version_micro]) +-m4_define([mym4_revision], +- m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r'])) ++m4_define([mym4_revision], [4091]) + m4_define([mym4_revision_dec], + m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))])) +-m4_define([mym4_betastring], +- m4_esyscmd_s([git describe --match 'libgcrypt-[0-9].*[0-9]' --long|\ +- awk -F- '$3!=0{print"-beta"$3}'])) ++m4_define([mym4_betastring], []) + m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes])) + m4_define([mym4_full_version],[mym4_version[]mym4_betastring]) + +-- +2.7.4 + + +From 7a22846e84ca5047b2f5cae7eb12ccab53c03026 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Sun, 28 Jun 2015 17:17:25 +0200 +Subject: [PATCH 3/3] configure.ac: no serial-tests if automake < 1.12 + +Earlier versions of automake complain if they get a configuration +parameter which they don't understand. The error is: + +configure.ac:27: error: option 'serial-tests' not recognized + +Use some m4 hackery to work around this. + +Fix libgcrypt build under x86_64 +See https://www.redhat.com/archives/libguestfs/2013-February/msg00102.html + +diff --git a/configure.ac b/configure.ac +index d43c012..b6f20ae 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -71,7 +71,24 @@ VERSION=$PACKAGE_VERSION + + AC_CONFIG_AUX_DIR([build-aux]) + AC_CONFIG_SRCDIR([src/libgcrypt.vers]) +-AM_INIT_AUTOMAKE([serial-tests dist-bzip2]) ++ ++dnl Initialize automake. automake < 1.12 didn't have serial-tests and ++dnl gives an error if it sees this, but for automake >= 1.13 ++dnl serial-tests is required so we have to include it. Solution is to ++dnl test for the version of automake (by running an external command) ++dnl and provide it if necessary. Note we have to do this entirely using ++dnl m4 macros since automake queries this macro by running ++dnl 'autoconf --trace ...'. ++m4_define([serial_tests], [ ++ m4_esyscmd([automake --version | ++ head -1 | ++ awk '{split ($NF,a,"."); if (a[1] == 1 && a[2] >= 12) { '\ ++ 'print "serial-tests" }}' ++ ]) ++]) ++dnl NB: Do not [quote] this parameter. ++AM_INIT_AUTOMAKE(serial_tests dist-bzip2) ++ + AC_CONFIG_HEADER(config.h) + AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_LIBOBJ_DIR([compat]) +-- +2.7.4 diff --git a/src/libgcrypt-2-no-git.patch b/src/libgcrypt-2-no-git.patch deleted file mode 100644 index ebde54d9..00000000 --- a/src/libgcrypt-2-no-git.patch +++ /dev/null @@ -1,34 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Contains ad hoc patches for cross building. - -From bb6a01f7a13be69e9ba395977dacd2ac0b9efbcd Mon Sep 17 00:00:00 2001 -From: MXE -Date: Fri, 12 Jun 2015 14:53:55 -0700 -Subject: [PATCH] Don't call git to determine the revision. - - -diff --git a/configure.ac b/configure.ac -index d9a1670..ab98441 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -38,13 +38,10 @@ m4_define(mym4_version_micro, [3]) - # processing is done by autoconf and not during the configure run. - m4_define(mym4_version, - [mym4_version_major.mym4_version_minor.mym4_version_micro]) --m4_define([mym4_revision], -- m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r'])) -+m4_define([mym4_revision], [4091]) - m4_define([mym4_revision_dec], - m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))])) --m4_define([mym4_betastring], -- m4_esyscmd_s([git describe --match 'libgcrypt-[0-9].*[0-9]' --long|\ -- awk -F- '$3!=0{print"-beta"$3}'])) -+m4_define([mym4_betastring], []) - m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes])) - m4_define([mym4_full_version],[mym4_version[]mym4_betastring]) - --- -2.1.4 - diff --git a/src/libgcrypt-3-no-serial-tests.patch b/src/libgcrypt-3-no-serial-tests.patch deleted file mode 100644 index cde1d539..00000000 --- a/src/libgcrypt-3-no-serial-tests.patch +++ /dev/null @@ -1,48 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Fix libgcrypt build under x86_64 -See https://www.redhat.com/archives/libguestfs/2013-February/msg00102.html - -From e19ba5689148df7cdcb6c515f44a897cc3a08418 Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Sun, 28 Jun 2015 17:17:25 +0200 -Subject: [PATCH] configure.ac: no serial-tests if automake < 1.12 - ---- - configure.ac | 19 ++++++++++++++++++- - 1 file changed, 18 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index ab98441..a015787 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -71,7 +71,24 @@ VERSION=$PACKAGE_VERSION - - AC_CONFIG_AUX_DIR([build-aux]) - AC_CONFIG_SRCDIR([src/libgcrypt.vers]) --AM_INIT_AUTOMAKE([serial-tests dist-bzip2]) -+ -+dnl Initialize automake. automake < 1.12 didn't have serial-tests and -+dnl gives an error if it sees this, but for automake >= 1.13 -+dnl serial-tests is required so we have to include it. Solution is to -+dnl test for the version of automake (by running an external command) -+dnl and provide it if necessary. Note we have to do this entirely using -+dnl m4 macros since automake queries this macro by running -+dnl 'autoconf --trace ...'. -+m4_define([serial_tests], [ -+ m4_esyscmd([automake --version | -+ head -1 | -+ awk '{split ($NF,a,"."); if (a[1] == 1 && a[2] >= 12) { '\ -+ 'print "serial-tests" }}' -+ ]) -+]) -+dnl NB: Do not [quote] this parameter. -+AM_INIT_AUTOMAKE(serial_tests dist-bzip2) -+ - AC_CONFIG_HEADER(config.h) - AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_LIBOBJ_DIR([compat]) --- -1.7.10.4 - diff --git a/src/libgcrypt.mk b/src/libgcrypt.mk index 091b808d..781b7265 100644 --- a/src/libgcrypt.mk +++ b/src/libgcrypt.mk @@ -3,8 +3,8 @@ PKG := libgcrypt $(PKG)_IGNORE := -$(PKG)_VERSION := 1.6.5 -$(PKG)_CHECKSUM := f49ebc5842d455ae7019def33eb5a014a0f07a2a8353dc3aa50a76fd1dafa924 +$(PKG)_VERSION := 1.7.0 +$(PKG)_CHECKSUM := b0e67ea74474939913c4d9d9ef4ef5ec378efbe2bebe36389dee319c79bffa92 $(PKG)_SUBDIR := libgcrypt-$($(PKG)_VERSION) $(PKG)_FILE := libgcrypt-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://mirrors.dotsrc.org/gcrypt/libgcrypt/$($(PKG)_FILE) From ab2cf656f58d88c2c04c2e88d7ad7acc3c623514 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sat, 16 Apr 2016 07:45:06 +0000 Subject: [PATCH 0588/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index d72462f3..b7e93639 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -1529,7 +1529,7 @@ feel free to submit a pull request. libgcrypt - 1.6.5 + 1.7.0 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 4e352990..77cf093e 100644 --- a/versions.json +++ b/versions.json @@ -148,7 +148,7 @@ "libffi": "3.2.1", "libftdi": "0.20", "libftdi1": "1.2", - "libgcrypt": "1.6.5", + "libgcrypt": "1.7.0", "libgda": "4.2.13", "libgdamm": "4.1.3", "libgee": "0.5.0", From 2ad80c24c5431d59f1c657756396fecebc5e1e38 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 18 Apr 2016 09:17:42 +0300 Subject: [PATCH 0589/1463] update qbittorrent to 3.3.4 The following patches were included in the upstream: * convert includes like to lowercase https://github.com/qbittorrent/qBittorrent/pull/4505 * fix library list https://github.com/qbittorrent/qBittorrent/pull/4824 --- plugins/apps/qbittorrent-1-fixes.patch | 151 ------------------------- plugins/apps/qbittorrent.mk | 4 +- 2 files changed, 2 insertions(+), 153 deletions(-) diff --git a/plugins/apps/qbittorrent-1-fixes.patch b/plugins/apps/qbittorrent-1-fixes.patch index af1cb2a0..e5e19c63 100644 --- a/plugins/apps/qbittorrent-1-fixes.patch +++ b/plugins/apps/qbittorrent-1-fixes.patch @@ -54,154 +54,3 @@ index 1111111..2222222 100755 if test -r "$QT_QMAKE/qmake-qt4"; then eval "$as_ac_File=yes" else - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Sun, 30 Aug 2015 01:58:17 +0200 -Subject: [PATCH] convert includes like to lowercase - - -diff --git a/src/app/application.cpp b/src/app/application.cpp -index 1111111..2222222 100644 ---- a/src/app/application.cpp -+++ b/src/app/application.cpp -@@ -37,7 +37,7 @@ - #ifndef DISABLE_GUI - #include "gui/guiiconprovider.h" - #ifdef Q_OS_WIN --#include -+#include - #include - #include - #endif // Q_OS_WIN -diff --git a/src/base/bittorrent/torrenthandle.cpp b/src/base/bittorrent/torrenthandle.cpp -index 1111111..2222222 100644 ---- a/src/base/bittorrent/torrenthandle.cpp -+++ b/src/base/bittorrent/torrenthandle.cpp -@@ -43,7 +43,7 @@ - #include - - #ifdef Q_OS_WIN --#include -+#include - #endif - - #include "base/logger.h" -diff --git a/src/base/preferences.cpp b/src/base/preferences.cpp -index 1111111..2222222 100644 ---- a/src/base/preferences.cpp -+++ b/src/base/preferences.cpp -@@ -47,7 +47,7 @@ - #endif - - #ifdef Q_OS_WIN --#include -+#include - #include - #endif - -diff --git a/src/base/utils/misc.cpp b/src/base/utils/misc.cpp -index 1111111..2222222 100644 ---- a/src/base/utils/misc.cpp -+++ b/src/base/utils/misc.cpp -@@ -48,7 +48,7 @@ - - #ifdef Q_OS_WIN - #include --#include -+#include - const int UNLEN = 256; - #else - #include -diff --git a/src/gui/powermanagement/powermanagement.cpp b/src/gui/powermanagement/powermanagement.cpp -index 1111111..2222222 100644 ---- a/src/gui/powermanagement/powermanagement.cpp -+++ b/src/gui/powermanagement/powermanagement.cpp -@@ -40,7 +40,7 @@ - #endif - - #ifdef Q_OS_WIN --#include -+#include - #endif - - PowerManagement::PowerManagement(QObject *parent) : QObject(parent), m_busy(false) - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Sun, 30 Aug 2015 02:02:39 +0200 -Subject: [PATCH] fix library list - -Replace library list hardcoded in qmake files with -libraries found by autotools. - -diff --git a/configure b/configure -index 1111111..2222222 100755 ---- a/configure -+++ b/configure -@@ -8345,7 +8345,7 @@ fi - $as_echo "$as_me: Running qmake to generate the makefile..." >&6;} - CONFDIR="$( cd "$( dirname "$0" )" && pwd )" - --$QT_QMAKE -r $CONFDIR/qbittorrent.pro -+$QT_QMAKE -r $CONFDIR/qbittorrent.pro "QMAKE_LRELEASE=$QMAKE_LRELEASE" "CONF_LIBS=$LIBS" - - ret="$?" - -diff --git a/winconf-mingw.pri b/winconf-mingw.pri -index 1111111..2222222 100644 ---- a/winconf-mingw.pri -+++ b/winconf-mingw.pri -@@ -20,19 +20,8 @@ CONFIG(debug, debug|release) { - - RC_FILE = qbittorrent_mingw.rc - --# Adapt the lib names/versions accordingly --CONFIG(debug, debug|release) { -- LIBS += libtorrent \ -- libboost_system-mgw45-mt-d-1_47 \ -- libboost_filesystem-mgw45-mt-d-1_47 \ -- libboost_thread-mgw45-mt-d-1_47 --} else { -- LIBS += libtorrent \ -- libboost_system-mgw45-mt-1_47 \ -- libboost_filesystem-mgw45-mt-1_47 \ -- libboost_thread-mgw45-mt-1_47 --} -+LIBS += $$CONF_LIBS - - LIBS += libadvapi32 libshell32 libuser32 --LIBS += libcrypto.dll libssl.dll libwsock32 libws2_32 libz libiconv.dll -+LIBS += libcrypto libssl libwsock32 libws2_32 libz libiconv - LIBS += libpowrprof -diff --git a/winconf.pri b/winconf.pri -index 1111111..2222222 100644 ---- a/winconf.pri -+++ b/winconf.pri -@@ -9,15 +9,6 @@ INCLUDEPATH += $$quote(C:/qBittorrent/Zlib/include) - # Point this to the openssl include folder - INCLUDEPATH += $$quote(C:/qBittorrent/openssl/include) - --# Point this to the boost lib folder --LIBS += $$quote(-LC:/qBittorrent/boost_1_51_0/stage/lib) --# Point this to the libtorrent lib folder --LIBS += $$quote(-LC:/qBittorrent/RC_0_16/bin/) --# Point this to the zlib lib folder --LIBS += $$quote(-LC:/qBittorrent/Zlib/lib) --# Point this to the openssl lib folder --LIBS += $$quote(-LC:/qBittorrent/openssl/lib) -- - # LIBTORRENT DEFINES - DEFINES += BOOST_ALL_NO_LIB - DEFINES += BOOST_ASIO_HASH_MAP_BUCKETS=1021 -@@ -46,9 +37,4 @@ CONFIG(debug, debug|release) { - # Enable backtrace support - CONFIG += strace_win - --win32-g++ { -- include(winconf-mingw.pri) --} --else { -- include(winconf-msvc.pri) --} -+include(winconf-mingw.pri) diff --git a/plugins/apps/qbittorrent.mk b/plugins/apps/qbittorrent.mk index 60494872..00a4019d 100644 --- a/plugins/apps/qbittorrent.mk +++ b/plugins/apps/qbittorrent.mk @@ -3,8 +3,8 @@ PKG := qbittorrent $(PKG)_IGNORE := -$(PKG)_VERSION := 3.3.1 -$(PKG)_CHECKSUM := dad15a233a69ce13ea75957585af3f9122dbf915291aab0fdbc48a71b8a229d2 +$(PKG)_VERSION := 3.3.4 +$(PKG)_CHECKSUM := c0d0d4b72c240f113b59a061146803bc1b7926d3d7f39b06b50a4d26f5ad91b8 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE) From 0fd22ac45a6f68cae96bec6f0e17719c44163250 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 19 Apr 2016 09:02:30 +0200 Subject: [PATCH 0590/1463] sqlite: update --- src/sqlite.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sqlite.mk b/src/sqlite.mk index e0412776..e97d6a06 100644 --- a/src/sqlite.mk +++ b/src/sqlite.mk @@ -3,8 +3,8 @@ PKG := sqlite $(PKG)_IGNORE := -$(PKG)_VERSION := 3120100 -$(PKG)_CHECKSUM := 1c038519862b3983b0475f3ed3143ce4bbfcd21bfbd0741192f415838c831a7c +$(PKG)_VERSION := 3120200 +$(PKG)_CHECKSUM := fd00770c9afd39db555c78400e52f55e8bd6568c78be23561abb472a22d09abb $(PKG)_SUBDIR := $(PKG)-autoconf-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-autoconf-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.sqlite.org/2016/$($(PKG)_FILE) From 2b397e0bedf4b68d7d1861a866276c7b10e5a689 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Tue, 19 Apr 2016 07:03:23 +0000 Subject: [PATCH 0591/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index b7e93639..15654512 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -3629,7 +3629,7 @@ feel free to submit a pull request. sqlite - 3120100 + 3120200 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 77cf093e..a1bced2a 100644 --- a/versions.json +++ b/versions.json @@ -358,7 +358,7 @@ "sparsehash": "2.0.3", "speex": "1.2rc2", "speexdsp": "1.2rc3", - "sqlite": "3120100", + "sqlite": "3120200", "subversion": "1.9.2", "suitesparse": "4.2.1", "t4k_common": "0.1.1", From c2687e985d8aa7c40f50fc735409d9f812fe636d Mon Sep 17 00:00:00 2001 From: Maurice Bos Date: Wed, 20 Apr 2016 19:24:05 +0200 Subject: [PATCH 0592/1463] Use correct cmake variable for static assimp library. --- src/assimp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assimp.mk b/src/assimp.mk index be5a8bbb..ba7ae5e9 100644 --- a/src/assimp.mk +++ b/src/assimp.mk @@ -25,7 +25,7 @@ define $(PKG)_BUILD -DASSIMP_BUILD_ASSIMP_TOOLS=OFF \ -DASSIMP_BUILD_SAMPLES=OFF \ -DASSIMP_BUILD_TESTS=OFF \ - -DASSIMP_BUILD_STATIC_LIB=$(if $(BUILD_STATIC),ON,OFF) + -DBUILD_SHARED_LIBS=$(if $(BUILD_STATIC),OFF,ON) $(MAKE) -C '$(1)/build' -j '$(JOBS)' install VERBOSE=1 '$(TARGET)-gcc' \ From 1a1c1ebf00162d7549fd7ff07c7b776c5221b73b Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 15 Feb 2016 08:53:48 +0300 Subject: [PATCH 0593/1463] build-pkg: move top-level code to main() function --- tools/build-pkg.lua | 68 ++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 32 deletions(-) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index d0870318..4f16d0b9 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -917,36 +917,40 @@ local function makeMxeSourcePackage() makePackage(name, files, deps, ver, d1, d2) end -assert(not io.open('usr/.git'), 'Remove usr/') -local MXE_DIR_EXPECTED = '/usr/lib/mxe' -if MXE_DIR ~= MXE_DIR_EXPECTED then - log("Warning! Building in dir %s, not in %s", - MXE_DIR, MXE_DIR_EXPECTED) -end -gitInit() -assert(execute(("%s check-requirements MXE_TARGETS=%q"):format( - tool 'make', table.concat(TARGETS, ' ')))) -if not max_items then - local cmd = ('%s download -j 6 -k'):format(tool 'make') - while not execute(cmd) do end -end -gitAdd() -gitCommit('Initial commit') -gitTag(GIT_INITIAL) -local items, item2deps, item2ver = getItems() -local build_list = sortForBuild(items, item2deps) -assert(isTopoOrdered(build_list, items, item2deps)) -build_list = sliceArray(build_list, max_items) -local unbroken, item2files = buildPackages(build_list, item2deps) -gitCheckout(GIT_ALL, unbroken, makeItem2Index(build_list)) -makeDebs(unbroken, item2deps, item2ver, item2files) -if not no_debs then - makeMxeRequirementsPackage('wheezy') - makeMxeRequirementsPackage('jessie') -end -makeMxeSourcePackage() -if #unbroken < #build_list then - local code = 1 - local close = true - os.exit(code, close) +local function main() + assert(not io.open('usr/.git'), 'Remove usr/') + local MXE_DIR_EXPECTED = '/usr/lib/mxe' + if MXE_DIR ~= MXE_DIR_EXPECTED then + log("Warning! Building in dir %s, not in %s", + MXE_DIR, MXE_DIR_EXPECTED) + end + gitInit() + assert(execute(("%s check-requirements MXE_TARGETS=%q"):format( + tool 'make', table.concat(TARGETS, ' ')))) + if not max_items then + local cmd = ('%s download -j 6 -k'):format(tool 'make') + while not execute(cmd) do end + end + gitAdd() + gitCommit('Initial commit') + gitTag(GIT_INITIAL) + local items, item2deps, item2ver = getItems() + local build_list = sortForBuild(items, item2deps) + assert(isTopoOrdered(build_list, items, item2deps)) + build_list = sliceArray(build_list, max_items) + local unbroken, item2files = buildPackages(build_list, item2deps) + gitCheckout(GIT_ALL, unbroken, makeItem2Index(build_list)) + makeDebs(unbroken, item2deps, item2ver, item2files) + if not no_debs then + makeMxeRequirementsPackage('wheezy') + makeMxeRequirementsPackage('jessie') + end + makeMxeSourcePackage() + if #unbroken < #build_list then + local code = 1 + local close = true + os.exit(code, close) + end end + +main() From 3f47774f1c93c8cfae905897ea3a2b2229cd81f0 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 15 Feb 2016 09:02:13 +0300 Subject: [PATCH 0594/1463] build-pkg: add argument pass=first to build funcs --- tools/build-pkg.lua | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index 4f16d0b9..638a2b44 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -350,10 +350,10 @@ local function isBlacklisted(file) end local GIT_INITIAL = 'initial' -local GIT_ALL = 'first-all' +local GIT_ALL_PSEUDOITEM = 'all' -local function itemToBranch(item) - return 'first-' .. item:gsub('~', '_') +local function itemToBranch(item, pass) + return pass .. '-' .. item:gsub('~', '_') end -- creates git repo in ./usr @@ -383,10 +383,10 @@ local function gitCommit(message) assert(execute(cmd:format(message))) end -local function gitCheckout(new_branch, deps, item2index) +local function gitCheckout(new_branch, deps, item2index, pass_of_deps) local main_dep = deps[1] if main_dep then - main_dep = itemToBranch(main_dep) + main_dep = itemToBranch(main_dep, pass_of_deps) else main_dep = GIT_INITIAL end @@ -398,7 +398,7 @@ local function gitCheckout(new_branch, deps, item2index) local cmd2 = '%s %s merge -q %s -m %q' if not execute(cmd2:format(GIT, GIT_USER, - itemToBranch(deps[i]), + itemToBranch(deps[i], pass_of_deps), message)) then -- probably merge conflict @@ -546,15 +546,17 @@ local function removeEmptyDirs(item) end -- builds package, returns list of new files -local function buildItem(item, item2deps, file2item, item2index) - gitCheckout(itemToBranch(item), item2deps[item], item2index) +local function buildItem(item, item2deps, file2item, item2index, pass) + gitCheckout( + itemToBranch(item, pass), item2deps[item], item2index, pass + ) local target, pkg = parseItem(item) local cmd = '%s %s MXE_TARGETS=%s --jobs=1' os.execute(cmd:format(tool 'make', pkg, target)) gitAdd() local new_files, changed_files = gitStatus() if #new_files + #changed_files > 0 then - gitCommit(("Build %s"):format(item)) + gitCommit(("Build %s, pass %s"):format(item, pass)) end for _, file in ipairs(new_files) do checkFile(file, item) @@ -771,7 +773,7 @@ local function isEmpty(files) end -- build all packages, save filelist to list file -local function buildPackages(items, item2deps) +local function buildPackages(items, item2deps, pass) local broken = {} local unbroken = {} local file2item = {} @@ -788,8 +790,9 @@ local function buildPackages(items, item2deps) local progress_printer = progressPrinter(items) for i, item in ipairs(items) do if not brokenDep(item) then - local files = buildItem(item, item2deps, - file2item, item2index) + local files = buildItem( + item, item2deps, file2item, item2index, pass + ) findForeignInstalls(item, files) if isBuilt(item, files) then item2files[item] = files @@ -938,8 +941,15 @@ local function main() local build_list = sortForBuild(items, item2deps) assert(isTopoOrdered(build_list, items, item2deps)) build_list = sliceArray(build_list, max_items) - local unbroken, item2files = buildPackages(build_list, item2deps) - gitCheckout(GIT_ALL, unbroken, makeItem2Index(build_list)) + local unbroken, item2files = buildPackages( + build_list, item2deps, 'first' + ) + gitCheckout( + itemToBranch(GIT_ALL_PSEUDOITEM, 'first'), + unbroken, + makeItem2Index(build_list), + 'first' + ) makeDebs(unbroken, item2deps, item2ver, item2files) if not no_debs then makeMxeRequirementsPackage('wheezy') From 07a0103247814dfd39f0dc057ae3d5cd70da8769 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 15 Feb 2016 21:50:40 +0300 Subject: [PATCH 0595/1463] build-pkg: provide a way to mute removeEmptyDirs() --- tools/build-pkg.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index 638a2b44..38500e85 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -531,13 +531,16 @@ end local function removeEmptyDirs(item) -- removing an empty dir can reveal another one (parent) + -- don't pass item to mute the log message local go_on = true while go_on do go_on = false local f = io.popen('find usr/* -empty -type d', 'r') for dir in f:lines() do - log("Remove empty directory %s created by %s", - dir, item) + if item then + log("Remove empty directory %s created by %s", + dir, item) + end os.remove(dir) go_on = true end From 1856ae5f8aef881a0dde8df71e1bedef4b6e83d4 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 15 Feb 2016 21:53:23 +0300 Subject: [PATCH 0596/1463] build-pkg, buildItem(): log pass (first, second) --- tools/build-pkg.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index 38500e85..e866abc2 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -572,8 +572,8 @@ local function buildItem(item, item2deps, file2item, item2index, pass) if not isInArray(creator_item, item2deps[item]) then table.insert(item2deps[item], creator_item) end - log('Item %s changes %s, created by %s', - item, file, creator_item) + log('Item %s (pass %s) changes %s, created by %s', + item, pass, file, creator_item) end checkFileList(concatArrays(new_files, changed_files), item) removeEmptyDirs(item) From d25a31bd2183f101d6836af54ed8eafbd9057700 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 21 Feb 2016 16:41:51 +0300 Subject: [PATCH 0597/1463] build-pkg: move function isBuilt() It will be used in buildItem() --- tools/build-pkg.lua | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index e866abc2..7a7172f9 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -548,6 +548,18 @@ local function removeEmptyDirs(item) end end +local function isBuilt(item, files) + local target, pkg = parseItem(item) + local INSTALLED = 'usr/%s/installed/%s' + local installed = INSTALLED:format(target, pkg) + for _, file in ipairs(files) do + if file == installed then + return true + end + end + return false +end + -- builds package, returns list of new files local function buildItem(item, item2deps, file2item, item2index, pass) gitCheckout( @@ -692,18 +704,6 @@ local function makeDeb(item, files, deps, ver) makePackage(deb_pkg, files, deb_deps, ver, d1, d2) end -local function isBuilt(item, files) - local target, pkg = parseItem(item) - local INSTALLED = 'usr/%s/installed/%s' - local installed = INSTALLED:format(target, pkg) - for _, file in ipairs(files) do - if file == installed then - return true - end - end - return false -end - local function findForeignInstalls(item, files) for _, file in ipairs(files) do local pattern = 'usr/([^/]+)/installed/([^/]+)' From aa4744cea4cf5b785216f985f4b42c79da417c28 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 15 Feb 2016 21:54:38 +0300 Subject: [PATCH 0598/1463] build-pkg: add second pass The second pass is done after the first one. During the second pass, an item is built in tree of files from all other items. It checks that: * packages can be built in any order satisfying dependencies; * a package can be rebuilt after its dependee. For both cases, not only build status is checked but also two sets of files are compared. Currently content of files is not checked, only their existance in both passes. See #1111 --- tools/build-pkg.lua | 87 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 78 insertions(+), 9 deletions(-) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index 7a7172f9..a78c4442 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -548,6 +548,57 @@ local function removeEmptyDirs(item) end end +local function prepareTree(pass, item, item2deps, prev_files, item2index) + if pass == 'first' then + gitCheckout( + itemToBranch(item, pass), + item2deps[item], + item2index, + pass + ) + elseif pass == 'second' then + -- Build item second time to check if it builds correctly if + -- its followers and unrelated packages have been built. + gitCheckout( + itemToBranch(item, 'second'), + {GIT_ALL_PSEUDOITEM}, + item2index, + 'first' + ) + -- Remove files of item from previous build. + for _, file in ipairs(prev_files) do + os.remove(file) + end + removeEmptyDirs() + gitAdd() + gitCommit(("Remove %s to rebuild it"):format(item, pass)) + else + error("Unknown pass: " .. pass) + end +end + +local function comparePasses(item, new_files, prev_file2item, prev_files) + local files_set = {} + for _, file in ipairs(new_files) do + if not prev_file2item[file] then + log('Item %s installs a file on second pass only: %s', + item, file) + elseif prev_file2item[file] ~= item then + log('File %s was installed by %s on first pass ' .. + 'and by %s - on the second pass', + file, prev_file2item[file], item) + end + files_set[file] = true + end + for _, file in ipairs(prev_files) do + if not files_set[file] then + log('Item %s installs a file on first pass only: %s', + item, file) + end + end + -- TODO compare contents of files (nm for binaries) +end + local function isBuilt(item, files) local target, pkg = parseItem(item) local INSTALLED = 'usr/%s/installed/%s' @@ -561,10 +612,9 @@ local function isBuilt(item, files) end -- builds package, returns list of new files -local function buildItem(item, item2deps, file2item, item2index, pass) - gitCheckout( - itemToBranch(item, pass), item2deps[item], item2index, pass - ) +-- prev_files is passed only to second pass. +local function buildItem(item, item2deps, file2item, item2index, pass, prev_files) + prepareTree(pass, item, item2deps, prev_files, item2index) local target, pkg = parseItem(item) local cmd = '%s %s MXE_TARGETS=%s --jobs=1' os.execute(cmd:format(tool 'make', pkg, target)) @@ -573,9 +623,13 @@ local function buildItem(item, item2deps, file2item, item2index, pass) if #new_files + #changed_files > 0 then gitCommit(("Build %s, pass %s"):format(item, pass)) end - for _, file in ipairs(new_files) do - checkFile(file, item) - file2item[file] = item + if pass == 'first' then + for _, file in ipairs(new_files) do + checkFile(file, item) + file2item[file] = item + end + elseif isBuilt(item, new_files) then + comparePasses(item, new_files, file2item, prev_files) end for _, file in ipairs(changed_files) do checkFile(file, item) @@ -776,7 +830,8 @@ local function isEmpty(files) end -- build all packages, save filelist to list file -local function buildPackages(items, item2deps, pass) +-- prev_files is passed only to second pass. +local function buildPackages(items, item2deps, pass, prev_item2files) local broken = {} local unbroken = {} local file2item = {} @@ -789,12 +844,22 @@ local function buildPackages(items, item2deps, pass) end return false end + if pass == 'second' then + assert(prev_item2files) + -- fill file2item with data from prev_item2files + for item, files in pairs(prev_item2files) do + for _, file in ipairs(files) do + file2item[file] = item + end + end + end local item2index = makeItem2Index(items) local progress_printer = progressPrinter(items) for i, item in ipairs(items) do if not brokenDep(item) then + local prev_files = prev_item2files and prev_item2files[item] local files = buildItem( - item, item2deps, file2item, item2index, pass + item, item2deps, file2item, item2index, pass, prev_files ) findForeignInstalls(item, files) if isBuilt(item, files) then @@ -959,6 +1024,10 @@ local function main() makeMxeRequirementsPackage('jessie') end makeMxeSourcePackage() + -- second pass + buildPackages( + build_list, item2deps, 'second', item2files + ) if #unbroken < #build_list then local code = 1 local close = true From f3de04c95496fbee09c3c8f9e31deb5351de1b4d Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 15 Feb 2016 22:02:19 +0300 Subject: [PATCH 0599/1463] build-pkg: provide a way to disable second pass --- tools/build-pkg.lua | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index a78c4442..d02a29e4 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -19,6 +19,9 @@ To prevent build-pkg from creating deb packages, set environment variable MXE_NO_DEBS to 1 In this case fakeroot and dpkg-deb are not needed. +To switch off the second pass, set MXE_NO_SECOND_PASS to 1. +See https://github.com/mxe/mxe/issues/1111 + To limit number of packages being built to x, set environment variable MXE_MAX_ITEMS to x, @@ -32,6 +35,7 @@ How to remove them: http://stackoverflow.com/a/4262545 local max_items = tonumber(os.getenv('MXE_MAX_ITEMS')) local no_debs = os.getenv('MXE_NO_DEBS') +local no_second_pass = os.getenv('MXE_NO_SECOND_PASS') local TODAY = os.date("%Y%m%d") @@ -1024,10 +1028,11 @@ local function main() makeMxeRequirementsPackage('jessie') end makeMxeSourcePackage() - -- second pass - buildPackages( - build_list, item2deps, 'second', item2files - ) + if not no_second_pass then + buildPackages( + build_list, item2deps, 'second', item2files + ) + end if #unbroken < #build_list then local code = 1 local close = true From 732169d86a0ea74e8a4fa75bc6fae18e10a0aeb3 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Thu, 18 Feb 2016 01:23:00 +0300 Subject: [PATCH 0600/1463] build-pkg: exit with non-zero if second pass fails --- tools/build-pkg.lua | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index d02a29e4..81b0391f 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -1013,9 +1013,13 @@ local function main() local build_list = sortForBuild(items, item2deps) assert(isTopoOrdered(build_list, items, item2deps)) build_list = sliceArray(build_list, max_items) + local first_pass_failed, second_pass_failed local unbroken, item2files = buildPackages( build_list, item2deps, 'first' ) + if #unbroken < #build_list then + first_pass_failed = true + end gitCheckout( itemToBranch(GIT_ALL_PSEUDOITEM, 'first'), unbroken, @@ -1029,11 +1033,14 @@ local function main() end makeMxeSourcePackage() if not no_second_pass then - buildPackages( + local unbroken_second = buildPackages( build_list, item2deps, 'second', item2files ) + if #unbroken_second < #build_list then + second_pass_failed = true + end end - if #unbroken < #build_list then + if first_pass_failed or second_pass_failed then local code = 1 local close = true os.exit(code, close) From ea511c193cd74b9cd6fae46c6745e38df4c4acb4 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 28 Feb 2016 13:51:19 +0300 Subject: [PATCH 0601/1463] build-pkg: use "git add" with --all From the warning produced by "git add ." after removing a file with "rm": > warning: You ran 'git add' with neither '-A (--all)' or '--ignore-removal', > whose behaviour will change in Git 2.0 with respect to paths you removed. > Paths like 'foo.txt' that are > removed from your working tree are ignored with this version of Git. > > * 'git add --ignore-removal ', which is the current default, > ignores paths you removed from your working tree. > > * 'git add --all ' will let you also record the removals. > > Run 'git status' to check the paths you removed from your working tree. $ git status --porcelain D foo.txt $ git add --all . $ git status --porcelain D foo.txt $ git --version git version 1.9.1 --- tools/build-pkg.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index 81b0391f..b3fa217a 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -430,7 +430,7 @@ local function gitCheckout(new_branch, deps, item2index, pass_of_deps) end local function gitAdd() - os.execute(GIT .. 'add .') + os.execute(GIT .. 'add --all .') end -- return two lists of filepaths under ./usr/ @@ -442,6 +442,7 @@ local function gitStatus() local git_st = io.popen(GIT .. 'status --porcelain', 'r') for line in git_st:lines() do local status, file = line:match('(..) (.*)') + assert(status:sub(2, 2) == ' ') status = trim(status) if file:sub(1, 1) == '"' then -- filename with a space is quoted by git From 6784792540ffd9eec647c85a984e1af126e79f4f Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 28 Feb 2016 14:59:10 +0300 Subject: [PATCH 0602/1463] build-pkg: detect broken symlink and removed file --- tools/build-pkg.lua | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index b3fa217a..a5635cac 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -178,6 +178,10 @@ local function fileExists(name) end end +local function isSymlink(name) + return shell(("ls -l %q"):format(name)):sub(1, 1) == "l" +end + local function writeFile(filename, data) local file = io.open(filename, 'w') file:write(data) @@ -450,7 +454,13 @@ local function gitStatus() end file = 'usr/' .. file if not fileExists(file) then - log('Missing file: %q', file) + if status == 'D' then + log('Removed file: %q', file) + elseif isSymlink(file) then + log('Broken symlink: %q', file) + else + log('Missing file: %q', file) + end elseif not isBlacklisted(file) then if status == 'A' then table.insert(new_files, file) From 9da2e477d372a21e727a3c47bca8fe1a8345192d Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 28 Feb 2016 16:34:35 +0300 Subject: [PATCH 0603/1463] build-pkg: provide more info about removed files --- tools/build-pkg.lua | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index a5635cac..56b1aaaf 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -317,6 +317,18 @@ local function sortForBuild(items, item2deps) return build_list end +local function isDependency(item, dependency, item2deps) + for _, dep in ipairs(item2deps[item]) do + if dep == dependency then + return true + end + if isDependency(dep, dependency, item2deps) then + return true + end + end + return false +end + local function makeItem2Index(build_list) local item2index = {} for index, item in ipairs(build_list) do @@ -440,7 +452,7 @@ end -- return two lists of filepaths under ./usr/ -- 1. new files -- 2. changed files -local function gitStatus() +local function gitStatus(item, item2deps, file2item) local new_files = {} local changed_files = {} local git_st = io.popen(GIT .. 'status --porcelain', 'r') @@ -455,7 +467,17 @@ local function gitStatus() file = 'usr/' .. file if not fileExists(file) then if status == 'D' then - log('Removed file: %q', file) + local prev_owner = assert(file2item[file]) + if prev_owner == item then + log('Item %s removed %q installed by itself', + item, file) + elseif isDependency(prev_owner, item, item2deps) then + log('Item %s removed %q installed by its follower %s', + item, file, prev_owner) + else + log('Item %s removed %q installed by %s', + item, file, prev_owner) + end elseif isSymlink(file) then log('Broken symlink: %q', file) else @@ -634,7 +656,7 @@ local function buildItem(item, item2deps, file2item, item2index, pass, prev_file local cmd = '%s %s MXE_TARGETS=%s --jobs=1' os.execute(cmd:format(tool 'make', pkg, target)) gitAdd() - local new_files, changed_files = gitStatus() + local new_files, changed_files = gitStatus(item, item2deps, file2item) if #new_files + #changed_files > 0 then gitCommit(("Build %s, pass %s"):format(item, pass)) end From c5c610b0853821a8ba824ff7a96d3bfc5d8562e7 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 20 Apr 2016 09:07:15 +0300 Subject: [PATCH 0604/1463] build-pkg, second pass: fix fail on broken package If a package is found to be broken on the first pass, then prev_files = nil, because this structure is filled only for non-broken packages. See https://github.com/mxe/mxe/pull/1243#issuecomment-211137555 --- tools/build-pkg.lua | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index 56b1aaaf..0af1d332 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -602,13 +602,15 @@ local function prepareTree(pass, item, item2deps, prev_files, item2index) item2index, 'first' ) - -- Remove files of item from previous build. - for _, file in ipairs(prev_files) do - os.remove(file) - end removeEmptyDirs() - gitAdd() - gitCommit(("Remove %s to rebuild it"):format(item, pass)) + if prev_files then + -- Remove files of item from previous build. + for _, file in ipairs(prev_files) do + os.remove(file) + end + gitAdd() + gitCommit(("Remove %s to rebuild it"):format(item, pass)) + end else error("Unknown pass: " .. pass) end From 01dd93bdc612f9b12a0f913aa495e98327872628 Mon Sep 17 00:00:00 2001 From: Maurice Bos Date: Thu, 21 Apr 2016 12:32:21 +0200 Subject: [PATCH 0605/1463] Disable dynamic loading for static libalure. --- src/alure.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/src/alure.mk b/src/alure.mk index 1188d962..a4905eae 100644 --- a/src/alure.mk +++ b/src/alure.mk @@ -19,6 +19,7 @@ endef define $(PKG)_BUILD cd '$(1)/build' && cmake \ + -DDYNLOAD=OFF \ -DBUILD_STATIC=ON \ -DBUILD_SHARED=OFF \ -DBUILD_EXAMPLES=OFF \ From 96ae6b546f33ef9f01868900bda359aa678ba2d4 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Sun, 24 Apr 2016 15:08:41 +0300 Subject: [PATCH 0606/1463] cmake: update to 3.5.2 --- src/cmake.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cmake.mk b/src/cmake.mk index 7e6071ba..4ac8c8c2 100644 --- a/src/cmake.mk +++ b/src/cmake.mk @@ -3,8 +3,8 @@ PKG := cmake $(PKG)_IGNORE := -$(PKG)_VERSION := 3.5.1 -$(PKG)_CHECKSUM := 93d651a754bcf6f0124669646391dd5774c0fc4d407c384e3ae76ef9a60477e8 +$(PKG)_VERSION := 3.5.2 +$(PKG)_CHECKSUM := 92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a $(PKG)_SUBDIR := cmake-$($(PKG)_VERSION) $(PKG)_FILE := cmake-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.cmake.org/files/v$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE) From 5f76add844a77fcf4052c1a76cc1a1ff887b98fa Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sun, 24 Apr 2016 13:09:29 +0000 Subject: [PATCH 0607/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 15654512..b7edc4ce 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -339,7 +339,7 @@ feel free to submit a pull request. cmake - 3.5.1 + 3.5.2 ✗ ✗ ✗ diff --git a/versions.json b/versions.json index a1bced2a..67af1c56 100644 --- a/versions.json +++ b/versions.json @@ -29,7 +29,7 @@ "chromaprint": "1.1", "cimg": "1.6.3", "cloog": "0.18.1", - "cmake": "3.5.1", + "cmake": "3.5.2", "cminpack": "1.3.4", "coda": "2.15.1", "coin": "3.1.3", From 6d948f77650f4984b6f0037862b22bc7505a8893 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 25 Apr 2016 02:53:38 +0300 Subject: [PATCH 0608/1463] update libuv to 1.9.0 --- src/libuv-1-fixes.patch | 42 +++++++++++++++++++++++++++++++++++++++++ src/libuv.mk | 4 ++-- 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/src/libuv-1-fixes.patch b/src/libuv-1-fixes.patch index 6a5a1970..ec8f9578 100644 --- a/src/libuv-1-fixes.patch +++ b/src/libuv-1-fixes.patch @@ -3,6 +3,48 @@ See index.html for further information. Contains ad hoc patches for cross building. +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: cjihrig +Date: Mon, 11 Apr 2016 11:11:47 -0400 +Subject: [PATCH] Revert "win,build: remove unused build defines" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This reverts commit 60db5b5a1bb446e4b8a6d15ce277d5f7987bf07a. +Removing the WIN32_LEAN_AND_MEAN definition caused build errors +on mingw64. + +Fixes: https://github.com/libuv/libuv/issues/820 +PR-URL: https://github.com/libuv/libuv/pull/821 +Reviewed-By: Saúl Ibarra Corretgé +Reviewed-By: Ben Noordhuis + +diff --git a/Makefile.am b/Makefile.am +index 1111111..2222222 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -43,6 +43,7 @@ if WINNT + + include_HEADERS += include/uv-win.h include/tree.h + AM_CPPFLAGS += -I$(top_srcdir)/src/win \ ++ -DWIN32_LEAN_AND_MEAN \ + -D_WIN32_WINNT=0x0600 + LIBS += -lws2_32 -lpsapi -liphlpapi -lshell32 -luserenv + libuv_la_SOURCES += src/win/async.c \ +diff --git a/Makefile.mingw b/Makefile.mingw +index 1111111..2222222 100644 +--- a/Makefile.mingw ++++ b/Makefile.mingw +@@ -20,6 +20,7 @@ CFLAGS += -Wall \ + -Iinclude \ + -Isrc \ + -Isrc/win \ ++ -DWIN32_LEAN_AND_MEAN \ + -D_WIN32_WINNT=0x0600 + + INCLUDES = include/stdint-msvc2008.h \ + From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 12 Apr 2016 11:06:36 +1000 diff --git a/src/libuv.mk b/src/libuv.mk index 5dd70a2c..3db9649c 100644 --- a/src/libuv.mk +++ b/src/libuv.mk @@ -3,8 +3,8 @@ PKG := libuv $(PKG)_IGNORE := -$(PKG)_VERSION := 1.8.0 -$(PKG)_CHECKSUM := 6511f734da4fe082dacf85967606d600b7bce557bb9b2f0d2539193535323125 +$(PKG)_VERSION := 1.9.0 +$(PKG)_CHECKSUM := d595b2725abcce851c76239aab038adc126c58714cfb572b2ebb2d21b3593842 $(PKG)_SUBDIR := $(PKG)-v$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-v$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://dist.libuv.org/dist/v$($(PKG)_VERSION)/$($(PKG)_FILE) From cfcb715f08a96d7ade12af91354897965809fa05 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Thu, 28 Apr 2016 01:43:34 +0300 Subject: [PATCH 0609/1463] box2d: update sha256 The file was changed in upstream. File pkg/box2d-2.3.1.tar.gz (or https://github.com/erincatto/Box2D/archive/v2.3.1.tar.gz): Old sha256: 2c61505f03ef403b54cf0e510d83d6f567e37882ad79b5b2d486acbc7d5eedea New sha256: 75d62738b13d2836cd56647581b6e574d4005a6e077ddefa5d727d445d649752 Changes: $ diff -r old/ new Only in old/Box2D-2.3.1/Contributions/Platforms: Box2D.XNA.zip Only in old/Box2D-2.3.1/Contributions/Platforms: Tizen.zip Files Box2D.XNA.zip and Tizen.zip are not used in build, according to logs. Removing them them seems to be safe. fix #1319 --- src/box2d.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/box2d.mk b/src/box2d.mk index 9d51d912..eead70d4 100644 --- a/src/box2d.mk +++ b/src/box2d.mk @@ -4,7 +4,7 @@ PKG := box2d $(PKG)_IGNORE := $(PKG)_VERSION := 2.3.1 -$(PKG)_CHECKSUM := 2c61505f03ef403b54cf0e510d83d6f567e37882ad79b5b2d486acbc7d5eedea +$(PKG)_CHECKSUM := 75d62738b13d2836cd56647581b6e574d4005a6e077ddefa5d727d445d649752 $(PKG)_SUBDIR := Box2D-$($(PKG)_VERSION)/Box2D $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/erincatto/Box2D/archive/v$($(PKG)_VERSION).tar.gz From 823707cb41e02a6d07d676731b4f59ebd42f810f Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sat, 30 Apr 2016 07:15:18 +0000 Subject: [PATCH 0610/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index b7edc4ce..f55493c9 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -2089,7 +2089,7 @@ feel free to submit a pull request. libuv - 1.8.0 + 1.9.0 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 67af1c56..d00ed6ea 100644 --- a/versions.json +++ b/versions.json @@ -204,7 +204,7 @@ "libunistring": "0.9.4", "libusb": "1.2.6.0", "libusb1": "1.0.19", - "libuv": "1.8.0", + "libuv": "1.9.0", "libvpx": "1.5.0", "libwebp": "0.4.4", "libwebsockets": "1.4-chrome43-firefox-36", From 670a6d300dd77f9a71a791b493831be2442b1bad Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Wed, 27 Apr 2016 16:23:59 +0300 Subject: [PATCH 0611/1463] Add gcc6 plugin --- plugins/gcc6/gcc6-overlay.mk | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 plugins/gcc6/gcc6-overlay.mk diff --git a/plugins/gcc6/gcc6-overlay.mk b/plugins/gcc6/gcc6-overlay.mk new file mode 100644 index 00000000..5ca92079 --- /dev/null +++ b/plugins/gcc6/gcc6-overlay.mk @@ -0,0 +1,25 @@ +# This file is part of MXE. +# See index.html for further information. + +# override relevant cloog, isl, and gcc variables changed in: +# https://github.com/mxe/mxe/pull/965 +# +# simply expanded variables (*_SUBDIR, *_FILE, etc.) need to be set + +PKG := cloog +$(PKG)_TARGETS := $(MXE_TARGETS) + +PKG := isl +$(PKG)_VERSION := 0.16.1 +$(PKG)_CHECKSUM := 412538bb65c799ac98e17e8cfcdacbb257a57362acfaaff254b0fcae970126d2 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 +$(PKG)_URL := http://isl.gforge.inria.fr/$($(PKG)_FILE) +$(PKG)_URL_2 := ftp://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE) + +PKG := gcc +$(PKG)_VERSION := 6.1.0 +$(PKG)_CHECKSUM := 09c4c85cabebb971b1de732a0219609f93fc0af5f86f6e437fd8d7f832f1a351 +$(PKG)_SUBDIR := gcc-$($(PKG)_VERSION) +$(PKG)_FILE := gcc-$($(PKG)_VERSION).tar.bz2 +$(PKG)_URL := http://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE) From 0cbf0b5358084141c883a93f673d5e46c7497def Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Wed, 27 Apr 2016 16:32:37 +0300 Subject: [PATCH 0612/1463] gcc5 plugin: add reserve url to isl sources --- plugins/gcc5/gcc5-overlay.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/gcc5/gcc5-overlay.mk b/plugins/gcc5/gcc5-overlay.mk index 3da31716..894952b1 100644 --- a/plugins/gcc5/gcc5-overlay.mk +++ b/plugins/gcc5/gcc5-overlay.mk @@ -16,6 +16,7 @@ $(PKG)_CHECKSUM := 8ceebbf4d9a81afa2b4449113cee4b7cb14a687d7a549a963deb5e2a41458 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://isl.gforge.inria.fr/$($(PKG)_FILE) +$(PKG)_URL_2 := ftp://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE) PKG := gcc $(PKG)_VERSION := 5.3.0 From 282e6b7907c9bf0296c4a697b8b9a29c8353095e Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Thu, 28 Apr 2016 15:25:01 +0300 Subject: [PATCH 0613/1463] gcc6 plugin: add README.md with notes about new GCC --- plugins/gcc6/README.md | 69 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 plugins/gcc6/README.md diff --git a/plugins/gcc6/README.md b/plugins/gcc6/README.md new file mode 100644 index 00000000..128a3745 --- /dev/null +++ b/plugins/gcc6/README.md @@ -0,0 +1,69 @@ +# Notes about GCC version 6.1.0 and later + +GCC 6.1 is released with a number of major changes +[[1](https://gcc.gnu.org/ml/gcc-announce/2016/msg00000.html)] +[[2](https://gcc.gnu.org/gcc-6/changes.html)] +. The most notable change is: +> The `C++` frontend now defaults to `C++14` standard instead of `C++98` it has +> been defaulting to previously, for compiling older `C++` code that might +> require either explicitly compiling with selected older `C++` standards, +> or might require some code adjustment, see +> [[3](http://gcc.gnu.org/gcc-6/porting_to.html)] +> for details. + +So it is expected that some of MXE packages will fails to build from source +(FTBFS) with default GCC 6.x options. As a workaround we may add `-std=gnu++11` +or `-std=gnu++98` into `CXXFLAGS` for building problematic packages. And this +will not affect the builds with older versions of GCC. + +For example, in autotools based projects: +``` +... +$(PKG)_CXXFLAGS := -std=gnu++11 +... + cd '$(1)' && \ + CXXFLAGS="$($(PKG)_CXXFLAGS)" \ + ./configure \ +... +``` + +Just after adding this plugin (gcc6) some packages were FTBFS: +* boost +* cgal +* dcmtk +* fdk-aac +* fdk-aac +* flann +* freeimage +* glib +* gtkimageview +* gtkmm2 +* gtkmm3 +* itk +* jsoncpp +* json_spirit +* libical +* librsvg +* libxml++ +* log4cxx +* opencv +* ossim +* qt +* qt3d +* sdl_sound +* smpeg2 +* ucl +* vtk +* vtk6 +* wxwidgets + +See logs +[[4](https://gist.github.com/starius/81e25169242155aa3ef6be1a733b9812)] +[[5](https://gist.github.com/c01ef084eeb85781bd1eb7f6b1e12192)] +for details. + +For now, these packages might be already fixed by upstream developers, by +additional patches or using above mentioned workaround. If some MXE packages +or your personal projects are still FTBFS you may look how other packages were +fixed and use similar approach. + From 58c2c96b967957a1a2df062f13dd4a5817aae792 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Thu, 28 Apr 2016 17:16:27 +0300 Subject: [PATCH 0614/1463] glib: update patch: fix build with GCC >= 6.x --- src/glib-1-fixes.patch | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/glib-1-fixes.patch b/src/glib-1-fixes.patch index d1cdbad5..8709dad7 100644 --- a/src/glib-1-fixes.patch +++ b/src/glib-1-fixes.patch @@ -580,3 +580,23 @@ index 1111111..2222222 100644 dnl dnl At the end, if we're not within glib, we'll define the public dnl definitions in terms of our private definitions. + + +From: Boris Pek +Date: Thu, 28 Apr 2016 16:48:12 +0300 +Subject: [PATCH] fix build with GCC >= 6.x + +See plugins/gcc6/README.md + +diff --git a/gio/gregistrysettingsbackend.c b/gio/gregistrysettingsbackend.c +--- a/gio/gregistrysettingsbackend.c ++++ b/gio/gregistrysettingsbackend.c +@@ -228,7 +228,7 @@ + if (result_code == ERROR_KEY_DELETED) + trace ("(%s)", win32_message); + else +- g_message (win32_message); ++ g_message ("%s", win32_message); + }; + + From 0bc73f739d7a8f2bc4e5100da62a0d894cbc9e38 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Thu, 28 Apr 2016 17:45:42 +0300 Subject: [PATCH 0615/1463] jsoncpp: add workaround for builds with GCC >= 6.x --- src/jsoncpp.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/jsoncpp.mk b/src/jsoncpp.mk index c812fa1d..532d20bd 100644 --- a/src/jsoncpp.mk +++ b/src/jsoncpp.mk @@ -10,6 +10,9 @@ $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/open-source-parsers/jsoncpp/archive/$($(PKG)_VERSION).tar.gz $(PKG)_DEPS := gcc +# workaround for builds with GCC >= 6.x +$(PKG)_CXXFLAGS := -Wno-error=conversion -Wno-error=shift-negative-value + define $(PKG)_UPDATE $(WGET) -q -O- 'https://github.com/open-source-parsers/jsoncpp/archive/' | \ $(SED) -n 's,.*/\([0-9][^"]*\)/"\.tar.*,\1,p' | \ @@ -22,6 +25,7 @@ define $(PKG)_BUILD cd '$(1)/build' && cmake .. \ -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF \ + -DCMAKE_CXX_FLAGS="$($(PKG)_CXXFLAGS)" \ -DBUILD_STATIC_LIBS=$(if $(BUILD_STATIC),true,false) \ -DBUILD_SHARED_LIBS=$(if $(BUILD_STATIC),false,true) $(MAKE) -C '$(1)/build' -j '$(JOBS)' install From 7ca2bceedd41c0919a30f900b6b35393bc4d1507 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Fri, 29 Apr 2016 01:31:10 +0300 Subject: [PATCH 0616/1463] boost: add workaround for builds with GCC >= 6.x --- src/boost.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/src/boost.mk b/src/boost.mk index fcbc5947..d73379eb 100644 --- a/src/boost.mk +++ b/src/boost.mk @@ -46,6 +46,7 @@ define $(PKG)_BUILD threading=multi \ variant=release \ toolset=gcc-mxe \ + cxxflags=$(if $(findstring posix,$(MXE_GCC_THREADS)),-std=gnu++11,-std=gnu++98) \ --layout=tagged \ --disable-icu \ --without-mpi \ From 5aac1c3335c9c725e35337ff423d55f0d8f0fa56 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Fri, 29 Apr 2016 01:32:30 +0300 Subject: [PATCH 0617/1463] qt: add workaround for builds with GCC >= 6.x --- src/qt.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qt.mk b/src/qt.mk index 5bf3b082..14198e7e 100644 --- a/src/qt.mk +++ b/src/qt.mk @@ -24,6 +24,7 @@ define $(PKG)_BUILD 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" \ + CXXFLAGS="-std=gnu++98" \ ./configure \ -opensource \ -confirm-license \ From 1a42cbc7522483ca8c1fc86b78a4618b9a59f47a Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Fri, 29 Apr 2016 12:26:25 +0300 Subject: [PATCH 0618/1463] smpeg2: add workaround for builds with GCC >= 6.x --- src/smpeg2.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/smpeg2.mk b/src/smpeg2.mk index e711c289..4d085d95 100644 --- a/src/smpeg2.mk +++ b/src/smpeg2.mk @@ -27,7 +27,7 @@ define $(PKG)_BUILD --disable-sdltest \ --disable-gtk-player \ --disable-opengl-player \ - CFLAGS='-ffriend-injection' + CFLAGS='-ffriend-injection -Wno-narrowing' $(MAKE) -C '$(1)' -j '$(JOBS)' install $(MXE_DISABLE_CRUFT) '$(TARGET)-gcc' \ From 57cb6bb571d650feb5549e88cbbdf2c4dc18b878 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Fri, 29 Apr 2016 12:27:31 +0300 Subject: [PATCH 0619/1463] smpeg: add workaround for builds with GCC >= 6.x --- src/smpeg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/smpeg.mk b/src/smpeg.mk index 852bd803..be276e7f 100644 --- a/src/smpeg.mk +++ b/src/smpeg.mk @@ -29,7 +29,7 @@ define $(PKG)_BUILD --disable-sdltest \ --disable-gtk-player \ --disable-opengl-player \ - CFLAGS='-ffriend-injection' + CFLAGS='-ffriend-injection -Wno-narrowing' $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= '$(TARGET)-gcc' \ From c03bcd35dd4aaff613221d810baf46758e677192 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 25 Apr 2016 03:37:31 +0300 Subject: [PATCH 0620/1463] add package luv to luarocks plugin --- plugins/luarocks/luv-1-fixes.patch | 69 ++++++++++++++++++++++++++++++ plugins/luarocks/luv.mk | 23 ++++++++++ 2 files changed, 92 insertions(+) create mode 100644 plugins/luarocks/luv-1-fixes.patch create mode 100644 plugins/luarocks/luv.mk diff --git a/plugins/luarocks/luv-1-fixes.patch b/plugins/luarocks/luv-1-fixes.patch new file mode 100644 index 00000000..bce9e263 --- /dev/null +++ b/plugins/luarocks/luv-1-fixes.patch @@ -0,0 +1,69 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Mon, 25 Apr 2016 02:31:37 +0200 +Subject: [PATCH] add rockspec from upstream + + +diff --git a/luv-1.9.0-1.rockspec b/luv-1.9.0-1.rockspec +new file mode 100644 +index 1111111..2222222 +--- /dev/null ++++ b/luv-1.9.0-1.rockspec +@@ -0,0 +1,34 @@ ++package = "luv" ++version = "1.9.0-1" ++source = { ++ url = 'https://github.com/luvit/luv/releases/download/'..version..'/luv-'..version..'.tar.gz' ++} ++ ++description = { ++ summary = "Bare libuv bindings for lua", ++ detailed = [[ ++libuv bindings for luajit and lua 5.1/5.2/5.3. ++ ++This library makes libuv available to lua scripts. It was made for the luvit ++project but should usable from nearly any lua project. ++ ]], ++ homepage = "https://github.com/luvit/luv", ++ license = "Apache 2.0" ++} ++ ++dependencies = { ++ "lua >= 5.1" ++} ++ ++build = { ++ type = 'cmake', ++ variables = { ++ CMAKE_C_FLAGS="$(CFLAGS)", ++ CMAKE_MODULE_LINKER_FLAGS="$(LIBFLAG)", ++ LUA_LIBDIR="$(LUA_LIBDIR)", ++ LUA_INCDIR="$(LUA_INCDIR)", ++ LUA="$(LUA)", ++ LIBDIR="$(LIBDIR)", ++ LUADIR="$(LUADIR)", ++ }, ++} + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Mon, 25 Apr 2016 02:25:47 +0200 +Subject: [PATCH] use external libuv + + +diff --git a/luv-1.9.0-1.rockspec b/luv-1.9.0-1.rockspec +index 1111111..2222222 100644 +--- a/luv-1.9.0-1.rockspec ++++ b/luv-1.9.0-1.rockspec +@@ -30,5 +30,6 @@ build = { + LUA="$(LUA)", + LIBDIR="$(LIBDIR)", + LUADIR="$(LUADIR)", ++ WITH_SHARED_LIBUV="ON", + }, + } diff --git a/plugins/luarocks/luv.mk b/plugins/luarocks/luv.mk new file mode 100644 index 00000000..b36b07a4 --- /dev/null +++ b/plugins/luarocks/luv.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := luv +$(PKG)_WEBSITE := https://github.com/luvit/luv +$(PKG)_OWNER := https://github.com/starius +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.9.0-1 +$(PKG)_CHECKSUM := fab5ba54f141711afc432216d03f3664710798204c78a2a7414479f10b2b2d83 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz +$(PKG)_URL := https://github.com/luvit/luv/releases/download/1.9.0-1/$($(PKG)_FILE) +$(PKG)_DEPS := gcc libuv luarocks + +define $(PKG)_UPDATE + $(call MXE_GET_GITHUB_TAGS, luvit/luv) +endef + +# shared-only because luarocks is shared-only + +define $(PKG)_BUILD_SHARED + cd '$(1)' && '$(TARGET)-luarocks' make +endef From 970fa1e6176bbfded601b5bd0d2716a233e49247 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Sun, 1 May 2016 03:09:29 +0300 Subject: [PATCH 0621/1463] gcc6 plugin: update README.md --- plugins/gcc6/README.md | 74 ++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 38 deletions(-) diff --git a/plugins/gcc6/README.md b/plugins/gcc6/README.md index 128a3745..9cbd7cdd 100644 --- a/plugins/gcc6/README.md +++ b/plugins/gcc6/README.md @@ -27,43 +27,41 @@ $(PKG)_CXXFLAGS := -std=gnu++11 ... ``` -Just after adding this plugin (gcc6) some packages were FTBFS: -* boost -* cgal -* dcmtk -* fdk-aac -* fdk-aac -* flann -* freeimage -* glib -* gtkimageview -* gtkmm2 -* gtkmm3 -* itk -* jsoncpp -* json_spirit -* libical -* librsvg -* libxml++ -* log4cxx -* opencv -* ossim -* qt -* qt3d -* sdl_sound -* smpeg2 -* ucl -* vtk -* vtk6 -* wxwidgets +Just after adding this plugin (gcc6) some packages were FTBFS. For now, these +packages might be already fixed by upstream developers, by additional patches +or using above mentioned workaround. See the table below for details. If some +MXE packages or your personal projects are still FTBFS you may look how other +packages were fixed and use similar approach. -See logs -[[4](https://gist.github.com/starius/81e25169242155aa3ef6be1a733b9812)] -[[5](https://gist.github.com/c01ef084eeb85781bd1eb7f6b1e12192)] -for details. - -For now, these packages might be already fixed by upstream developers, by -additional patches or using above mentioned workaround. If some MXE packages -or your personal projects are still FTBFS you may look how other packages were -fixed and use similar approach. +| package | target | fixed in commit | +| ------------------ | -------------------- | ---------------------------------------------------- | +| boost | all | [7ca2bce](https://github.com/mxe/mxe/commit/7ca2bce) | +| cgal | all | - | +| dcmtk | all | - | +| fdk-aac | all | - | +| flann | all | - | +| freeimage | all | - | +| glib | all | [58c2c96](https://github.com/mxe/mxe/commit/58c2c96) | +| gtkimageview | all | - | +| gtkmm2 | all | - | +| gtkmm3 | all | - | +| itk | all | - | +| jsoncpp | all | [0bc73f7](https://github.com/mxe/mxe/commit/0bc73f7) | +| json_spirit | all | - | +| libical | all | - | +| librsvg | all | - | +| libxml++ | all | - | +| log4cxx | all | - | +| opencv | all | - | +| ossim | all | - | +| qt | all | [5aac1c3](https://github.com/mxe/mxe/commit/5aac1c3) | +| qt3d | all | - | +| sdl_sound | all | - | +| smpeg | all | [57cb6bb](https://github.com/mxe/mxe/commit/57cb6bb) | +| smpeg2 | all | [1a42cbc](https://github.com/mxe/mxe/commit/1a42cbc) | +| ucl | all | - | +| vtk | all | - | +| vtk6 | all | - | +| wxwidgets | all | - | +| ... | ... | ... | From a1cc0195abd91827d347449a52336d0031b48d52 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Mon, 2 May 2016 01:55:23 +0300 Subject: [PATCH 0622/1463] jsoncpp: fix build with GCC < 6.x Fix after 0bc73f739d7a8f2bc4e5100da62a0d894cbc9e38. There is no -Werror=shift-negative-value in GCC 4.9.x. --- src/jsoncpp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jsoncpp.mk b/src/jsoncpp.mk index 532d20bd..f7ef89a3 100644 --- a/src/jsoncpp.mk +++ b/src/jsoncpp.mk @@ -11,7 +11,7 @@ $(PKG)_URL := https://github.com/open-source-parsers/jsoncpp/archive/$($(PK $(PKG)_DEPS := gcc # workaround for builds with GCC >= 6.x -$(PKG)_CXXFLAGS := -Wno-error=conversion -Wno-error=shift-negative-value +$(PKG)_CXXFLAGS := -Wno-error=conversion -Wno-shift-negative-value define $(PKG)_UPDATE $(WGET) -q -O- 'https://github.com/open-source-parsers/jsoncpp/archive/' | \ From 3ee3445f9020c4395cdf2219dbf1067686166700 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 2 May 2016 14:16:07 +0300 Subject: [PATCH 0623/1463] build-pkg: limit number of retries of downloading fix #1308 --- tools/build-pkg.lua | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index 0af1d332..9cda06fa 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -39,6 +39,8 @@ local no_second_pass = os.getenv('MXE_NO_SECOND_PASS') local TODAY = os.date("%Y%m%d") +local MAX_TRIES = 10 + local GIT = 'git --work-tree=./usr/ --git-dir=./usr/.git ' local GIT_USER = '-c user.name="build-pkg" ' .. '-c user.email="build-pkg@mxe" ' @@ -1027,6 +1029,20 @@ local function makeMxeSourcePackage() makePackage(name, files, deps, ver, d1, d2) end +local function downloadPackages() + local cmd = ('%s download -j 6 -k'):format(tool 'make') + for i = 1, MAX_TRIES do + log("Downloading packages. Attempt %d.", i) + if execute(cmd) then + log("All packages were downloaded.") + return + end + log("Some packages failed to download.") + end + log("%d downloading attempts failed. Giving up.", MAX_TRIES) + error('downloading failed') +end + local function main() assert(not io.open('usr/.git'), 'Remove usr/') local MXE_DIR_EXPECTED = '/usr/lib/mxe' @@ -1038,8 +1054,7 @@ local function main() assert(execute(("%s check-requirements MXE_TARGETS=%q"):format( tool 'make', table.concat(TARGETS, ' ')))) if not max_items then - local cmd = ('%s download -j 6 -k'):format(tool 'make') - while not execute(cmd) do end + downloadPackages() end gitAdd() gitCommit('Initial commit') From 8212c4fb37a0315fb4927ff945d17783eac65b65 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 2 May 2016 13:39:53 +0300 Subject: [PATCH 0624/1463] gcc6: libical is not broken Log: https://gist.github.com/8b3c9547b89d3c0ca29762adcf3a7bb5 --- plugins/gcc6/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/gcc6/README.md b/plugins/gcc6/README.md index 9cbd7cdd..d4485730 100644 --- a/plugins/gcc6/README.md +++ b/plugins/gcc6/README.md @@ -48,7 +48,6 @@ packages were fixed and use similar approach. | itk | all | - | | jsoncpp | all | [0bc73f7](https://github.com/mxe/mxe/commit/0bc73f7) | | json_spirit | all | - | -| libical | all | - | | librsvg | all | - | | libxml++ | all | - | | log4cxx | all | - | From 0fad6ffd4d5ba21ab7f27a26f72c250dac433ff6 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 2 May 2016 13:40:57 +0300 Subject: [PATCH 0625/1463] gcc6: remove "..." from the end of the table --- plugins/gcc6/README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/gcc6/README.md b/plugins/gcc6/README.md index d4485730..2d849372 100644 --- a/plugins/gcc6/README.md +++ b/plugins/gcc6/README.md @@ -62,5 +62,3 @@ packages were fixed and use similar approach. | vtk | all | - | | vtk6 | all | - | | wxwidgets | all | - | -| ... | ... | ... | - From 1a5234c4d6a638603c2251e65c30b24665b5506a Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 2 May 2016 13:41:56 +0300 Subject: [PATCH 0626/1463] gcc6: more space for target column --- plugins/gcc6/README.md | 58 +++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/plugins/gcc6/README.md b/plugins/gcc6/README.md index 2d849372..535f0c5a 100644 --- a/plugins/gcc6/README.md +++ b/plugins/gcc6/README.md @@ -33,32 +33,32 @@ or using above mentioned workaround. See the table below for details. If some MXE packages or your personal projects are still FTBFS you may look how other packages were fixed and use similar approach. -| package | target | fixed in commit | -| ------------------ | -------------------- | ---------------------------------------------------- | -| boost | all | [7ca2bce](https://github.com/mxe/mxe/commit/7ca2bce) | -| cgal | all | - | -| dcmtk | all | - | -| fdk-aac | all | - | -| flann | all | - | -| freeimage | all | - | -| glib | all | [58c2c96](https://github.com/mxe/mxe/commit/58c2c96) | -| gtkimageview | all | - | -| gtkmm2 | all | - | -| gtkmm3 | all | - | -| itk | all | - | -| jsoncpp | all | [0bc73f7](https://github.com/mxe/mxe/commit/0bc73f7) | -| json_spirit | all | - | -| librsvg | all | - | -| libxml++ | all | - | -| log4cxx | all | - | -| opencv | all | - | -| ossim | all | - | -| qt | all | [5aac1c3](https://github.com/mxe/mxe/commit/5aac1c3) | -| qt3d | all | - | -| sdl_sound | all | - | -| smpeg | all | [57cb6bb](https://github.com/mxe/mxe/commit/57cb6bb) | -| smpeg2 | all | [1a42cbc](https://github.com/mxe/mxe/commit/1a42cbc) | -| ucl | all | - | -| vtk | all | - | -| vtk6 | all | - | -| wxwidgets | all | - | +| package | target | fixed in commit | +| ------------------ | --------------------------------------- | ---------------------------------------------------- | +| boost | all | [7ca2bce](https://github.com/mxe/mxe/commit/7ca2bce) | +| cgal | all | - | +| dcmtk | all | - | +| fdk-aac | all | - | +| flann | all | - | +| freeimage | all | - | +| glib | all | [58c2c96](https://github.com/mxe/mxe/commit/58c2c96) | +| gtkimageview | all | - | +| gtkmm2 | all | - | +| gtkmm3 | all | - | +| itk | all | - | +| jsoncpp | all | [0bc73f7](https://github.com/mxe/mxe/commit/0bc73f7) | +| json_spirit | all | - | +| librsvg | all | - | +| libxml++ | all | - | +| log4cxx | all | - | +| opencv | all | - | +| ossim | all | - | +| qt | all | [5aac1c3](https://github.com/mxe/mxe/commit/5aac1c3) | +| qt3d | all | - | +| sdl_sound | all | - | +| smpeg | all | [57cb6bb](https://github.com/mxe/mxe/commit/57cb6bb) | +| smpeg2 | all | [1a42cbc](https://github.com/mxe/mxe/commit/1a42cbc) | +| ucl | all | - | +| vtk | all | - | +| vtk6 | all | - | +| wxwidgets | all | - | From 0210f1664111f8cf5e5a83828c39ce4d13af3a1e Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 2 May 2016 13:47:54 +0300 Subject: [PATCH 0627/1463] gcc6: add 3 more broken packages * guile * ocaml-lablgtk2 * qtwebkit --- plugins/gcc6/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/gcc6/README.md b/plugins/gcc6/README.md index 535f0c5a..57619729 100644 --- a/plugins/gcc6/README.md +++ b/plugins/gcc6/README.md @@ -45,16 +45,19 @@ packages were fixed and use similar approach. | gtkimageview | all | - | | gtkmm2 | all | - | | gtkmm3 | all | - | +| guile | i686-w64-mingw32.static (all) | - | | itk | all | - | | jsoncpp | all | [0bc73f7](https://github.com/mxe/mxe/commit/0bc73f7) | | json_spirit | all | - | | librsvg | all | - | | libxml++ | all | - | | log4cxx | all | - | +| ocaml-lablgtk2 | i686-w64-mingw32.static (all) | - | | opencv | all | - | | ossim | all | - | | qt | all | [5aac1c3](https://github.com/mxe/mxe/commit/5aac1c3) | | qt3d | all | - | +| qtwebkit | i686-w64-mingw32.shared | - | | sdl_sound | all | - | | smpeg | all | [57cb6bb](https://github.com/mxe/mxe/commit/57cb6bb) | | smpeg2 | all | [1a42cbc](https://github.com/mxe/mxe/commit/1a42cbc) | From 0314d3eec1cf323a4c3b592e945184fcad700cf4 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 2 May 2016 13:55:13 +0300 Subject: [PATCH 0628/1463] gcc6: add "static" to static-only packages --- plugins/gcc6/README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/plugins/gcc6/README.md b/plugins/gcc6/README.md index 57619729..6303f19f 100644 --- a/plugins/gcc6/README.md +++ b/plugins/gcc6/README.md @@ -37,31 +37,31 @@ packages were fixed and use similar approach. | ------------------ | --------------------------------------- | ---------------------------------------------------- | | boost | all | [7ca2bce](https://github.com/mxe/mxe/commit/7ca2bce) | | cgal | all | - | -| dcmtk | all | - | +| dcmtk | static (all) | - | | fdk-aac | all | - | | flann | all | - | -| freeimage | all | - | +| freeimage | static (all) | - | | glib | all | [58c2c96](https://github.com/mxe/mxe/commit/58c2c96) | -| gtkimageview | all | - | -| gtkmm2 | all | - | -| gtkmm3 | all | - | +| gtkimageview | static (all) | - | +| gtkmm2 | static (all) | - | +| gtkmm3 | static (all) | - | | guile | i686-w64-mingw32.static (all) | - | | itk | all | - | | jsoncpp | all | [0bc73f7](https://github.com/mxe/mxe/commit/0bc73f7) | | json_spirit | all | - | | librsvg | all | - | | libxml++ | all | - | -| log4cxx | all | - | +| log4cxx | static (all) | - | | ocaml-lablgtk2 | i686-w64-mingw32.static (all) | - | | opencv | all | - | | ossim | all | - | | qt | all | [5aac1c3](https://github.com/mxe/mxe/commit/5aac1c3) | | qt3d | all | - | | qtwebkit | i686-w64-mingw32.shared | - | -| sdl_sound | all | - | +| sdl_sound | static (all) | - | | smpeg | all | [57cb6bb](https://github.com/mxe/mxe/commit/57cb6bb) | | smpeg2 | all | [1a42cbc](https://github.com/mxe/mxe/commit/1a42cbc) | | ucl | all | - | -| vtk | all | - | +| vtk | static (all) | - | | vtk6 | all | - | -| wxwidgets | all | - | +| wxwidgets | static (all) | - | From 3d816111a9caa185acef50f2c1c692d64e69edcd Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 3 May 2016 14:15:37 +1000 Subject: [PATCH 0629/1463] gcc6: link final jsoncpp fix and add note to test earlier gcc versions --- plugins/gcc6/README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/gcc6/README.md b/plugins/gcc6/README.md index 6303f19f..a4137692 100644 --- a/plugins/gcc6/README.md +++ b/plugins/gcc6/README.md @@ -33,6 +33,9 @@ or using above mentioned workaround. See the table below for details. If some MXE packages or your personal projects are still FTBFS you may look how other packages were fixed and use similar approach. +Please ensure that proposed fixes for packages [also build with earlier GCC +versions](https://github.com/mxe/mxe/commit/a1cc019). + | package | target | fixed in commit | | ------------------ | --------------------------------------- | ---------------------------------------------------- | | boost | all | [7ca2bce](https://github.com/mxe/mxe/commit/7ca2bce) | @@ -47,7 +50,7 @@ packages were fixed and use similar approach. | gtkmm3 | static (all) | - | | guile | i686-w64-mingw32.static (all) | - | | itk | all | - | -| jsoncpp | all | [0bc73f7](https://github.com/mxe/mxe/commit/0bc73f7) | +| jsoncpp | all | [a1cc019](https://github.com/mxe/mxe/commit/a1cc019) | | json_spirit | all | - | | librsvg | all | - | | libxml++ | all | - | From 945e76fc6ca3a8ab6acb6655749525fa43c4fca6 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 3 May 2016 21:13:16 +0200 Subject: [PATCH 0630/1463] openssl: update --- src/openssl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openssl.mk b/src/openssl.mk index 49796154..2a83bc30 100644 --- a/src/openssl.mk +++ b/src/openssl.mk @@ -3,8 +3,8 @@ PKG := openssl $(PKG)_IGNORE := -$(PKG)_VERSION := 1.0.2g -$(PKG)_CHECKSUM := b784b1b3907ce39abf4098702dade6365522a253ad1552e267a9a0e89594aa33 +$(PKG)_VERSION := 1.0.2h +$(PKG)_CHECKSUM := 1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919 $(PKG)_SUBDIR := openssl-$($(PKG)_VERSION) $(PKG)_FILE := openssl-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.openssl.org/source/$($(PKG)_FILE) From 49b1e4a4414c5a945bf917591aad63469c151a30 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 3 May 2016 21:22:57 +0200 Subject: [PATCH 0631/1463] harfbuzz: update --- src/harfbuzz.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/harfbuzz.mk b/src/harfbuzz.mk index 8db47557..42b5f424 100644 --- a/src/harfbuzz.mk +++ b/src/harfbuzz.mk @@ -3,8 +3,8 @@ PKG := harfbuzz $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.3 -$(PKG)_CHECKSUM := 8216d2404aaab7fde87be0365a90d64aa6c55928e104557cfcb37b54a096cb8c +$(PKG)_VERSION := 1.2.7 +$(PKG)_CHECKSUM := bba0600ae08b84384e6d2d7175bea10b5fc246c4583dc841498d01894d479026 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://www.freedesktop.org/software/$(PKG)/release/$($(PKG)_FILE) From 9059a0b6a425de27a119550d33367309682b4f25 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 3 May 2016 21:23:40 +0200 Subject: [PATCH 0632/1463] freetds: update --- src/freetds.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/freetds.mk b/src/freetds.mk index 429936e1..a4832731 100644 --- a/src/freetds.mk +++ b/src/freetds.mk @@ -3,8 +3,8 @@ PKG := freetds $(PKG)_IGNORE := -$(PKG)_VERSION := 0.95.84 -$(PKG)_CHECKSUM := 9c4de7f4e8dce0a7606004bb3b8d77b032efba2b583907af540492e222cc54ca +$(PKG)_VERSION := 0.95.95 +$(PKG)_CHECKSUM := 170bbe11ffe02cb38ec8f76605d13689e3e405862d7d083526667640f12ea95c $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := ftp://ftp.freetds.org/pub/$(PKG)/stable/$($(PKG)_FILE) From fc01badf03d07773a82b15117130c275935fc959 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Tue, 3 May 2016 21:03:14 +0000 Subject: [PATCH 0633/1463] Update versions.json & build-matrix.html --- build-matrix.html | 6 +++--- versions.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index f55493c9..aec92782 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -629,7 +629,7 @@ feel free to submit a pull request. freetds - 0.95.84 + 0.95.95 ✓ ✓ ✓ @@ -1069,7 +1069,7 @@ feel free to submit a pull request. harfbuzz - 1.2.3 + 1.2.7 ✓ ✓ ✓ @@ -2639,7 +2639,7 @@ feel free to submit a pull request. openssl - 1.0.2g + 1.0.2h ✓ ✓ ✓ diff --git a/versions.json b/versions.json index d00ed6ea..42ab8a3c 100644 --- a/versions.json +++ b/versions.json @@ -58,7 +58,7 @@ "fontconfig": "2.11.1", "freeglut": "2.8.1", "freeimage": "3.15.4", - "freetds": "0.95.84", + "freetds": "0.95.95", "freetype": "2.6.3", "freetype-bootstrap": "2.6.3", "fribidi": "0.19.6", @@ -102,7 +102,7 @@ "gtksourceview": "2.10.5", "gtksourceviewmm2": "2.10.3", "guile": "1.8.8", - "harfbuzz": "1.2.3", + "harfbuzz": "1.2.7", "hdf4": "4.2.10", "hdf5": "1.8.12", "hunspell": "1.3.3", @@ -259,7 +259,7 @@ "openjpeg": "2.1.0", "openmp-validation": "3.1", "openscenegraph": "3.4.0", - "openssl": "1.0.2g", + "openssl": "1.0.2h", "openthreads": "3.4.0", "opus": "1.1.1", "opusfile": "0.6", From d52961fe21137aead714f4bb3533a45f755cfc92 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Wed, 4 May 2016 11:41:58 +0300 Subject: [PATCH 0634/1463] qt3d: update patch: fix build with GCC >= 6.x --- src/qt3d-1.patch | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/qt3d-1.patch b/src/qt3d-1.patch index bc704d5d..3193f32f 100644 --- a/src/qt3d-1.patch +++ b/src/qt3d-1.patch @@ -33,6 +33,21 @@ index cb5f1d1..8d2be9b 100644 CONFIG += dll } --- -1.8.4.5 +From: Boris Pek +Date: Wed, 04 May 2016 11:41:04 +0300 +Subject: [PATCH] fix build with GCC >= 6.x + +diff --git a/3rdparty/assimp/code/DXFLoader.cpp b/3rdparty/assimp/code/DXFLoader.cpp +index e372d60..2c1a13d 100644 +--- a/3rdparty/assimp/code/DXFLoader.cpp ++++ b/3rdparty/assimp/code/DXFLoader.cpp +@@ -84,7 +84,7 @@ + + // ------------------------------------------------------------------------------------------------ + // Constructor to be privately used by Importer +-DXFImporter::DXFImporter() : buffer(0), groupCode(0), bRepeat(false), mDefaultLayer(false) ++DXFImporter::DXFImporter() : buffer(0), groupCode(0), bRepeat(false) + { + memset(cursor,0,sizeof(cursor)); + } From 3414a5d8ffb9a8154c44f2e171e280fc7b9cbd2d Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Wed, 4 May 2016 12:06:32 +0300 Subject: [PATCH 0635/1463] gcc6 plugin: update info about qt3d pkg in README.md --- plugins/gcc6/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/gcc6/README.md b/plugins/gcc6/README.md index a4137692..c674d0a7 100644 --- a/plugins/gcc6/README.md +++ b/plugins/gcc6/README.md @@ -59,7 +59,7 @@ versions](https://github.com/mxe/mxe/commit/a1cc019). | opencv | all | - | | ossim | all | - | | qt | all | [5aac1c3](https://github.com/mxe/mxe/commit/5aac1c3) | -| qt3d | all | - | +| qt3d | all | [d52961f](https://github.com/mxe/mxe/commit/d52961f) | | qtwebkit | i686-w64-mingw32.shared | - | | sdl_sound | static (all) | - | | smpeg | all | [57cb6bb](https://github.com/mxe/mxe/commit/57cb6bb) | From 7e3e75cc7a7a7e694dfb5693bac462f9b1d968d4 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Wed, 4 May 2016 12:09:11 +0300 Subject: [PATCH 0636/1463] gcc6 plugin: update info about jsoncpp pkg in README.md GCC 6.x related fix was in 0bc73f7. And it may be interesting for users who want to use GCC 6.x. As for a1cc019 -- just cosmetic change for common style in README. --- plugins/gcc6/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/gcc6/README.md b/plugins/gcc6/README.md index c674d0a7..f1f4cfce 100644 --- a/plugins/gcc6/README.md +++ b/plugins/gcc6/README.md @@ -33,8 +33,8 @@ or using above mentioned workaround. See the table below for details. If some MXE packages or your personal projects are still FTBFS you may look how other packages were fixed and use similar approach. -Please ensure that proposed fixes for packages [also build with earlier GCC -versions](https://github.com/mxe/mxe/commit/a1cc019). +Please ensure that proposed fixes for packages also build with earlier GCC +versions [[4](https://github.com/mxe/mxe/commit/a1cc019)]. | package | target | fixed in commit | | ------------------ | --------------------------------------- | ---------------------------------------------------- | @@ -50,7 +50,7 @@ versions](https://github.com/mxe/mxe/commit/a1cc019). | gtkmm3 | static (all) | - | | guile | i686-w64-mingw32.static (all) | - | | itk | all | - | -| jsoncpp | all | [a1cc019](https://github.com/mxe/mxe/commit/a1cc019) | +| jsoncpp | all | [0bc73f7](https://github.com/mxe/mxe/commit/0bc73f7) | | json_spirit | all | - | | librsvg | all | - | | libxml++ | all | - | From 2f4621f8a88b33caef985eda578c57f6d6f7fc2a Mon Sep 17 00:00:00 2001 From: Rashad Kanavath Date: Wed, 4 May 2016 12:04:49 +0200 Subject: [PATCH 0637/1463] libsvm: change output lib name. liblibsvm -> libsvm --- src/libsvm-1-cmakelists.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libsvm-1-cmakelists.patch b/src/libsvm-1-cmakelists.patch index f10518a9..d7e559fb 100644 --- a/src/libsvm-1-cmakelists.patch +++ b/src/libsvm-1-cmakelists.patch @@ -4,9 +4,9 @@ diff -burN libsvm-3.20.orig/CMakeLists.txt libsvm-3.20/CMakeLists.txt @@ -0,0 +1,12 @@ +cmake_minimum_required(VERSION 2.8) + -+add_library(libsvm svm.cpp) ++add_library(svm svm.cpp) + -+install(TARGETS libsvm ++install(TARGETS svm + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) From 52f45813d4ce6b327400fef282330881fe952c0a Mon Sep 17 00:00:00 2001 From: Rashad Kanavath Date: Wed, 4 May 2016 12:07:59 +0200 Subject: [PATCH 0638/1463] proj4: libproj-0.dll is checked by GDAL if the platform is windows For mingw, proj4 creates libproj-9.dll and GDAL library consider this as missing dll. GDAL has a workaround to use PROJSO env variable that allows to set proj-9.dll. But it is better if proj library could simply output the dll with the other name https://trac.osgeo.org/gdal/browser/branches/2.1/gdal/ogr/ogrct.cpp#L86 --- src/proj-1-fixes.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/proj-1-fixes.patch diff --git a/src/proj-1-fixes.patch b/src/proj-1-fixes.patch new file mode 100644 index 00000000..3792b1c0 --- /dev/null +++ b/src/proj-1-fixes.patch @@ -0,0 +1,12 @@ +diff -bruN proj-4.9.1.original/src/Makefile.in proj-4.9.1/src/Makefile.in +--- proj-4.9.1.original/src/Makefile.in 2016-04-05 10:59:38.834624359 +0200 ++++ proj-4.9.1/src/Makefile.in 2016-04-05 11:00:11.073813213 +0200 +@@ -400,7 +400,7 @@ + multistresstest_LDADD = libproj.la -lpthread + test228_LDADD = libproj.la -lpthread + lib_LTLIBRARIES = libproj.la +-libproj_la_LDFLAGS = -no-undefined -version-info 9:0:0 ++libproj_la_LDFLAGS = -no-undefined -version-info 0:0:0 + libproj_la_SOURCES = \ + pj_list.h \ + PJ_aeqd.c PJ_gnom.c PJ_laea.c PJ_mod_ster.c \ From cde1849c88f43edd20460d8c5a55e9011651f425 Mon Sep 17 00:00:00 2001 From: Rashad Kanavath Date: Wed, 4 May 2016 15:29:36 +0200 Subject: [PATCH 0639/1463] ossim: upstream patch release. 1.8.20-1 -> 1.8.20-3 --- src/ossim-1-fixes.patch | 30 ------------------------------ src/ossim.mk | 4 ++-- 2 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 src/ossim-1-fixes.patch diff --git a/src/ossim-1-fixes.patch b/src/ossim-1-fixes.patch deleted file mode 100644 index 9512a3f9..00000000 --- a/src/ossim-1-fixes.patch +++ /dev/null @@ -1,30 +0,0 @@ -This file is part of MXE. -See index.html for further information. -This patch has been taken from: - -https://github.com/rkanavath/ossim/commit/643f0b1f6984b97e7a72af7ff05085b7e716f934 -This patch MUST be removed when building ossim version > 1.8.20 -Merged in https://github.com/ossimlabs/ossim/pull/3 - -diff -burN ossim-1.8.20-1.orig/ossim/include/ossim/point_cloud/ossimGenericPointCloudHandler.h ossim-1.8.20-1/ossim/include/ossim/point_cloud/ossimGenericPointCloudHandler.h ---- ossim-1.8.20-1.orig/ossim/include/ossim/point_cloud/ossimGenericPointCloudHandler.h 2015-07-21 15:23:00.000000000 +0200 -+++ ossim-1.8.20-1/ossim/include/ossim/point_cloud/ossimGenericPointCloudHandler.h 2015-12-04 12:29:00.001900000 +0100 -@@ -75,7 +75,7 @@ - virtual void close() { } - - protected: -- ossimGenericPointCloudHandler() {} -+ ossimGenericPointCloudHandler(); - ossimPointBlock m_pointBlock; - }; - -diff -burN ossim-1.8.20-1.orig/ossim/src/ossim/point_cloud/ossimGenericPointCloudHandler.cpp ossim-1.8.20-1/ossim/src/ossim/point_cloud/ossimGenericPointCloudHandler.cpp ---- ossim-1.8.20-1.orig/ossim/src/ossim/point_cloud/ossimGenericPointCloudHandler.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ ossim-1.8.20-1/ossim/src/ossim/point_cloud/ossimGenericPointCloudHandler.cpp 2015-12-04 12:27:33.000145000 +0100 -@@ -0,0 +1,6 @@ -+#include -+ -+ossimGenericPointCloudHandler::ossimGenericPointCloudHandler() -+{ -+ -+} diff --git a/src/ossim.mk b/src/ossim.mk index b78d377d..4f212aeb 100644 --- a/src/ossim.mk +++ b/src/ossim.mk @@ -4,8 +4,8 @@ PKG := ossim $(PKG)_IGNORE := $(PKG)_VERSION := 1.8.20 -$(PKG)_CHECKSUM := a9148cbc7eebaed1d09d139e68c038592edcf74318ec2623f21494aa56879f52 -$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)-1 +$(PKG)_CHECKSUM := d7981d0d7e84bdbc26d5bda9e5b80c583d806164e4d6e5fab276c9255a2b407c +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)-3 $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_URL := http://download.osgeo.org/ossim/source/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc freetype geos jpeg libgeotiff libpng openthreads proj tiff zlib From 73cd8137d1816b94abb1b11e2b5e31c3e86ebe6e Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Wed, 4 May 2016 16:39:20 +0300 Subject: [PATCH 0640/1463] flann: add new patch: fix build with GCC >= 6.x --- src/flann-4-c++11-related-fixes.patch | 31 +++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/flann-4-c++11-related-fixes.patch diff --git a/src/flann-4-c++11-related-fixes.patch b/src/flann-4-c++11-related-fixes.patch new file mode 100644 index 00000000..90be357a --- /dev/null +++ b/src/flann-4-c++11-related-fixes.patch @@ -0,0 +1,31 @@ +This file is part of MXE. +See index.html for further information. + +Taken from: https://github.com/mariusmuja/flann/commit/3645f0c30a47267e56e5acdecfc7bac2b76bc3d5 + +From 3645f0c30a47267e56e5acdecfc7bac2b76bc3d5 Mon Sep 17 00:00:00 2001 +From: Alastair Quadros +Date: Sun, 15 Mar 2015 10:58:57 +1100 +Subject: [PATCH] abs -> std::abs + +diff --git a/src/cpp/flann/algorithms/kdtree_index.h b/src/cpp/flann/algorithms/kdtree_index.h +index 42659ca..fc12d8f 100644 +--- a/src/cpp/flann/algorithms/kdtree_index.h ++++ b/src/cpp/flann/algorithms/kdtree_index.h +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + #include "flann/general.h" + #include "flann/algorithms/nn_index.h" +@@ -663,7 +664,7 @@ + ElementType max_span = 0; + size_t div_feat = 0; + for (size_t i=0;i max_span) { + max_span = span; + div_feat = i; From f593aef0b212fea2a79a804ba6cda01daf4c6445 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Wed, 4 May 2016 16:45:44 +0300 Subject: [PATCH 0641/1463] gcc6 plugin: update info about flann pkg in README.md --- plugins/gcc6/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/gcc6/README.md b/plugins/gcc6/README.md index f1f4cfce..240c2593 100644 --- a/plugins/gcc6/README.md +++ b/plugins/gcc6/README.md @@ -42,7 +42,7 @@ versions [[4](https://github.com/mxe/mxe/commit/a1cc019)]. | cgal | all | - | | dcmtk | static (all) | - | | fdk-aac | all | - | -| flann | all | - | +| flann | all | [73cd813](https://github.com/mxe/mxe/commit/73cd813) | | freeimage | static (all) | - | | glib | all | [58c2c96](https://github.com/mxe/mxe/commit/58c2c96) | | gtkimageview | static (all) | - | From 0f813cdff46324946674f0802dcd2061ce2eee61 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Wed, 4 May 2016 19:08:06 +0300 Subject: [PATCH 0642/1463] Makefile: simplify work with patches Fix annoying "different line endings" problem of patch tool. https://stackoverflow.com/questions/2076688/how-to-use-patches-created-in-windows-with-crlf-in-linuxi --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3f846bf8..8ea8e0c6 100644 --- a/Makefile +++ b/Makefile @@ -199,7 +199,7 @@ define PREPARE_PKG_SOURCE cd '$(2)' && $(call UNPACK_PKG_ARCHIVE,$(1)) cd '$(2)/$($(1)_SUBDIR)' $(foreach PKG_PATCH,$(PKG_PATCHES), - (cd '$(2)/$($(1)_SUBDIR)' && $(PATCH) -p1 -u) < $(PKG_PATCH)) + (cd '$(2)/$($(1)_SUBDIR)' && $(PATCH) -p1 -u --binary) < $(PKG_PATCH)) endef PKG_CHECKSUM = \ From adc74c9aef335a24c859c0316f24f6f929ab0c12 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Wed, 4 May 2016 19:10:26 +0300 Subject: [PATCH 0643/1463] freeimage: update patch: fix build with GCC >= 6.x --- src/freeimage-1-fixes.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/freeimage-1-fixes.patch b/src/freeimage-1-fixes.patch index ba6bdbca..bcc626ce 100644 --- a/src/freeimage-1-fixes.patch +++ b/src/freeimage-1-fixes.patch @@ -76,3 +76,22 @@ index 1111111..2222222 100644 CXXFLAGS += $(INCLUDE) ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64) + +From: Boris Pek +Date: Wed, 04 May 2016 18:43:16 +0300 +Subject: [PATCH] fix build with GCC >= 6.x + +diff --git a/Makefile.mingw b/Makefile.mingw +index 1111111..2222222 100644 +--- a/Makefile.mingw ++++ b/Makefile.mingw +@@ -67,7 +67,7 @@ + RESOURCE = $(RCFILE:.rc=.coff) + CFLAGS ?= -O3 -fexceptions -DNDEBUG $(WIN32_CFLAGS) + CFLAGS += $(INCLUDE) +-CXXFLAGS ?= -O3 -fexceptions -Wno-ctor-dtor-privacy -DNDEBUG $(WIN32_CXXFLAGS) ++CXXFLAGS ?= -O3 -fexceptions -Wno-ctor-dtor-privacy -Wno-narrowing -DNDEBUG $(WIN32_CXXFLAGS) + CXXFLAGS += $(INCLUDE) + RCFLAGS ?= -DNDEBUG + LDFLAGS ?= -s -shared -static -Wl,-soname,$(SOLIBNAME) $(WIN32_LDFLAGS) + From 01c5c63fe1c4e1b4fd3588024a390873c7b15a2f Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Wed, 4 May 2016 19:17:51 +0300 Subject: [PATCH 0644/1463] gcc6 plugin: update info about freeimage pkg in README.md --- plugins/gcc6/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/gcc6/README.md b/plugins/gcc6/README.md index 240c2593..b684c5c2 100644 --- a/plugins/gcc6/README.md +++ b/plugins/gcc6/README.md @@ -43,7 +43,7 @@ versions [[4](https://github.com/mxe/mxe/commit/a1cc019)]. | dcmtk | static (all) | - | | fdk-aac | all | - | | flann | all | [73cd813](https://github.com/mxe/mxe/commit/73cd813) | -| freeimage | static (all) | - | +| freeimage | static (all) | [adc74c9](https://github.com/mxe/mxe/commit/adc74c9) | | glib | all | [58c2c96](https://github.com/mxe/mxe/commit/58c2c96) | | gtkimageview | static (all) | - | | gtkmm2 | static (all) | - | From 363aec7c7fffd60c1d76503b7a5ec543d48e2035 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Thu, 5 May 2016 15:09:49 +0300 Subject: [PATCH 0645/1463] fdk-aac: fix build with GCC >= 6.x --- src/fdk-aac.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/fdk-aac.mk b/src/fdk-aac.mk index d9bf8522..110f233c 100644 --- a/src/fdk-aac.mk +++ b/src/fdk-aac.mk @@ -22,7 +22,8 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ - $(MXE_CONFIGURE_OPTS) + $(MXE_CONFIGURE_OPTS) \ + CXXFLAGS='-Wno-narrowing' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef From f913661fba0b8a822702f328a23bd0bfab62a092 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Thu, 5 May 2016 15:13:17 +0300 Subject: [PATCH 0646/1463] gcc6 plugin: update info about fdk-aac pkg in README.md --- plugins/gcc6/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/gcc6/README.md b/plugins/gcc6/README.md index b684c5c2..60eafea9 100644 --- a/plugins/gcc6/README.md +++ b/plugins/gcc6/README.md @@ -41,7 +41,7 @@ versions [[4](https://github.com/mxe/mxe/commit/a1cc019)]. | boost | all | [7ca2bce](https://github.com/mxe/mxe/commit/7ca2bce) | | cgal | all | - | | dcmtk | static (all) | - | -| fdk-aac | all | - | +| fdk-aac | all | [363aec7](https://github.com/mxe/mxe/commit/363aec7) | | flann | all | [73cd813](https://github.com/mxe/mxe/commit/73cd813) | | freeimage | static (all) | [adc74c9](https://github.com/mxe/mxe/commit/adc74c9) | | glib | all | [58c2c96](https://github.com/mxe/mxe/commit/58c2c96) | From 8608e1335c4e28674bc26c209501db463c782572 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Thu, 5 May 2016 16:30:30 +0300 Subject: [PATCH 0647/1463] dcmtk: add new patch: fix build with GCC >= 6.x --- src/dcmtk-4-c++11-related-fixes.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/dcmtk-4-c++11-related-fixes.patch diff --git a/src/dcmtk-4-c++11-related-fixes.patch b/src/dcmtk-4-c++11-related-fixes.patch new file mode 100644 index 00000000..2e47dc4f --- /dev/null +++ b/src/dcmtk-4-c++11-related-fixes.patch @@ -0,0 +1,16 @@ +From: Boris Pek +Date: Thu, 05 May 2016 15:38:47 +0300 +Subject: [PATCH] fix build with GCC >= 6.x + +diff --git a/ofstd/libsrc/ofstd.cc b/ofstd/libsrc/ofstd.cc +--- a/ofstd/libsrc/ofstd.cc ++++ b/ofstd/libsrc/ofstd.cc +@@ -175,7 +175,7 @@ + + + // some systems don't properly define isnan() +-#ifdef HAVE_ISNAN ++#if defined(HAVE_ISNAN) && (__cplusplus < 201103L) + #ifndef HAVE_PROTOTYPE_ISNAN + extern "C" + { From 0bcfdad5592864c3aaa3140266ae2bf55b2d21ed Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Thu, 5 May 2016 16:34:28 +0300 Subject: [PATCH 0648/1463] cc6 plugin: update info about dcmtk pkg in README.md --- plugins/gcc6/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/gcc6/README.md b/plugins/gcc6/README.md index 60eafea9..50bb9a8c 100644 --- a/plugins/gcc6/README.md +++ b/plugins/gcc6/README.md @@ -40,7 +40,7 @@ versions [[4](https://github.com/mxe/mxe/commit/a1cc019)]. | ------------------ | --------------------------------------- | ---------------------------------------------------- | | boost | all | [7ca2bce](https://github.com/mxe/mxe/commit/7ca2bce) | | cgal | all | - | -| dcmtk | static (all) | - | +| dcmtk | static (all) | [8608e13](https://github.com/mxe/mxe/commit/8608e13) | | fdk-aac | all | [363aec7](https://github.com/mxe/mxe/commit/363aec7) | | flann | all | [73cd813](https://github.com/mxe/mxe/commit/73cd813) | | freeimage | static (all) | [adc74c9](https://github.com/mxe/mxe/commit/adc74c9) | From 6869e3b13b02a29ba13d57036fc78d6315bdcf30 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Thu, 5 May 2016 19:11:39 +0300 Subject: [PATCH 0649/1463] wxwidgets: add patch: fix build with GCC >= 6.x --- src/wxwidgets-1-c++11-related-fixes.patch | 27 +++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 src/wxwidgets-1-c++11-related-fixes.patch diff --git a/src/wxwidgets-1-c++11-related-fixes.patch b/src/wxwidgets-1-c++11-related-fixes.patch new file mode 100644 index 00000000..32050014 --- /dev/null +++ b/src/wxwidgets-1-c++11-related-fixes.patch @@ -0,0 +1,27 @@ +From: Boris Pek +Date: Thu, 05 May 2016 19:11:19 +0300 +Subject: [PATCH] fix build with GCC >= 6.x + +diff --git a/src/stc/scintilla/src/Editor.cxx b/src/stc/scintilla/src/Editor.cxx +--- a/src/stc/scintilla/src/Editor.cxx ++++ b/src/stc/scintilla/src/Editor.cxx +@@ -10,6 +10,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -5841,9 +5842,9 @@ + } + + static bool Close(Point pt1, Point pt2) { +- if (abs(pt1.x - pt2.x) > 3) ++ if (fabs(pt1.x - pt2.x) > 3) + return false; +- if (abs(pt1.y - pt2.y) > 3) ++ if (fabs(pt1.y - pt2.y) > 3) + return false; + return true; + } From 3b8c39c6562364b79dafffb9a3132ef099ca90eb Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Thu, 5 May 2016 19:12:44 +0300 Subject: [PATCH 0650/1463] cc6 plugin: update info about wxwidgets pkg in README.md --- plugins/gcc6/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/gcc6/README.md b/plugins/gcc6/README.md index 50bb9a8c..65ff0e6b 100644 --- a/plugins/gcc6/README.md +++ b/plugins/gcc6/README.md @@ -67,4 +67,4 @@ versions [[4](https://github.com/mxe/mxe/commit/a1cc019)]. | ucl | all | - | | vtk | static (all) | - | | vtk6 | all | - | -| wxwidgets | static (all) | - | +| wxwidgets | static (all) | [6869e3b](https://github.com/mxe/mxe/commit/6869e3b) | From dee27685270df556c4d866be7837fc4ba5f5ba13 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Fri, 6 May 2016 11:45:00 +0300 Subject: [PATCH 0651/1463] Revert "Makefile: simplify work with patches" This reverts commit 0f813cdff46324946674f0802dcd2061ce2eee61. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8ea8e0c6..3f846bf8 100644 --- a/Makefile +++ b/Makefile @@ -199,7 +199,7 @@ define PREPARE_PKG_SOURCE cd '$(2)' && $(call UNPACK_PKG_ARCHIVE,$(1)) cd '$(2)/$($(1)_SUBDIR)' $(foreach PKG_PATCH,$(PKG_PATCHES), - (cd '$(2)/$($(1)_SUBDIR)' && $(PATCH) -p1 -u --binary) < $(PKG_PATCH)) + (cd '$(2)/$($(1)_SUBDIR)' && $(PATCH) -p1 -u) < $(PKG_PATCH)) endef PKG_CHECKSUM = \ From 78312ba6080d76119bc6f242b7a8fbafcb4ee6bb Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Fri, 6 May 2016 11:58:37 +0300 Subject: [PATCH 0652/1463] freeimage: update patch: fix line endings [Thanks to Tony Theodore] --- src/freeimage-1-fixes.patch | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/freeimage-1-fixes.patch b/src/freeimage-1-fixes.patch index bcc626ce..39dcc617 100644 --- a/src/freeimage-1-fixes.patch +++ b/src/freeimage-1-fixes.patch @@ -76,16 +76,17 @@ index 1111111..2222222 100644 CXXFLAGS += $(INCLUDE) ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64) - + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Wed, 04 May 2016 18:43:16 +0300 Subject: [PATCH] fix build with GCC >= 6.x - -diff --git a/Makefile.mingw b/Makefile.mingw -index 1111111..2222222 100644 ---- a/Makefile.mingw -+++ b/Makefile.mingw -@@ -67,7 +67,7 @@ + +diff --git a/Makefile.mingw b/Makefile.mingw +index 1111111..2222222 100644 +--- a/Makefile.mingw ++++ b/Makefile.mingw +@@ -67,7 +67,7 @@ MODULES := $(MODULES:.cpp=.o) RESOURCE = $(RCFILE:.rc=.coff) CFLAGS ?= -O3 -fexceptions -DNDEBUG $(WIN32_CFLAGS) CFLAGS += $(INCLUDE) From 3e39ece1a7d459761ba4fc302b8ec20aa5d4185f Mon Sep 17 00:00:00 2001 From: Tobias Gruetzmacher Date: Fri, 6 May 2016 23:15:48 +0200 Subject: [PATCH 0653/1463] jsoncpp: Build & install cmake files --- src/jsoncpp.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/src/jsoncpp.mk b/src/jsoncpp.mk index f7ef89a3..493b34ba 100644 --- a/src/jsoncpp.mk +++ b/src/jsoncpp.mk @@ -26,6 +26,7 @@ define $(PKG)_BUILD -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF \ -DCMAKE_CXX_FLAGS="$($(PKG)_CXXFLAGS)" \ + -DJSONCPP_WITH_CMAKE_PACKAGE=ON \ -DBUILD_STATIC_LIBS=$(if $(BUILD_STATIC),true,false) \ -DBUILD_SHARED_LIBS=$(if $(BUILD_STATIC),false,true) $(MAKE) -C '$(1)/build' -j '$(JOBS)' install From 37f5d463d9855a7c084bf8b2dcf439120e87e2af Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 9 May 2016 20:14:47 +1000 Subject: [PATCH 0654/1463] add native build of gettext for Ubuntu 14.04 Trusty fixes #1341 --- plugins/native/trusty/gettext.mk | 1 + plugins/native/trusty/libiconv.mk | 1 + 2 files changed, 2 insertions(+) create mode 120000 plugins/native/trusty/gettext.mk create mode 120000 plugins/native/trusty/libiconv.mk diff --git a/plugins/native/trusty/gettext.mk b/plugins/native/trusty/gettext.mk new file mode 120000 index 00000000..6314aff1 --- /dev/null +++ b/plugins/native/trusty/gettext.mk @@ -0,0 +1 @@ +../gettext.mk \ No newline at end of file diff --git a/plugins/native/trusty/libiconv.mk b/plugins/native/trusty/libiconv.mk new file mode 120000 index 00000000..629a6688 --- /dev/null +++ b/plugins/native/trusty/libiconv.mk @@ -0,0 +1 @@ +../libiconv.mk \ No newline at end of file From 8675ed061e2e90ff6295c5f9bd6a82384886a405 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 10 May 2016 04:42:38 +1000 Subject: [PATCH 0655/1463] libxslt: enable shared fixes #1343 --- src/libxslt.mk | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/libxslt.mk b/src/libxslt.mk index 1e9675e1..9d6e16b5 100644 --- a/src/libxslt.mk +++ b/src/libxslt.mk @@ -20,15 +20,10 @@ endef define $(PKG)_BUILD cd '$(1)' && ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --disable-shared \ + $(MXE_CONFIGURE_OPTS) \ --without-debug \ - --prefix='$(PREFIX)/$(TARGET)' \ --with-libxml-prefix='$(PREFIX)/$(TARGET)' \ --without-python \ --without-plugins $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= endef - -$(PKG)_BUILD_SHARED = From 73656e75cb5522d88d6ee5386096758accf62e06 Mon Sep 17 00:00:00 2001 From: Rashad Kanavath Date: Tue, 10 May 2016 14:59:00 +0200 Subject: [PATCH 0656/1463] gdal: install gdal.pc and gdal-data --- src/gdal.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gdal.mk b/src/gdal.mk index 5e201700..ff54ca40 100644 --- a/src/gdal.mk +++ b/src/gdal.mk @@ -79,7 +79,8 @@ define $(PKG)_BUILD LIBS="-ljpeg -lsecur32 -lportablexdr `'$(TARGET)-pkg-config' --libs openssl libtiff-4`" $(MAKE) -C '$(1)' -j '$(JOBS)' lib-target - $(MAKE) -C '$(1)' -j '$(JOBS)' install-lib + $(MAKE) -C '$(1)' -j '$(JOBS)' gdal.pc + $(MAKE) -C '$(1)' -j '$(JOBS)' install-actions $(MAKE) -C '$(1)/port' -j '$(JOBS)' install $(MAKE) -C '$(1)/gcore' -j '$(JOBS)' install $(MAKE) -C '$(1)/frmts' -j '$(JOBS)' install From cb06e059b23ef08f31eafd1dae1ea1417b102198 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 11 May 2016 22:28:21 +1000 Subject: [PATCH 0657/1463] docs: update known OS X failures --- index.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 9976f2a0..1c7cc168 100644 --- a/index.html +++ b/index.html @@ -827,9 +827,13 @@ USE_OSGPLUGIN(<plugin2>)

    Certain packages have open issues on OS X

    - to build the remainder of MXE, run: + For Xcode <7.3, run: 

    make EXCLUDE_PKGS='nsis'
    +

    + For Xcode ≥7.3, run: +

    + 
    make EXCLUDE_PKGS='gsoap'

    openSUSE

    From 129ef68410b0decf95c760ce40807f6b9f6f093f Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Fri, 13 May 2016 15:45:30 +0000 Subject: [PATCH 0658/1463] Update versions.json & build-matrix.html --- build-matrix.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index aec92782..1b89c23b 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -2151,9 +2151,9 @@ feel free to submit a pull request. libxslt 1.1.28 ✓ - ✗ ✓ - ✗ + ✓ + ✓ ✗ @@ -4084,9 +4084,9 @@ Total: 394 +4 native-only) 391 -292 +293 374 -290 +291 15 From dce1bc264918aa09efff4ca161b0ce8c3112d66f Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Fri, 6 May 2016 17:03:35 +0300 Subject: [PATCH 0659/1463] nsis: fix build for x86_64-w64-mingw32 targets Required for: https://github.com/mxe/mxe/pull/1165 --- src/nsis-1-fixes.patch | 282 ++++++++++++++++++++++++++++++++++++++++- src/nsis.mk | 6 +- 2 files changed, 285 insertions(+), 3 deletions(-) diff --git a/src/nsis-1-fixes.patch b/src/nsis-1-fixes.patch index a0407bc4..1feeaef8 100644 --- a/src/nsis-1-fixes.patch +++ b/src/nsis-1-fixes.patch @@ -645,7 +645,7 @@ diff --git a/Source/exehead/SConscript b/Source/exehead/SConscript index 1111111..2222222 100755 --- a/Source/exehead/SConscript +++ b/Source/exehead/SConscript -@@ -53,7 +53,7 @@ Import('env compression solid_compression') +@@ -52,7 +52,7 @@ Import('env compression solid_compression') env.Append(CPPDEFINES = ['EXEHEAD']) env.Append(CPPDEFINES = ['WIN32_LEAN_AND_MEAN']) @@ -654,3 +654,283 @@ index 1111111..2222222 100755 ### Some other settings + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Pek +Date: Fri, 6 May 2016 15:56:21 +0300 +Subject: [PATCH] fix build for x86_64-w64-mingw32 targets + + +diff --git a/Contrib/BgImage/BgImage.cpp b/Contrib/BgImage/BgImage.cpp +index 1111111..2222222 100755 +--- a/Contrib/BgImage/BgImage.cpp ++++ b/Contrib/BgImage/BgImage.cpp +@@ -149,7 +149,7 @@ NSISFunc(SetBg) { + return; + } + +- oldProc = (void *)SetWindowLong(hwndParent, GWL_WNDPROC, (long)WndProc); ++ oldProc = (void *)SetWindowLongPtr(hwndParent, GWLP_WNDPROC, (long long)WndProc); + } + + bgBitmap.bReady = FALSE; +@@ -345,7 +345,7 @@ NSISFunc(Clear) { + NSISFunc(Destroy) { + bgBitmap.bReady = FALSE; + if (IsWindow(hwndParent) && oldProc) +- SetWindowLong(hwndParent, GWL_WNDPROC, (long)oldProc); ++ SetWindowLongPtr(hwndParent, GWLP_WNDPROC, (long long)oldProc); + if (IsWindow(hWndImage)) + SendMessage(hWndImage, WM_CLOSE, 0, 0); + hWndImage = 0; +diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp +index 1111111..2222222 100755 +--- a/Contrib/InstallOptions/InstallerOptions.cpp ++++ b/Contrib/InstallOptions/InstallerOptions.cpp +@@ -772,7 +772,7 @@ BOOL CALLBACK cfgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) + if (lpdis->itemAction & ODA_DRAWENTIRE) + { + // Get TxtColor unless the user has set another using SetCtlColors +- if (!GetWindowLong(lpdis->hwndItem, GWL_USERDATA)) ++ if (!GetWindowLongPtr(lpdis->hwndItem, GWLP_USERDATA)) + SetTextColor(lpdis->hDC, (COLORREF) pField->hImage); + + // Draw the text +@@ -1217,8 +1217,8 @@ int WINAPI createCfgDlg() + mySendMessage(hwCtrl, EM_LIMITTEXT, (WPARAM)pField->nMaxLength, (LPARAM)0); + if (dwStyle & ES_NUMBER) + { +- pField->wndProc = GetWindowLong(hwCtrl, GWL_WNDPROC); +- SetWindowLong(hwCtrl, GWL_WNDPROC, (long) NumbersOnlyPasteWndProc); ++ pField->wndProc = GetWindowLongPtr(hwCtrl, GWLP_WNDPROC); ++ SetWindowLongPtr(hwCtrl, GWLP_WNDPROC, (long) NumbersOnlyPasteWndProc); + } + break; + +@@ -1400,7 +1400,7 @@ int WINAPI createCfgDlg() + + #ifdef IO_ENABLE_LINK + case FIELD_LINK: +- pField->nParentIdx = SetWindowLong(hwCtrl, GWL_WNDPROC, (long)StaticLINKWindowProc); ++ pField->nParentIdx = SetWindowLongPtr(hwCtrl, GWLP_WNDPROC, (long)StaticLINKWindowProc); + break; + #endif + } +@@ -1438,7 +1438,7 @@ int WINAPI createCfgDlg() + + void WINAPI showCfgDlg() + { +- lpWndProcOld = (void *) SetWindowLong(hMainWindow,DWL_DLGPROC,(long)ParentWndProc); ++ lpWndProcOld = (void *) SetWindowLongPtr(hMainWindow,DWLP_DLGPROC,(long)ParentWndProc); + + // Tell NSIS to remove old inner dialog and pass handle of the new inner dialog + mySendMessage(hMainWindow, WM_NOTIFY_CUSTOM_READY, (WPARAM)hConfigWindow, 0); +@@ -1460,7 +1460,7 @@ void WINAPI showCfgDlg() + // quit soon, which means the ini might get flushed late and cause crap. :) anwyay. + if (!g_is_cancel) SaveSettings(); + +- SetWindowLong(hMainWindow,DWL_DLGPROC,(long)lpWndProcOld); ++ SetWindowLongPtr(hMainWindow,DWLP_DLGPROC,(long)lpWndProcOld); + DestroyWindow(hConfigWindow); + + // by ORTIM: 13-August-2002 +diff --git a/Contrib/Makensisw/makensisw.cpp b/Contrib/Makensisw/makensisw.cpp +index 1111111..2222222 100755 +--- a/Contrib/Makensisw/makensisw.cpp ++++ b/Contrib/Makensisw/makensisw.cpp +@@ -172,7 +172,7 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { + { + g_sdata.hwnd=hwndDlg; + HICON hIcon = LoadIcon(g_sdata.hInstance,MAKEINTRESOURCE(IDI_ICON)); +- SetClassLong(hwndDlg,GCL_HICON,(long)hIcon); ++ SetClassLongPtr(hwndDlg,GCLP_HICON,(long)hIcon); + // Altered by Darren Owen (DrO) on 29/9/2003 + // Added in receiving of mouse and key events from the richedit control + SendMessage(GetDlgItem(hwndDlg,IDC_LOGWIN),EM_SETEVENTMASK,(WPARAM)NULL,ENM_SELCHANGE|ENM_MOUSEEVENTS|ENM_KEYEVENTS); +@@ -267,7 +267,7 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { + case WM_ENTERSIZEMOVE: + { + GetClientRect(g_sdata.hwnd, &g_resize.resizeRect); +- return TRUE; ++ return TRUE; + } + case WM_SIZE: + { +diff --git a/Contrib/NSISdl/nsisdl.cpp b/Contrib/NSISdl/nsisdl.cpp +index 1111111..2222222 100755 +--- a/Contrib/NSISdl/nsisdl.cpp ++++ b/Contrib/NSISdl/nsisdl.cpp +@@ -344,7 +344,7 @@ __declspec(dllexport) void download (HWND parent, + { + uMsgCreate = RegisterWindowMessage("nsisdl create"); + +- lpWndProcOld = (void *)SetWindowLong(parent,GWL_WNDPROC,(long)ParentWndProc); ++ lpWndProcOld = (void *)SetWindowLongPtr(parent,GWLP_WNDPROC,(long)ParentWndProc); + + SendMessage(parent, uMsgCreate, TRUE, (LPARAM) parent); + +@@ -418,7 +418,7 @@ __declspec(dllexport) void download (HWND parent, + if (parent) + { + SendMessage(parent, uMsgCreate, FALSE, (LPARAM) parent); +- SetWindowLong(parent, GWL_WNDPROC, (long)lpWndProcOld); ++ SetWindowLongPtr(parent, GWLP_WNDPROC, (long)lpWndProcOld); + } + break; + } +diff --git a/Contrib/StartMenu/StartMenu.c b/Contrib/StartMenu/StartMenu.c +index 1111111..2222222 100755 +--- a/Contrib/StartMenu/StartMenu.c ++++ b/Contrib/StartMenu/StartMenu.c +@@ -120,7 +120,7 @@ void __declspec(dllexport) Init(HWND hwndParent, int string_size, char *variable + } + else + { +- lpWndProcOld = (void *) SetWindowLong(hwndParent, DWL_DLGPROC, (long) ParentWndProc); ++ lpWndProcOld = (void *) SetWindowLongPtr(hwndParent, DWLP_DLGPROC, (long) ParentWndProc); + wsprintf(buf, "%u", hwStartMenuSelect); + pushstring(buf); + } +@@ -145,7 +145,7 @@ void __declspec(dllexport) Show(HWND hwndParent, int string_size, char *variable + } + DestroyWindow(hwStartMenuSelect); + +- SetWindowLong(hwndParent, DWL_DLGPROC, (long) lpWndProcOld); ++ SetWindowLongPtr(hwndParent, DWLP_DLGPROC, (long) lpWndProcOld); + } + + void __declspec(dllexport) Select(HWND hwndParent, int string_size, char *variables, stack_t **stacktop, extra_parameters *extra) +diff --git a/Contrib/nsDialogs/nsDialogs.c b/Contrib/nsDialogs/nsDialogs.c +index 1111111..2222222 100755 +--- a/Contrib/nsDialogs/nsDialogs.c ++++ b/Contrib/nsDialogs/nsDialogs.c +@@ -194,7 +194,7 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) + xtraDrawStyle |= DT_HIDEPREFIX; + + // Use blue unless the user has set another using SetCtlColors +- if (!GetWindowLong(lpdis->hwndItem, GWL_USERDATA)) ++ if (!GetWindowLongPtr(lpdis->hwndItem, GWLP_USERDATA)) + SetTextColor(lpdis->hDC, RGB(0,0,255)); + + // Draw the text +@@ -276,7 +276,7 @@ void __declspec(dllexport) Create(HWND hwndParent, int string_size, char *variab + SWP_NOZORDER | SWP_NOACTIVATE + ); + +- g_dialog.parentOriginalWndproc = (WNDPROC) SetWindowLong(hwndParent, DWL_DLGPROC, (long) ParentProc); ++ g_dialog.parentOriginalWndproc = (WNDPROC) SetWindowLongPtr(hwndParent, DWLP_DLGPROC, (long) ParentProc); + + g_dialog.rtl = FALSE; + +@@ -387,7 +387,7 @@ void __declspec(dllexport) CreateControl(HWND hwndParent, int string_size, char + // set the WndProc for the link control + + if(g_dialog.controls[id].type == NSCTL_LINK) +- g_dialog.controls[id].oldWndProc = (WNDPROC) SetWindowLong(hwItem, GWL_WNDPROC, (long) LinkWndProc); ++ g_dialog.controls[id].oldWndProc = (WNDPROC) SetWindowLongPtr(hwItem, GWLP_WNDPROC, (long) LinkWndProc); + + // push back result + +@@ -588,7 +588,7 @@ void __declspec(dllexport) Show(HWND hwndParent, int string_size, char *variable + + // reset wndproc + +- SetWindowLong(hwndParent, DWL_DLGPROC, (long) g_dialog.parentOriginalWndproc); ++ SetWindowLongPtr(hwndParent, DWLP_DLGPROC, (long) g_dialog.parentOriginalWndproc); + } + + BOOL WINAPI DllMain(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved) +diff --git a/Contrib/zip2exe/main.cpp b/Contrib/zip2exe/main.cpp +index 1111111..2222222 100755 +--- a/Contrib/zip2exe/main.cpp ++++ b/Contrib/zip2exe/main.cpp +@@ -633,7 +633,7 @@ BOOL CALLBACK DlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) + SetDlgItemText(hwndDlg,IDC_INSTPATH,gp_poi); + + hIcon=LoadIcon(g_hInstance,MAKEINTRESOURCE(IDI_ICON1)); +- SetClassLong(hwndDlg,GCL_HICON,(long)hIcon); ++ SetClassLongPtr(hwndDlg,GCLP_HICON,(long)hIcon); + + hFont=CreateFont(15,0,0,0,FW_NORMAL,0,0,0,DEFAULT_CHARSET, + OUT_CHARACTER_PRECIS, +diff --git a/SCons/Config/gnu b/SCons/Config/gnu +index 1111111..2222222 100755 +--- a/SCons/Config/gnu ++++ b/SCons/Config/gnu +@@ -73,6 +73,7 @@ if not defenv['DEBUG']: + stub_env.Append(CCFLAGS = ['-Wall']) # all warnings + stub_env.Append(CCFLAGS = ['-xc']) # force compile as c + stub_env.Append(CCFLAGS = ['-fno-strict-aliasing']) # not safe for strict aliasing ++stub_env.Append(CCFLAGS = ['-fpermissive']) # ignore invalid conversion errors (since C++11) + + if not defenv['DEBUG'] and defenv['STRIP'] and defenv['STRIP_W32']: + stub_env.Append(LINKFLAGS = ['-s']) # strip +@@ -109,6 +110,7 @@ if not defenv['DEBUG']: + plugin_env.Append(CCFLAGS = ['-Os']) # optimize for size + plugin_env.Append(CCFLAGS = ['-Wall']) # level 3 warnings + plugin_env.Append(CCFLAGS = ['-fno-strict-aliasing']) # not safe for strict aliasing ++plugin_env.Append(CCFLAGS = ['-fpermissive']) # ignore invalid conversion errors (since C++11) + + if not defenv['DEBUG'] and defenv['STRIP'] and defenv['STRIP_W32']: + plugin_env.Append(LINKFLAGS = ['-s']) # strip +@@ -126,6 +128,7 @@ if not defenv['DEBUG']: + cp_util_env.Append(CCFLAGS = ['-O2']) # optimize + cp_util_env.Append(CCFLAGS = ['-Wall']) # all warnings + cp_util_env.Append(CCFLAGS = ['-fno-strict-aliasing']) # not safe for strict aliasing ++cp_util_env.Append(CCFLAGS = ['-fpermissive']) # ignore invalid conversion errors (since C++11) + + conf = FlagsConfigure(cp_util_env) + conf.CheckLinkFlag('$MAP_FLAG') # generate map file +diff --git a/Source/exehead/Ui.c b/Source/exehead/Ui.c +index 1111111..2222222 100755 +--- a/Source/exehead/Ui.c ++++ b/Source/exehead/Ui.c +@@ -121,7 +121,7 @@ static BOOL NSISCALL _HandleStaticBkColor(UINT uMsg, WPARAM wParam, LPARAM lPara + { + if ((uMsg - WM_CTLCOLOREDIT) <= (WM_CTLCOLORSTATIC - WM_CTLCOLOREDIT)) + { +- ctlcolors *c = (ctlcolors *)GetWindowLong((HWND)lParam, GWL_USERDATA); ++ ctlcolors *c = (ctlcolors *)GetWindowLongPtr((HWND)lParam, GWLP_USERDATA); + + if (c) { + COLORREF text; +@@ -482,7 +482,7 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) + m_hwndOK=GetDlgItem(hwndDlg,IDOK); + m_hwndCancel=GetDlgItem(hwndDlg,IDCANCEL); + SetDlgItemTextFromLang(hwndDlg,IDC_VERSTR,LANG_BRANDING); +- SetClassLong(hwndDlg,GCL_HICON,(long)g_hIcon); ++ SetClassLongPtr(hwndDlg,GCLP_HICON,(long)g_hIcon); + // use the following line instead of the above, if .rdata needs shirking + //SendMessage(hwndDlg,WM_SETICON,ICON_BIG,(LPARAM)g_hIcon); + #if defined(NSIS_SUPPORT_CODECALLBACKS) && defined(NSIS_CONFIG_ENHANCEDUI_SUPPORT) +@@ -647,7 +647,7 @@ skipPage: + } + if (uMsg == WM_QUERYENDSESSION) + { +- SetWindowLong(hwndDlg, DWL_MSGRESULT, FALSE); ++ SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, FALSE); + return TRUE; + } + if (uMsg == WM_COMMAND) +@@ -1288,7 +1288,7 @@ static BOOL CALLBACK SelProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar + hBMcheck1=LoadBitmap(g_hInstance, MAKEINTRESOURCE(IDB_BITMAP1)); + + last_selected_tree_item=-1; +- oldTreeWndProc=SetWindowLong(hwndTree1,GWL_WNDPROC,(long)newTreeWndProc); ++ oldTreeWndProc=SetWindowLongPtr(hwndTree1,GWLP_WNDPROC,(long)newTreeWndProc); + + hImageList = ImageList_Create(16,16, ILC_COLOR32|ILC_MASK, 6, 0); + ImageList_AddMasked(hImageList,hBMcheck1,RGB(255,0,255)); +diff --git a/Source/exehead/exec.c b/Source/exehead/exec.c +index 1111111..2222222 100755 +--- a/Source/exehead/exec.c ++++ b/Source/exehead/exec.c +@@ -781,7 +781,7 @@ static int NSISCALL ExecuteEntry(entry *entry_) + case EW_SETCTLCOLORS: + { + ctlcolors *c = (ctlcolors *)(g_blocks[NB_CTLCOLORS].offset + parm1); +- SetWindowLong((HWND) GetIntFromParm(0), GWL_USERDATA, (long) c); ++ SetWindowLongPtr((HWND) GetIntFromParm(0), GWLP_USERDATA, (long) c); + } + break; + case EW_SETBRANDINGIMAGE: diff --git a/src/nsis.mk b/src/nsis.mk index 07c576c9..5c4d34b1 100644 --- a/src/nsis.mk +++ b/src/nsis.mk @@ -17,15 +17,17 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD + $(if $(findstring x86_64-w64-mingw32,$(TARGET)),\ + $(SED) -i 's/pei-i386/pei-x86-64/' '$(1)/SCons/Config/linker_script') cd '$(1)' && scons \ MINGW_CROSS_PREFIX='$(TARGET)-' \ PREFIX='$(PREFIX)/$(TARGET)' \ `[ -d /usr/local/include ] && echo APPEND_CPPPATH=/usr/local/include` \ `[ -d /usr/local/lib ] && echo APPEND_LIBPATH=/usr/local/lib` \ + $(if $(findstring x86_64-w64-mingw32,$(TARGET)),\ + SKIPPLUGINS='System') \ SKIPUTILS='NSIS Menu' \ NSIS_MAX_STRLEN=8192 \ install $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/bin/makensis' '$(PREFIX)/bin/$(TARGET)-makensis' endef - -$(PKG)_BUILD_x86_64-w64-mingw32 = From 0637045bed3fec392f384a0f554cb928a0a5824a Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Sun, 15 May 2016 14:22:41 +0300 Subject: [PATCH 0660/1463] nsis: disable not needed utils They are useless for cross-compiling purposes. For example, in Debian package they are disabled too: http://anonscm.debian.org/cgit/collab-maint/nsis.git/tree/debian/rules --- src/nsis.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nsis.mk b/src/nsis.mk index 5c4d34b1..d8b14c36 100644 --- a/src/nsis.mk +++ b/src/nsis.mk @@ -26,7 +26,7 @@ define $(PKG)_BUILD `[ -d /usr/local/lib ] && echo APPEND_LIBPATH=/usr/local/lib` \ $(if $(findstring x86_64-w64-mingw32,$(TARGET)),\ SKIPPLUGINS='System') \ - SKIPUTILS='NSIS Menu' \ + SKIPUTILS='MakeLangId,Makensisw,NSIS Menu,UIs,zip2exe' \ NSIS_MAX_STRLEN=8192 \ install $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/bin/makensis' '$(PREFIX)/bin/$(TARGET)-makensis' From 4df5e4852c75372ad583ce29bacdbe6772bc3d45 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Sun, 15 May 2016 14:49:47 +0300 Subject: [PATCH 0661/1463] nsis: update from 2.50 to 2.51 --- src/nsis.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nsis.mk b/src/nsis.mk index d8b14c36..008c9b6d 100644 --- a/src/nsis.mk +++ b/src/nsis.mk @@ -3,8 +3,8 @@ PKG := nsis $(PKG)_IGNORE := -$(PKG)_VERSION := 2.50 -$(PKG)_CHECKSUM := 3fb674cb75e0237ef6b7c9e8a8e8ce89504087a6932c5d2e26764d4220a89848 +$(PKG)_VERSION := 2.51 +$(PKG)_CHECKSUM := 43d4c9209847e35eb6e2c7cd5a7586e1445374c056c2c7899e40a080e17a1be7 $(PKG)_SUBDIR := nsis-$($(PKG)_VERSION)-src $(PKG)_FILE := nsis-$($(PKG)_VERSION)-src.tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/nsis/NSIS 2/$($(PKG)_VERSION)/$($(PKG)_FILE) From 8cca6b2fa6ae85a92a8364150bf310285c2cd050 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Mon, 16 May 2016 15:07:38 +0300 Subject: [PATCH 0662/1463] nsis: update patch after changing of nsis version --- src/nsis-1-fixes.patch | 68 +++++++++++++++++++++++++++++------------- 1 file changed, 48 insertions(+), 20 deletions(-) diff --git a/src/nsis-1-fixes.patch b/src/nsis-1-fixes.patch index 1feeaef8..3780de45 100644 --- a/src/nsis-1-fixes.patch +++ b/src/nsis-1-fixes.patch @@ -67,8 +67,8 @@ index 1111111..2222222 100755 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Tony Theodore -Date: Fri, 3 May 2013 17:28:44 +1000 +From: Boris Pek +Date: Mon, 16 May 2016 14:26:59 +0300 Subject: [PATCH] Enable native 64-bit build Taken from: @@ -118,7 +118,7 @@ index 1111111..2222222 100755 seeker += sizeof(WORD); \ } \ else { \ -@@ -444,7 +444,7 @@ void CDialogTemplate::ConvertToRTL() { +@@ -450,7 +450,7 @@ void CDialogTemplate::ConvertToRTL() { szClass = winchar_toansi(m_vItems[i]->szClass); // Button @@ -127,7 +127,7 @@ index 1111111..2222222 100755 m_vItems[i]->dwStyle ^= BS_LEFTTEXT; m_vItems[i]->dwStyle ^= BS_RIGHT; m_vItems[i]->dwStyle ^= BS_LEFT; -@@ -458,13 +458,13 @@ void CDialogTemplate::ConvertToRTL() { +@@ -464,13 +464,13 @@ void CDialogTemplate::ConvertToRTL() { } } // Edit @@ -143,7 +143,7 @@ index 1111111..2222222 100755 if ((m_vItems[i]->dwStyle & SS_TYPEMASK) == SS_LEFT || (m_vItems[i]->dwStyle & SS_TYPEMASK) == SS_LEFTNOWORDWRAP) { m_vItems[i]->dwStyle &= ~SS_TYPEMASK; -@@ -571,7 +571,7 @@ BYTE* CDialogTemplate::Save(DWORD& dwSize) { +@@ -577,7 +577,7 @@ BYTE* CDialogTemplate::Save(DWORD& dwSize) { // Write all of the items for (unsigned int i = 0; i < m_vItems.size(); i++) { // DLGITEMTEMPLATE[EX]s must be aligned on DWORD boundary @@ -152,7 +152,7 @@ index 1111111..2222222 100755 seeker += sizeof(WORD); if (m_bExtended) { -@@ -622,7 +622,7 @@ BYTE* CDialogTemplate::Save(DWORD& dwSize) { +@@ -628,7 +628,7 @@ BYTE* CDialogTemplate::Save(DWORD& dwSize) { } } @@ -568,15 +568,6 @@ index 1111111..2222222 100755 dwSize = pVerRes->dwResSize; pRawRes = &(pVerRes->bVerData); -@@ -780,7 +780,7 @@ static DWORD GetVxdVersionInfoSize( LPCSTR szFile ) - - // GetVxdVersion() will fail with ERROR_INSUFFICIENT_BUFFER and - // the required buffer size will be returned in dwResult. -- if ( GetLastError() == ERROR_INSUFFICIENT_BUFFER ) -+ if ( dwError == ERROR_INSUFFICIENT_BUFFER ) - { - SetLastError( 0 ); - return dwResult; From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Theodore @@ -738,7 +729,7 @@ diff --git a/Contrib/Makensisw/makensisw.cpp b/Contrib/Makensisw/makensisw.cpp index 1111111..2222222 100755 --- a/Contrib/Makensisw/makensisw.cpp +++ b/Contrib/Makensisw/makensisw.cpp -@@ -172,7 +172,7 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { +@@ -177,7 +177,7 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { { g_sdata.hwnd=hwndDlg; HICON hIcon = LoadIcon(g_sdata.hInstance,MAKEINTRESOURCE(IDI_ICON)); @@ -747,7 +738,7 @@ index 1111111..2222222 100755 // Altered by Darren Owen (DrO) on 29/9/2003 // Added in receiving of mouse and key events from the richedit control SendMessage(GetDlgItem(hwndDlg,IDC_LOGWIN),EM_SETEVENTMASK,(WPARAM)NULL,ENM_SELCHANGE|ENM_MOUSEEVENTS|ENM_KEYEVENTS); -@@ -267,7 +267,7 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { +@@ -272,7 +272,7 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { case WM_ENTERSIZEMOVE: { GetClientRect(g_sdata.hwnd, &g_resize.resizeRect); @@ -839,7 +830,7 @@ index 1111111..2222222 100755 + SetWindowLongPtr(hwndParent, DWLP_DLGPROC, (long) g_dialog.parentOriginalWndproc); } - BOOL WINAPI DllMain(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved) + BOOL WINAPI DllMain(HINSTANCE hInst, ULONG ul_reason_for_call, LPVOID lpReserved) diff --git a/Contrib/zip2exe/main.cpp b/Contrib/zip2exe/main.cpp index 1111111..2222222 100755 --- a/Contrib/zip2exe/main.cpp @@ -912,7 +903,7 @@ index 1111111..2222222 100755 return TRUE; } if (uMsg == WM_COMMAND) -@@ -1288,7 +1288,7 @@ static BOOL CALLBACK SelProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar +@@ -1290,7 +1290,7 @@ static BOOL CALLBACK SelProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar hBMcheck1=LoadBitmap(g_hInstance, MAKEINTRESOURCE(IDB_BITMAP1)); last_selected_tree_item=-1; @@ -925,7 +916,7 @@ diff --git a/Source/exehead/exec.c b/Source/exehead/exec.c index 1111111..2222222 100755 --- a/Source/exehead/exec.c +++ b/Source/exehead/exec.c -@@ -781,7 +781,7 @@ static int NSISCALL ExecuteEntry(entry *entry_) +@@ -788,7 +788,7 @@ static int NSISCALL ExecuteEntry(entry *entry_) case EW_SETCTLCOLORS: { ctlcolors *c = (ctlcolors *)(g_blocks[NB_CTLCOLORS].offset + parm1); @@ -934,3 +925,40 @@ index 1111111..2222222 100755 } break; case EW_SETBRANDINGIMAGE: + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Pek +Date: Mon, 16 May 2016 15:12:58 +0300 +Subject: [PATCH] Fix stdcall + +Taken from: +http://anonscm.debian.org/gitweb/?p=collab-maint/nsis.git;a=blob;f=debian/patches/stdcall.patch;h=46b497e3a48a145afba97644390ac2e026225e89;hb=HEAD + +diff --git a/SCons/Config/gnu b/SCons/Config/gnu +index 1111111..2222222 100755 +--- a/SCons/Config/gnu ++++ b/SCons/Config/gnu +@@ -9,6 +9,14 @@ Import('FlagsConfigure') + ### cross compiling + + def cross_env(env): ++ # Set stdcall calling convention for Win32 targets ++ if env.has_key('CPPDEFINES'): ++ for i in range(len(env['CPPDEFINES'])): ++ if 'NSISCALL' in env['CPPDEFINES'][i]: ++ env['CPPDEFINES'][i] = ('NSISCALL', '\'$STDCALL\'') ++ break ++ else: ++ env.Append(CPPDEFINES = [('NSISCALL', '$STDCALL')]) + if env['PLATFORM'] != 'win32': + env.Tool('crossmingw', toolpath = [Dir('../Tools').rdir()]) + +@@ -35,7 +43,7 @@ defenv['STDCALL'] = '__attribute__((__stdcall__))' + + ### defines + +-defenv.Append(CPPDEFINES = [('NSISCALL', '$STDCALL')]) ++defenv.Append(CPPDEFINES = [('NSISCALL', '')]) + + ### helper functions + From 0acac278d238acbdacd75267f5cfbb1a6cf9afd3 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Tue, 17 May 2016 06:20:12 +0000 Subject: [PATCH 0663/1463] Update versions.json & build-matrix.html --- build-matrix.html | 10 +++++----- versions.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 1b89c23b..ca9adf86 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -2419,11 +2419,11 @@ feel free to submit a pull request. nsis - 2.50 + 2.51 + ✓ + ✓ ✓ ✓ - ✗ - ✗ ✗ @@ -4085,8 +4085,8 @@ Total: 394 391 293 -374 -291 +375 +292 15 diff --git a/versions.json b/versions.json index 42ab8a3c..e5780c40 100644 --- a/versions.json +++ b/versions.json @@ -237,7 +237,7 @@ "netpbm": "10.35.96", "nettle": "3.2", "nlopt": "2.4.2", - "nsis": "2.50", + "nsis": "2.51", "ocaml-cairo": "1.2.0", "ocaml-camlimages": "4.0.1", "ocaml-core": "4.00.1", From 79c2b29d80c4b48b0de65b130931ddc2a219f3d1 Mon Sep 17 00:00:00 2001 From: Rashad Kanavath Date: Tue, 17 May 2016 11:00:45 +0200 Subject: [PATCH 0664/1463] openthreads: build in src/OpenThreads --- src/openthreads.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openthreads.mk b/src/openthreads.mk index 94ed993d..3343aaac 100644 --- a/src/openthreads.mk +++ b/src/openthreads.mk @@ -25,5 +25,5 @@ define $(PKG)_BUILD -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED=1 \ '$(1)' - $(MAKE) -C '$(1).build' -j '$(JOBS)' install VERBOSE=1 + $(MAKE) -C '$(1).build/src/OpenThreads' -j '$(JOBS)' install VERBOSE=1 endef From 43ade244e143a1f97ed8f2d4539a2c20616c796a Mon Sep 17 00:00:00 2001 From: Pavel Vatagin Date: Wed, 18 May 2016 01:53:17 +0300 Subject: [PATCH 0665/1463] fix nsis --- src/nsis.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nsis.mk b/src/nsis.mk index 008c9b6d..03fe6052 100644 --- a/src/nsis.mk +++ b/src/nsis.mk @@ -26,7 +26,7 @@ define $(PKG)_BUILD `[ -d /usr/local/lib ] && echo APPEND_LIBPATH=/usr/local/lib` \ $(if $(findstring x86_64-w64-mingw32,$(TARGET)),\ SKIPPLUGINS='System') \ - SKIPUTILS='MakeLangId,Makensisw,NSIS Menu,UIs,zip2exe' \ + SKIPUTILS='MakeLangId,Makensisw,NSIS Menu,zip2exe' \ NSIS_MAX_STRLEN=8192 \ install $(INSTALL) -m755 '$(PREFIX)/$(TARGET)/bin/makensis' '$(PREFIX)/bin/$(TARGET)-makensis' From 1ed002bd1789ab046136cd20b01e29c7a8423ce8 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 18 May 2016 21:08:45 +0300 Subject: [PATCH 0666/1463] add package hyperscan --- index.html | 4 + src/hyperscan-1-fixes.patch | 6449 +++++++++++++++++++++++++++++++++++ src/hyperscan.mk | 29 + 3 files changed, 6482 insertions(+) create mode 100644 src/hyperscan-1-fixes.patch create mode 100644 src/hyperscan.mk diff --git a/index.html b/index.html index 1c7cc168..a55046b4 100644 --- a/index.html +++ b/index.html @@ -1525,6 +1525,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) hunspell Hunspell + + hyperscan + Hyperscan + icu4c ICU4C diff --git a/src/hyperscan-1-fixes.patch b/src/hyperscan-1-fixes.patch new file mode 100644 index 00000000..658cb0ac --- /dev/null +++ b/src/hyperscan-1-fixes.patch @@ -0,0 +1,6449 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Tue, 17 May 2016 19:02:54 +0200 +Subject: [PATCH] add output of Ragel from build + +Workaround not to include Ragel as a dependency. + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1111111..2222222 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,7 +18,6 @@ INCLUDE (CheckLibraryExists) + INCLUDE (CheckSymbolExists) + include (CMakeDependentOption) + include (${CMAKE_MODULE_PATH}/platform.cmake) +-include (${CMAKE_MODULE_PATH}/ragel.cmake) + + find_package(PkgConfig QUIET) + +@@ -82,7 +81,6 @@ endif() + + # -- make this work? set(python_ADDITIONAL_VERSIONS 2.7 2.6) + find_package(PythonInterp) +-find_program(RAGEL ragel) + + if(PYTHONINTERP_FOUND) + set(PYTHON ${PYTHON_EXECUTABLE}) +@@ -90,10 +88,6 @@ else() + message(FATAL_ERROR "No python interpreter found") + endif() + +-if(${RAGEL} STREQUAL "RAGEL-NOTFOUND") +- message(FATAL_ERROR "Ragel state machine compiler not found") +-endif() +- + option(OPTIMISE "Turns off compiler optimizations (on by default unless debug output enabled or coverage testing)" TRUE) + + option(DEBUG_OUTPUT "Enable debug output (warning: very verbose)" FALSE) +@@ -362,12 +356,10 @@ set(RAGEL_C_FLAGS "-Wno-unused") + endif() + + set_source_files_properties( +- ${CMAKE_BINARY_DIR}/src/parser/Parser.cpp ++ ${CMAKE_SOURCE_DIR}/src/parser/Parser.cpp + PROPERTIES + COMPILE_FLAGS "${RAGEL_C_FLAGS}") + +-ragelmaker(src/parser/Parser.rl) +- + SET(hs_HEADERS + src/hs.h + src/hs_common.h +@@ -935,7 +927,6 @@ endif() + # we want the static lib for testing + add_library(hs STATIC ${hs_SRCS} $) + +-add_dependencies(hs ragel_Parser) + add_dependencies(hs autogen_compiler autogen_teddy_compiler) + + if (NOT BUILD_SHARED_LIBS) +@@ -944,7 +935,6 @@ endif() + + if (BUILD_STATIC_AND_SHARED OR BUILD_SHARED_LIBS) + add_library(hs_shared SHARED ${hs_SRCS} $) +- add_dependencies(hs_shared ragel_Parser) + add_dependencies(hs_shared autogen_compiler autogen_teddy_compiler) + set_target_properties(hs_shared PROPERTIES + OUTPUT_NAME hs +diff --git a/src/parser/Parser.cpp b/src/parser/Parser.cpp +new file mode 100644 +index 1111111..2222222 +--- /dev/null ++++ b/src/parser/Parser.cpp +@@ -0,0 +1,5436 @@ ++ ++#line 1 "hyperscan-4.1.0/src/parser/Parser.rl" ++/* ++ * Copyright (c) 2015, Intel Corporation ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions are met: ++ * ++ * * Redistributions of source code must retain the above copyright notice, ++ * this list of conditions and the following disclaimer. ++ * * Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * * Neither the name of Intel Corporation nor the names of its contributors ++ * may be used to endorse or promote products derived from this software ++ * without specific prior written permission. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE ++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF ++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS ++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN ++ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE ++ * POSSIBILITY OF SUCH DAMAGE. ++ */ ++ ++/** \file ++ * \brief Parser code (generated with Ragel from Parser.rl). ++ */ ++ ++#include "config.h" ++ ++/* Parser.cpp is a built source, may not be in same dir as parser files */ ++#include "parser/check_refs.h" ++#include "parser/ComponentAlternation.h" ++#include "parser/ComponentAssertion.h" ++#include "parser/ComponentAtomicGroup.h" ++#include "parser/ComponentBackReference.h" ++#include "parser/ComponentBoundary.h" ++#include "parser/ComponentByte.h" ++#include "parser/ComponentClass.h" ++#include "parser/ComponentCondReference.h" ++#include "parser/ComponentEmpty.h" ++#include "parser/ComponentEUS.h" ++#include "parser/Component.h" ++#include "parser/ComponentRepeat.h" ++#include "parser/ComponentSequence.h" ++#include "parser/ComponentWordBoundary.h" ++#include "parser/parse_error.h" ++#include "parser/Parser.h" ++#include "ue2common.h" ++#include "util/compare.h" ++#include "util/make_unique.h" ++#include "util/ue2_containers.h" ++#include "util/unicode_def.h" ++#include "util/verify_types.h" ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++using namespace std; ++ ++namespace ue2 { ++ ++#define PUSH_SEQUENCE do {\ ++ sequences.push_back(ExprState(currentSeq, (size_t)(ts - ptr), \ ++ mode)); \ ++ } while(0) ++#define POP_SEQUENCE do {\ ++ currentSeq = sequences.back().seq; \ ++ mode = sequences.back().mode; \ ++ sequences.pop_back(); \ ++ } while(0) ++ ++namespace { ++ ++/** \brief Structure representing current state as we're parsing (current ++ * sequence, current options). Stored in the 'sequences' vector. */ ++struct ExprState { ++ ExprState(ComponentSequence *seq_in, size_t offset, ++ const ParseMode &mode_in) : ++ seq(seq_in), seqOffset(offset), mode(mode_in) {} ++ ++ ComponentSequence *seq; //!< current sequence ++ size_t seqOffset; //!< offset seq was entered, for error reporting ++ ParseMode mode; //!< current mode flags ++}; ++ ++} // namespace ++ ++static ++unsigned parseAsDecimal(unsigned oct) { ++ // The input was parsed as octal, but should have been parsed as decimal. ++ // Deconstruct the octal number and reconstruct into decimal ++ unsigned ret = 0; ++ unsigned multiplier = 1; ++ while (oct) { ++ ret += (oct & 0x7) * multiplier; ++ oct >>= 3; ++ multiplier *= 10; ++ } ++ return ret; ++} ++ ++/** \brief Maximum value for a positive integer. We use INT_MAX, as that's what ++ * PCRE uses. */ ++static constexpr u32 MAX_NUMBER = INT_MAX; ++ ++static ++void pushDec(u32 *acc, u8 raw_digit) { ++ assert(raw_digit >= '0' && raw_digit <= '9'); ++ u32 digit_val = raw_digit - '0'; ++ ++ // Ensure that we don't overflow. ++ u64a val = ((u64a)*acc * 10) + digit_val; ++ if (val > MAX_NUMBER) { ++ throw LocatedParseError("Number is too big"); ++ } ++ ++ *acc = verify_u32(val); ++} ++ ++static ++void pushOct(u32 *acc, u8 raw_digit) { ++ assert(raw_digit >= '0' && raw_digit <= '7'); ++ u32 digit_val = raw_digit - '0'; ++ ++ // Ensure that we don't overflow. ++ u64a val = ((u64a)*acc * 8) + digit_val; ++ if (val > MAX_NUMBER) { ++ throw LocatedParseError("Number is too big"); ++ } ++ ++ *acc = verify_u32(val); ++} ++ ++static ++void throwInvalidRepeat(void) { ++ throw LocatedParseError("Invalid repeat"); ++} ++ ++static ++void throwInvalidUtf8(void) { ++ throw ParseError("Expression is not valid UTF-8."); ++} ++ ++/** ++ * Adds the given child component to the parent sequence, returning a pointer ++ * to the new (child) "current sequence". ++ */ ++static ++ComponentSequence *enterSequence(ComponentSequence *parent, ++ unique_ptr child) { ++ assert(parent); ++ assert(child); ++ ++ ComponentSequence *seq = child.get(); ++ parent->addComponent(move(child)); ++ return seq; ++} ++ ++static ++void addLiteral(ComponentSequence *currentSeq, unsigned char c, ++ const ParseMode &mode) { ++ if (mode.utf8 && mode.caseless) { ++ /* leverage ComponentClass to generate the vertices */ ++ auto cc = getComponentClass(mode); ++ assert(cc); ++ cc->add(c); ++ cc->finalize(); ++ currentSeq->addComponent(move(cc)); ++ } else { ++ currentSeq->addComponent(getLiteralComponentClass(c, mode.caseless)); ++ } ++} ++ ++static ++void addEscaped(ComponentSequence *currentSeq, unichar accum, ++ const ParseMode &mode, const char *err_msg) { ++ if (mode.utf8) { ++ /* leverage ComponentClass to generate the vertices */ ++ auto cc = getComponentClass(mode); ++ assert(cc); ++ cc->add(accum); ++ cc->finalize(); ++ currentSeq->addComponent(move(cc)); ++ } else { ++ if (accum > 255) { ++ throw LocatedParseError(err_msg); ++ } ++ addLiteral(currentSeq, (unsigned char)accum, mode); ++ } ++} ++ ++static ++void addEscapedOctal(ComponentSequence *currentSeq, unichar accum, ++ const ParseMode &mode) { ++ addEscaped(currentSeq, accum, mode, "Octal value is greater than \\377"); ++} ++ ++static ++void addEscapedHex(ComponentSequence *currentSeq, unichar accum, ++ const ParseMode &mode) { ++ addEscaped(currentSeq, accum, mode, ++ "Hexadecimal value is greater than \\xFF"); ++} ++ ++#define SLASH_C_ERROR "\\c must be followed by an ASCII character" ++ ++static ++u8 decodeCtrl(u8 raw) { ++ if (raw & 0x80) { ++ throw LocatedParseError(SLASH_C_ERROR); ++ } ++ return mytoupper(raw) ^ 0x40; ++} ++ ++static ++unichar readUtf8CodePoint2c(const u8 *ts) { ++ assert(ts[0] >= 0xc0 && ts[0] < 0xe0); ++ assert(ts[1] >= 0x80 && ts[1] < 0xc0); ++ ++ unichar val = ts[0] & 0x1f; ++ val <<= 6; ++ val |= ts[1] & 0x3f; ++ DEBUG_PRINTF("utf8 %02hhx %02hhx ->\\x{%x}\n", ts[0], ++ ts[1], val); ++ return val; ++} ++ ++static ++unichar readUtf8CodePoint3c(const u8 *ts) { ++ assert(ts[0] >= 0xe0 && ts[0] < 0xf0); ++ assert(ts[1] >= 0x80 && ts[1] < 0xc0); ++ assert(ts[2] >= 0x80 && ts[2] < 0xc0); ++ unichar val = ts[0] & 0x0f; ++ val <<= 6; ++ val |= ts[1] & 0x3f; ++ val <<= 6; ++ val |= ts[2] & 0x3f; ++ DEBUG_PRINTF("utf8 %02hhx %02hhx %02hhx ->\\x{%x}\n", ts[0], ++ ts[1], ts[2], val); ++ return val; ++} ++ ++static ++unichar readUtf8CodePoint4c(const u8 *ts) { ++ assert(ts[0] >= 0xf0 && ts[0] < 0xf8); ++ assert(ts[1] >= 0x80 && ts[1] < 0xc0); ++ assert(ts[2] >= 0x80 && ts[2] < 0xc0); ++ assert(ts[3] >= 0x80 && ts[3] < 0xc0); ++ unichar val = ts[0] & 0x07; ++ val <<= 6; ++ val |= ts[1] & 0x3f; ++ val <<= 6; ++ val |= ts[2] & 0x3f; ++ val <<= 6; ++ val |= ts[3] & 0x3f; ++ DEBUG_PRINTF("utf8 %02hhx %02hhx %02hhx %02hhx ->\\x{%x}\n", ts[0], ++ ts[1], ts[2], ts[3], val); ++ return val; ++} ++ ++ ++#line 1833 "hyperscan-4.1.0/src/parser/Parser.rl" ++ ++ ++ ++#line 280 "hyperscan-build/src/parser/Parser.cpp" ++static const short _regex_actions[] = { ++ 0, 1, 0, 1, 1, 1, 2, 1, ++ 3, 1, 4, 1, 7, 1, 8, 1, ++ 9, 1, 10, 1, 11, 1, 12, 1, ++ 13, 1, 15, 1, 16, 1, 17, 1, ++ 18, 1, 19, 1, 20, 1, 21, 1, ++ 22, 1, 23, 1, 24, 1, 25, 1, ++ 26, 1, 27, 1, 28, 1, 29, 1, ++ 30, 1, 31, 1, 32, 1, 33, 1, ++ 34, 1, 35, 1, 36, 1, 37, 1, ++ 38, 1, 39, 1, 40, 1, 41, 1, ++ 42, 1, 43, 1, 44, 1, 45, 1, ++ 46, 1, 47, 1, 48, 1, 49, 1, ++ 50, 1, 51, 1, 52, 1, 53, 1, ++ 54, 1, 55, 1, 56, 1, 57, 1, ++ 58, 1, 59, 1, 60, 1, 61, 1, ++ 62, 1, 63, 1, 64, 1, 65, 1, ++ 66, 1, 67, 1, 68, 1, 69, 1, ++ 70, 1, 71, 1, 72, 1, 73, 1, ++ 74, 1, 75, 1, 76, 1, 77, 1, ++ 78, 1, 79, 1, 80, 1, 81, 1, ++ 82, 1, 83, 1, 84, 1, 85, 1, ++ 86, 1, 87, 1, 88, 1, 89, 1, ++ 90, 1, 91, 1, 92, 1, 93, 1, ++ 94, 1, 95, 1, 96, 1, 97, 1, ++ 98, 1, 99, 1, 100, 1, 101, 1, ++ 102, 1, 103, 1, 104, 1, 105, 1, ++ 106, 1, 107, 1, 108, 1, 109, 1, ++ 110, 1, 111, 1, 112, 1, 113, 1, ++ 114, 1, 115, 1, 116, 1, 117, 1, ++ 118, 1, 119, 1, 120, 1, 121, 1, ++ 122, 1, 123, 1, 124, 1, 125, 1, ++ 126, 1, 127, 1, 128, 1, 129, 1, ++ 130, 1, 131, 1, 132, 1, 133, 1, ++ 134, 1, 135, 1, 136, 1, 137, 1, ++ 138, 1, 139, 1, 140, 1, 141, 1, ++ 142, 1, 143, 1, 144, 1, 145, 1, ++ 146, 1, 147, 1, 148, 1, 149, 1, ++ 150, 1, 151, 1, 152, 1, 153, 1, ++ 154, 1, 155, 1, 156, 1, 157, 1, ++ 158, 1, 159, 1, 160, 1, 161, 1, ++ 162, 1, 163, 1, 164, 1, 165, 1, ++ 166, 1, 167, 1, 168, 1, 169, 1, ++ 170, 1, 171, 1, 172, 1, 173, 1, ++ 174, 1, 175, 1, 176, 1, 177, 1, ++ 178, 1, 179, 1, 180, 1, 181, 1, ++ 182, 1, 183, 1, 184, 1, 185, 1, ++ 186, 1, 187, 1, 188, 1, 189, 1, ++ 190, 1, 191, 1, 192, 1, 193, 1, ++ 194, 1, 195, 1, 196, 1, 197, 1, ++ 198, 1, 199, 1, 200, 1, 201, 1, ++ 202, 1, 203, 1, 204, 1, 205, 1, ++ 206, 1, 207, 1, 208, 1, 209, 1, ++ 210, 1, 211, 1, 212, 1, 213, 1, ++ 214, 1, 215, 1, 216, 1, 217, 1, ++ 218, 1, 219, 1, 220, 1, 221, 1, ++ 222, 1, 223, 1, 224, 1, 225, 1, ++ 226, 1, 227, 1, 228, 1, 229, 1, ++ 230, 1, 231, 1, 232, 1, 233, 1, ++ 234, 1, 235, 1, 236, 1, 239, 1, ++ 241, 1, 242, 1, 243, 1, 244, 1, ++ 245, 1, 246, 1, 247, 1, 248, 1, ++ 249, 1, 250, 1, 251, 1, 252, 1, ++ 253, 1, 254, 1, 255, 1, 256, 1, ++ 257, 1, 258, 1, 259, 1, 260, 1, ++ 261, 1, 262, 1, 263, 1, 264, 1, ++ 265, 1, 266, 1, 267, 1, 268, 1, ++ 269, 1, 270, 1, 271, 1, 272, 1, ++ 273, 1, 274, 1, 275, 1, 276, 1, ++ 277, 1, 278, 1, 279, 1, 280, 1, ++ 281, 1, 282, 1, 283, 1, 284, 1, ++ 285, 1, 286, 1, 287, 1, 288, 1, ++ 289, 1, 290, 1, 294, 1, 295, 1, ++ 296, 1, 297, 1, 298, 1, 299, 1, ++ 300, 1, 301, 1, 302, 1, 303, 1, ++ 304, 1, 305, 1, 306, 1, 307, 1, ++ 308, 1, 309, 1, 310, 1, 311, 1, ++ 312, 1, 313, 1, 314, 1, 315, 1, ++ 316, 1, 317, 1, 318, 1, 319, 1, ++ 320, 1, 321, 1, 322, 1, 323, 1, ++ 324, 1, 325, 1, 329, 1, 330, 1, ++ 331, 1, 332, 1, 333, 1, 334, 1, ++ 335, 1, 336, 1, 337, 1, 339, 1, ++ 340, 1, 341, 1, 342, 1, 343, 1, ++ 344, 1, 345, 1, 346, 1, 347, 1, ++ 348, 1, 349, 1, 350, 1, 351, 1, ++ 352, 1, 353, 1, 354, 1, 355, 1, ++ 356, 1, 357, 1, 358, 1, 359, 1, ++ 360, 1, 361, 1, 362, 1, 363, 1, ++ 364, 1, 365, 1, 366, 1, 367, 1, ++ 368, 1, 369, 1, 370, 1, 371, 1, ++ 372, 1, 373, 1, 374, 1, 375, 1, ++ 376, 1, 377, 1, 378, 1, 379, 1, ++ 380, 1, 381, 1, 382, 1, 383, 1, ++ 384, 1, 385, 1, 386, 1, 387, 1, ++ 388, 1, 389, 1, 390, 1, 391, 1, ++ 392, 1, 393, 1, 394, 1, 395, 1, ++ 396, 1, 397, 1, 398, 1, 399, 1, ++ 400, 1, 401, 1, 402, 1, 403, 1, ++ 404, 1, 405, 1, 406, 1, 407, 1, ++ 408, 1, 409, 1, 410, 1, 411, 1, ++ 412, 1, 413, 1, 414, 1, 415, 1, ++ 416, 1, 417, 1, 418, 1, 419, 1, ++ 420, 1, 421, 1, 422, 1, 423, 2, ++ 3, 0, 2, 4, 5, 2, 5, 1, ++ 2, 9, 10, 2, 9, 237, 2, 9, ++ 238, 2, 9, 326, 2, 10, 1, 2, ++ 10, 327, 2, 10, 328, 2, 11, 240, ++ 2, 11, 338, 2, 12, 240, 2, 12, ++ 338, 2, 13, 240, 2, 13, 338, 2, ++ 14, 362, 2, 14, 363, 2, 25, 0, ++ 2, 25, 3, 2, 25, 6, 2, 25, ++ 14, 3, 25, 5, 293, 3, 25, 10, ++ 292, 3, 25, 14, 15, 4, 25, 9, ++ 291, 10 ++}; ++ ++static const char _regex_cond_offsets[] = { ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 1, ++ 2, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 3, 3, 3, 4, 5, 6, 12, 12, ++ 12, 12, 12, 12, 12, 12, 12, 12, ++ 12, 12, 12, 12, 12, 12, 12, 12, ++ 12, 12, 12, 12, 12, 12, 12, 12, ++ 12, 12, 12, 12, 12, 12, 12, 12, ++ 12, 12, 12, 12, 13, 14, 15, 15, ++ 15, 15, 15, 15, 15, 15, 15, 15, ++ 15, 15, 15, 15, 15, 15, 15, 15, ++ 15, 15, 15, 15, 15, 15, 15, 15, ++ 15, 15, 15, 15, 15, 15, 20, 20, ++ 20, 20, 20, 20, 20, 20, 20, 20, ++ 20, 20, 20, 20, 21, 22, 23, 25, ++ 25, 25, 25, 25, 25, 25 ++}; ++ ++static const char _regex_cond_lengths[] = { ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 1, 1, ++ 1, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 1, 1, 1, 6, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 1, 1, 1, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 5, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 1, 1, 1, 2, 0, ++ 0, 0, 0, 0, 0, 0 ++}; ++ ++static const short _regex_cond_keys[] = { ++ 128u, 191u, 128u, 191u, 128u, 191u, 128u, 191u, ++ 128u, 191u, 128u, 191u, 35u, 35u, 128u, 191u, ++ 192u, 223u, 224u, 239u, 240u, 247u, 248u, 255u, ++ 128u, 191u, 128u, 191u, 128u, 191u, 128u, 191u, ++ 192u, 223u, 224u, 239u, 240u, 247u, 248u, 255u, ++ 128u, 191u, 128u, 191u, 128u, 191u, 93u, 93u, ++ 94u, 94u, 0 ++}; ++ ++static const char _regex_cond_spaces[] = { ++ 0, 0, 0, 0, 0, 0, 1, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 2, ++ 2, 0 ++}; ++ ++static const short _regex_key_offsets[] = { ++ 0, 0, 1, 23, 31, 39, 46, 54, ++ 55, 63, 71, 79, 86, 94, 97, 99, ++ 108, 115, 123, 131, 134, 140, 148, 151, ++ 158, 165, 173, 180, 184, 191, 194, 197, ++ 199, 202, 205, 207, 210, 213, 215, 216, ++ 218, 219, 227, 229, 232, 235, 236, 244, ++ 252, 260, 268, 275, 283, 290, 298, 305, ++ 313, 315, 318, 325, 329, 332, 335, 337, ++ 339, 341, 342, 343, 344, 346, 347, 348, ++ 349, 350, 352, 353, 354, 355, 356, 357, ++ 358, 359, 360, 361, 362, 363, 364, 365, ++ 368, 369, 370, 371, 372, 373, 374, 375, ++ 376, 377, 378, 379, 380, 381, 382, 383, ++ 384, 385, 386, 387, 388, 389, 391, 392, ++ 393, 394, 395, 396, 398, 399, 400, 401, ++ 402, 403, 404, 405, 407, 408, 409, 410, ++ 411, 412, 413, 414, 415, 416, 417, 418, ++ 419, 420, 421, 422, 423, 424, 425, 426, ++ 428, 429, 430, 431, 432, 433, 434, 435, ++ 436, 437, 438, 439, 440, 441, 442, 443, ++ 444, 445, 446, 447, 449, 450, 451, 452, ++ 453, 454, 455, 456, 457, 458, 460, 461, ++ 462, 463, 464, 465, 466, 467, 468, 469, ++ 470, 471, 472, 473, 474, 475, 476, 477, ++ 478, 479, 480, 481, 482, 483, 484, 485, ++ 486, 487, 488, 489, 490, 491, 492, 493, ++ 494, 495, 496, 497, 498, 499, 500, 501, ++ 502, 503, 504, 505, 506, 507, 508, 509, ++ 510, 511, 512, 513, 514, 515, 516, 518, ++ 519, 520, 521, 522, 523, 524, 525, 526, ++ 527, 528, 529, 530, 531, 532, 533, 534, ++ 535, 536, 537, 538, 539, 540, 541, 542, ++ 543, 544, 545, 546, 547, 548, 549, 550, ++ 551, 552, 553, 554, 555, 556, 557, 558, ++ 560, 561, 562, 563, 564, 565, 566, 567, ++ 568, 569, 570, 571, 572, 573, 574, 575, ++ 576, 577, 578, 579, 581, 582, 583, 584, ++ 585, 586, 587, 588, 589, 590, 591, 592, ++ 593, 594, 595, 596, 600, 601, 602, 603, ++ 604, 605, 606, 607, 608, 609, 610, 611, ++ 612, 613, 614, 615, 616, 617, 619, 620, ++ 621, 622, 623, 624, 625, 626, 627, 628, ++ 630, 631, 632, 633, 634, 635, 636, 639, ++ 640, 641, 642, 643, 644, 645, 646, 647, ++ 649, 650, 651, 652, 653, 654, 655, 657, ++ 658, 659, 660, 661, 662, 663, 664, 665, ++ 666, 667, 668, 669, 670, 671, 672, 673, ++ 674, 675, 676, 677, 678, 679, 680, 681, ++ 682, 683, 684, 685, 686, 687, 688, 689, ++ 690, 691, 692, 693, 694, 695, 696, 697, ++ 698, 699, 700, 701, 703, 704, 705, 706, ++ 707, 708, 709, 713, 714, 715, 716, 717, ++ 718, 719, 720, 721, 722, 723, 724, 725, ++ 726, 727, 728, 729, 730, 731, 732, 733, ++ 734, 735, 736, 737, 738, 739, 740, 741, ++ 742, 743, 744, 745, 746, 747, 748, 749, ++ 751, 752, 753, 754, 755, 756, 757, 758, ++ 759, 760, 761, 762, 763, 764, 765, 766, ++ 767, 768, 769, 770, 772, 773, 774, 775, ++ 776, 777, 778, 779, 780, 781, 782, 783, ++ 784, 785, 786, 787, 788, 789, 790, 791, ++ 792, 793, 794, 795, 796, 797, 798, 799, ++ 800, 801, 802, 804, 805, 806, 807, 808, ++ 809, 810, 811, 812, 813, 814, 815, 816, ++ 819, 821, 822, 823, 824, 825, 826, 827, ++ 828, 829, 832, 833, 834, 835, 836, 837, ++ 838, 839, 840, 841, 842, 843, 844, 845, ++ 846, 848, 849, 850, 852, 853, 854, 855, ++ 856, 857, 858, 859, 860, 861, 862, 863, ++ 864, 865, 866, 867, 868, 869, 870, 871, ++ 872, 873, 874, 875, 876, 879, 882, 884, ++ 899, 902, 905, 907, 921, 926, 931, 935, ++ 939, 942, 945, 949, 953, 956, 959, 963, ++ 967, 971, 974, 977, 981, 985, 989, 993, ++ 996, 999, 1003, 1007, 1011, 1015, 1018, 1021, ++ 1025, 1029, 1033, 1037, 1040, 1043, 1047, 1051, ++ 1055, 1059, 1062, 1065, 1069, 1073, 1077, 1081, ++ 1084, 1087, 1092, 1096, 1100, 1104, 1107, 1110, ++ 1114, 1118, 1122, 1125, 1128, 1132, 1136, 1140, ++ 1144, 1147, 1150, 1154, 1158, 1162, 1166, 1169, ++ 1172, 1176, 1180, 1184, 1187, 1190, 1194, 1198, ++ 1202, 1206, 1210, 1213, 1216, 1221, 1226, 1230, ++ 1234, 1237, 1240, 1244, 1248, 1251, 1254, 1258, ++ 1262, 1266, 1269, 1272, 1276, 1280, 1284, 1288, ++ 1291, 1294, 1298, 1302, 1306, 1310, 1313, 1316, ++ 1320, 1324, 1328, 1332, 1335, 1338, 1342, 1346, ++ 1350, 1354, 1357, 1360, 1364, 1368, 1372, 1376, ++ 1379, 1382, 1387, 1391, 1395, 1399, 1402, 1405, ++ 1409, 1413, 1417, 1420, 1423, 1427, 1431, 1435, ++ 1439, 1442, 1445, 1449, 1453, 1457, 1461, 1464, ++ 1467, 1471, 1475, 1479, 1482, 1485, 1489, 1493, ++ 1497, 1501, 1505, 1508, 1511, 1514, 1517, 1519, ++ 1521, 1524, 1531, 1533, 1535, 1537, 1573, 1575, ++ 1582, 1589, 1603, 1605, 1611, 1614, 1623, 1624, ++ 1627, 1630, 1637, 1639, 1641, 1643, 1646, 1691, ++ 1693, 1695, 1699, 1703, 1705, 1706, 1706, 1712, ++ 1714, 1716, 1718, 1720, 1723, 1724, 1725, 1732, ++ 1738, 1744, 1746, 1748, 1750, 1752, 1754, 1755, ++ 1757, 1780, 1783, 1788, 1797, 1799, 1800, 1802, ++ 1807, 1810, 1812, 1814, 1815, 1817, 1827, 1833, ++ 1834, 1839, 1843, 1851, 1853, 1862, 1866, 1867, ++ 1868, 1872, 1873, 1876, 1876, 1883, 1901, 1904, ++ 1943, 1945, 1947, 1949, 1951, 1952, 1952, 1953, ++ 1954, 1961, 1967, 1973, 1975, 1977, 1979, 1988, ++ 1990, 1991, 1992, 1993, 1994, 1995 ++}; ++ ++static const short _regex_trans_keys[] = { ++ 41u, 33u, 35u, 38u, 39u, 40u, 41u, 43u, ++ 45u, 58u, 60u, 61u, 62u, 63u, 67u, 80u, ++ 105u, 109u, 115u, 120u, 123u, 48u, 57u, 41u, ++ 95u, 48u, 57u, 65u, 90u, 97u, 122u, 39u, ++ 95u, 48u, 57u, 65u, 90u, 97u, 122u, 95u, ++ 48u, 57u, 65u, 90u, 97u, 122u, 39u, 95u, ++ 48u, 57u, 65u, 90u, 97u, 122u, 41u, 41u, ++ 95u, 48u, 57u, 65u, 90u, 97u, 122u, 41u, ++ 95u, 48u, 57u, 65u, 90u, 97u, 122u, 41u, ++ 95u, 48u, 57u, 65u, 90u, 97u, 122u, 95u, ++ 48u, 57u, 65u, 90u, 97u, 122u, 62u, 95u, ++ 48u, 57u, 65u, 90u, 97u, 122u, 33u, 60u, ++ 61u, 33u, 61u, 38u, 41u, 95u, 48u, 57u, ++ 65u, 90u, 97u, 122u, 95u, 48u, 57u, 65u, ++ 90u, 97u, 122u, 41u, 95u, 48u, 57u, 65u, ++ 90u, 97u, 122u, 41u, 95u, 48u, 57u, 65u, ++ 90u, 97u, 122u, 41u, 48u, 57u, 41u, 58u, ++ 105u, 109u, 115u, 120u, 62u, 95u, 48u, 57u, ++ 65u, 90u, 97u, 122u, 41u, 48u, 57u, 95u, ++ 48u, 57u, 65u, 90u, 97u, 122u, 95u, 48u, ++ 57u, 65u, 90u, 97u, 122u, 41u, 95u, 48u, ++ 57u, 65u, 90u, 97u, 122u, 95u, 48u, 57u, ++ 65u, 90u, 97u, 122u, 105u, 109u, 115u, 120u, ++ 41u, 45u, 58u, 105u, 109u, 115u, 120u, 46u, ++ 92u, 93u, 46u, 92u, 93u, 46u, 92u, 58u, ++ 92u, 93u, 58u, 92u, 93u, 58u, 92u, 61u, ++ 92u, 93u, 61u, 92u, 93u, 61u, 92u, 39u, ++ 48u, 57u, 62u, 45u, 95u, 48u, 57u, 65u, ++ 90u, 97u, 122u, 48u, 57u, 125u, 48u, 57u, ++ 125u, 48u, 57u, 125u, 95u, 125u, 48u, 57u, ++ 65u, 90u, 97u, 122u, 95u, 125u, 48u, 57u, ++ 65u, 90u, 97u, 122u, 95u, 125u, 48u, 57u, ++ 65u, 90u, 97u, 122u, 95u, 125u, 48u, 57u, ++ 65u, 90u, 97u, 122u, 95u, 48u, 57u, 65u, ++ 90u, 97u, 122u, 39u, 95u, 48u, 57u, 65u, ++ 90u, 97u, 122u, 95u, 48u, 57u, 65u, 90u, ++ 97u, 122u, 62u, 95u, 48u, 57u, 65u, 90u, ++ 97u, 122u, 95u, 48u, 57u, 65u, 90u, 97u, ++ 122u, 95u, 125u, 48u, 57u, 65u, 90u, 97u, ++ 122u, 48u, 55u, 125u, 48u, 55u, 125u, 48u, ++ 57u, 65u, 70u, 97u, 102u, 44u, 125u, 48u, ++ 57u, 125u, 48u, 57u, 125u, 48u, 57u, 640u, ++ 703u, 640u, 703u, 640u, 703u, 80u, 41u, 70u, ++ 49u, 56u, 54u, 41u, 41u, 121u, 97u, 109u, ++ 98u, 105u, 99u, 101u, 110u, 105u, 97u, 110u, ++ 101u, 115u, 116u, 97u, 110u, 108u, 109u, 116u, ++ 105u, 110u, 101u, 115u, 101u, 117u, 109u, 97u, ++ 107u, 110u, 103u, 97u, 108u, 105u, 112u, 111u, ++ 109u, 111u, 102u, 111u, 97u, 104u, 105u, 109u, ++ 105u, 108u, 108u, 101u, 103u, 104u, 105u, 110u, ++ 101u, 115u, 101u, 105u, 100u, 110u, 114u, 97u, ++ 100u, 105u, 97u, 110u, 95u, 65u, 98u, 111u, ++ 114u, 105u, 103u, 105u, 110u, 97u, 108u, 105u, ++ 97u, 110u, 97u, 101u, 109u, 114u, 111u, 107u, ++ 101u, 101u, 109u, 111u, 110u, 116u, 105u, 99u, ++ 110u, 101u, 105u, 102u, 111u, 114u, 109u, 112u, ++ 114u, 114u, 105u, 111u, 116u, 105u, 108u, 108u, ++ 105u, 99u, 115u, 118u, 101u, 114u, 101u, 116u, ++ 97u, 110u, 97u, 103u, 97u, 114u, 105u, 121u, ++ 112u, 116u, 105u, 97u, 110u, 95u, 72u, 105u, ++ 101u, 114u, 111u, 103u, 108u, 121u, 112u, 104u, ++ 115u, 104u, 105u, 111u, 112u, 105u, 99u, 111u, ++ 114u, 103u, 105u, 97u, 110u, 97u, 103u, 111u, ++ 108u, 105u, 116u, 105u, 99u, 116u, 104u, 105u, ++ 99u, 101u, 101u, 107u, 106u, 114u, 97u, 114u, ++ 97u, 116u, 105u, 109u, 117u, 107u, 104u, 105u, ++ 110u, 117u, 108u, 110u, 111u, 111u, 98u, 114u, ++ 101u, 119u, 114u, 97u, 103u, 97u, 110u, 97u, ++ 112u, 101u, 114u, 105u, 97u, 108u, 95u, 65u, ++ 114u, 97u, 109u, 97u, 105u, 99u, 104u, 115u, ++ 101u, 114u, 105u, 116u, 101u, 100u, 99u, 114u, ++ 105u, 112u, 116u, 105u, 111u, 110u, 97u, 108u, ++ 95u, 80u, 97u, 104u, 114u, 108u, 97u, 118u, ++ 105u, 116u, 104u, 105u, 97u, 110u, 118u, 97u, ++ 110u, 101u, 115u, 101u, 105u, 110u, 116u, 121u, ++ 116u, 104u, 105u, 110u, 97u, 100u, 97u, 97u, ++ 107u, 97u, 110u, 97u, 97u, 104u, 95u, 76u, ++ 105u, 97u, 109u, 114u, 111u, 115u, 104u, 116u, ++ 104u, 105u, 101u, 114u, 111u, 116u, 105u, 110u, ++ 112u, 99u, 104u, 97u, 109u, 110u, 115u, 98u, ++ 117u, 101u, 97u, 114u, 95u, 66u, 117u, 99u, ++ 100u, 105u, 97u, 110u, 105u, 97u, 110u, 108u, ++ 110u, 97u, 121u, 97u, 108u, 97u, 109u, 100u, ++ 97u, 105u, 99u, 116u, 101u, 105u, 95u, 77u, ++ 97u, 121u, 101u, 107u, 110u, 103u, 111u, 108u, ++ 105u, 97u, 110u, 97u, 110u, 109u, 97u, 114u, ++ 119u, 95u, 84u, 97u, 105u, 95u, 76u, 117u, ++ 101u, 111u, 104u, 97u, 109u, 95u, 100u, 67u, ++ 104u, 105u, 107u, 105u, 95u, 73u, 80u, 83u, ++ 84u, 116u, 97u, 108u, 105u, 99u, 101u, 114u, ++ 115u, 105u, 97u, 110u, 111u, 117u, 116u, 104u, ++ 95u, 65u, 114u, 97u, 98u, 105u, 97u, 110u, ++ 117u, 114u, 107u, 105u, 99u, 105u, 121u, 97u, ++ 109u, 97u, 110u, 121u, 97u, 97u, 111u, 103u, ++ 115u, 95u, 80u, 97u, 101u, 110u, 105u, 99u, ++ 105u, 97u, 110u, 106u, 97u, 110u, 103u, 110u, ++ 105u, 99u, 109u, 117u, 97u, 114u, 105u, 116u, ++ 97u, 110u, 114u, 97u, 115u, 104u, 116u, 114u, ++ 97u, 97u, 118u, 105u, 97u, 110u, 110u, 104u, ++ 97u, 108u, 97u, 110u, 100u, 97u, 110u, 101u, ++ 115u, 101u, 108u, 114u, 111u, 116u, 105u, 95u, ++ 78u, 97u, 103u, 114u, 105u, 105u, 97u, 99u, ++ 103u, 105u, 109u, 97u, 98u, 108u, 111u, 103u, ++ 97u, 110u, 119u, 97u, 95u, 76u, 84u, 86u, ++ 101u, 104u, 97u, 109u, 105u, 101u, 116u, 105u, ++ 108u, 108u, 117u, 103u, 117u, 97u, 97u, 105u, ++ 110u, 97u, 98u, 102u, 101u, 116u, 97u, 110u, ++ 105u, 110u, 97u, 103u, 104u, 97u, 114u, 105u, ++ 116u, 105u, 99u, 105u, 110u, 115u, 112u, 100u, ++ 123u, 94u, 125u, 94u, 46u, 92u, 93u, 46u, ++ 92u, 93u, 46u, 92u, 58u, 92u, 93u, 94u, ++ 97u, 98u, 99u, 100u, 103u, 108u, 112u, 115u, ++ 117u, 119u, 120u, 58u, 92u, 93u, 58u, 92u, ++ 93u, 58u, 92u, 58u, 92u, 93u, 97u, 98u, ++ 99u, 100u, 103u, 108u, 112u, 115u, 117u, 119u, ++ 120u, 58u, 92u, 93u, 108u, 115u, 58u, 92u, ++ 93u, 110u, 112u, 58u, 92u, 93u, 117u, 58u, ++ 92u, 93u, 109u, 58u, 92u, 93u, 58u, 92u, ++ 93u, 58u, 92u, 93u, 104u, 58u, 92u, 93u, ++ 97u, 58u, 92u, 93u, 58u, 92u, 93u, 58u, ++ 92u, 93u, 99u, 58u, 92u, 93u, 105u, 58u, ++ 92u, 93u, 105u, 58u, 92u, 93u, 58u, 92u, ++ 93u, 58u, 92u, 93u, 108u, 58u, 92u, 93u, ++ 97u, 58u, 92u, 93u, 110u, 58u, 92u, 93u, ++ 107u, 58u, 92u, 93u, 58u, 92u, 93u, 58u, ++ 92u, 93u, 110u, 58u, 92u, 93u, 116u, 58u, ++ 92u, 93u, 114u, 58u, 92u, 93u, 108u, 58u, ++ 92u, 93u, 58u, 92u, 93u, 58u, 92u, 93u, ++ 105u, 58u, 92u, 93u, 103u, 58u, 92u, 93u, ++ 105u, 58u, 92u, 93u, 116u, 58u, 92u, 93u, ++ 58u, 92u, 93u, 58u, 92u, 93u, 114u, 58u, ++ 92u, 93u, 97u, 58u, 92u, 93u, 112u, 58u, ++ 92u, 93u, 104u, 58u, 92u, 93u, 58u, 92u, ++ 93u, 58u, 92u, 93u, 111u, 58u, 92u, 93u, ++ 119u, 58u, 92u, 93u, 101u, 58u, 92u, 93u, ++ 114u, 58u, 92u, 93u, 58u, 92u, 93u, 58u, ++ 92u, 93u, 114u, 117u, 58u, 92u, 93u, 105u, ++ 58u, 92u, 93u, 110u, 58u, 92u, 93u, 116u, ++ 58u, 92u, 93u, 58u, 92u, 93u, 58u, 92u, ++ 93u, 110u, 58u, 92u, 93u, 99u, 58u, 92u, ++ 93u, 116u, 58u, 92u, 93u, 58u, 92u, 93u, ++ 58u, 92u, 93u, 112u, 58u, 92u, 93u, 97u, ++ 58u, 92u, 93u, 99u, 58u, 92u, 93u, 101u, ++ 58u, 92u, 93u, 58u, 92u, 93u, 58u, 92u, ++ 93u, 112u, 58u, 92u, 93u, 112u, 58u, 92u, ++ 93u, 101u, 58u, 92u, 93u, 114u, 58u, 92u, ++ 93u, 58u, 92u, 93u, 58u, 92u, 93u, 111u, ++ 58u, 92u, 93u, 114u, 58u, 92u, 93u, 100u, ++ 58u, 92u, 93u, 58u, 92u, 93u, 58u, 92u, ++ 93u, 100u, 58u, 92u, 93u, 105u, 58u, 92u, ++ 93u, 103u, 58u, 92u, 93u, 105u, 58u, 92u, ++ 93u, 116u, 58u, 92u, 93u, 58u, 92u, 93u, ++ 58u, 92u, 93u, 108u, 115u, 58u, 92u, 93u, ++ 110u, 112u, 58u, 92u, 93u, 117u, 58u, 92u, ++ 93u, 109u, 58u, 92u, 93u, 58u, 92u, 93u, ++ 58u, 92u, 93u, 104u, 58u, 92u, 93u, 97u, ++ 58u, 92u, 93u, 58u, 92u, 93u, 58u, 92u, ++ 93u, 99u, 58u, 92u, 93u, 105u, 58u, 92u, ++ 93u, 105u, 58u, 92u, 93u, 58u, 92u, 93u, ++ 58u, 92u, 93u, 108u, 58u, 92u, 93u, 97u, ++ 58u, 92u, 93u, 110u, 58u, 92u, 93u, 107u, ++ 58u, 92u, 93u, 58u, 92u, 93u, 58u, 92u, ++ 93u, 110u, 58u, 92u, 93u, 116u, 58u, 92u, ++ 93u, 114u, 58u, 92u, 93u, 108u, 58u, 92u, ++ 93u, 58u, 92u, 93u, 58u, 92u, 93u, 105u, ++ 58u, 92u, 93u, 103u, 58u, 92u, 93u, 105u, ++ 58u, 92u, 93u, 116u, 58u, 92u, 93u, 58u, ++ 92u, 93u, 58u, 92u, 93u, 114u, 58u, 92u, ++ 93u, 97u, 58u, 92u, 93u, 112u, 58u, 92u, ++ 93u, 104u, 58u, 92u, 93u, 58u, 92u, 93u, ++ 58u, 92u, 93u, 111u, 58u, 92u, 93u, 119u, ++ 58u, 92u, 93u, 101u, 58u, 92u, 93u, 114u, ++ 58u, 92u, 93u, 58u, 92u, 93u, 58u, 92u, ++ 93u, 114u, 117u, 58u, 92u, 93u, 105u, 58u, ++ 92u, 93u, 110u, 58u, 92u, 93u, 116u, 58u, ++ 92u, 93u, 58u, 92u, 93u, 58u, 92u, 93u, ++ 110u, 58u, 92u, 93u, 99u, 58u, 92u, 93u, ++ 116u, 58u, 92u, 93u, 58u, 92u, 93u, 58u, ++ 92u, 93u, 112u, 58u, 92u, 93u, 97u, 58u, ++ 92u, 93u, 99u, 58u, 92u, 93u, 101u, 58u, ++ 92u, 93u, 58u, 92u, 93u, 58u, 92u, 93u, ++ 112u, 58u, 92u, 93u, 112u, 58u, 92u, 93u, ++ 101u, 58u, 92u, 93u, 114u, 58u, 92u, 93u, ++ 58u, 92u, 93u, 58u, 92u, 93u, 111u, 58u, ++ 92u, 93u, 114u, 58u, 92u, 93u, 100u, 58u, ++ 92u, 93u, 58u, 92u, 93u, 58u, 92u, 93u, ++ 100u, 58u, 92u, 93u, 105u, 58u, 92u, 93u, ++ 103u, 58u, 92u, 93u, 105u, 58u, 92u, 93u, ++ 116u, 58u, 92u, 93u, 58u, 92u, 93u, 61u, ++ 92u, 93u, 61u, 92u, 93u, 61u, 92u, 48u, ++ 55u, 125u, 48u, 55u, 125u, 48u, 57u, 65u, ++ 70u, 97u, 102u, 640u, 703u, 640u, 703u, 640u, ++ 703u, 0u, 32u, 36u, 40u, 41u, 42u, 43u, ++ 46u, 63u, 91u, 92u, 94u, 123u, 124u, 1315u, ++ 1571u, 1u, 8u, 9u, 13u, 14u, 34u, 37u, ++ 127u, 384u, 511u, 640u, 703u, 704u, 735u, 736u, ++ 751u, 752u, 759u, 760u, 767u, 42u, 63u, 95u, ++ 48u, 57u, 65u, 90u, 97u, 122u, 95u, 48u, ++ 57u, 65u, 90u, 97u, 122u, 39u, 48u, 60u, ++ 63u, 82u, 95u, 49u, 55u, 56u, 57u, 65u, ++ 90u, 97u, 122u, 48u, 57u, 105u, 109u, 115u, ++ 120u, 48u, 57u, 41u, 48u, 57u, 33u, 61u, ++ 95u, 48u, 57u, 65u, 90u, 97u, 122u, 123u, ++ 41u, 48u, 57u, 60u, 61u, 62u, 41u, 45u, ++ 58u, 105u, 109u, 115u, 120u, 43u, 63u, 43u, ++ 63u, 43u, 63u, 46u, 58u, 61u, 48u, 65u, ++ 66u, 67u, 68u, 69u, 71u, 72u, 75u, 76u, ++ 78u, 80u, 81u, 82u, 83u, 85u, 86u, 87u, ++ 88u, 90u, 97u, 98u, 99u, 100u, 101u, 102u, ++ 103u, 104u, 107u, 108u, 110u, 111u, 112u, 114u, ++ 115u, 116u, 117u, 118u, 119u, 120u, 122u, 49u, ++ 55u, 56u, 57u, 48u, 55u, 48u, 55u, 48u, ++ 55u, 56u, 57u, 48u, 55u, 56u, 57u, 48u, ++ 57u, 123u, 39u, 45u, 60u, 123u, 48u, 57u, ++ 48u, 57u, 48u, 57u, 48u, 57u, 48u, 57u, ++ 39u, 60u, 123u, 123u, 123u, 123u, 48u, 57u, ++ 65u, 70u, 97u, 102u, 48u, 57u, 65u, 70u, ++ 97u, 102u, 48u, 57u, 65u, 70u, 97u, 102u, ++ 48u, 57u, 43u, 63u, 640u, 703u, 640u, 703u, ++ 640u, 703u, 85u, 67u, 84u, 65u, 66u, 67u, ++ 68u, 69u, 71u, 72u, 73u, 74u, 75u, 76u, ++ 77u, 78u, 79u, 80u, 82u, 83u, 84u, 85u, ++ 86u, 88u, 89u, 90u, 110u, 114u, 118u, 97u, ++ 101u, 111u, 114u, 117u, 97u, 99u, 102u, 104u, ++ 110u, 111u, 115u, 117u, 121u, 109u, 112u, 101u, ++ 103u, 116u, 101u, 108u, 111u, 114u, 117u, 97u, ++ 101u, 105u, 103u, 117u, 109u, 110u, 97u, 97u, ++ 104u, 38u, 97u, 101u, 105u, 108u, 109u, 111u, ++ 116u, 117u, 121u, 97u, 99u, 101u, 110u, 111u, ++ 121u, 101u, 100u, 101u, 107u, 108u, 111u, 103u, ++ 108u, 114u, 115u, 99u, 100u, 101u, 102u, 104u, ++ 105u, 111u, 115u, 101u, 117u, 97u, 99u, 104u, ++ 105u, 107u, 109u, 111u, 117u, 121u, 97u, 101u, ++ 104u, 105u, 103u, 97u, 97u, 112u, 115u, 119u, ++ 105u, 108u, 112u, 115u, 67u, 76u, 77u, 78u, ++ 80u, 83u, 90u, 45u, 91u, 92u, 93u, 0u, ++ 127u, 384u, 511u, 640u, 703u, 704u, 735u, 736u, ++ 751u, 752u, 759u, 760u, 767u, 46u, 58u, 61u, ++ 48u, 68u, 69u, 72u, 76u, 78u, 80u, 81u, ++ 83u, 85u, 86u, 87u, 97u, 98u, 99u, 100u, ++ 101u, 102u, 103u, 104u, 108u, 110u, 111u, 112u, ++ 114u, 115u, 116u, 117u, 118u, 119u, 120u, 49u, ++ 55u, 56u, 57u, 65u, 90u, 105u, 122u, 48u, ++ 55u, 48u, 55u, 48u, 55u, 48u, 55u, 123u, ++ 123u, 123u, 123u, 48u, 57u, 65u, 70u, 97u, ++ 102u, 48u, 57u, 65u, 70u, 97u, 102u, 48u, ++ 57u, 65u, 70u, 97u, 102u, 640u, 703u, 640u, ++ 703u, 640u, 703u, 92u, 1117u, 1118u, 0u, 91u, ++ 95u, 255u, 861u, 862u, 69u, 81u, 92u, 69u, ++ 92u, 69u, 41u, 10u, 0 ++}; ++ ++static const char _regex_single_lengths[] = { ++ 0, 1, 20, 2, 2, 1, 2, 1, ++ 2, 2, 2, 1, 2, 3, 2, 3, ++ 1, 2, 2, 1, 6, 2, 1, 1, ++ 1, 2, 1, 4, 7, 3, 3, 2, ++ 3, 3, 2, 3, 3, 2, 1, 0, ++ 1, 2, 0, 1, 1, 1, 2, 2, ++ 2, 2, 1, 2, 1, 2, 1, 2, ++ 0, 1, 1, 2, 1, 1, 0, 0, ++ 0, 1, 1, 1, 2, 1, 1, 1, ++ 1, 2, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 3, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 2, 1, 1, ++ 1, 1, 1, 2, 1, 1, 1, 1, ++ 1, 1, 1, 2, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 2, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 2, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 2, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 2, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 2, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 2, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 4, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 2, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 2, ++ 1, 1, 1, 1, 1, 1, 3, 1, ++ 1, 1, 1, 1, 1, 1, 1, 2, ++ 1, 1, 1, 1, 1, 1, 2, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 2, 1, 1, 1, 1, ++ 1, 1, 4, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 2, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 2, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 2, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 3, ++ 2, 1, 1, 1, 1, 1, 1, 1, ++ 1, 3, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 2, 1, 1, 2, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 3, 3, 2, 15, ++ 3, 3, 2, 14, 5, 5, 4, 4, ++ 3, 3, 4, 4, 3, 3, 4, 4, ++ 4, 3, 3, 4, 4, 4, 4, 3, ++ 3, 4, 4, 4, 4, 3, 3, 4, ++ 4, 4, 4, 3, 3, 4, 4, 4, ++ 4, 3, 3, 4, 4, 4, 4, 3, ++ 3, 5, 4, 4, 4, 3, 3, 4, ++ 4, 4, 3, 3, 4, 4, 4, 4, ++ 3, 3, 4, 4, 4, 4, 3, 3, ++ 4, 4, 4, 3, 3, 4, 4, 4, ++ 4, 4, 3, 3, 5, 5, 4, 4, ++ 3, 3, 4, 4, 3, 3, 4, 4, ++ 4, 3, 3, 4, 4, 4, 4, 3, ++ 3, 4, 4, 4, 4, 3, 3, 4, ++ 4, 4, 4, 3, 3, 4, 4, 4, ++ 4, 3, 3, 4, 4, 4, 4, 3, ++ 3, 5, 4, 4, 4, 3, 3, 4, ++ 4, 4, 3, 3, 4, 4, 4, 4, ++ 3, 3, 4, 4, 4, 4, 3, 3, ++ 4, 4, 4, 3, 3, 4, 4, 4, ++ 4, 4, 3, 3, 3, 3, 2, 0, ++ 1, 1, 0, 0, 0, 16, 2, 1, ++ 1, 6, 0, 4, 1, 3, 1, 1, ++ 3, 7, 2, 2, 2, 3, 41, 0, ++ 0, 0, 0, 0, 1, 0, 4, 0, ++ 0, 0, 0, 3, 1, 1, 1, 0, ++ 0, 0, 2, 0, 0, 0, 1, 2, ++ 23, 3, 5, 9, 2, 1, 2, 5, ++ 3, 2, 2, 1, 2, 10, 6, 1, ++ 5, 4, 8, 2, 9, 4, 1, 1, ++ 4, 1, 3, 0, 7, 4, 3, 31, ++ 0, 0, 0, 0, 1, 0, 1, 1, ++ 1, 0, 0, 0, 0, 0, 3, 2, ++ 1, 1, 1, 1, 1, 1 ++}; ++ ++static const char _regex_range_lengths[] = { ++ 0, 0, 1, 3, 3, 3, 3, 0, ++ 3, 3, 3, 3, 3, 0, 0, 3, ++ 3, 3, 3, 1, 0, 3, 1, 3, ++ 3, 3, 3, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 1, ++ 0, 3, 1, 1, 1, 0, 3, 3, ++ 3, 3, 3, 3, 3, 3, 3, 3, ++ 1, 1, 3, 1, 1, 1, 1, 1, ++ 1, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 1, ++ 1, 3, 1, 1, 1, 10, 0, 3, ++ 3, 4, 1, 1, 1, 3, 0, 1, ++ 0, 0, 0, 0, 0, 0, 2, 1, ++ 1, 2, 2, 1, 0, 0, 1, 1, ++ 1, 1, 1, 0, 0, 0, 3, 3, ++ 3, 1, 0, 1, 1, 1, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 7, 0, 4, ++ 1, 1, 1, 1, 0, 0, 0, 0, ++ 3, 3, 3, 1, 1, 1, 3, 0, ++ 0, 0, 0, 0, 0, 0 ++}; ++ ++static const short _regex_index_offsets[] = { ++ 0, 0, 2, 24, 30, 36, 41, 47, ++ 49, 55, 61, 67, 72, 78, 82, 85, ++ 92, 97, 103, 109, 112, 119, 125, 128, ++ 133, 138, 144, 149, 154, 162, 166, 170, ++ 173, 177, 181, 184, 188, 192, 195, 197, ++ 199, 201, 207, 209, 212, 215, 217, 223, ++ 229, 235, 241, 246, 252, 257, 263, 268, ++ 274, 276, 279, 284, 288, 291, 294, 296, ++ 298, 300, 302, 304, 306, 309, 311, 313, ++ 315, 317, 320, 322, 324, 326, 328, 330, ++ 332, 334, 336, 338, 340, 342, 344, 346, ++ 350, 352, 354, 356, 358, 360, 362, 364, ++ 366, 368, 370, 372, 374, 376, 378, 380, ++ 382, 384, 386, 388, 390, 392, 395, 397, ++ 399, 401, 403, 405, 408, 410, 412, 414, ++ 416, 418, 420, 422, 425, 427, 429, 431, ++ 433, 435, 437, 439, 441, 443, 445, 447, ++ 449, 451, 453, 455, 457, 459, 461, 463, ++ 466, 468, 470, 472, 474, 476, 478, 480, ++ 482, 484, 486, 488, 490, 492, 494, 496, ++ 498, 500, 502, 504, 507, 509, 511, 513, ++ 515, 517, 519, 521, 523, 525, 528, 530, ++ 532, 534, 536, 538, 540, 542, 544, 546, ++ 548, 550, 552, 554, 556, 558, 560, 562, ++ 564, 566, 568, 570, 572, 574, 576, 578, ++ 580, 582, 584, 586, 588, 590, 592, 594, ++ 596, 598, 600, 602, 604, 606, 608, 610, ++ 612, 614, 616, 618, 620, 622, 624, 626, ++ 628, 630, 632, 634, 636, 638, 640, 643, ++ 645, 647, 649, 651, 653, 655, 657, 659, ++ 661, 663, 665, 667, 669, 671, 673, 675, ++ 677, 679, 681, 683, 685, 687, 689, 691, ++ 693, 695, 697, 699, 701, 703, 705, 707, ++ 709, 711, 713, 715, 717, 719, 721, 723, ++ 726, 728, 730, 732, 734, 736, 738, 740, ++ 742, 744, 746, 748, 750, 752, 754, 756, ++ 758, 760, 762, 764, 767, 769, 771, 773, ++ 775, 777, 779, 781, 783, 785, 787, 789, ++ 791, 793, 795, 797, 802, 804, 806, 808, ++ 810, 812, 814, 816, 818, 820, 822, 824, ++ 826, 828, 830, 832, 834, 836, 839, 841, ++ 843, 845, 847, 849, 851, 853, 855, 857, ++ 860, 862, 864, 866, 868, 870, 872, 876, ++ 878, 880, 882, 884, 886, 888, 890, 892, ++ 895, 897, 899, 901, 903, 905, 907, 910, ++ 912, 914, 916, 918, 920, 922, 924, 926, ++ 928, 930, 932, 934, 936, 938, 940, 942, ++ 944, 946, 948, 950, 952, 954, 956, 958, ++ 960, 962, 964, 966, 968, 970, 972, 974, ++ 976, 978, 980, 982, 984, 986, 988, 990, ++ 992, 994, 996, 998, 1001, 1003, 1005, 1007, ++ 1009, 1011, 1013, 1018, 1020, 1022, 1024, 1026, ++ 1028, 1030, 1032, 1034, 1036, 1038, 1040, 1042, ++ 1044, 1046, 1048, 1050, 1052, 1054, 1056, 1058, ++ 1060, 1062, 1064, 1066, 1068, 1070, 1072, 1074, ++ 1076, 1078, 1080, 1082, 1084, 1086, 1088, 1090, ++ 1093, 1095, 1097, 1099, 1101, 1103, 1105, 1107, ++ 1109, 1111, 1113, 1115, 1117, 1119, 1121, 1123, ++ 1125, 1127, 1129, 1131, 1134, 1136, 1138, 1140, ++ 1142, 1144, 1146, 1148, 1150, 1152, 1154, 1156, ++ 1158, 1160, 1162, 1164, 1166, 1168, 1170, 1172, ++ 1174, 1176, 1178, 1180, 1182, 1184, 1186, 1188, ++ 1190, 1192, 1194, 1197, 1199, 1201, 1203, 1205, ++ 1207, 1209, 1211, 1213, 1215, 1217, 1219, 1221, ++ 1225, 1228, 1230, 1232, 1234, 1236, 1238, 1240, ++ 1242, 1244, 1248, 1250, 1252, 1254, 1256, 1258, ++ 1260, 1262, 1264, 1266, 1268, 1270, 1272, 1274, ++ 1276, 1279, 1281, 1283, 1286, 1288, 1290, 1292, ++ 1294, 1296, 1298, 1300, 1302, 1304, 1306, 1308, ++ 1310, 1312, 1314, 1316, 1318, 1320, 1322, 1324, ++ 1326, 1328, 1330, 1332, 1334, 1338, 1342, 1345, ++ 1361, 1365, 1369, 1372, 1387, 1393, 1399, 1404, ++ 1409, 1413, 1417, 1422, 1427, 1431, 1435, 1440, ++ 1445, 1450, 1454, 1458, 1463, 1468, 1473, 1478, ++ 1482, 1486, 1491, 1496, 1501, 1506, 1510, 1514, ++ 1519, 1524, 1529, 1534, 1538, 1542, 1547, 1552, ++ 1557, 1562, 1566, 1570, 1575, 1580, 1585, 1590, ++ 1594, 1598, 1604, 1609, 1614, 1619, 1623, 1627, ++ 1632, 1637, 1642, 1646, 1650, 1655, 1660, 1665, ++ 1670, 1674, 1678, 1683, 1688, 1693, 1698, 1702, ++ 1706, 1711, 1716, 1721, 1725, 1729, 1734, 1739, ++ 1744, 1749, 1754, 1758, 1762, 1768, 1774, 1779, ++ 1784, 1788, 1792, 1797, 1802, 1806, 1810, 1815, ++ 1820, 1825, 1829, 1833, 1838, 1843, 1848, 1853, ++ 1857, 1861, 1866, 1871, 1876, 1881, 1885, 1889, ++ 1894, 1899, 1904, 1909, 1913, 1917, 1922, 1927, ++ 1932, 1937, 1941, 1945, 1950, 1955, 1960, 1965, ++ 1969, 1973, 1979, 1984, 1989, 1994, 1998, 2002, ++ 2007, 2012, 2017, 2021, 2025, 2030, 2035, 2040, ++ 2045, 2049, 2053, 2058, 2063, 2068, 2073, 2077, ++ 2081, 2086, 2091, 2096, 2100, 2104, 2109, 2114, ++ 2119, 2124, 2129, 2133, 2137, 2141, 2145, 2148, ++ 2150, 2153, 2158, 2160, 2162, 2164, 2191, 2194, ++ 2199, 2204, 2215, 2217, 2223, 2226, 2233, 2235, ++ 2238, 2242, 2250, 2253, 2256, 2259, 2263, 2307, ++ 2309, 2311, 2314, 2317, 2319, 2321, 2322, 2328, ++ 2330, 2332, 2334, 2336, 2340, 2342, 2344, 2349, ++ 2353, 2357, 2359, 2362, 2364, 2366, 2368, 2370, ++ 2373, 2397, 2401, 2407, 2417, 2420, 2422, 2425, ++ 2431, 2435, 2438, 2441, 2443, 2446, 2457, 2464, ++ 2466, 2472, 2477, 2486, 2489, 2499, 2504, 2506, ++ 2508, 2513, 2515, 2519, 2520, 2528, 2540, 2544, ++ 2580, 2582, 2584, 2586, 2588, 2590, 2591, 2593, ++ 2595, 2600, 2604, 2608, 2610, 2612, 2614, 2621, ++ 2624, 2626, 2628, 2630, 2632, 2634 ++}; ++ ++static const short _regex_indicies[] = { ++ 0, 1, 3, 4, 5, 6, 7, 8, ++ 9, 10, 12, 13, 14, 15, 16, 17, ++ 18, 19, 19, 19, 19, 20, 11, 2, ++ 22, 23, 23, 23, 23, 21, 24, 25, ++ 25, 25, 25, 21, 27, 27, 27, 27, ++ 26, 28, 27, 27, 27, 27, 26, 29, ++ 26, 29, 30, 30, 30, 30, 26, 31, ++ 30, 32, 30, 30, 26, 29, 30, 32, ++ 30, 30, 26, 33, 33, 33, 33, 26, ++ 28, 33, 33, 33, 33, 26, 34, 35, ++ 36, 26, 37, 38, 26, 39, 40, 30, ++ 41, 30, 30, 26, 42, 42, 42, 42, ++ 26, 40, 42, 42, 42, 42, 26, 40, ++ 30, 41, 30, 30, 26, 43, 44, 21, ++ 45, 46, 47, 47, 47, 47, 21, 24, ++ 48, 48, 48, 48, 21, 49, 50, 21, ++ 48, 48, 48, 48, 21, 51, 51, 51, ++ 51, 21, 52, 51, 51, 51, 51, 21, ++ 23, 23, 23, 23, 21, 47, 47, 47, ++ 47, 21, 45, 53, 46, 54, 54, 54, ++ 54, 21, 57, 58, 55, 56, 57, 58, ++ 59, 56, 57, 58, 56, 61, 62, 55, ++ 60, 61, 62, 63, 60, 61, 62, 60, ++ 65, 66, 55, 64, 65, 66, 59, 64, ++ 65, 66, 64, 69, 68, 70, 67, 69, ++ 71, 72, 74, 73, 74, 74, 67, 75, ++ 67, 77, 76, 67, 77, 78, 67, 77, ++ 67, 74, 80, 79, 74, 74, 67, 74, ++ 80, 81, 74, 74, 67, 74, 80, 74, ++ 74, 74, 67, 74, 82, 74, 74, 74, ++ 67, 84, 84, 84, 84, 83, 85, 84, ++ 84, 84, 84, 83, 86, 86, 86, 86, ++ 83, 87, 86, 86, 86, 86, 83, 88, ++ 88, 88, 88, 83, 88, 89, 88, 88, ++ 88, 83, 91, 90, 92, 91, 90, 95, ++ 94, 94, 94, 93, 97, 99, 98, 96, ++ 101, 100, 96, 102, 100, 96, 104, 103, ++ 105, 103, 106, 103, 108, 107, 109, 107, ++ 110, 107, 111, 112, 107, 113, 107, 114, ++ 107, 115, 107, 117, 116, 118, 119, 116, ++ 120, 116, 121, 116, 122, 116, 123, 116, ++ 124, 116, 125, 116, 126, 116, 127, 116, ++ 128, 116, 129, 116, 130, 116, 131, 116, ++ 132, 116, 133, 134, 135, 116, 136, 116, ++ 137, 116, 138, 116, 139, 116, 140, 116, ++ 141, 116, 142, 116, 143, 116, 144, 116, ++ 145, 116, 146, 116, 147, 116, 148, 116, ++ 149, 116, 150, 116, 151, 116, 152, 116, ++ 153, 116, 154, 116, 155, 116, 156, 116, ++ 157, 158, 116, 159, 116, 160, 116, 161, ++ 116, 162, 116, 163, 116, 164, 165, 116, ++ 166, 116, 167, 116, 168, 116, 169, 116, ++ 170, 116, 171, 116, 172, 116, 174, 175, ++ 173, 176, 173, 177, 173, 178, 173, 179, ++ 173, 180, 173, 181, 173, 182, 173, 183, ++ 173, 184, 173, 185, 173, 186, 173, 187, ++ 173, 188, 173, 189, 173, 190, 173, 191, ++ 173, 192, 173, 193, 173, 194, 173, 195, ++ 196, 173, 197, 173, 198, 173, 199, 173, ++ 200, 173, 201, 173, 202, 173, 204, 203, ++ 205, 203, 206, 203, 207, 203, 208, 203, ++ 209, 203, 210, 173, 211, 173, 212, 173, ++ 213, 173, 214, 173, 215, 173, 216, 173, ++ 217, 218, 173, 219, 173, 220, 173, 221, ++ 173, 222, 173, 223, 173, 224, 173, 225, ++ 173, 226, 173, 227, 173, 228, 229, 116, ++ 230, 116, 231, 116, 232, 116, 233, 116, ++ 234, 116, 235, 116, 236, 116, 237, 116, ++ 238, 116, 239, 116, 240, 116, 241, 116, ++ 242, 116, 243, 116, 244, 116, 245, 116, ++ 246, 116, 247, 116, 248, 116, 249, 116, ++ 250, 116, 251, 116, 252, 116, 253, 116, ++ 254, 116, 255, 116, 256, 116, 257, 116, ++ 258, 116, 259, 116, 260, 116, 261, 116, ++ 262, 116, 263, 116, 264, 116, 265, 116, ++ 266, 116, 267, 116, 268, 116, 269, 116, ++ 270, 116, 271, 116, 272, 116, 273, 116, ++ 274, 116, 275, 116, 276, 116, 277, 116, ++ 278, 116, 279, 116, 280, 116, 281, 116, ++ 282, 116, 283, 116, 284, 116, 285, 116, ++ 286, 287, 116, 288, 116, 289, 116, 290, ++ 116, 291, 116, 292, 116, 293, 116, 294, ++ 116, 295, 116, 296, 116, 297, 116, 298, ++ 116, 300, 299, 301, 299, 302, 299, 303, ++ 299, 304, 299, 305, 116, 306, 116, 307, ++ 116, 308, 116, 309, 116, 310, 116, 311, ++ 116, 312, 116, 313, 116, 314, 116, 315, ++ 116, 316, 116, 317, 116, 318, 116, 319, ++ 116, 320, 116, 321, 116, 322, 116, 323, ++ 116, 324, 116, 325, 116, 326, 116, 327, ++ 116, 328, 116, 329, 330, 116, 331, 116, ++ 332, 116, 333, 116, 334, 116, 335, 116, ++ 336, 116, 337, 116, 338, 116, 339, 116, ++ 340, 116, 341, 116, 342, 116, 343, 116, ++ 344, 116, 345, 116, 346, 116, 347, 116, ++ 348, 116, 349, 116, 350, 351, 116, 352, ++ 116, 353, 116, 354, 116, 355, 116, 356, ++ 116, 357, 116, 358, 116, 359, 116, 360, ++ 116, 361, 116, 362, 116, 363, 116, 364, ++ 116, 365, 116, 366, 116, 367, 368, 369, ++ 370, 116, 371, 116, 372, 116, 373, 116, ++ 374, 116, 375, 116, 376, 116, 377, 116, ++ 378, 116, 379, 116, 380, 116, 381, 116, ++ 382, 116, 383, 116, 384, 116, 385, 116, ++ 386, 116, 387, 116, 388, 389, 116, 390, ++ 116, 391, 116, 392, 116, 393, 116, 394, ++ 116, 395, 116, 396, 116, 397, 116, 398, ++ 116, 400, 401, 399, 402, 399, 403, 399, ++ 404, 399, 405, 399, 406, 399, 407, 399, ++ 408, 409, 410, 399, 411, 399, 412, 399, ++ 413, 399, 414, 399, 415, 399, 416, 399, ++ 417, 399, 418, 399, 419, 420, 399, 421, ++ 399, 422, 399, 423, 399, 424, 399, 425, ++ 399, 426, 399, 428, 429, 427, 430, 427, ++ 431, 427, 432, 427, 433, 427, 434, 427, ++ 435, 427, 436, 427, 437, 427, 438, 427, ++ 439, 427, 441, 440, 442, 440, 443, 440, ++ 444, 440, 445, 440, 446, 440, 447, 440, ++ 448, 440, 449, 440, 450, 427, 451, 427, ++ 452, 427, 453, 427, 454, 427, 455, 427, ++ 456, 427, 457, 427, 458, 427, 459, 427, ++ 460, 427, 461, 427, 463, 462, 464, 462, ++ 465, 462, 466, 462, 467, 462, 468, 462, ++ 469, 462, 470, 462, 471, 462, 472, 462, ++ 473, 116, 474, 116, 475, 116, 476, 477, ++ 116, 478, 116, 479, 116, 480, 116, 481, ++ 116, 482, 116, 483, 116, 484, 485, 486, ++ 487, 116, 488, 116, 489, 116, 490, 116, ++ 491, 116, 492, 116, 493, 116, 494, 116, ++ 495, 116, 496, 116, 497, 116, 498, 116, ++ 499, 116, 500, 116, 501, 116, 502, 116, ++ 503, 116, 504, 116, 505, 116, 506, 116, ++ 507, 116, 508, 116, 509, 116, 510, 116, ++ 511, 116, 512, 116, 513, 116, 514, 116, ++ 515, 116, 516, 116, 517, 116, 518, 116, ++ 519, 116, 520, 116, 521, 116, 522, 116, ++ 523, 116, 525, 526, 524, 527, 524, 528, ++ 524, 529, 524, 530, 524, 531, 524, 532, ++ 524, 533, 524, 534, 524, 535, 524, 536, ++ 524, 537, 524, 538, 524, 539, 116, 540, ++ 116, 541, 116, 542, 116, 543, 116, 544, ++ 116, 545, 116, 547, 548, 546, 549, 546, ++ 550, 546, 551, 546, 552, 546, 553, 546, ++ 554, 546, 555, 546, 556, 546, 557, 546, ++ 558, 546, 559, 546, 560, 546, 561, 546, ++ 562, 546, 563, 546, 564, 546, 565, 546, ++ 566, 546, 567, 546, 568, 546, 569, 546, ++ 570, 546, 571, 546, 572, 546, 573, 546, ++ 574, 546, 575, 546, 576, 546, 577, 546, ++ 578, 546, 579, 580, 546, 581, 546, 582, ++ 546, 583, 546, 584, 546, 585, 546, 586, ++ 546, 587, 546, 588, 546, 589, 546, 590, ++ 546, 591, 546, 592, 546, 593, 594, 595, ++ 116, 596, 597, 116, 598, 116, 599, 116, ++ 600, 116, 601, 116, 602, 116, 603, 116, ++ 604, 116, 605, 116, 606, 607, 608, 116, ++ 609, 116, 610, 116, 611, 116, 612, 116, ++ 613, 116, 614, 116, 615, 116, 616, 116, ++ 617, 116, 618, 116, 619, 116, 620, 116, ++ 621, 116, 622, 116, 623, 624, 116, 625, ++ 116, 626, 116, 627, 628, 116, 629, 116, ++ 630, 116, 631, 116, 632, 116, 633, 116, ++ 634, 116, 635, 116, 636, 116, 637, 116, ++ 638, 116, 639, 116, 640, 116, 641, 116, ++ 642, 116, 643, 116, 644, 116, 645, 116, ++ 646, 116, 647, 116, 648, 116, 650, 649, ++ 652, 651, 653, 649, 649, 651, 656, 657, ++ 654, 655, 656, 657, 658, 655, 656, 657, ++ 655, 660, 661, 654, 662, 663, 664, 665, ++ 666, 667, 668, 669, 670, 671, 672, 673, ++ 659, 660, 661, 654, 659, 660, 661, 674, ++ 659, 660, 661, 659, 660, 661, 654, 675, ++ 676, 677, 678, 679, 680, 681, 682, 683, ++ 684, 685, 659, 660, 661, 654, 686, 687, ++ 659, 660, 661, 654, 688, 689, 659, 660, ++ 661, 654, 690, 659, 660, 661, 654, 691, ++ 659, 692, 661, 654, 659, 660, 661, 693, ++ 659, 660, 661, 654, 694, 659, 660, 661, ++ 654, 695, 659, 696, 661, 654, 659, 660, ++ 661, 697, 659, 660, 661, 654, 698, 659, ++ 660, 661, 654, 699, 659, 660, 661, 654, ++ 700, 659, 701, 661, 654, 659, 660, 661, ++ 702, 659, 660, 661, 654, 703, 659, 660, ++ 661, 654, 704, 659, 660, 661, 654, 705, ++ 659, 660, 661, 654, 706, 659, 707, 661, ++ 654, 659, 660, 661, 708, 659, 660, 661, ++ 654, 709, 659, 660, 661, 654, 710, 659, ++ 660, 661, 654, 711, 659, 660, 661, 654, ++ 712, 659, 713, 661, 654, 659, 660, 661, ++ 714, 659, 660, 661, 654, 715, 659, 660, ++ 661, 654, 716, 659, 660, 661, 654, 717, ++ 659, 660, 661, 654, 718, 659, 719, 661, ++ 654, 659, 660, 661, 720, 659, 660, 661, ++ 654, 721, 659, 660, 661, 654, 722, 659, ++ 660, 661, 654, 723, 659, 660, 661, 654, ++ 724, 659, 725, 661, 654, 659, 660, 661, ++ 726, 659, 660, 661, 654, 727, 659, 660, ++ 661, 654, 728, 659, 660, 661, 654, 729, ++ 659, 660, 661, 654, 730, 659, 731, 661, ++ 654, 659, 660, 661, 732, 659, 660, 661, ++ 654, 733, 734, 659, 660, 661, 654, 735, ++ 659, 660, 661, 654, 736, 659, 660, 661, ++ 654, 737, 659, 738, 661, 654, 659, 660, ++ 661, 739, 659, 660, 661, 654, 740, 659, ++ 660, 661, 654, 741, 659, 660, 661, 654, ++ 742, 659, 743, 661, 654, 659, 660, 661, ++ 744, 659, 660, 661, 654, 745, 659, 660, ++ 661, 654, 746, 659, 660, 661, 654, 747, ++ 659, 660, 661, 654, 748, 659, 749, 661, ++ 654, 659, 660, 661, 750, 659, 660, 661, ++ 654, 751, 659, 660, 661, 654, 752, 659, ++ 660, 661, 654, 753, 659, 660, 661, 654, ++ 754, 659, 755, 661, 654, 659, 660, 661, ++ 756, 659, 660, 661, 654, 757, 659, 660, ++ 661, 654, 758, 659, 660, 661, 654, 759, ++ 659, 760, 661, 654, 659, 660, 661, 761, ++ 659, 660, 661, 654, 762, 659, 660, 661, ++ 654, 763, 659, 660, 661, 654, 764, 659, ++ 660, 661, 654, 765, 659, 660, 661, 654, ++ 766, 659, 767, 661, 654, 659, 660, 661, ++ 768, 659, 660, 661, 654, 769, 770, 659, ++ 660, 661, 654, 771, 772, 659, 660, 661, ++ 654, 773, 659, 660, 661, 654, 774, 659, ++ 775, 661, 654, 659, 660, 661, 776, 659, ++ 660, 661, 654, 777, 659, 660, 661, 654, ++ 778, 659, 779, 661, 654, 659, 660, 661, ++ 780, 659, 660, 661, 654, 781, 659, 660, ++ 661, 654, 782, 659, 660, 661, 654, 783, ++ 659, 784, 661, 654, 659, 660, 661, 785, ++ 659, 660, 661, 654, 786, 659, 660, 661, ++ 654, 787, 659, 660, 661, 654, 788, 659, ++ 660, 661, 654, 789, 659, 790, 661, 654, ++ 659, 660, 661, 791, 659, 660, 661, 654, ++ 792, 659, 660, 661, 654, 793, 659, 660, ++ 661, 654, 794, 659, 660, 661, 654, 795, ++ 659, 796, 661, 654, 659, 660, 661, 797, ++ 659, 660, 661, 654, 798, 659, 660, 661, ++ 654, 799, 659, 660, 661, 654, 800, 659, ++ 660, 661, 654, 801, 659, 802, 661, 654, ++ 659, 660, 661, 803, 659, 660, 661, 654, ++ 804, 659, 660, 661, 654, 805, 659, 660, ++ 661, 654, 806, 659, 660, 661, 654, 807, ++ 659, 808, 661, 654, 659, 660, 661, 809, ++ 659, 660, 661, 654, 810, 659, 660, 661, ++ 654, 811, 659, 660, 661, 654, 812, 659, ++ 660, 661, 654, 813, 659, 814, 661, 654, ++ 659, 660, 661, 815, 659, 660, 661, 654, ++ 816, 817, 659, 660, 661, 654, 818, 659, ++ 660, 661, 654, 819, 659, 660, 661, 654, ++ 820, 659, 821, 661, 654, 659, 660, 661, ++ 822, 659, 660, 661, 654, 823, 659, 660, ++ 661, 654, 824, 659, 660, 661, 654, 825, ++ 659, 826, 661, 654, 659, 660, 661, 827, ++ 659, 660, 661, 654, 828, 659, 660, 661, ++ 654, 829, 659, 660, 661, 654, 830, 659, ++ 660, 661, 654, 831, 659, 832, 661, 654, ++ 659, 660, 661, 833, 659, 660, 661, 654, ++ 834, 659, 660, 661, 654, 835, 659, 660, ++ 661, 654, 836, 659, 660, 661, 654, 837, ++ 659, 838, 661, 654, 659, 660, 661, 839, ++ 659, 660, 661, 654, 840, 659, 660, 661, ++ 654, 841, 659, 660, 661, 654, 842, 659, ++ 843, 661, 654, 659, 660, 661, 844, 659, ++ 660, 661, 654, 845, 659, 660, 661, 654, ++ 846, 659, 660, 661, 654, 847, 659, 660, ++ 661, 654, 848, 659, 660, 661, 654, 849, ++ 659, 850, 661, 654, 659, 660, 661, 851, ++ 659, 853, 854, 654, 852, 853, 854, 658, ++ 852, 853, 854, 852, 856, 855, 857, 856, ++ 855, 860, 859, 859, 859, 858, 862, 861, ++ 863, 861, 864, 861, 865, 867, 868, 870, ++ 871, 872, 873, 874, 875, 876, 877, 878, ++ 879, 880, 866, 885, 866, 867, 866, 866, ++ 866, 881, 882, 883, 884, 881, 869, 887, ++ 888, 886, 23, 23, 23, 23, 889, 25, ++ 25, 25, 25, 889, 891, 30, 894, 895, ++ 896, 30, 892, 893, 30, 30, 890, 44, ++ 889, 47, 47, 47, 47, 44, 889, 43, ++ 44, 889, 897, 898, 48, 48, 48, 48, ++ 889, 899, 889, 49, 50, 889, 900, 901, ++ 902, 889, 45, 53, 46, 54, 54, 54, ++ 54, 889, 904, 905, 903, 907, 908, 906, ++ 910, 911, 909, 56, 60, 64, 912, 915, ++ 918, 919, 920, 921, 922, 923, 924, 925, ++ 926, 926, 927, 928, 929, 930, 926, 931, ++ 932, 933, 934, 935, 936, 937, 938, 939, ++ 940, 941, 942, 943, 926, 944, 945, 946, ++ 947, 948, 949, 926, 950, 951, 952, 953, ++ 916, 917, 914, 955, 954, 956, 954, 958, ++ 959, 957, 961, 959, 960, 959, 962, 965, ++ 964, 967, 68, 969, 71, 971, 970, 968, ++ 973, 972, 974, 972, 976, 975, 977, 975, ++ 979, 980, 981, 978, 983, 982, 986, 985, ++ 991, 988, 989, 990, 987, 992, 993, 994, ++ 987, 94, 94, 94, 995, 98, 996, 998, ++ 999, 997, 1001, 1000, 1002, 1000, 1003, 1000, ++ 1005, 1004, 1007, 1008, 1006, 1010, 1011, 1012, ++ 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, ++ 1021, 1022, 1023, 1024, 1025, 1026, 1027, 1028, ++ 1029, 1030, 1031, 1032, 1009, 1034, 1035, 1036, ++ 1033, 1037, 1038, 1039, 1040, 1041, 1033, 1043, ++ 1044, 1045, 1046, 1047, 1048, 1049, 1050, 1051, ++ 1042, 1053, 1054, 1052, 1055, 1033, 1056, 1057, ++ 1033, 1058, 1059, 1060, 1061, 1062, 1033, 1063, ++ 1064, 1065, 1033, 1067, 1068, 1066, 1069, 1070, ++ 1033, 1071, 1033, 1072, 1073, 1033, 1075, 1076, ++ 1077, 1078, 1079, 1080, 1081, 1082, 1083, 1084, ++ 1074, 1086, 1087, 1088, 1089, 1090, 1091, 1085, ++ 1093, 1092, 1095, 1096, 1097, 1098, 1099, 1094, ++ 1100, 1101, 1102, 1103, 1033, 1105, 1106, 1107, ++ 1108, 1109, 1110, 1111, 1112, 1104, 1113, 1114, ++ 1033, 1116, 1117, 1118, 1119, 1120, 1121, 1122, ++ 1123, 1124, 1115, 1125, 1126, 1127, 1128, 1033, ++ 1129, 1033, 1130, 1033, 1131, 1132, 1133, 1134, ++ 1033, 1135, 1033, 1137, 1138, 1139, 1136, 649, ++ 1141, 1142, 1143, 1144, 1145, 1146, 1147, 1140, ++ 1149, 1150, 1151, 1152, 1148, 1148, 1153, 1154, ++ 1155, 1156, 1153, 869, 655, 1158, 852, 1157, ++ 1160, 1164, 1165, 1166, 1167, 1167, 1168, 1169, ++ 1170, 1167, 1171, 1172, 1173, 1174, 1175, 1176, ++ 1177, 1178, 1179, 1180, 1167, 1181, 1182, 1183, ++ 1184, 1185, 1186, 1167, 1187, 1188, 1189, 1161, ++ 1162, 1163, 1163, 1159, 1191, 1190, 1192, 1190, ++ 1194, 1193, 1195, 1193, 1198, 1197, 1200, 1202, ++ 1201, 1205, 1204, 1210, 1207, 1208, 1209, 1206, ++ 1211, 1212, 1213, 1206, 859, 859, 859, 1214, ++ 1216, 1215, 1217, 1215, 1218, 1215, 1220, 1221, ++ 1222, 1219, 1219, 1219, 869, 1224, 1225, 1223, ++ 1227, 1226, 1229, 1228, 1231, 1230, 1233, 1232, ++ 1235, 1234, 1237, 1236, 0 ++}; ++ ++static const short _regex_trans_targs[] = { ++ 741, 741, 741, 741, 741, 743, 744, 745, ++ 741, 746, 747, 748, 741, 749, 741, 741, ++ 750, 751, 752, 753, 741, 741, 741, 3, ++ 741, 4, 741, 6, 7, 741, 8, 741, ++ 9, 12, 741, 14, 741, 741, 741, 16, ++ 741, 18, 17, 741, 19, 741, 741, 20, ++ 21, 741, 22, 25, 741, 27, 28, 741, ++ 29, 30, 31, 741, 32, 33, 34, 741, ++ 35, 36, 37, 741, 38, 741, 767, 40, ++ 42, 46, 49, 43, 44, 741, 45, 47, ++ 741, 48, 741, 741, 51, 741, 53, 741, ++ 55, 741, 741, 57, 741, 741, 58, 741, ++ 741, 60, 59, 778, 61, 778, 778, 741, ++ 741, 64, 741, 782, 66, 782, 68, 69, ++ 71, 70, 782, 782, 784, 784, 74, 77, ++ 75, 76, 784, 78, 79, 80, 81, 784, ++ 83, 84, 85, 86, 784, 88, 93, 95, ++ 89, 90, 91, 92, 784, 94, 784, 96, ++ 784, 98, 99, 100, 101, 784, 103, 104, ++ 105, 106, 107, 784, 109, 110, 112, 111, ++ 784, 113, 114, 784, 116, 121, 117, 118, ++ 119, 120, 784, 122, 784, 784, 124, 140, ++ 125, 126, 127, 128, 129, 130, 131, 132, ++ 133, 134, 135, 136, 137, 138, 139, 784, ++ 141, 142, 784, 144, 145, 784, 146, 147, ++ 148, 149, 784, 784, 151, 152, 784, 154, ++ 155, 784, 157, 158, 159, 160, 161, 162, ++ 784, 164, 168, 165, 166, 167, 784, 169, ++ 170, 171, 172, 784, 174, 178, 175, 176, ++ 177, 784, 179, 180, 181, 182, 183, 184, ++ 784, 186, 187, 188, 189, 190, 191, 192, ++ 193, 194, 195, 196, 197, 198, 199, 200, ++ 201, 202, 784, 204, 205, 206, 207, 208, ++ 784, 210, 211, 212, 213, 214, 784, 216, ++ 217, 218, 219, 220, 221, 222, 784, 224, ++ 225, 226, 784, 228, 229, 784, 231, 236, ++ 232, 233, 234, 235, 784, 237, 238, 239, ++ 240, 784, 793, 784, 243, 784, 245, 246, ++ 784, 248, 249, 250, 784, 252, 253, 254, ++ 255, 256, 784, 258, 259, 260, 261, 262, ++ 263, 264, 265, 266, 267, 268, 269, 270, ++ 784, 272, 278, 273, 274, 275, 276, 277, ++ 784, 279, 280, 281, 282, 283, 284, 285, ++ 286, 287, 288, 289, 290, 291, 292, 296, ++ 293, 294, 295, 784, 297, 298, 299, 300, ++ 784, 302, 303, 304, 305, 306, 784, 308, ++ 311, 315, 320, 309, 310, 784, 312, 313, ++ 314, 784, 316, 317, 318, 319, 784, 321, ++ 322, 323, 324, 784, 326, 333, 327, 328, ++ 329, 330, 331, 332, 784, 334, 784, 784, ++ 784, 336, 337, 784, 339, 340, 341, 784, ++ 343, 345, 350, 344, 784, 346, 347, 348, ++ 349, 784, 784, 352, 355, 353, 354, 784, ++ 356, 357, 784, 784, 359, 365, 360, 361, ++ 362, 363, 364, 784, 366, 367, 368, 784, ++ 784, 370, 371, 372, 373, 374, 375, 376, ++ 377, 784, 379, 380, 381, 382, 383, 384, ++ 784, 386, 387, 388, 389, 784, 784, 391, ++ 392, 393, 394, 395, 396, 397, 398, 784, ++ 784, 401, 402, 784, 404, 409, 405, 406, ++ 407, 408, 784, 410, 411, 416, 422, 434, ++ 412, 413, 414, 415, 784, 417, 418, 419, ++ 420, 421, 784, 423, 424, 425, 426, 427, ++ 428, 429, 430, 431, 432, 433, 784, 435, ++ 436, 437, 438, 784, 440, 441, 784, 443, ++ 444, 445, 446, 784, 784, 448, 453, 449, ++ 450, 451, 452, 784, 454, 455, 456, 457, ++ 458, 459, 784, 461, 462, 463, 784, 465, ++ 466, 784, 784, 468, 474, 469, 470, 471, ++ 472, 473, 784, 475, 476, 477, 478, 479, ++ 480, 784, 482, 483, 484, 485, 784, 487, ++ 488, 489, 490, 784, 492, 493, 494, 495, ++ 496, 497, 784, 499, 508, 500, 501, 502, ++ 503, 504, 505, 506, 507, 784, 509, 510, ++ 784, 512, 520, 529, 513, 516, 514, 515, ++ 784, 517, 518, 519, 784, 521, 522, 523, ++ 526, 784, 524, 525, 784, 527, 528, 784, ++ 530, 784, 532, 533, 534, 784, 536, 537, ++ 784, 538, 784, 540, 544, 541, 542, 543, ++ 784, 545, 546, 547, 548, 784, 550, 551, ++ 552, 553, 554, 784, 784, 784, 784, 784, ++ 784, 0, 561, 562, 563, 811, 813, 564, ++ 565, 566, 813, 568, 569, 570, 571, 652, ++ 667, 673, 679, 685, 691, 697, 708, 714, ++ 720, 725, 813, 572, 587, 593, 599, 605, ++ 611, 617, 628, 634, 640, 645, 573, 582, ++ 574, 578, 575, 576, 577, 813, 579, 580, ++ 581, 813, 583, 584, 585, 586, 813, 588, ++ 589, 590, 591, 592, 813, 594, 595, 596, ++ 597, 598, 813, 600, 601, 602, 603, 604, ++ 813, 606, 607, 608, 609, 610, 813, 612, ++ 613, 614, 615, 616, 813, 618, 623, 619, ++ 620, 621, 622, 813, 624, 625, 626, 627, ++ 813, 629, 630, 631, 632, 633, 813, 635, ++ 636, 637, 638, 639, 813, 641, 642, 643, ++ 644, 813, 646, 647, 648, 649, 650, 651, ++ 813, 653, 662, 654, 658, 655, 656, 657, ++ 813, 659, 660, 661, 813, 663, 664, 665, ++ 666, 813, 668, 669, 670, 671, 672, 813, ++ 674, 675, 676, 677, 678, 813, 680, 681, ++ 682, 683, 684, 813, 686, 687, 688, 689, ++ 690, 813, 692, 693, 694, 695, 696, 813, ++ 698, 703, 699, 700, 701, 702, 813, 704, ++ 705, 706, 707, 813, 709, 710, 711, 712, ++ 713, 813, 715, 716, 717, 718, 719, 813, ++ 721, 722, 723, 724, 813, 726, 727, 728, ++ 729, 730, 731, 813, 732, 733, 734, 813, ++ 736, 813, 813, 737, 813, 813, 813, 740, ++ 813, 741, 741, 741, 741, 0, 742, 741, ++ 754, 755, 741, 756, 757, 758, 741, 777, ++ 741, 741, 779, 780, 781, 741, 741, 1, ++ 2, 741, 741, 5, 9, 10, 11, 13, ++ 15, 741, 741, 741, 23, 24, 26, 741, ++ 741, 741, 741, 741, 741, 741, 741, 741, ++ 741, 741, 741, 759, 761, 763, 741, 741, ++ 741, 741, 741, 741, 741, 741, 741, 764, ++ 741, 741, 741, 741, 741, 741, 741, 741, ++ 741, 765, 741, 741, 741, 766, 741, 771, ++ 741, 772, 773, 741, 741, 741, 741, 741, ++ 774, 741, 741, 760, 741, 741, 762, 763, ++ 741, 763, 741, 741, 741, 741, 741, 741, ++ 741, 39, 769, 41, 741, 768, 741, 741, ++ 770, 741, 741, 50, 52, 54, 741, 56, ++ 741, 741, 741, 741, 775, 775, 775, 776, ++ 741, 741, 741, 741, 741, 741, 741, 741, ++ 741, 741, 62, 63, 782, 783, 782, 65, ++ 67, 784, 785, 786, 787, 789, 790, 791, ++ 792, 794, 795, 796, 797, 798, 800, 801, ++ 802, 803, 804, 805, 806, 807, 808, 809, ++ 810, 784, 72, 73, 82, 87, 97, 102, ++ 108, 115, 784, 123, 784, 784, 143, 784, ++ 788, 784, 156, 163, 784, 150, 153, 173, ++ 185, 203, 209, 215, 223, 227, 230, 241, ++ 247, 251, 784, 242, 244, 257, 271, 301, ++ 307, 325, 784, 784, 335, 338, 342, 784, ++ 784, 784, 784, 784, 351, 784, 358, 784, ++ 799, 784, 378, 385, 784, 369, 784, 784, ++ 390, 399, 784, 784, 400, 403, 439, 442, ++ 784, 784, 784, 784, 784, 447, 784, 784, ++ 784, 460, 464, 784, 467, 784, 481, 486, ++ 784, 784, 784, 491, 498, 511, 531, 535, ++ 539, 549, 555, 556, 557, 558, 559, 784, ++ 784, 784, 784, 784, 812, 812, 812, 812, ++ 812, 812, 812, 812, 813, 813, 814, 815, ++ 813, 813, 827, 828, 829, 813, 567, 813, ++ 816, 818, 813, 813, 813, 813, 813, 813, ++ 820, 813, 813, 813, 813, 813, 813, 821, ++ 813, 813, 813, 813, 813, 813, 822, 823, ++ 813, 813, 813, 813, 813, 824, 813, 817, ++ 813, 813, 819, 813, 813, 813, 813, 813, ++ 813, 813, 735, 813, 813, 813, 813, 825, ++ 825, 825, 826, 813, 813, 813, 813, 813, ++ 813, 738, 739, 830, 831, 830, 830, 830, ++ 830, 830, 832, 833, 832, 832, 834, 835, ++ 834, 834, 836, 836, 837, 837 ++}; ++ ++static const short _regex_trans_actions[] = { ++ 801, 605, 739, 705, 697, 45, 877, 877, ++ 871, 45, 886, 45, 874, 877, 703, 715, ++ 0, 45, 45, 897, 711, 815, 721, 0, ++ 717, 3, 813, 3, 0, 735, 3, 733, ++ 844, 3, 725, 0, 723, 729, 727, 0, ++ 731, 3, 0, 719, 0, 699, 701, 27, ++ 3, 737, 0, 3, 647, 0, 25, 803, ++ 0, 0, 0, 577, 0, 0, 0, 575, ++ 0, 0, 0, 805, 0, 649, 17, 0, ++ 7, 844, 3, 17, 17, 637, 17, 844, ++ 635, 844, 639, 811, 3, 645, 3, 643, ++ 3, 641, 807, 0, 651, 809, 0, 653, ++ 819, 0, 11, 29, 13, 31, 0, 817, ++ 743, 0, 745, 57, 0, 49, 0, 0, ++ 0, 0, 51, 47, 357, 313, 0, 0, ++ 0, 0, 125, 0, 0, 0, 0, 127, ++ 0, 0, 0, 0, 129, 0, 0, 0, ++ 0, 0, 0, 0, 131, 0, 133, 0, ++ 135, 0, 0, 0, 0, 137, 0, 0, ++ 0, 0, 0, 139, 0, 0, 0, 0, ++ 141, 0, 0, 143, 0, 0, 0, 0, ++ 0, 0, 145, 0, 147, 339, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 149, ++ 0, 0, 151, 0, 0, 153, 0, 0, ++ 0, 0, 155, 341, 0, 0, 157, 0, ++ 0, 159, 0, 0, 0, 0, 0, 0, ++ 161, 0, 0, 0, 0, 0, 163, 0, ++ 0, 0, 0, 165, 0, 0, 0, 0, ++ 0, 167, 0, 0, 0, 0, 0, 0, ++ 169, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 171, 0, 0, 0, 0, 0, ++ 173, 0, 0, 0, 0, 0, 175, 0, ++ 0, 0, 0, 0, 0, 0, 177, 0, ++ 0, 0, 179, 0, 0, 181, 0, 0, ++ 0, 0, 0, 0, 183, 0, 0, 0, ++ 0, 185, 45, 355, 0, 187, 0, 0, ++ 189, 0, 0, 0, 191, 0, 0, 0, ++ 0, 0, 193, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 195, 0, 0, 0, 0, 0, 0, 0, ++ 197, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 199, 0, 0, 0, 0, ++ 201, 0, 0, 0, 0, 0, 203, 0, ++ 0, 0, 0, 0, 0, 205, 0, 0, ++ 0, 207, 0, 0, 0, 0, 209, 0, ++ 0, 0, 0, 211, 0, 0, 0, 0, ++ 0, 0, 0, 0, 213, 0, 215, 343, ++ 217, 0, 0, 219, 0, 0, 0, 221, ++ 0, 0, 0, 0, 223, 0, 0, 0, ++ 0, 225, 227, 0, 0, 0, 0, 229, ++ 0, 0, 231, 345, 0, 0, 0, 0, ++ 0, 0, 0, 233, 0, 0, 0, 235, ++ 347, 0, 0, 0, 0, 0, 0, 0, ++ 0, 237, 0, 0, 0, 0, 0, 0, ++ 239, 0, 0, 0, 0, 241, 349, 0, ++ 0, 0, 0, 0, 0, 0, 0, 243, ++ 245, 0, 0, 247, 0, 0, 0, 0, ++ 0, 0, 249, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 251, 0, 0, 0, ++ 0, 0, 253, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 255, 0, ++ 0, 0, 0, 257, 0, 0, 259, 0, ++ 0, 0, 0, 261, 351, 0, 0, 0, ++ 0, 0, 0, 263, 0, 0, 0, 0, ++ 0, 0, 265, 0, 0, 0, 267, 0, ++ 0, 269, 353, 0, 0, 0, 0, 0, ++ 0, 0, 271, 0, 0, 0, 0, 0, ++ 0, 273, 0, 0, 0, 0, 275, 0, ++ 0, 0, 0, 277, 0, 0, 0, 0, ++ 0, 0, 279, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 281, 0, 0, ++ 283, 0, 0, 0, 0, 0, 0, 0, ++ 285, 0, 0, 0, 287, 0, 0, 0, ++ 0, 289, 0, 0, 291, 0, 0, 293, ++ 0, 295, 0, 0, 0, 297, 0, 0, ++ 301, 0, 299, 0, 0, 0, 0, 0, ++ 303, 0, 0, 0, 0, 305, 0, 0, ++ 0, 0, 0, 307, 309, 117, 119, 121, ++ 123, 39, 0, 35, 33, 37, 537, 0, ++ 0, 0, 375, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 433, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 379, 0, 0, ++ 0, 383, 0, 0, 0, 0, 387, 0, ++ 0, 0, 0, 0, 391, 0, 0, 0, ++ 0, 0, 395, 0, 0, 0, 0, 0, ++ 399, 0, 0, 0, 0, 0, 403, 0, ++ 0, 0, 0, 0, 407, 0, 0, 0, ++ 0, 0, 0, 411, 0, 0, 0, 0, ++ 415, 0, 0, 0, 0, 0, 419, 0, ++ 0, 0, 0, 0, 423, 0, 0, 0, ++ 0, 427, 0, 0, 0, 0, 0, 0, ++ 431, 0, 0, 0, 0, 0, 0, 0, ++ 377, 0, 0, 0, 381, 0, 0, 0, ++ 0, 385, 0, 0, 0, 0, 0, 389, ++ 0, 0, 0, 0, 0, 393, 0, 0, ++ 0, 0, 0, 397, 0, 0, 0, 0, ++ 0, 401, 0, 0, 0, 0, 0, 405, ++ 0, 0, 0, 0, 0, 0, 409, 0, ++ 0, 0, 0, 413, 0, 0, 0, 0, ++ 0, 417, 0, 0, 0, 0, 0, 421, ++ 0, 0, 0, 0, 425, 0, 0, 0, ++ 0, 0, 0, 429, 0, 0, 0, 531, ++ 0, 469, 533, 0, 473, 535, 501, 0, ++ 503, 607, 751, 749, 611, 0, 45, 571, ++ 0, 0, 583, 0, 45, 0, 609, 883, ++ 573, 747, 0, 45, 45, 603, 753, 0, ++ 0, 795, 793, 1, 829, 829, 1, 0, ++ 3, 709, 707, 713, 1, 1, 0, 757, ++ 589, 587, 759, 593, 591, 761, 597, 595, ++ 755, 791, 695, 5, 826, 889, 613, 621, ++ 585, 669, 581, 691, 673, 689, 657, 0, ++ 579, 687, 665, 677, 661, 693, 615, 631, ++ 619, 0, 667, 633, 629, 880, 671, 45, ++ 625, 45, 0, 627, 663, 623, 675, 659, ++ 7, 617, 765, 15, 841, 769, 832, 893, ++ 767, 901, 821, 785, 685, 683, 783, 655, ++ 775, 7, 17, 823, 773, 17, 850, 771, ++ 17, 847, 789, 1, 1, 1, 777, 0, ++ 787, 681, 679, 779, 19, 23, 21, 45, ++ 856, 868, 862, 781, 799, 763, 601, 599, ++ 797, 741, 0, 0, 53, 45, 55, 0, ++ 0, 315, 45, 45, 45, 45, 45, 45, ++ 45, 45, 45, 45, 45, 45, 45, 45, ++ 45, 45, 45, 45, 45, 45, 45, 0, ++ 0, 337, 0, 0, 0, 0, 0, 0, ++ 0, 0, 317, 0, 59, 61, 0, 63, ++ 45, 65, 0, 0, 319, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 335, 0, 0, 0, 0, 0, ++ 0, 0, 321, 77, 0, 0, 0, 67, ++ 69, 71, 73, 75, 0, 323, 0, 79, ++ 45, 81, 0, 0, 325, 0, 327, 83, ++ 0, 0, 85, 87, 0, 0, 0, 0, ++ 329, 89, 91, 93, 95, 0, 97, 99, ++ 101, 0, 0, 331, 0, 103, 0, 0, ++ 105, 107, 109, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 311, ++ 333, 111, 113, 115, 373, 359, 361, 363, ++ 365, 367, 369, 371, 507, 489, 45, 0, ++ 509, 505, 0, 45, 45, 529, 0, 497, ++ 5, 9, 471, 495, 487, 437, 455, 491, ++ 0, 435, 483, 459, 479, 449, 439, 0, ++ 485, 451, 447, 493, 453, 443, 45, 0, ++ 445, 481, 441, 457, 477, 7, 515, 15, ++ 835, 517, 15, 838, 511, 467, 465, 525, ++ 475, 519, 0, 513, 463, 461, 521, 19, ++ 23, 21, 45, 853, 865, 859, 523, 527, ++ 499, 0, 0, 547, 0, 541, 539, 549, ++ 545, 543, 553, 0, 555, 551, 559, 0, ++ 561, 557, 565, 563, 569, 567 ++}; ++ ++static const short _regex_to_state_actions[] = { ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 41, 0, 41, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 41, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 41, 0, ++ 41, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 41, 41, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 41, 0, ++ 41, 0, 41, 0, 41, 41 ++}; ++ ++static const short _regex_from_state_actions[] = { ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 43, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 43, 0, ++ 43, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 43, 43, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 43, 0, ++ 43, 0, 43, 0, 43, 43 ++}; ++ ++static const short _regex_eof_actions[] = { ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 39, 39, 39, 39, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0 ++}; ++ ++static const short _regex_eof_trans[] = { ++ 0, 1, 1, 22, 22, 27, 27, 27, ++ 27, 27, 27, 27, 27, 27, 27, 27, ++ 27, 27, 27, 22, 22, 22, 22, 22, ++ 22, 22, 22, 22, 22, 56, 56, 56, ++ 56, 56, 56, 56, 56, 56, 68, 68, ++ 68, 68, 68, 68, 68, 68, 68, 68, ++ 68, 68, 84, 84, 84, 84, 84, 84, ++ 91, 91, 94, 97, 97, 97, 104, 104, ++ 104, 108, 108, 108, 108, 108, 108, 108, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 174, 174, 174, 174, 174, ++ 174, 174, 174, 174, 174, 174, 174, 174, ++ 174, 174, 174, 174, 174, 174, 174, 174, ++ 174, 174, 174, 174, 174, 174, 204, 204, ++ 204, 204, 204, 204, 174, 174, 174, 174, ++ 174, 174, 174, 174, 174, 174, 174, 174, ++ 174, 174, 174, 174, 174, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 300, 300, 300, 300, 300, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 400, ++ 400, 400, 400, 400, 400, 400, 400, 400, ++ 400, 400, 400, 400, 400, 400, 400, 400, ++ 400, 400, 400, 400, 400, 400, 428, 428, ++ 428, 428, 428, 428, 428, 428, 428, 428, ++ 428, 441, 441, 441, 441, 441, 441, 441, ++ 441, 441, 428, 428, 428, 428, 428, 428, ++ 428, 428, 428, 428, 428, 428, 463, 463, ++ 463, 463, 463, 463, 463, 463, 463, 463, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 525, ++ 525, 525, 525, 525, 525, 525, 525, 525, ++ 525, 525, 525, 525, 117, 117, 117, 117, ++ 117, 117, 117, 547, 547, 547, 547, 547, ++ 547, 547, 547, 547, 547, 547, 547, 547, ++ 547, 547, 547, 547, 547, 547, 547, 547, ++ 547, 547, 547, 547, 547, 547, 547, 547, ++ 547, 547, 547, 547, 547, 547, 547, 547, ++ 547, 547, 547, 547, 547, 547, 547, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 117, 117, 117, 117, 117, 117, 117, 117, ++ 0, 0, 0, 0, 655, 655, 655, 655, ++ 655, 655, 655, 655, 655, 655, 655, 655, ++ 655, 655, 655, 655, 655, 655, 655, 655, ++ 655, 655, 655, 655, 655, 655, 655, 655, ++ 655, 655, 655, 655, 655, 655, 655, 655, ++ 655, 655, 655, 655, 655, 655, 655, 655, ++ 655, 655, 655, 655, 655, 655, 655, 655, ++ 655, 655, 655, 655, 655, 655, 655, 655, ++ 655, 655, 655, 655, 655, 655, 655, 655, ++ 655, 655, 655, 655, 655, 655, 655, 655, ++ 655, 655, 655, 655, 655, 655, 655, 655, ++ 655, 655, 655, 655, 655, 655, 655, 655, ++ 655, 655, 655, 655, 655, 655, 655, 655, ++ 655, 655, 655, 655, 655, 655, 655, 655, ++ 655, 655, 655, 655, 655, 655, 655, 655, ++ 655, 655, 655, 655, 655, 655, 655, 655, ++ 655, 655, 655, 655, 655, 655, 655, 655, ++ 655, 655, 655, 655, 655, 655, 655, 655, ++ 655, 655, 655, 655, 655, 655, 655, 655, ++ 655, 655, 655, 655, 655, 655, 655, 655, ++ 655, 655, 655, 655, 655, 655, 655, 655, ++ 655, 655, 655, 655, 655, 655, 655, 856, ++ 856, 859, 862, 862, 862, 0, 887, 890, ++ 890, 891, 890, 890, 890, 890, 890, 890, ++ 890, 890, 904, 907, 910, 913, 914, 955, ++ 955, 958, 961, 963, 964, 967, 969, 973, ++ 973, 976, 976, 979, 983, 985, 988, 988, ++ 996, 997, 998, 1001, 1001, 1001, 0, 1007, ++ 0, 1034, 1034, 1043, 1053, 1034, 1034, 1034, ++ 1034, 1067, 1034, 1034, 1034, 1075, 1086, 1093, ++ 1095, 1034, 1105, 1034, 1116, 1034, 1034, 1034, ++ 1034, 1034, 1137, 0, 0, 0, 1158, 1158, ++ 1191, 1191, 1194, 1194, 1197, 1200, 1202, 1204, ++ 1207, 1207, 1215, 1216, 1216, 1216, 0, 1224, ++ 0, 1229, 0, 1233, 0, 0 ++}; ++ ++static const int regex_start = 741; ++static const int regex_error = 0; ++ ++static const int regex_en_readVerb = 782; ++static const int regex_en_readUCP = 784; ++static const int regex_en_readBracedUCP = 560; ++static const int regex_en_readUCPSingle = 812; ++static const int regex_en_charClassGuts = 813; ++static const int regex_en_readClass = 830; ++static const int regex_en_readQuotedLiteral = 832; ++static const int regex_en_readQuotedClass = 834; ++static const int regex_en_readComment = 836; ++static const int regex_en_readNewlineTerminatedComment = 837; ++static const int regex_en_main = 741; ++ ++ ++#line 1836 "hyperscan-4.1.0/src/parser/Parser.rl" ++ ++/** \brief Main parser call, returns root Component or nullptr. */ ++unique_ptr parse(const char *const c_ptr, ParseMode &globalMode) { ++ const u8 * const ptr = (const u8 * const)c_ptr; ++ const u8 *p = ptr; ++ const u8 *pe = ptr + strlen(c_ptr); ++ const u8 *eof = pe; ++ int cs; ++ UNUSED int act; ++ int top; ++ vector stack; ++ const u8 *ts, *te; ++ unichar accumulator = 0; ++ unichar octAccumulator = 0; /* required as we are also accumulating for ++ * back ref when looking for octals */ ++ unsigned repeatN = 0; ++ unsigned repeatM = 0; ++ string label; ++ ++ ParseMode mode = globalMode; ++ ParseMode newMode; ++ ++ bool negated = false; ++ bool inComment = false; ++ ++ // Stack of sequences and flags used to store state when we enter ++ // sub-sequences. ++ vector sequences; ++ ++ // Index of the next capturing group. Note that zero is reserved for the ++ // root sequence. ++ unsigned groupIndex = 1; ++ ++ // Set storing group names that are currently in use. ++ ue2::flat_set groupNames; ++ ++ // Root sequence. ++ unique_ptr rootSeq = ue2::make_unique(); ++ rootSeq->setCaptureIndex(0); ++ ++ // Current sequence being appended to ++ ComponentSequence *currentSeq = rootSeq.get(); ++ ++ // The current character class being appended to. This is used as the ++ // accumulator for both character class and UCP properties. ++ unique_ptr currentCls; ++ ++ // True if the machine is currently inside a character class, i.e. square ++ // brackets [..]. ++ bool inCharClass = false; ++ ++ // True if the machine is inside a character class but it has not processed ++ // any "real" elements yet, i.e. it's still processing meta-characters like ++ // '^'. ++ bool inCharClassEarly = false; ++ ++ // Location at which the current character class began. ++ const u8 *currentClsBegin = p; ++ ++ const u8 *ucp_start_p = p; /* for (*UCP) verb */ ++ ++ // We throw exceptions on various parsing failures beyond this point: we ++ // use a try/catch block here to clean up our allocated memory before we ++ // re-throw the exception to the caller. ++ try { ++ // Embed the Ragel machine here ++ ++#line 2481 "hyperscan-build/src/parser/Parser.cpp" ++ { ++ cs = regex_start; ++ top = 0; ++ ts = 0; ++ te = 0; ++ act = 0; ++ } ++ ++#line 1903 "hyperscan-4.1.0/src/parser/Parser.rl" ++ ++#line 2492 "hyperscan-build/src/parser/Parser.cpp" ++ { ++ int _klen; ++ unsigned int _trans; ++ short _widec; ++ const short *_acts; ++ unsigned int _nacts; ++ const short *_keys; ++ ++ if ( p == pe ) ++ goto _test_eof; ++ if ( cs == 0 ) ++ goto _out; ++_resume: ++ _acts = _regex_actions + _regex_from_state_actions[cs]; ++ _nacts = (unsigned int) *_acts++; ++ while ( _nacts-- > 0 ) { ++ switch ( *_acts++ ) { ++ case 24: ++#line 1 "NONE" ++ {ts = p;} ++ break; ++#line 2514 "hyperscan-build/src/parser/Parser.cpp" ++ } ++ } ++ ++ _widec = (*p); ++ _klen = _regex_cond_lengths[cs]; ++ _keys = _regex_cond_keys + (_regex_cond_offsets[cs]*2); ++ if ( _klen > 0 ) { ++ const short *_lower = _keys; ++ const short *_mid; ++ const short *_upper = _keys + (_klen<<1) - 2; ++ while (1) { ++ if ( _upper < _lower ) ++ break; ++ ++ _mid = _lower + (((_upper-_lower) >> 1) & ~1); ++ if ( _widec < _mid[0] ) ++ _upper = _mid - 2; ++ else if ( _widec > _mid[1] ) ++ _lower = _mid + 2; ++ else { ++ switch ( _regex_cond_spaces[_regex_cond_offsets[cs] + ((_mid - _keys)>>1)] ) { ++ case 0: { ++ _widec = (short)(256u + ((*p) - 0u)); ++ if ( ++#line 476 "hyperscan-4.1.0/src/parser/Parser.rl" ++ mode.utf8 ) _widec += 256; ++ break; ++ } ++ case 1: { ++ _widec = (short)(1280u + ((*p) - 0u)); ++ if ( ++#line 477 "hyperscan-4.1.0/src/parser/Parser.rl" ++ mode.ignore_space ) _widec += 256; ++ break; ++ } ++ case 2: { ++ _widec = (short)(768u + ((*p) - 0u)); ++ if ( ++#line 478 "hyperscan-4.1.0/src/parser/Parser.rl" ++ inCharClassEarly ) _widec += 256; ++ break; ++ } ++ } ++ break; ++ } ++ } ++ } ++ ++ _keys = _regex_trans_keys + _regex_key_offsets[cs]; ++ _trans = _regex_index_offsets[cs]; ++ ++ _klen = _regex_single_lengths[cs]; ++ if ( _klen > 0 ) { ++ const short *_lower = _keys; ++ const short *_mid; ++ const short *_upper = _keys + _klen - 1; ++ while (1) { ++ if ( _upper < _lower ) ++ break; ++ ++ _mid = _lower + ((_upper-_lower) >> 1); ++ if ( _widec < *_mid ) ++ _upper = _mid - 1; ++ else if ( _widec > *_mid ) ++ _lower = _mid + 1; ++ else { ++ _trans += (unsigned int)(_mid - _keys); ++ goto _match; ++ } ++ } ++ _keys += _klen; ++ _trans += _klen; ++ } ++ ++ _klen = _regex_range_lengths[cs]; ++ if ( _klen > 0 ) { ++ const short *_lower = _keys; ++ const short *_mid; ++ const short *_upper = _keys + (_klen<<1) - 2; ++ while (1) { ++ if ( _upper < _lower ) ++ break; ++ ++ _mid = _lower + (((_upper-_lower) >> 1) & ~1); ++ if ( _widec < _mid[0] ) ++ _upper = _mid - 2; ++ else if ( _widec > _mid[1] ) ++ _lower = _mid + 2; ++ else { ++ _trans += (unsigned int)((_mid - _keys)>>1); ++ goto _match; ++ } ++ } ++ _trans += _klen; ++ } ++ ++_match: ++ _trans = _regex_indicies[_trans]; ++_eof_trans: ++ cs = _regex_trans_targs[_trans]; ++ ++ if ( _regex_trans_actions[_trans] == 0 ) ++ goto _again; ++ ++ _acts = _regex_actions + _regex_trans_actions[_trans]; ++ _nacts = (unsigned int) *_acts++; ++ while ( _nacts-- > 0 ) ++ { ++ switch ( *_acts++ ) ++ { ++ case 0: ++#line 286 "hyperscan-4.1.0/src/parser/Parser.rl" ++ { label.clear();} ++ break; ++ case 1: ++#line 287 "hyperscan-4.1.0/src/parser/Parser.rl" ++ { label.push_back((*p));} ++ break; ++ case 2: ++#line 288 "hyperscan-4.1.0/src/parser/Parser.rl" ++ { octAccumulator = 0;} ++ break; ++ case 3: ++#line 289 "hyperscan-4.1.0/src/parser/Parser.rl" ++ { accumulator = 0;} ++ break; ++ case 4: ++#line 290 "hyperscan-4.1.0/src/parser/Parser.rl" ++ { ++ octAccumulator = 0; ++ pushOct(&octAccumulator, (*p)); ++ } ++ break; ++ case 5: ++#line 294 "hyperscan-4.1.0/src/parser/Parser.rl" ++ { ++ accumulator = 0; ++ pushDec(&accumulator, (*p)); ++ } ++ break; ++ case 6: ++#line 298 "hyperscan-4.1.0/src/parser/Parser.rl" ++ { repeatN = 0; repeatM = 0; } ++ break; ++ case 7: ++#line 299 "hyperscan-4.1.0/src/parser/Parser.rl" ++ { pushDec(&repeatN, (*p)); } ++ break; ++ case 8: ++#line 300 "hyperscan-4.1.0/src/parser/Parser.rl" ++ { pushDec(&repeatM, (*p)); } ++ break; ++ case 9: ++#line 301 "hyperscan-4.1.0/src/parser/Parser.rl" ++ { pushOct(&octAccumulator, (*p)); } ++ break; ++ case 10: ++#line 302 "hyperscan-4.1.0/src/parser/Parser.rl" ++ { pushDec(&accumulator, (*p)); } ++ break; ++ case 11: ++#line 303 "hyperscan-4.1.0/src/parser/Parser.rl" ++ { ++ accumulator *= 16; ++ accumulator += (*p) - '0'; ++ } ++ break; ++ case 12: ++#line 307 "hyperscan-4.1.0/src/parser/Parser.rl" ++ { ++ accumulator *= 16; ++ accumulator += 10 + (*p) - 'a'; ++ } ++ break; ++ case 13: ++#line 311 "hyperscan-4.1.0/src/parser/Parser.rl" ++ { ++ accumulator *= 16; ++ accumulator += 10 + (*p) - 'A'; ++ } ++ break; ++ case 14: ++#line 431 "hyperscan-4.1.0/src/parser/Parser.rl" ++ { ++ newMode = mode; ++ } ++ break; ++ case 15: ++#line 438 "hyperscan-4.1.0/src/parser/Parser.rl" ++ { ++ switch ((*p)) { ++ case 'i': ++ newMode.caseless = true; ++ break; ++ case 'm': ++ newMode.multiline = true; ++ break; ++ case 's': ++ newMode.dotall = true; ++ break; ++ case 'x': ++ newMode.ignore_space = true; ++ break; ++ default: ++ assert(0); // this action only called for [imsx] ++ break; ++ } ++ } ++ break; ++ case 16: ++#line 457 "hyperscan-4.1.0/src/parser/Parser.rl" ++ { ++ switch ((*p)) { ++ case 'i': ++ newMode.caseless = false; ++ break; ++ case 'm': ++ newMode.multiline = false; ++ break; ++ case 's': ++ newMode.dotall = false; ++ break; ++ case 'x': ++ newMode.ignore_space = false; ++ break; ++ default: ++ assert(0); // this action only called for [imsx] ++ break; ++ } ++ } ++ break; ++ case 17: ++#line 511 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {repeatM = repeatN;} ++ break; ++ case 18: ++#line 511 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {repeatM = ComponentRepeat::NoLimit;} ++ break; ++ case 19: ++#line 724 "hyperscan-4.1.0/src/parser/Parser.rl" ++ { negated = !negated; } ++ break; ++ case 20: ++#line 725 "hyperscan-4.1.0/src/parser/Parser.rl" ++ { p--; { ++ DEBUG_PRINTF("stack %zu top %d\n", stack.size(), top); ++ if ((int)stack.size() == top) { ++ stack.resize(2 * (top + 1)); ++ } ++ {stack[top++] = cs; cs = 784; goto _again;}} } ++ break; ++ case 21: ++#line 726 "hyperscan-4.1.0/src/parser/Parser.rl" ++ { if (!inCharClass) { // not inside [..] ++ currentCls->finalize(); ++ currentSeq->addComponent(move(currentCls)); ++ } ++ {cs = stack[--top]; goto _again;} ++ } ++ break; ++ case 22: ++#line 732 "hyperscan-4.1.0/src/parser/Parser.rl" ++ { throw LocatedParseError("Malformed property"); } ++ break; ++ case 25: ++#line 1 "NONE" ++ {te = p+1;} ++ break; ++ case 26: ++#line 551 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ if (ts != ptr + 2) { ++ throw LocatedParseError("(*UTF8) must be at start of " ++ "expression, encountered"); ++ } ++ mode.utf8 = true; ++ globalMode.utf8 = true; /* once you unicode, you can't stop */ ++ ucp_start_p = te; /* (*UCP) can appear after us */ ++ {cs = stack[--top]; goto _again;} ++ }} ++ break; ++ case 27: ++#line 561 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ if (ts != ucp_start_p + 2) { ++ throw LocatedParseError("(*UCP) must be at start of " ++ "expression, encountered"); ++ } ++ mode.ucp = true; ++ globalMode.ucp = true; /* once you unicode, you can't stop */ ++ {cs = stack[--top]; goto _again;} ++ }} ++ break; ++ case 28: ++#line 570 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ throw LocatedParseError("(*UTF16) not supported"); ++ }} ++ break; ++ case 29: ++#line 573 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ throw LocatedParseError("Unknown control verb"); ++ }} ++ break; ++ case 30: ++#line 573 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ throw LocatedParseError("Unknown control verb"); ++ }} ++ break; ++ case 31: ++#line 573 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {{p = ((te))-1;}{ ++ throw LocatedParseError("Unknown control verb"); ++ }} ++ break; ++ case 32: ++#line 583 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_CC, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 33: ++#line 584 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_CF, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 34: ++#line 585 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_CN, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 35: ++#line 587 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_CS, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 36: ++#line 589 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_LL, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 37: ++#line 590 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_LM, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 38: ++#line 591 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_LO, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 39: ++#line 592 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_LT, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 40: ++#line 593 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_LU, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 41: ++#line 594 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_L_AND, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 42: ++#line 596 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_MC, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 43: ++#line 598 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_MN, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 44: ++#line 600 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_ND, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 45: ++#line 601 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_NL, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 46: ++#line 602 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_NO, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 47: ++#line 604 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_PC, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 48: ++#line 605 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_PD, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 49: ++#line 606 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_PE, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 50: ++#line 607 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_PF, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 51: ++#line 608 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_PI, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 52: ++#line 609 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_PO, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 53: ++#line 610 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_PS, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 54: ++#line 612 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_SC, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 55: ++#line 613 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_SK, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 56: ++#line 614 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_SM, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 57: ++#line 615 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_SO, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 58: ++#line 617 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_ZL, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 59: ++#line 618 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_ZP, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 60: ++#line 619 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_ZS, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 61: ++#line 620 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_XAN, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 62: ++#line 621 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_XPS, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 63: ++#line 622 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_XSP, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 64: ++#line 623 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_XWD, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 65: ++#line 624 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_ARABIC, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 66: ++#line 625 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_ARMENIAN, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 67: ++#line 626 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_AVESTAN, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 68: ++#line 627 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_BALINESE, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 69: ++#line 628 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_BAMUM, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 70: ++#line 629 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_BATAK, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 71: ++#line 630 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_BENGALI, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 72: ++#line 631 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_BOPOMOFO, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 73: ++#line 632 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_BRAHMI, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 74: ++#line 633 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_BRAILLE, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 75: ++#line 634 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_BUGINESE, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 76: ++#line 635 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_BUHID, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 77: ++#line 636 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_CANADIAN_ABORIGINAL, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 78: ++#line 637 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_CARIAN, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 79: ++#line 638 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_CHAM, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 80: ++#line 639 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_CHEROKEE, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 81: ++#line 640 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_COMMON, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 82: ++#line 641 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_COPTIC, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 83: ++#line 642 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_CUNEIFORM, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 84: ++#line 643 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_CYPRIOT, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 85: ++#line 644 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_CYRILLIC, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 86: ++#line 645 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_DESERET, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 87: ++#line 646 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_DEVANAGARI, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 88: ++#line 647 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_EGYPTIAN_HIEROGLYPHS, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 89: ++#line 648 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_ETHIOPIC, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 90: ++#line 649 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_GEORGIAN, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 91: ++#line 650 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_GLAGOLITIC, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 92: ++#line 651 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_GOTHIC, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 93: ++#line 652 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_GREEK, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 94: ++#line 653 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_GUJARATI, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 95: ++#line 654 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_GURMUKHI, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 96: ++#line 656 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_HANGUL, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 97: ++#line 657 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_HANUNOO, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 98: ++#line 658 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_HEBREW, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 99: ++#line 659 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_HIRAGANA, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 100: ++#line 660 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_IMPERIAL_ARAMAIC, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 101: ++#line 661 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_INHERITED, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 102: ++#line 662 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_INSCRIPTIONAL_PAHLAVI, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 103: ++#line 663 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_INSCRIPTIONAL_PARTHIAN, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 104: ++#line 664 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_JAVANESE, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 105: ++#line 665 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_KAITHI, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 106: ++#line 666 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_KANNADA, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 107: ++#line 667 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_KATAKANA, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 108: ++#line 668 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_KAYAH_LI, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 109: ++#line 669 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_KHAROSHTHI, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 110: ++#line 670 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_KHMER, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 111: ++#line 671 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_LAO, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 112: ++#line 672 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_LATIN, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 113: ++#line 673 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_LEPCHA, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 114: ++#line 674 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_LIMBU, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 115: ++#line 675 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_LINEAR_B, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 116: ++#line 676 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_LISU, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 117: ++#line 677 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_LYCIAN, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 118: ++#line 678 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_LYDIAN, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 119: ++#line 679 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_MALAYALAM, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 120: ++#line 680 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_MANDAIC, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 121: ++#line 681 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_MEETEI_MAYEK, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 122: ++#line 682 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_MONGOLIAN, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 123: ++#line 683 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_MYANMAR, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 124: ++#line 684 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_NEW_TAI_LUE, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 125: ++#line 685 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_NKO, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 126: ++#line 686 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_OGHAM, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 127: ++#line 687 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_OL_CHIKI, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 128: ++#line 688 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_OLD_ITALIC, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 129: ++#line 689 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_OLD_PERSIAN, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 130: ++#line 690 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_OLD_SOUTH_ARABIAN, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 131: ++#line 691 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_OLD_TURKIC, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 132: ++#line 692 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_ORIYA, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 133: ++#line 693 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_OSMANYA, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 134: ++#line 694 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_PHAGS_PA, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 135: ++#line 695 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_PHOENICIAN, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 136: ++#line 696 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_REJANG, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 137: ++#line 697 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_RUNIC, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 138: ++#line 698 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_SAMARITAN, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 139: ++#line 699 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_SAURASHTRA, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 140: ++#line 700 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_SHAVIAN, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 141: ++#line 701 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_SINHALA, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 142: ++#line 702 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_SUNDANESE, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 143: ++#line 703 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_SYLOTI_NAGRI, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 144: ++#line 704 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_SYRIAC, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 145: ++#line 705 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_TAGALOG, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 146: ++#line 706 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_TAGBANWA, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 147: ++#line 707 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_TAI_LE, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 148: ++#line 708 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_TAI_THAM, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 149: ++#line 709 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_TAI_VIET, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 150: ++#line 710 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_TAMIL, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 151: ++#line 711 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_TELUGU, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 152: ++#line 712 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_THAANA, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 153: ++#line 713 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_THAI, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 154: ++#line 714 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_TIBETAN, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 155: ++#line 715 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_TIFINAGH, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 156: ++#line 716 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_UGARITIC, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 157: ++#line 717 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_VAI, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 158: ++#line 718 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_SCRIPT_YI, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 159: ++#line 719 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ currentCls->add(CLASS_UCP_ANY, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 160: ++#line 720 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ throw LocatedParseError("Unknown property"); }} ++ break; ++ case 161: ++#line 582 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ currentCls->add(CLASS_UCP_C, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 162: ++#line 586 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ currentCls->add(CLASS_UCP_CO, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 163: ++#line 588 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ currentCls->add(CLASS_UCP_L, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 164: ++#line 595 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ currentCls->add(CLASS_UCP_M, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 165: ++#line 597 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ currentCls->add(CLASS_UCP_ME, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 166: ++#line 599 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ currentCls->add(CLASS_UCP_N, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 167: ++#line 603 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ currentCls->add(CLASS_UCP_P, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 168: ++#line 611 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ currentCls->add(CLASS_UCP_S, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 169: ++#line 616 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ currentCls->add(CLASS_UCP_Z, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 170: ++#line 655 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ currentCls->add(CLASS_SCRIPT_HAN, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 171: ++#line 720 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ throw LocatedParseError("Unknown property"); }} ++ break; ++ case 172: ++#line 582 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {{p = ((te))-1;}{ currentCls->add(CLASS_UCP_C, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 173: ++#line 586 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {{p = ((te))-1;}{ currentCls->add(CLASS_UCP_CO, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 174: ++#line 588 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {{p = ((te))-1;}{ currentCls->add(CLASS_UCP_L, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 175: ++#line 595 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {{p = ((te))-1;}{ currentCls->add(CLASS_UCP_M, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 176: ++#line 597 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {{p = ((te))-1;}{ currentCls->add(CLASS_UCP_ME, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 177: ++#line 599 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {{p = ((te))-1;}{ currentCls->add(CLASS_UCP_N, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 178: ++#line 603 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {{p = ((te))-1;}{ currentCls->add(CLASS_UCP_P, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 179: ++#line 611 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {{p = ((te))-1;}{ currentCls->add(CLASS_UCP_S, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 180: ++#line 655 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {{p = ((te))-1;}{ currentCls->add(CLASS_SCRIPT_HAN, negated); {cs = stack[--top]; goto _again;} }} ++ break; ++ case 181: ++#line 720 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {{p = ((te))-1;}{ throw LocatedParseError("Unknown property"); }} ++ break; ++ case 182: ++#line 735 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_UCP_C, negated); ++ if (!inCharClass) { ++ currentCls->finalize(); ++ currentSeq->addComponent(move(currentCls)); ++ } ++ {cs = stack[--top]; goto _again;} ++ }} ++ break; ++ case 183: ++#line 743 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_UCP_L, negated); ++ if (!inCharClass) { ++ currentCls->finalize(); ++ currentSeq->addComponent(move(currentCls)); ++ } ++ {cs = stack[--top]; goto _again;} ++ }} ++ break; ++ case 184: ++#line 751 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_UCP_M, negated); ++ if (!inCharClass) { ++ currentCls->finalize(); ++ currentSeq->addComponent(move(currentCls)); ++ } ++ {cs = stack[--top]; goto _again;} ++ }} ++ break; ++ case 185: ++#line 759 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_UCP_N, negated); ++ if (!inCharClass) { ++ currentCls->finalize(); ++ currentSeq->addComponent(move(currentCls)); ++ } ++ {cs = stack[--top]; goto _again;} ++ }} ++ break; ++ case 186: ++#line 767 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_UCP_P, negated); ++ if (!inCharClass) { ++ currentCls->finalize(); ++ currentSeq->addComponent(move(currentCls)); ++ } ++ {cs = stack[--top]; goto _again;} ++ }} ++ break; ++ case 187: ++#line 775 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_UCP_S, negated); ++ if (!inCharClass) { ++ currentCls->finalize(); ++ currentSeq->addComponent(move(currentCls)); ++ } ++ {cs = stack[--top]; goto _again;} ++ }} ++ break; ++ case 188: ++#line 783 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_UCP_Z, negated); ++ if (!inCharClass) { ++ currentCls->finalize(); ++ currentSeq->addComponent(move(currentCls)); ++ } ++ {cs = stack[--top]; goto _again;} ++ }} ++ break; ++ case 189: ++#line 792 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ throw LocatedParseError("Unknown property"); }} ++ break; ++ case 190: ++#line 798 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ throw LocatedParseError("Unsupported POSIX collating " ++ "element"); ++ }} ++ break; ++ case 191: ++#line 805 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_ALNUM, false); ++ }} ++ break; ++ case 192: ++#line 808 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_ALNUM, true); ++ }} ++ break; ++ case 193: ++#line 811 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_ALPHA, false); ++ }} ++ break; ++ case 194: ++#line 814 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_ALPHA, true); ++ }} ++ break; ++ case 195: ++#line 817 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_ASCII, false); ++ }} ++ break; ++ case 196: ++#line 820 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_ASCII, true); ++ }} ++ break; ++ case 197: ++#line 823 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_BLANK, false); ++ }} ++ break; ++ case 198: ++#line 826 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_BLANK, true); ++ }} ++ break; ++ case 199: ++#line 829 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_CNTRL, false); ++ }} ++ break; ++ case 200: ++#line 832 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_CNTRL, true); ++ }} ++ break; ++ case 201: ++#line 835 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_DIGIT, false); ++ }} ++ break; ++ case 202: ++#line 838 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_DIGIT, true); ++ }} ++ break; ++ case 203: ++#line 841 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_GRAPH, false); ++ }} ++ break; ++ case 204: ++#line 844 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_GRAPH, true); ++ }} ++ break; ++ case 205: ++#line 847 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_LOWER, false); ++ }} ++ break; ++ case 206: ++#line 850 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_LOWER, true); ++ }} ++ break; ++ case 207: ++#line 853 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_PRINT, false); ++ }} ++ break; ++ case 208: ++#line 856 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_PRINT, true); ++ }} ++ break; ++ case 209: ++#line 859 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_PUNCT, false); ++ }} ++ break; ++ case 210: ++#line 862 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_PUNCT, true); ++ }} ++ break; ++ case 211: ++#line 866 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_SPACE, false); ++ }} ++ break; ++ case 212: ++#line 869 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_SPACE, true); ++ }} ++ break; ++ case 213: ++#line 872 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_UPPER, false); ++ }} ++ break; ++ case 214: ++#line 875 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_UPPER, true); ++ }} ++ break; ++ case 215: ++#line 878 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_WORD, false); ++ }} ++ break; ++ case 216: ++#line 881 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_WORD, true); ++ }} ++ break; ++ case 217: ++#line 884 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_XDIGIT, false); ++ }} ++ break; ++ case 218: ++#line 887 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_XDIGIT, true); ++ }} ++ break; ++ case 219: ++#line 892 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ throw LocatedParseError("Invalid POSIX named class"); ++ }} ++ break; ++ case 220: ++#line 895 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ { ++ DEBUG_PRINTF("stack %zu top %d\n", stack.size(), top); ++ if ((int)stack.size() == top) { ++ stack.resize(2 * (top + 1)); ++ } ++ {stack[top++] = cs; cs = 834; goto _again;}} ++ }} ++ break; ++ case 221: ++#line 898 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ /*noop*/}} ++ break; ++ case 222: ++#line 900 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add('\x08'); ++ }} ++ break; ++ case 223: ++#line 904 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add('\x09'); ++ }} ++ break; ++ case 224: ++#line 908 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add('\x0a'); ++ }} ++ break; ++ case 225: ++#line 912 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add('\x0d'); ++ }} ++ break; ++ case 226: ++#line 916 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add('\x0c'); ++ }} ++ break; ++ case 227: ++#line 920 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add('\x07'); ++ }} ++ break; ++ case 228: ++#line 924 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add('\x1b'); ++ }} ++ break; ++ case 229: ++#line 928 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_HORZ, false); ++ }} ++ break; ++ case 230: ++#line 932 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_HORZ, true); ++ }} ++ break; ++ case 231: ++#line 936 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_VERT, false); ++ }} ++ break; ++ case 232: ++#line 940 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_VERT, true); ++ }} ++ break; ++ case 233: ++#line 944 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ negated = false; ++ p--; ++ { ++ DEBUG_PRINTF("stack %zu top %d\n", stack.size(), top); ++ if ((int)stack.size() == top) { ++ stack.resize(2 * (top + 1)); ++ } ++ {stack[top++] = cs; cs = 560; goto _again;}} ++ }} ++ break; ++ case 234: ++#line 950 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ negated = false; ++ p--; ++ { ++ DEBUG_PRINTF("stack %zu top %d\n", stack.size(), top); ++ if ((int)stack.size() == top) { ++ stack.resize(2 * (top + 1)); ++ } ++ {stack[top++] = cs; cs = 812; goto _again;}} ++ }} ++ break; ++ case 235: ++#line 956 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ negated = true; ++ p--; ++ { ++ DEBUG_PRINTF("stack %zu top %d\n", stack.size(), top); ++ if ((int)stack.size() == top) { ++ stack.resize(2 * (top + 1)); ++ } ++ {stack[top++] = cs; cs = 560; goto _again;}} ++ }} ++ break; ++ case 236: ++#line 962 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ negated = true; ++ p--; ++ { ++ DEBUG_PRINTF("stack %zu top %d\n", stack.size(), top); ++ if ((int)stack.size() == top) { ++ stack.resize(2 * (top + 1)); ++ } ++ {stack[top++] = cs; cs = 812; goto _again;}} ++ }} ++ break; ++ case 237: ++#line 972 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(octAccumulator); ++ }} ++ break; ++ case 238: ++#line 975 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(octAccumulator); ++ }} ++ break; ++ case 239: ++#line 979 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ string oct((const char *)ts + 3, te - ts - 4); ++ long int val = strtol(oct.c_str(), nullptr, 8); ++ if ((!mode.utf8 && val > 255) || val > MAX_UNICODE) { ++ throw LocatedParseError("Value in \\o{...} sequence is too large"); ++ } ++ currentCls->add((unichar)val); ++ }} ++ break; ++ case 240: ++#line 994 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(accumulator); ++ }} ++ break; ++ case 241: ++#line 998 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ // whatever we found here ++ currentCls->add(*(ts + 1)); ++ ++ }} ++ break; ++ case 242: ++#line 1004 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ string hex((const char *)ts + 3, te - ts - 4); ++ long int val = strtol(hex.c_str(), nullptr, 16); ++ if (val > MAX_UNICODE) { ++ throw LocatedParseError("Value in \\x{...} sequence is too large"); ++ } ++ currentCls->add((unichar)val); ++ }} ++ break; ++ case 243: ++#line 1017 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ if (te - ts < 3) { ++ assert(te - ts == 2); ++ throw LocatedParseError(SLASH_C_ERROR); ++ } else { ++ assert(te - ts == 3); ++ currentCls->add(decodeCtrl(ts[2])); ++ } ++ }} ++ break; ++ case 244: ++#line 1027 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_WORD, false); ++ }} ++ break; ++ case 245: ++#line 1031 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_WORD, true); ++ }} ++ break; ++ case 246: ++#line 1035 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_SPACE, false); ++ }} ++ break; ++ case 247: ++#line 1039 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_SPACE, true); ++ }} ++ break; ++ case 248: ++#line 1043 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_DIGIT, false); ++ }} ++ break; ++ case 249: ++#line 1047 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(CLASS_DIGIT, true); ++ }} ++ break; ++ case 250: ++#line 1050 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->addDash(); ++ }} ++ break; ++ case 251: ++#line 277 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ ostringstream str; ++ str << "'\\" << (char)*(ts + 1) << "' at index " ++ << ts - ptr << " not supported in a character class."; ++ throw ParseError(str.str()); ++ }} ++ break; ++ case 252: ++#line 277 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ ostringstream str; ++ str << "'\\" << (char)*(ts + 1) << "' at index " ++ << ts - ptr << " not supported in a character class."; ++ throw ParseError(str.str()); ++ }} ++ break; ++ case 253: ++#line 277 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ ostringstream str; ++ str << "'\\" << (char)*(ts + 1) << "' at index " ++ << ts - ptr << " not supported in a character class."; ++ throw ParseError(str.str()); ++ }} ++ break; ++ case 254: ++#line 1067 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ // add the literal char ++ currentCls->add(*(ts + 1)); ++ }} ++ break; ++ case 255: ++#line 1073 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ assert(mode.utf8); ++ currentCls->add(readUtf8CodePoint2c(ts)); ++ }} ++ break; ++ case 256: ++#line 1078 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ assert(mode.utf8); ++ currentCls->add(readUtf8CodePoint3c(ts)); ++ }} ++ break; ++ case 257: ++#line 1083 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ assert(mode.utf8); ++ currentCls->add(readUtf8CodePoint4c(ts)); ++ }} ++ break; ++ case 258: ++#line 1088 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ assert(mode.utf8); ++ throwInvalidUtf8(); ++ }} ++ break; ++ case 259: ++#line 1094 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(*ts); ++ }} ++ break; ++ case 260: ++#line 1098 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->finalize(); ++ currentSeq->addComponent(move(currentCls)); ++ inCharClass = false; ++ {cs = 741; goto _again;} ++ }} ++ break; ++ case 261: ++#line 968 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ throw LocatedParseError("Malformed property"); }} ++ break; ++ case 262: ++#line 969 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ throw LocatedParseError("Malformed property"); }} ++ break; ++ case 263: ++#line 972 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ currentCls->add(octAccumulator); ++ }} ++ break; ++ case 264: ++#line 975 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ currentCls->add(octAccumulator); ++ }} ++ break; ++ case 265: ++#line 989 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ throw LocatedParseError("Value in \\o{...} sequence is non-octal or missing braces"); ++ }} ++ break; ++ case 266: ++#line 994 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ currentCls->add(accumulator); ++ }} ++ break; ++ case 267: ++#line 1013 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ throw LocatedParseError("Value in \\x{...} sequence is non-hex or missing }"); ++ }} ++ break; ++ case 268: ++#line 1017 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ if (te - ts < 3) { ++ assert(te - ts == 2); ++ throw LocatedParseError(SLASH_C_ERROR); ++ } else { ++ assert(te - ts == 3); ++ currentCls->add(decodeCtrl(ts[2])); ++ } ++ }} ++ break; ++ case 269: ++#line 1088 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ assert(mode.utf8); ++ throwInvalidUtf8(); ++ }} ++ break; ++ case 270: ++#line 1094 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ currentCls->add(*ts); ++ }} ++ break; ++ case 271: ++#line 989 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {{p = ((te))-1;}{ ++ throw LocatedParseError("Value in \\o{...} sequence is non-octal or missing braces"); ++ }} ++ break; ++ case 272: ++#line 1013 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {{p = ((te))-1;}{ ++ throw LocatedParseError("Value in \\x{...} sequence is non-hex or missing }"); ++ }} ++ break; ++ case 273: ++#line 1088 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {{p = ((te))-1;}{ ++ assert(mode.utf8); ++ throwInvalidUtf8(); ++ }} ++ break; ++ case 274: ++#line 1094 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {{p = ((te))-1;}{ ++ currentCls->add(*ts); ++ }} ++ break; ++ case 275: ++#line 1112 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ if (currentCls->isNegated()) { ++ // Already seen a caret; the second one is not a meta-character. ++ inCharClassEarly = false; ++ p--; {cs = 813; goto _again;} ++ } else { ++ currentCls->negate(); ++ // Note: we cannot switch off inCharClassEarly here, as /[^]]/ ++ // needs to use the right square bracket path below. ++ } ++ }} ++ break; ++ case 276: ++#line 1125 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(']'); ++ inCharClassEarly = false; ++ }} ++ break; ++ case 277: ++#line 1130 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ { ++ DEBUG_PRINTF("stack %zu top %d\n", stack.size(), top); ++ if ((int)stack.size() == top) { ++ stack.resize(2 * (top + 1)); ++ } ++ {stack[top++] = cs; cs = 834; goto _again;}} }} ++ break; ++ case 278: ++#line 1131 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ /*noop*/}} ++ break; ++ case 279: ++#line 1134 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ inCharClassEarly = false; ++ p--; ++ {cs = 813; goto _again;} ++ }} ++ break; ++ case 280: ++#line 1134 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ inCharClassEarly = false; ++ p--; ++ {cs = 813; goto _again;} ++ }} ++ break; ++ case 281: ++#line 1146 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ {cs = 741; goto _again;} ++ }} ++ break; ++ case 282: ++#line 1150 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ addLiteral(currentSeq, *ts, mode); ++ }} ++ break; ++ case 283: ++#line 1150 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ addLiteral(currentSeq, *ts, mode); ++ }} ++ break; ++ case 284: ++#line 1160 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ {cs = stack[--top]; goto _again;} ++ }} ++ break; ++ case 285: ++#line 1164 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentCls->add(*ts); ++ inCharClassEarly = false; ++ }} ++ break; ++ case 286: ++#line 1164 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ currentCls->add(*ts); ++ inCharClassEarly = false; ++ }} ++ break; ++ case 287: ++#line 1176 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ inComment = false; {cs = 741; goto _again;} }} ++ break; ++ case 288: ++#line 1180 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;} ++ break; ++ case 289: ++#line 1188 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ inComment = false; {cs = 741; goto _again;} }} ++ break; ++ case 290: ++#line 1192 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;} ++ break; ++ case 291: ++#line 1425 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {act = 279;} ++ break; ++ case 292: ++#line 1442 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {act = 281;} ++ break; ++ case 293: ++#line 1661 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {act = 321;} ++ break; ++ case 294: ++#line 363 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ if (sequences.empty()) { ++ throw LocatedParseError("Unmatched parentheses"); ++ } ++ currentSeq->finalize(); ++ POP_SEQUENCE; ++ }} ++ break; ++ case 295: ++#line 1207 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentSeq->addAlternation(); ++ }} ++ break; ++ case 296: ++#line 1212 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ throw LocatedParseError("POSIX named classes are only " ++ "supported inside a class"); ++ }} ++ break; ++ case 297: ++#line 1219 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ throw LocatedParseError("Unsupported POSIX collating " ++ "element"); ++ }} ++ break; ++ case 298: ++#line 1226 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ {cs = 832; goto _again;} ++ }} ++ break; ++ case 299: ++#line 1229 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ throw LocatedParseError("Unmatched \\E"); ++ }} ++ break; ++ case 300: ++#line 1233 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentSeq->addComponent(generateComponent(CLASS_ANY, false, mode)); ++ }} ++ break; ++ case 301: ++#line 1237 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ if (mode.utf8) { ++ throw LocatedParseError("\\C is unsupported in UTF8"); ++ } ++ currentSeq->addComponent(ue2::make_unique()); ++ }} ++ break; ++ case 302: ++#line 1251 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ if (!currentSeq->addRepeat(0, ComponentRepeat::NoLimit, ++ ComponentRepeat::REPEAT_NONGREEDY)) { ++ throwInvalidRepeat(); ++ } ++ }} ++ break; ++ case 303: ++#line 1258 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ if (!currentSeq->addRepeat(0, ComponentRepeat::NoLimit, ++ ComponentRepeat::REPEAT_POSSESSIVE)) { ++ throwInvalidRepeat(); ++ } ++ }} ++ break; ++ case 304: ++#line 1272 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ if (!currentSeq->addRepeat(1, ComponentRepeat::NoLimit, ++ ComponentRepeat::REPEAT_NONGREEDY)) { ++ throwInvalidRepeat(); ++ } ++ }} ++ break; ++ case 305: ++#line 1279 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ if (!currentSeq->addRepeat(1, ComponentRepeat::NoLimit, ++ ComponentRepeat::REPEAT_POSSESSIVE)) { ++ throwInvalidRepeat(); ++ } ++ }} ++ break; ++ case 306: ++#line 1293 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ if (!currentSeq->addRepeat( ++ 0, 1, ComponentRepeat::REPEAT_NONGREEDY)) { ++ throwInvalidRepeat(); ++ } ++ }} ++ break; ++ case 307: ++#line 1300 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ if (!currentSeq->addRepeat( ++ 0, 1, ComponentRepeat::REPEAT_POSSESSIVE)) { ++ throwInvalidRepeat(); ++ } ++ }} ++ break; ++ case 308: ++#line 1317 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ if (repeatN > repeatM || repeatM == 0) { ++ throwInvalidRepeat(); ++ } else if (!currentSeq->addRepeat( ++ repeatN, repeatM, ++ ComponentRepeat::REPEAT_NONGREEDY)) { ++ throwInvalidRepeat(); ++ } ++ }} ++ break; ++ case 309: ++#line 1327 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ if (repeatN > repeatM || repeatM == 0) { ++ throwInvalidRepeat(); ++ } else if (!currentSeq->addRepeat( ++ repeatN, repeatM, ++ ComponentRepeat::REPEAT_POSSESSIVE)) { ++ throwInvalidRepeat(); ++ } ++ }} ++ break; ++ case 310: ++#line 323 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ inComment = true; ++ {cs = 837; goto _again;} ++ }} ++ break; ++ case 311: ++#line 1344 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ p--; { ++ DEBUG_PRINTF("stack %zu top %d\n", stack.size(), top); ++ if ((int)stack.size() == top) { ++ stack.resize(2 * (top + 1)); ++ } ++ {stack[top++] = cs; cs = 782; goto _again;}} }} ++ break; ++ case 312: ++#line 1348 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ assert(0); {p++; goto _out; } }} ++ break; ++ case 313: ++#line 1355 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ auto bound = mode.multiline ? ComponentBoundary::BEGIN_LINE ++ : ComponentBoundary::BEGIN_STRING; ++ currentSeq->addComponent(ue2::make_unique(bound)); ++ }} ++ break; ++ case 314: ++#line 1362 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ auto bound = mode.multiline ? ComponentBoundary::END_LINE ++ : ComponentBoundary::END_STRING_OPTIONAL_LF; ++ currentSeq->addComponent(ue2::make_unique(bound)); ++ }} ++ break; ++ case 315: ++#line 1368 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ auto bound = ComponentBoundary::BEGIN_STRING; ++ currentSeq->addComponent(ue2::make_unique(bound)); ++ }} ++ break; ++ case 316: ++#line 1373 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ auto bound = ComponentBoundary::END_STRING_OPTIONAL_LF; ++ currentSeq->addComponent(ue2::make_unique(bound)); ++ }} ++ break; ++ case 317: ++#line 1378 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ auto bound = ComponentBoundary::END_STRING; ++ currentSeq->addComponent(ue2::make_unique(bound)); ++ }} ++ break; ++ case 318: ++#line 1383 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentSeq->addComponent( ++ ue2::make_unique(ts - ptr, false, mode)); ++ }} ++ break; ++ case 319: ++#line 1388 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentSeq->addComponent( ++ ue2::make_unique(ts - ptr, true, mode)); ++ }} ++ break; ++ case 320: ++#line 1398 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ addLiteral(currentSeq, '\x09', mode); ++ }} ++ break; ++ case 321: ++#line 1402 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ addLiteral(currentSeq, '\x0a', mode); ++ }} ++ break; ++ case 322: ++#line 1406 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ addLiteral(currentSeq, '\x0d', mode); ++ }} ++ break; ++ case 323: ++#line 1410 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ addLiteral(currentSeq, '\x0c', mode); ++ }} ++ break; ++ case 324: ++#line 1414 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ addLiteral(currentSeq, '\x07', mode); ++ }} ++ break; ++ case 325: ++#line 1418 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ addLiteral(currentSeq, '\x1b', mode); ++ }} ++ break; ++ case 326: ++#line 1422 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ addLiteral(currentSeq, octAccumulator, mode); ++ }} ++ break; ++ case 327: ++#line 480 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ if (accumulator == 0) { ++ throw LocatedParseError("Numbered reference cannot be zero"); ++ } ++ currentSeq->addComponent(ue2::make_unique(accumulator)); ++ }} ++ break; ++ case 328: ++#line 487 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ // Accumulator is a negative offset. ++ if (accumulator == 0) { ++ throw LocatedParseError("Numbered reference cannot be zero"); ++ } ++ if (accumulator >= groupIndex) { ++ throw LocatedParseError("Invalid reference"); ++ } ++ unsigned idx = groupIndex - accumulator; ++ currentSeq->addComponent(ue2::make_unique(idx)); ++ }} ++ break; ++ case 329: ++#line 480 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ if (accumulator == 0) { ++ throw LocatedParseError("Numbered reference cannot be zero"); ++ } ++ currentSeq->addComponent(ue2::make_unique(accumulator)); ++ }} ++ break; ++ case 330: ++#line 487 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ // Accumulator is a negative offset. ++ if (accumulator == 0) { ++ throw LocatedParseError("Numbered reference cannot be zero"); ++ } ++ if (accumulator >= groupIndex) { ++ throw LocatedParseError("Invalid reference"); ++ } ++ unsigned idx = groupIndex - accumulator; ++ currentSeq->addComponent(ue2::make_unique(idx)); ++ }} ++ break; ++ case 331: ++#line 499 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentSeq->addComponent(ue2::make_unique(label)); ++ }} ++ break; ++ case 332: ++#line 499 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentSeq->addComponent(ue2::make_unique(label)); ++ }} ++ break; ++ case 333: ++#line 499 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentSeq->addComponent(ue2::make_unique(label)); ++ }} ++ break; ++ case 334: ++#line 499 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentSeq->addComponent(ue2::make_unique(label)); ++ }} ++ break; ++ case 335: ++#line 499 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentSeq->addComponent(ue2::make_unique(label)); ++ }} ++ break; ++ case 336: ++#line 1483 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ ostringstream str; ++ str << "Onigiruma subroutine call at index " << ts - ptr << ++ " not supported."; ++ throw ParseError(str.str()); ++ }} ++ break; ++ case 337: ++#line 1494 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ string oct((const char *)ts + 3, te - ts - 4); ++ long int val = strtol(oct.c_str(), nullptr, 8); ++ if ((!mode.utf8 && val > 255) || val > MAX_UNICODE) { ++ throw LocatedParseError("Value in \\o{...} sequence is too large"); ++ } ++ addEscapedOctal(currentSeq, (unichar)val, mode); ++ }} ++ break; ++ case 338: ++#line 1507 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ addEscapedHex(currentSeq, accumulator, mode); ++ }} ++ break; ++ case 339: ++#line 1511 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ string hex((const char *)ts + 3, te - ts - 4); ++ long int val = strtol(hex.c_str(), nullptr, 16); ++ if (val > MAX_UNICODE) { ++ throw LocatedParseError("Value in \\x{...} sequence is too large"); ++ } ++ addEscapedHex(currentSeq, (unichar)val, mode); ++ }} ++ break; ++ case 340: ++#line 1524 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ if (te - ts < 3) { ++ assert(te - ts == 2); ++ throw LocatedParseError(SLASH_C_ERROR); ++ } else { ++ assert(te - ts == 3); ++ addLiteral(currentSeq, decodeCtrl(ts[2]), mode); ++ } ++ }} ++ break; ++ case 341: ++#line 1534 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ ostringstream str; ++ str << "'\\" << (char)*(ts + 1) << "' at index " ++ << ts - ptr << " not supported."; ++ throw ParseError(str.str()); ++ }} ++ break; ++ case 342: ++#line 1542 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ auto cc = generateComponent(CLASS_WORD, false, mode); ++ currentSeq->addComponent(move(cc)); ++ }} ++ break; ++ case 343: ++#line 1547 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ auto cc = generateComponent(CLASS_WORD, true, mode); ++ currentSeq->addComponent(move(cc)); ++ }} ++ break; ++ case 344: ++#line 1552 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ auto cc = generateComponent(CLASS_SPACE, false, mode); ++ currentSeq->addComponent(move(cc)); ++ }} ++ break; ++ case 345: ++#line 1557 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ auto cc = generateComponent(CLASS_SPACE, true, mode); ++ currentSeq->addComponent(move(cc)); ++ }} ++ break; ++ case 346: ++#line 1562 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ auto cc = generateComponent(CLASS_DIGIT, false, mode); ++ currentSeq->addComponent(move(cc)); ++ }} ++ break; ++ case 347: ++#line 1567 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ auto cc = generateComponent(CLASS_DIGIT, true, mode); ++ currentSeq->addComponent(move(cc)); ++ }} ++ break; ++ case 348: ++#line 1572 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ auto cc = generateComponent(CLASS_HORZ, false, mode); ++ currentSeq->addComponent(move(cc)); ++ }} ++ break; ++ case 349: ++#line 1577 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ auto cc = generateComponent(CLASS_HORZ, true, mode); ++ currentSeq->addComponent(move(cc)); ++ }} ++ break; ++ case 350: ++#line 1582 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ auto cc = generateComponent(CLASS_VERT, false, mode); ++ currentSeq->addComponent(move(cc)); ++ }} ++ break; ++ case 351: ++#line 1587 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ auto cc = generateComponent(CLASS_VERT, true, mode); ++ currentSeq->addComponent(move(cc)); ++ }} ++ break; ++ case 352: ++#line 1592 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ assert(!currentCls && !inCharClass); ++ currentCls = getComponentClass(mode); ++ negated = false; ++ p--; ++ { ++ DEBUG_PRINTF("stack %zu top %d\n", stack.size(), top); ++ if ((int)stack.size() == top) { ++ stack.resize(2 * (top + 1)); ++ } ++ {stack[top++] = cs; cs = 560; goto _again;}} ++ }} ++ break; ++ case 353: ++#line 1600 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ assert(!currentCls && !inCharClass); ++ currentCls = getComponentClass(mode); ++ negated = false; ++ p--; ++ { ++ DEBUG_PRINTF("stack %zu top %d\n", stack.size(), top); ++ if ((int)stack.size() == top) { ++ stack.resize(2 * (top + 1)); ++ } ++ {stack[top++] = cs; cs = 812; goto _again;}} ++ }} ++ break; ++ case 354: ++#line 1608 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ assert(!currentCls && !inCharClass); ++ currentCls = getComponentClass(mode); ++ negated = true; ++ p--; ++ { ++ DEBUG_PRINTF("stack %zu top %d\n", stack.size(), top); ++ if ((int)stack.size() == top) { ++ stack.resize(2 * (top + 1)); ++ } ++ {stack[top++] = cs; cs = 560; goto _again;}} ++ }} ++ break; ++ case 355: ++#line 1616 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ assert(!currentCls && !inCharClass); ++ currentCls = getComponentClass(mode); ++ negated = true; ++ p--; ++ { ++ DEBUG_PRINTF("stack %zu top %d\n", stack.size(), top); ++ if ((int)stack.size() == top) { ++ stack.resize(2 * (top + 1)); ++ } ++ {stack[top++] = cs; cs = 812; goto _again;}} ++ }} ++ break; ++ case 356: ++#line 1628 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ ostringstream str; ++ str << "\\R at index " << ts - ptr << " not supported."; ++ throw ParseError(str.str()); ++ }} ++ break; ++ case 357: ++#line 1635 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ ostringstream str; ++ str << "\\K at index " << ts - ptr << " not supported."; ++ throw ParseError(str.str()); ++ }} ++ break; ++ case 358: ++#line 1650 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ ostringstream str; ++ str << "\\G at index " << ts - ptr << " not supported."; ++ throw ParseError(str.str()); ++ }} ++ break; ++ case 359: ++#line 1656 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ currentSeq->addComponent(ue2::make_unique(ts - ptr, mode)); ++ }} ++ break; ++ case 360: ++#line 1661 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ addLiteral(currentSeq, *(ts + 1), mode); ++ }} ++ break; ++ case 361: ++#line 317 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ inComment = true; ++ {cs = 836; goto _again;} ++ }} ++ break; ++ case 362: ++#line 434 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ mode = newMode; ++ currentSeq->addComponent(ue2::make_unique()); ++ }} ++ break; ++ case 363: ++#line 356 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ PUSH_SEQUENCE; ++ mode = newMode; ++ currentSeq = ++ enterSequence(currentSeq, ue2::make_unique()); ++ }} ++ break; ++ case 364: ++#line 370 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ PUSH_SEQUENCE; ++ currentSeq = enterSequence(currentSeq, ++ ue2::make_unique(ComponentAssertion::LOOKAHEAD, ++ ComponentAssertion::POS)); ++ }} ++ break; ++ case 365: ++#line 376 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ PUSH_SEQUENCE; ++ currentSeq = enterSequence(currentSeq, ++ ue2::make_unique(ComponentAssertion::LOOKAHEAD, ++ ComponentAssertion::NEG)); ++ }} ++ break; ++ case 366: ++#line 382 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ PUSH_SEQUENCE; ++ currentSeq = enterSequence(currentSeq, ++ ue2::make_unique(ComponentAssertion::LOOKBEHIND, ++ ComponentAssertion::POS)); ++ }} ++ break; ++ case 367: ++#line 388 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ PUSH_SEQUENCE; ++ currentSeq = enterSequence(currentSeq, ++ ue2::make_unique(ComponentAssertion::LOOKBEHIND, ++ ComponentAssertion::NEG)); ++ }} ++ break; ++ case 368: ++#line 394 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ throw LocatedParseError("Embedded code is not supported"); ++ }} ++ break; ++ case 369: ++#line 394 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ throw LocatedParseError("Embedded code is not supported"); ++ }} ++ break; ++ case 370: ++#line 417 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ PUSH_SEQUENCE; ++ currentSeq = enterSequence(currentSeq, ++ ue2::make_unique()); ++ }} ++ break; ++ case 371: ++#line 337 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ assert(!label.empty()); // should be guaranteed by machine ++ char c = *label.begin(); ++ if (c >= '0' && c <= '9') { ++ throw LocatedParseError("Group name cannot begin with a digit"); ++ } ++ if (!groupNames.insert(label).second) { ++ throw LocatedParseError("Two named subpatterns use the name '" + label + "'"); ++ } ++ PUSH_SEQUENCE; ++ auto seq = ue2::make_unique(); ++ seq->setCaptureIndex(groupIndex++); ++ seq->setCaptureName(label); ++ currentSeq = enterSequence(currentSeq, move(seq)); ++ }} ++ break; ++ case 372: ++#line 400 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ throw LocatedParseError("Subpattern reference unsupported"); ++ }} ++ break; ++ case 373: ++#line 400 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ throw LocatedParseError("Subpattern reference unsupported"); ++ }} ++ break; ++ case 374: ++#line 1707 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ auto a = ue2::make_unique( ++ ComponentAssertion::LOOKAHEAD, ComponentAssertion::POS); ++ ComponentAssertion *a_seq = a.get(); ++ PUSH_SEQUENCE; ++ currentSeq = enterSequence(currentSeq, ++ ue2::make_unique(move(a))); ++ PUSH_SEQUENCE; ++ currentSeq = a_seq; ++ }} ++ break; ++ case 375: ++#line 1718 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ auto a = ue2::make_unique( ++ ComponentAssertion::LOOKAHEAD, ComponentAssertion::NEG); ++ ComponentAssertion *a_seq = a.get(); ++ PUSH_SEQUENCE; ++ currentSeq = enterSequence(currentSeq, ++ ue2::make_unique(move(a))); ++ PUSH_SEQUENCE; ++ currentSeq = a_seq; ++ }} ++ break; ++ case 376: ++#line 1729 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ auto a = ue2::make_unique( ++ ComponentAssertion::LOOKBEHIND, ComponentAssertion::POS); ++ ComponentAssertion *a_seq = a.get(); ++ PUSH_SEQUENCE; ++ currentSeq = enterSequence(currentSeq, ++ ue2::make_unique(move(a))); ++ PUSH_SEQUENCE; ++ currentSeq = a_seq; ++ }} ++ break; ++ case 377: ++#line 1740 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ auto a = ue2::make_unique( ++ ComponentAssertion::LOOKBEHIND, ComponentAssertion::NEG); ++ ComponentAssertion *a_seq = a.get(); ++ PUSH_SEQUENCE; ++ currentSeq = enterSequence(currentSeq, ++ ue2::make_unique(move(a))); ++ PUSH_SEQUENCE; ++ currentSeq = a_seq; ++ }} ++ break; ++ case 378: ++#line 1752 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ throw LocatedParseError("Pattern recursion not supported"); ++ }} ++ break; ++ case 379: ++#line 403 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ if (accumulator == 0) { ++ throw LocatedParseError("Numbered reference cannot be zero"); ++ } ++ PUSH_SEQUENCE; ++ currentSeq = enterSequence(currentSeq, ++ ue2::make_unique(accumulator)); ++ }} ++ break; ++ case 380: ++#line 411 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ PUSH_SEQUENCE; ++ assert(!label.empty()); ++ currentSeq = enterSequence(currentSeq, ++ ue2::make_unique(label)); ++ }} ++ break; ++ case 381: ++#line 1768 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ ostringstream str; ++ str << "Callout at index " << ts - ptr << " not supported."; ++ throw ParseError(str.str()); ++ }} ++ break; ++ case 382: ++#line 1776 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ throw LocatedParseError("Unrecognised character after (?"); ++ }} ++ break; ++ case 383: ++#line 1781 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ assert(mode.utf8); ++ /* leverage ComponentClass to generate the vertices */ ++ auto cc = getComponentClass(mode); ++ cc->add(readUtf8CodePoint2c(ts)); ++ cc->finalize(); ++ currentSeq->addComponent(move(cc)); ++ }} ++ break; ++ case 384: ++#line 1790 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ assert(mode.utf8); ++ /* leverage ComponentClass to generate the vertices */ ++ auto cc = getComponentClass(mode); ++ cc->add(readUtf8CodePoint3c(ts)); ++ cc->finalize(); ++ currentSeq->addComponent(move(cc)); ++ }} ++ break; ++ case 385: ++#line 1799 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ assert(mode.utf8); ++ /* leverage ComponentClass to generate the vertices */ ++ auto cc = getComponentClass(mode); ++ cc->add(readUtf8CodePoint4c(ts)); ++ cc->finalize(); ++ currentSeq->addComponent(move(cc)); ++ }} ++ break; ++ case 386: ++#line 1808 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ assert(mode.utf8); ++ throwInvalidUtf8(); ++ }} ++ break; ++ case 387: ++#line 1817 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ if (mode.ignore_space == false) { ++ addLiteral(currentSeq, *ts, mode); ++ } ++ }} ++ break; ++ case 388: ++#line 1822 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p+1;{ ++ addLiteral(currentSeq, *ts, mode); ++ }} ++ break; ++ case 389: ++#line 329 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ PUSH_SEQUENCE; ++ auto seq = ue2::make_unique(); ++ seq->setCaptureIndex(groupIndex++); ++ currentSeq = enterSequence(currentSeq, move(seq)); ++ }} ++ break; ++ case 390: ++#line 422 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ assert(!currentCls); ++ assert(!inCharClass); // not reentrant ++ currentCls = getComponentClass(mode); ++ inCharClass = true; ++ inCharClassEarly = true; ++ currentClsBegin = ts; ++ {cs = 830; goto _again;} ++ }} ++ break; ++ case 391: ++#line 1244 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ if (!currentSeq->addRepeat(0, ComponentRepeat::NoLimit, ++ ComponentRepeat::REPEAT_GREEDY)) { ++ throwInvalidRepeat(); ++ } ++ }} ++ break; ++ case 392: ++#line 1265 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ if (!currentSeq->addRepeat(1, ComponentRepeat::NoLimit, ++ ComponentRepeat::REPEAT_GREEDY)) { ++ throwInvalidRepeat(); ++ } ++ }} ++ break; ++ case 393: ++#line 1286 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ if (!currentSeq->addRepeat( ++ 0, 1, ComponentRepeat::REPEAT_GREEDY)) { ++ throwInvalidRepeat(); ++ } ++ }} ++ break; ++ case 394: ++#line 1307 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ if (repeatN > repeatM || repeatM == 0) { ++ throwInvalidRepeat(); ++ } else if (!currentSeq->addRepeat( ++ repeatN, repeatM, ++ ComponentRepeat::REPEAT_GREEDY)) { ++ throwInvalidRepeat(); ++ } ++ }} ++ break; ++ case 395: ++#line 1422 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ addLiteral(currentSeq, octAccumulator, mode); ++ }} ++ break; ++ case 396: ++#line 1425 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ // If there are enough capturing sub expressions, this may be ++ // a back reference ++ accumulator = parseAsDecimal(octAccumulator); ++ if (accumulator < groupIndex) { ++ currentSeq->addComponent(ue2::make_unique(accumulator)); ++ } else { ++ addEscapedOctal(currentSeq, octAccumulator, mode); ++ } ++ }} ++ break; ++ case 397: ++#line 480 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ if (accumulator == 0) { ++ throw LocatedParseError("Numbered reference cannot be zero"); ++ } ++ currentSeq->addComponent(ue2::make_unique(accumulator)); ++ }} ++ break; ++ case 398: ++#line 480 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ if (accumulator == 0) { ++ throw LocatedParseError("Numbered reference cannot be zero"); ++ } ++ currentSeq->addComponent(ue2::make_unique(accumulator)); ++ }} ++ break; ++ case 399: ++#line 487 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ // Accumulator is a negative offset. ++ if (accumulator == 0) { ++ throw LocatedParseError("Numbered reference cannot be zero"); ++ } ++ if (accumulator >= groupIndex) { ++ throw LocatedParseError("Invalid reference"); ++ } ++ unsigned idx = groupIndex - accumulator; ++ currentSeq->addComponent(ue2::make_unique(idx)); ++ }} ++ break; ++ case 400: ++#line 1491 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ throw LocatedParseError("Invalid reference after \\g"); ++ }} ++ break; ++ case 401: ++#line 1503 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ throw LocatedParseError("Value in \\o{...} sequence is non-octal or missing braces"); ++ }} ++ break; ++ case 402: ++#line 1507 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ addEscapedHex(currentSeq, accumulator, mode); ++ }} ++ break; ++ case 403: ++#line 1520 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ throw LocatedParseError("Value in \\x{...} sequence is non-hex or missing }"); ++ }} ++ break; ++ case 404: ++#line 1524 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ if (te - ts < 3) { ++ assert(te - ts == 2); ++ throw LocatedParseError(SLASH_C_ERROR); ++ } else { ++ assert(te - ts == 3); ++ addLiteral(currentSeq, decodeCtrl(ts[2]), mode); ++ } ++ }} ++ break; ++ case 405: ++#line 1624 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ throw LocatedParseError("Malformed property"); }} ++ break; ++ case 406: ++#line 1625 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ throw LocatedParseError("Malformed property"); }} ++ break; ++ case 407: ++#line 1643 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ ostringstream str; ++ str << "\\k at index " << ts - ptr << " not supported."; ++ throw ParseError(str.str()); ++ }} ++ break; ++ case 408: ++#line 1666 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ assert(ts + 1 == pe); ++ ostringstream str; ++ str << "Unescaped \\ at end of input, index " << ts - ptr << "."; ++ throw ParseError(str.str()); ++ }} ++ break; ++ case 409: ++#line 397 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ throw LocatedParseError("Conditional subpattern unsupported"); ++ }} ++ break; ++ case 410: ++#line 1776 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ throw LocatedParseError("Unrecognised character after (?"); ++ }} ++ break; ++ case 411: ++#line 1808 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ assert(mode.utf8); ++ throwInvalidUtf8(); ++ }} ++ break; ++ case 412: ++#line 1822 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {te = p;p--;{ ++ addLiteral(currentSeq, *ts, mode); ++ }} ++ break; ++ case 413: ++#line 329 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {{p = ((te))-1;}{ ++ PUSH_SEQUENCE; ++ auto seq = ue2::make_unique(); ++ seq->setCaptureIndex(groupIndex++); ++ currentSeq = enterSequence(currentSeq, move(seq)); ++ }} ++ break; ++ case 414: ++#line 422 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {{p = ((te))-1;}{ ++ assert(!currentCls); ++ assert(!inCharClass); // not reentrant ++ currentCls = getComponentClass(mode); ++ inCharClass = true; ++ inCharClassEarly = true; ++ currentClsBegin = ts; ++ {cs = 830; goto _again;} ++ }} ++ break; ++ case 415: ++#line 1491 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {{p = ((te))-1;}{ ++ throw LocatedParseError("Invalid reference after \\g"); ++ }} ++ break; ++ case 416: ++#line 1503 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {{p = ((te))-1;}{ ++ throw LocatedParseError("Value in \\o{...} sequence is non-octal or missing braces"); ++ }} ++ break; ++ case 417: ++#line 1520 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {{p = ((te))-1;}{ ++ throw LocatedParseError("Value in \\x{...} sequence is non-hex or missing }"); ++ }} ++ break; ++ case 418: ++#line 1643 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {{p = ((te))-1;}{ ++ ostringstream str; ++ str << "\\k at index " << ts - ptr << " not supported."; ++ throw ParseError(str.str()); ++ }} ++ break; ++ case 419: ++#line 397 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {{p = ((te))-1;}{ ++ throw LocatedParseError("Conditional subpattern unsupported"); ++ }} ++ break; ++ case 420: ++#line 1776 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {{p = ((te))-1;}{ ++ throw LocatedParseError("Unrecognised character after (?"); ++ }} ++ break; ++ case 421: ++#line 1808 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {{p = ((te))-1;}{ ++ assert(mode.utf8); ++ throwInvalidUtf8(); ++ }} ++ break; ++ case 422: ++#line 1822 "hyperscan-4.1.0/src/parser/Parser.rl" ++ {{p = ((te))-1;}{ ++ addLiteral(currentSeq, *ts, mode); ++ }} ++ break; ++ case 423: ++#line 1 "NONE" ++ { switch( act ) { ++ case 279: ++ {{p = ((te))-1;} ++ // If there are enough capturing sub expressions, this may be ++ // a back reference ++ accumulator = parseAsDecimal(octAccumulator); ++ if (accumulator < groupIndex) { ++ currentSeq->addComponent(ue2::make_unique(accumulator)); ++ } else { ++ addEscapedOctal(currentSeq, octAccumulator, mode); ++ } ++ } ++ break; ++ case 281: ++ {{p = ((te))-1;} ++ // if there are enough left parens to this point, back ref ++ if (accumulator < groupIndex) { ++ currentSeq->addComponent(ue2::make_unique(accumulator)); ++ } else { ++ // Otherwise, we interpret the first three digits as an ++ // octal escape, and the remaining characters stand for ++ // themselves as literals. ++ const u8 *p = ts; ++ unsigned int accum = 0; ++ unsigned int oct_digits = 0; ++ assert(*p == '\\'); // token starts at backslash ++ for (++p; p < te && oct_digits < 3; ++oct_digits, ++p) { ++ u8 digit = *p - '0'; ++ if (digit < 8) { ++ accum = digit + accum * 8; ++ } else { ++ break; ++ } ++ } ++ ++ if (oct_digits > 0) { ++ addEscapedOctal(currentSeq, accum, mode); ++ } ++ ++ // And then the rest of the digits, if any, are literal. ++ for (; p < te; ++p) { ++ addLiteral(currentSeq, *p, mode); ++ } ++ } ++ } ++ break; ++ case 321: ++ {{p = ((te))-1;} ++ addLiteral(currentSeq, *(ts + 1), mode); ++ } ++ break; ++ } ++ } ++ break; ++#line 5339 "hyperscan-build/src/parser/Parser.cpp" ++ } ++ } ++ ++_again: ++ _acts = _regex_actions + _regex_to_state_actions[cs]; ++ _nacts = (unsigned int) *_acts++; ++ while ( _nacts-- > 0 ) { ++ switch ( *_acts++ ) { ++ case 23: ++#line 1 "NONE" ++ {ts = 0;} ++ break; ++#line 5352 "hyperscan-build/src/parser/Parser.cpp" ++ } ++ } ++ ++ if ( cs == 0 ) ++ goto _out; ++ if ( ++p != pe ) ++ goto _resume; ++ _test_eof: {} ++ if ( p == eof ) ++ { ++ if ( _regex_eof_trans[cs] > 0 ) { ++ _trans = _regex_eof_trans[cs] - 1; ++ goto _eof_trans; ++ } ++ const short *__acts = _regex_actions + _regex_eof_actions[cs]; ++ unsigned int __nacts = (unsigned int) *__acts++; ++ while ( __nacts-- > 0 ) { ++ switch ( *__acts++ ) { ++ case 22: ++#line 732 "hyperscan-4.1.0/src/parser/Parser.rl" ++ { throw LocatedParseError("Malformed property"); } ++ break; ++#line 5375 "hyperscan-build/src/parser/Parser.cpp" ++ } ++ } ++ } ++ ++ _out: {} ++ } ++ ++#line 1904 "hyperscan-4.1.0/src/parser/Parser.rl" ++ ++ if (p != pe && *p != '\0') { ++ // didn't make it to the end of our input, but we didn't throw a ParseError? ++ assert(0); ++ ostringstream str; ++ str << "Parse error at index " << (p - ptr) << "."; ++ throw ParseError(str.str()); ++ } ++ ++ if (currentCls) { ++ assert(inCharClass); ++ assert(currentClsBegin); ++ ostringstream oss; ++ oss << "Unterminated character class starting at index " ++ << currentClsBegin - ptr << "."; ++ throw ParseError(oss.str()); ++ } ++ ++ if (inComment) { ++ throw ParseError("Unterminated comment."); ++ } ++ ++ if (!sequences.empty()) { ++ ostringstream str; ++ str << "Missing close parenthesis for group started at index " ++ << sequences.back().seqOffset << "."; ++ throw ParseError(str.str()); ++ } ++ ++ // Unlikely, but possible ++ if (groupIndex > 65535) { ++ throw ParseError("The maximum number of capturing subexpressions is 65535."); ++ } ++ ++ // Finalize the top-level sequence, which will take care of any ++ // top-level alternation. ++ currentSeq->finalize(); ++ assert(currentSeq == rootSeq.get()); ++ ++ // Ensure that all references are valid. ++ checkReferences(*rootSeq, groupIndex, groupNames); ++ ++ return move(rootSeq); ++ } catch (LocatedParseError &error) { ++ if (ts >= ptr && ts <= pe) { ++ error.locate(ts - ptr); ++ } else { ++ error.locate(0); ++ } ++ throw; ++ } ++} ++ ++} // namespace ue2 +diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt +index 1111111..2222222 100644 +--- a/util/CMakeLists.txt ++++ b/util/CMakeLists.txt +@@ -4,12 +4,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CXX_FLAGS}") + include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) + + set_source_files_properties( +- ${CMAKE_BINARY_DIR}/tools/ExpressionParser.cpp ++ ${CMAKE_SOURCE_DIR}/tools/ExpressionParser.cpp + PROPERTIES + COMPILE_FLAGS "${RAGEL_C_FLAGS}") + +-ragelmaker(ExpressionParser.rl) +- + set(expressionutil_SRCS + expressions.cpp + expressions.h +@@ -17,7 +15,6 @@ set(expressionutil_SRCS + ExpressionParser.cpp + ) + add_library(expressionutil ${expressionutil_SRCS}) +-add_dependencies(expressionutil ragel_ExpressionParser) + + SET(corpusomatic_SRCS + ng_corpus_editor.h +diff --git a/util/ExpressionParser.cpp b/util/ExpressionParser.cpp +new file mode 100644 +index 1111111..2222222 +--- /dev/null ++++ b/util/ExpressionParser.cpp +@@ -0,0 +1,383 @@ ++ ++#line 1 "hyperscan-4.1.0/util/ExpressionParser.rl" ++/* ++ * Copyright (c) 2015, Intel Corporation ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions are met: ++ * ++ * * Redistributions of source code must retain the above copyright notice, ++ * this list of conditions and the following disclaimer. ++ * * Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * * Neither the name of Intel Corporation nor the names of its contributors ++ * may be used to endorse or promote products derived from this software ++ * without specific prior written permission. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE ++ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR ++ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF ++ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS ++ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN ++ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ++ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE ++ * POSSIBILITY OF SUCH DAMAGE. ++ */ ++ ++#include "config.h" ++ ++#include "ExpressionParser.h" ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include "ue2common.h" ++#include "hs_compile.h" ++ ++ ++using std::string; ++ ++namespace { // anon ++ ++enum ParamKey { ++ PARAM_NONE, ++ PARAM_MIN_OFFSET, ++ PARAM_MAX_OFFSET, ++ PARAM_MIN_LENGTH ++}; ++ ++ ++#line 58 "hyperscan-build/util//ExpressionParser.cpp" ++static const char _ExpressionParser_actions[] = { ++ 0, 1, 0, 1, 1, 1, 2, 1, ++ 3, 1, 4, 1, 5, 1, 7, 1, ++ 8, 2, 6, 0 ++}; ++ ++static const char _ExpressionParser_key_offsets[] = { ++ 0, 0, 2, 4, 6, 7, 8, 9, ++ 10, 11, 12, 13, 14, 15, 17, 22, ++ 25, 26, 27, 29, 30, 31, 32, 33, ++ 34, 35, 36, 37, 38, 39, 50 ++}; ++ ++static const char _ExpressionParser_trans_keys[] = { ++ 32, 109, 32, 109, 97, 105, 120, 95, ++ 111, 102, 102, 115, 101, 116, 61, 48, ++ 57, 32, 44, 125, 48, 57, 32, 44, ++ 125, 110, 95, 108, 111, 101, 110, 103, ++ 116, 104, 102, 102, 115, 101, 116, 56, ++ 72, 76, 105, 109, 115, 123, 79, 80, ++ 86, 87, 0 ++}; ++ ++static const char _ExpressionParser_single_lengths[] = { ++ 0, 2, 2, 2, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 0, 3, 3, ++ 1, 1, 2, 1, 1, 1, 1, 1, ++ 1, 1, 1, 1, 1, 7, 0 ++}; ++ ++static const char _ExpressionParser_range_lengths[] = { ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 1, 1, 0, ++ 0, 0, 0, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 2, 0 ++}; ++ ++static const char _ExpressionParser_index_offsets[] = { ++ 0, 0, 3, 6, 9, 11, 13, 15, ++ 17, 19, 21, 23, 25, 27, 29, 34, ++ 38, 40, 42, 45, 47, 49, 51, 53, ++ 55, 57, 59, 61, 63, 65, 75 ++}; ++ ++static const char _ExpressionParser_indicies[] = { ++ 1, 2, 0, 3, 4, 0, 5, 6, ++ 0, 7, 0, 8, 0, 9, 0, 10, ++ 0, 11, 0, 12, 0, 13, 0, 14, ++ 0, 15, 0, 16, 0, 17, 18, 20, ++ 19, 0, 17, 18, 20, 0, 21, 0, ++ 22, 0, 23, 24, 0, 25, 0, 26, ++ 0, 27, 0, 28, 0, 29, 0, 30, ++ 0, 31, 0, 32, 0, 33, 0, 34, ++ 0, 35, 35, 35, 35, 35, 35, 36, ++ 35, 35, 0, 0, 0 ++}; ++ ++static const char _ExpressionParser_trans_targs[] = { ++ 0, 2, 3, 2, 3, 4, 16, 5, ++ 6, 7, 8, 9, 10, 11, 12, 13, ++ 14, 15, 1, 14, 30, 17, 18, 19, ++ 24, 20, 21, 22, 23, 12, 25, 26, ++ 27, 28, 12, 29, 1 ++}; ++ ++static const char _ExpressionParser_trans_actions[] = { ++ 15, 13, 13, 0, 0, 0, 0, 0, ++ 0, 0, 0, 0, 0, 0, 9, 0, ++ 17, 0, 5, 1, 5, 0, 0, 0, ++ 0, 0, 0, 0, 0, 11, 0, 0, ++ 0, 0, 7, 3, 0 ++}; ++ ++static const char _ExpressionParser_eof_actions[] = { ++ 0, 15, 15, 15, 15, 15, 15, 15, ++ 15, 15, 15, 15, 15, 15, 15, 15, ++ 15, 15, 15, 15, 15, 15, 15, 15, ++ 15, 15, 15, 15, 15, 0, 0 ++}; ++ ++static const int ExpressionParser_start = 29; ++static const int ExpressionParser_first_final = 29; ++static const int ExpressionParser_error = 0; ++ ++static const int ExpressionParser_en_main = 29; ++ ++ ++#line 103 "hyperscan-4.1.0/util/ExpressionParser.rl" ++ ++ ++} // namespace ++ ++static ++void initExt(hs_expr_ext *ext) { ++ memset(ext, 0, sizeof(*ext)); ++ ext->max_offset = MAX_OFFSET; ++} ++ ++bool readExpression(const std::string &input, std::string &expr, ++ unsigned int *flags, hs_expr_ext *ext, ++ bool *must_be_ordered) { ++ assert(flags); ++ assert(ext); ++ ++ // Init flags and ext params. ++ *flags = 0; ++ initExt(ext); ++ if (must_be_ordered) { ++ *must_be_ordered = false; ++ } ++ ++ // Extract expr, which is easier to do in straight C++ than with Ragel. ++ if (input.empty() || input[0] != '/') { ++ return false; ++ } ++ size_t end = input.find_last_of('/'); ++ if (end == string::npos || end == 0) { ++ return false; ++ } ++ expr = input.substr(1, end - 1); ++ ++ // Use a Ragel scanner to handle flags and params. ++ const char *p = input.c_str() + end + 1; ++ const char *pe = input.c_str() + input.size(); ++ UNUSED const char *eof = pe; ++ UNUSED const char *ts = p, *te = p; ++ int cs; ++ UNUSED int act; ++ ++ assert(p); ++ assert(pe); ++ ++ // For storing integers as they're scanned. ++ u64a num = 0; ++ enum ParamKey key = PARAM_NONE; ++ ++ ++#line 196 "hyperscan-build/util//ExpressionParser.cpp" ++ { ++ cs = ExpressionParser_start; ++ } ++ ++#line 201 "hyperscan-build/util//ExpressionParser.cpp" ++ { ++ int _klen; ++ unsigned int _trans; ++ const char *_acts; ++ unsigned int _nacts; ++ const char *_keys; ++ ++ if ( p == pe ) ++ goto _test_eof; ++ if ( cs == 0 ) ++ goto _out; ++_resume: ++ _keys = _ExpressionParser_trans_keys + _ExpressionParser_key_offsets[cs]; ++ _trans = _ExpressionParser_index_offsets[cs]; ++ ++ _klen = _ExpressionParser_single_lengths[cs]; ++ if ( _klen > 0 ) { ++ const char *_lower = _keys; ++ const char *_mid; ++ const char *_upper = _keys + _klen - 1; ++ while (1) { ++ if ( _upper < _lower ) ++ break; ++ ++ _mid = _lower + ((_upper-_lower) >> 1); ++ if ( (*p) < *_mid ) ++ _upper = _mid - 1; ++ else if ( (*p) > *_mid ) ++ _lower = _mid + 1; ++ else { ++ _trans += (unsigned int)(_mid - _keys); ++ goto _match; ++ } ++ } ++ _keys += _klen; ++ _trans += _klen; ++ } ++ ++ _klen = _ExpressionParser_range_lengths[cs]; ++ if ( _klen > 0 ) { ++ const char *_lower = _keys; ++ const char *_mid; ++ const char *_upper = _keys + (_klen<<1) - 2; ++ while (1) { ++ if ( _upper < _lower ) ++ break; ++ ++ _mid = _lower + (((_upper-_lower) >> 1) & ~1); ++ if ( (*p) < _mid[0] ) ++ _upper = _mid - 2; ++ else if ( (*p) > _mid[1] ) ++ _lower = _mid + 2; ++ else { ++ _trans += (unsigned int)((_mid - _keys)>>1); ++ goto _match; ++ } ++ } ++ _trans += _klen; ++ } ++ ++_match: ++ _trans = _ExpressionParser_indicies[_trans]; ++ cs = _ExpressionParser_trans_targs[_trans]; ++ ++ if ( _ExpressionParser_trans_actions[_trans] == 0 ) ++ goto _again; ++ ++ _acts = _ExpressionParser_actions + _ExpressionParser_trans_actions[_trans]; ++ _nacts = (unsigned int) *_acts++; ++ while ( _nacts-- > 0 ) ++ { ++ switch ( *_acts++ ) ++ { ++ case 0: ++#line 57 "hyperscan-4.1.0/util/ExpressionParser.rl" ++ { ++ num = (num * 10) + ((*p) - '0'); ++ } ++ break; ++ case 1: ++#line 61 "hyperscan-4.1.0/util/ExpressionParser.rl" ++ { ++ switch ((*p)) { ++ case 'i': *flags |= HS_FLAG_CASELESS; break; ++ case 's': *flags |= HS_FLAG_DOTALL; break; ++ case 'm': *flags |= HS_FLAG_MULTILINE; break; ++ case 'H': *flags |= HS_FLAG_SINGLEMATCH; break; ++ case 'O': ++ if (must_be_ordered) { ++ *must_be_ordered = true; ++ } ++ break; ++ case 'V': *flags |= HS_FLAG_ALLOWEMPTY; break; ++ case 'W': *flags |= HS_FLAG_UCP; break; ++ case '8': *flags |= HS_FLAG_UTF8; break; ++ case 'P': *flags |= HS_FLAG_PREFILTER; break; ++ case 'L': *flags |= HS_FLAG_SOM_LEFTMOST; break; ++ default: {p++; goto _out; } ++ } ++ } ++ break; ++ case 2: ++#line 81 "hyperscan-4.1.0/util/ExpressionParser.rl" ++ { ++ switch (key) { ++ case PARAM_MIN_OFFSET: ++ ext->flags |= HS_EXT_FLAG_MIN_OFFSET; ++ ext->min_offset = num; ++ break; ++ case PARAM_MAX_OFFSET: ++ ext->flags |= HS_EXT_FLAG_MAX_OFFSET; ++ ext->max_offset = num; ++ break; ++ case PARAM_MIN_LENGTH: ++ ext->flags |= HS_EXT_FLAG_MIN_LENGTH; ++ ext->min_length = num; ++ break; ++ case PARAM_NONE: ++ default: ++ // No key specified, syntax invalid. ++ return false; ++ } ++ } ++ break; ++ case 3: ++#line 153 "hyperscan-4.1.0/util/ExpressionParser.rl" ++ { key = PARAM_MIN_OFFSET; } ++ break; ++ case 4: ++#line 154 "hyperscan-4.1.0/util/ExpressionParser.rl" ++ { key = PARAM_MAX_OFFSET; } ++ break; ++ case 5: ++#line 155 "hyperscan-4.1.0/util/ExpressionParser.rl" ++ { key = PARAM_MIN_LENGTH; } ++ break; ++ case 6: ++#line 157 "hyperscan-4.1.0/util/ExpressionParser.rl" ++ {num = 0;} ++ break; ++ case 7: ++#line 158 "hyperscan-4.1.0/util/ExpressionParser.rl" ++ { key = PARAM_NONE; } ++ break; ++ case 8: ++#line 163 "hyperscan-4.1.0/util/ExpressionParser.rl" ++ { return false; } ++ break; ++#line 350 "hyperscan-build/util//ExpressionParser.cpp" ++ } ++ } ++ ++_again: ++ if ( cs == 0 ) ++ goto _out; ++ if ( ++p != pe ) ++ goto _resume; ++ _test_eof: {} ++ if ( p == eof ) ++ { ++ const char *__acts = _ExpressionParser_actions + _ExpressionParser_eof_actions[cs]; ++ unsigned int __nacts = (unsigned int) *__acts++; ++ while ( __nacts-- > 0 ) { ++ switch ( *__acts++ ) { ++ case 8: ++#line 163 "hyperscan-4.1.0/util/ExpressionParser.rl" ++ { return false; } ++ break; ++#line 370 "hyperscan-build/util//ExpressionParser.cpp" ++ } ++ } ++ } ++ ++ _out: {} ++ } ++ ++#line 168 "hyperscan-4.1.0/util/ExpressionParser.rl" ++ ++ ++ DEBUG_PRINTF("expr='%s', flags=%u\n", expr.c_str(), *flags); ++ ++ return (cs != ExpressionParser_error) && (p == pe); ++} + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Wed, 18 May 2016 01:10:30 +0200 +Subject: [PATCH] add Libs.private to fix linking errors + +See https://github.com/01org/hyperscan/issues/18 + +diff --git a/libhs.pc.in b/libhs.pc.in +index 1111111..2222222 100644 +--- a/libhs.pc.in ++++ b/libhs.pc.in +@@ -7,4 +7,5 @@ Name: libhs + Description: Intel(R) Hyperscan Library + Version: @HS_VERSION@ + Libs: -L${libdir} -lhs ++Libs.private: -lstdc++ -lm + Cflags: -I${includedir}/hs + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Wed, 18 May 2016 01:12:02 +0200 +Subject: [PATCH] fix linking against gtest in shared mode + +See https://github.com/01org/hyperscan/issues/19 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1111111..2222222 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -214,7 +214,7 @@ CHECK_FUNCTION_EXISTS(_aligned_malloc HAVE__ALIGNED_MALLOC) + CHECK_C_COMPILER_FLAG(-fvisibility=hidden HAS_C_HIDDEN) + CHECK_CXX_COMPILER_FLAG(-fvisibility=hidden HAS_CXX_HIDDEN) + +-if (RELEASE_BUILD) ++if (RELEASE_BUILD AND NOT BUILD_STATIC_AND_SHARED AND NOT BUILD_SHARED_LIBS) + if (HAS_C_HIDDEN) + set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -fvisibility=hidden") + endif() + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Wed, 18 May 2016 01:25:59 +0200 +Subject: [PATCH] update preprocessor conditions + +Add macro NATIVE_WIN32 = Windows && !MinGW. +Replace _WIN32 with NATIVE_WIN32 where it failed. + +diff --git a/cmake/config.h.in b/cmake/config.h.in +index 1111111..2222222 100644 +--- a/cmake/config.h.in ++++ b/cmake/config.h.in +@@ -99,3 +99,4 @@ + /* define if this is a release build. */ + #cmakedefine RELEASE_BUILD + ++#define NATIVE_WIN32 ((defined(_WIN32) || defined(_WIN64)) && !defined(__MINGW__) && !defined(__MINGW32__)) +diff --git a/src/database.c b/src/database.c +index 1111111..2222222 100644 +--- a/src/database.c ++++ b/src/database.c +@@ -385,7 +385,7 @@ hs_database_t *dbCreate(const char *in_bytecode, size_t len, u64a platform) { + return db; + } + +-#if defined(_WIN32) ++#if NATIVE_WIN32 + #define SNPRINTF_COMPAT _snprintf + #else + #define SNPRINTF_COMPAT snprintf +diff --git a/src/nfa/nfa_internal.h b/src/nfa/nfa_internal.h +index 1111111..2222222 100644 +--- a/src/nfa/nfa_internal.h ++++ b/src/nfa/nfa_internal.h +@@ -240,7 +240,7 @@ int isMultiTopType(u8 t) { + + /** Macros used in place of unimplemented NFA API functions for a given + * engine. */ +-#if !defined(_WIN32) ++#if !NATIVE_WIN32 + + /* Use for functions that return an integer. */ + #define NFA_API_NO_IMPL(...) \ +diff --git a/src/rose/rose_internal.h b/src/rose/rose_internal.h +index 1111111..2222222 100644 +--- a/src/rose/rose_internal.h ++++ b/src/rose/rose_internal.h +@@ -637,7 +637,7 @@ struct lit_benefits { + } expected; + }; + +-#if defined(_WIN32) ++#if NATIVE_WIN32 + #pragma pack(push, 1) + #endif + // Rose runtime state +@@ -645,7 +645,7 @@ struct RoseRuntimeState { + u8 stored_depth; /* depth at stream boundary */ + u8 flags; /* high bit true if delay rebuild needed */ + u8 broken; /* user has requested that we stop matching */ +-#if defined(_WIN32) ++#if NATIVE_WIN32 + }; + #pragma pack(pop) + #else +diff --git a/src/ue2common.h b/src/ue2common.h +index 1111111..2222222 100644 +--- a/src/ue2common.h ++++ b/src/ue2common.h +@@ -46,7 +46,7 @@ + #include + + /* ick */ +-#if defined(_WIN32) ++#if NATIVE_WIN32 + #define ALIGN_ATTR(x) __declspec(align(x)) + #else + #define ALIGN_ATTR(x) __attribute__((aligned((x)))) +@@ -75,7 +75,7 @@ typedef u32 ReportID; + + /* Shorthand for attribute to mark a function as part of our public API. + * Functions without this attribute will be hidden. */ +-#if !defined(_WIN32) ++#if !NATIVE_WIN32 + #define HS_PUBLIC_API __attribute__((visibility("default"))) + #else + // TODO: dllexport defines for windows +@@ -89,14 +89,14 @@ typedef u32 ReportID; + #define ARRAY_LENGTH(a) (sizeof(a)/sizeof((a)[0])) + + /** \brief Shorthand for the attribute to shut gcc about unused parameters */ +-#if !defined(_WIN32) ++#if !NATIVE_WIN32 + #define UNUSED __attribute__ ((unused)) + #else + #define UNUSED + #endif + + /* really_inline forces inlining always */ +-#if !defined(_WIN32) ++#if !NATIVE_WIN32 + #if defined(HS_OPTIMIZE) + #define really_inline inline __attribute__ ((always_inline, unused)) + #else +@@ -126,7 +126,7 @@ typedef u32 ReportID; + + + // We use C99-style "restrict". +-#ifdef _WIN32 ++#if NATIVE_WIN32 + #ifdef __cplusplus + #define restrict + #else +@@ -182,7 +182,7 @@ typedef u32 ReportID; + #define LIMIT_TO_AT_MOST(a, b) (*(a) = MIN(*(a),(b))) + #define ENSURE_AT_LEAST(a, b) (*(a) = MAX(*(a),(b))) + +-#ifndef _WIN32 ++#if !NATIVE_WIN32 + #ifndef likely + #define likely(x) __builtin_expect(!!(x), 1) + #endif +diff --git a/src/util/alloc.cpp b/src/util/alloc.cpp +index 1111111..2222222 100644 +--- a/src/util/alloc.cpp ++++ b/src/util/alloc.cpp +@@ -61,7 +61,7 @@ namespace ue2 { + + void *aligned_malloc_internal(size_t size, size_t align) { + void *mem; +-#if !defined(_WIN32) ++#if !NATIVE_WIN32 + int rv = posix_memalign(&mem, align, size); + if (rv != 0) { + DEBUG_PRINTF("posix_memalign returned %d when asked for %zu bytes\n", +@@ -85,7 +85,7 @@ void aligned_free_internal(void *ptr) { + return; + } + +-#if defined(_WIN32) ++#if NATIVE_WIN32 + _aligned_free(ptr); + #else + free(ptr); +diff --git a/src/util/bitutils.h b/src/util/bitutils.h +index 1111111..2222222 100644 +--- a/src/util/bitutils.h ++++ b/src/util/bitutils.h +@@ -63,7 +63,7 @@ + #endif + + // MSVC has a different form of inline asm +-#ifdef _WIN32 ++#if NATIVE_WIN32 + #define NO_ASM + #endif + +@@ -74,7 +74,7 @@ + static really_inline + u32 clz32(u32 x) { + assert(x); // behaviour not defined for x == 0 +-#if defined(_WIN32) ++#if NATIVE_WIN32 + unsigned long r; + _BitScanReverse(&r, x); + return 31 - r; +@@ -86,7 +86,7 @@ u32 clz32(u32 x) { + static really_inline + u32 clz64(u64a x) { + assert(x); // behaviour not defined for x == 0 +-#if defined(_WIN32) ++#if NATIVE_WIN32 + unsigned long r; + _BitScanReverse64(&r, x); + return 63 - r; +@@ -99,7 +99,7 @@ u32 clz64(u64a x) { + static really_inline + u32 ctz32(u32 x) { + assert(x); // behaviour not defined for x == 0 +-#if defined(_WIN32) ++#if NATIVE_WIN32 + unsigned long r; + _BitScanForward(&r, x); + return r; +@@ -111,7 +111,7 @@ u32 ctz32(u32 x) { + static really_inline + u32 ctz64(u64a x) { + assert(x); // behaviour not defined for x == 0 +-#if defined(_WIN32) ++#if NATIVE_WIN32 + unsigned long r; + _BitScanForward64(&r, x); + return r; +diff --git a/src/util/cpuid_flags.c b/src/util/cpuid_flags.c +index 1111111..2222222 100644 +--- a/src/util/cpuid_flags.c ++++ b/src/util/cpuid_flags.c +@@ -31,7 +31,7 @@ + #include "hs_compile.h" // for HS_MODE_ flags + #include "hs_internal.h" + +-#ifndef _WIN32 ++#if !NATIVE_WIN32 + #include + #endif + +@@ -54,7 +54,7 @@ + static __inline + void cpuid(unsigned int op, unsigned int leaf, unsigned int *eax, + unsigned int *ebx, unsigned int *ecx, unsigned int *edx) { +-#ifndef _WIN32 ++#if !NATIVE_WIN32 + __cpuid_count(op, leaf, *eax, *ebx, *ecx, *edx); + #else + unsigned int a[4]; +diff --git a/src/util/popcount.h b/src/util/popcount.h +index 1111111..2222222 100644 +--- a/src/util/popcount.h ++++ b/src/util/popcount.h +@@ -40,7 +40,7 @@ + #define HAVE_POPCOUNT_INSTR + #endif + +-#if defined(_WIN32) && defined(__AVX__) // TODO: fix win preproc ++#if NATIVE_WIN32 && defined(__AVX__) // TODO: fix win preproc + #define HAVE_POPCOUNT_INSTR + #define __builtin_popcount __popcnt + #define __builtin_popcountll __popcnt64 +diff --git a/src/util/shuffle.h b/src/util/shuffle.h +index 1111111..2222222 100644 +--- a/src/util/shuffle.h ++++ b/src/util/shuffle.h +@@ -42,7 +42,7 @@ + #include "simd_utils.h" + #include "ue2common.h" + +-#if defined(__BMI2__) || (defined(_WIN32) && defined(__AVX2__)) ++#if defined(__BMI2__) || (NATIVE_WIN32 && defined(__AVX2__)) + #define HAVE_PEXT + #endif + +diff --git a/src/util/simd_utils.h b/src/util/simd_utils.h +index 1111111..2222222 100644 +--- a/src/util/simd_utils.h ++++ b/src/util/simd_utils.h +@@ -84,7 +84,7 @@ + # endif + #endif + +-#ifdef _WIN32 ++#if NATIVE_WIN32 + #define NO_ASM + #endif + +diff --git a/src/util/simd_utils_ssse3.h b/src/util/simd_utils_ssse3.h +index 1111111..2222222 100644 +--- a/src/util/simd_utils_ssse3.h ++++ b/src/util/simd_utils_ssse3.h +@@ -33,7 +33,7 @@ + #ifndef SIMD_UTILS_SSSE3_H_E27DF795C9AA02 + #define SIMD_UTILS_SSSE3_H_E27DF795C9AA02 + +-#if !defined(_WIN32) && !defined(__SSSE3__) ++#if !NATIVE_WIN32 && !defined(__SSSE3__) + #error SSSE3 instructions must be enabled + #endif + +diff --git a/src/util/unaligned.h b/src/util/unaligned.h +index 1111111..2222222 100644 +--- a/src/util/unaligned.h ++++ b/src/util/unaligned.h +@@ -35,7 +35,7 @@ + + #include "ue2common.h" + +-#if !defined(_WIN32) ++#if !NATIVE_WIN32 + #define PACKED__MAY_ALIAS __attribute__((packed, may_alias)) + #else + #define PACKED__MAY_ALIAS +@@ -89,7 +89,7 @@ void unaligned_store_u64a(void *ptr, u64a val) { + struct unaligned *uptr = (struct unaligned *)ptr; + uptr->u = val; + } +-#if defined(_WIN32) ++#if NATIVE_WIN32 + #pragma pack(pop) + #endif // win32 + +diff --git a/unit/hyperscan/test_util.h b/unit/hyperscan/test_util.h +index 1111111..2222222 100644 +--- a/unit/hyperscan/test_util.h ++++ b/unit/hyperscan/test_util.h +@@ -35,7 +35,7 @@ + #include "hs.h" + + #ifndef UNUSED +-#if defined(_WIN32) || defined(_WIN64) ++#if NATIVE_WIN32 + #define UNUSED + #else + #define UNUSED __attribute__ ((unused)) +diff --git a/util/expressions.cpp b/util/expressions.cpp +index 1111111..2222222 100644 +--- a/util/expressions.cpp ++++ b/util/expressions.cpp +@@ -37,7 +37,7 @@ + #include + #include + #include +-#if !defined(_WIN32) ++#if !NATIVE_WIN32 + #include + #include + #else +@@ -96,7 +96,7 @@ void processLine(string &line, unsigned lineNum, + } + } + +-#if defined(_WIN32) ++#if NATIVE_WIN32 + #define stat _stat + #define S_ISDIR(st_m) (_S_IFDIR & (st_m)) + #define S_ISREG(st_m) (_S_IFREG & (st_m)) +@@ -141,7 +141,7 @@ bool isIgnorable(const std::string &f) { + return false; + } + +-#ifndef _WIN32 ++#if !NATIVE_WIN32 + void loadExpressions(const string &inPath, ExpressionMap &exprMap) { + // Is our input path a file or a directory? + struct stat st; + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Wed, 18 May 2016 07:38:29 +0200 +Subject: [PATCH] cmake: replace WIN32 with WIN32 AND NOT MINGW + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1111111..2222222 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -101,7 +101,7 @@ option(BUILD_SHARED_LIBS "Build shared libs instead of static" OFF) + option(BUILD_STATIC_AND_SHARED "Build shared libs as well as static" OFF) + + if (BUILD_STATIC_AND_SHARED OR BUILD_SHARED_LIBS) +- if (WIN32) ++ if (WIN32 AND NOT MINGW) + message(FATAL_ERROR "Windows DLLs currently not supported") + else() + message(STATUS "Building shared libraries") +@@ -227,7 +227,7 @@ endif() + CHECK_C_SOURCE_COMPILES("void *aa_test(void *x) { return __builtin_assume_aligned(x, 16);}\nint main(void) { return 0; }" HAVE_CC_BUILTIN_ASSUME_ALIGNED) + CHECK_CXX_SOURCE_COMPILES("void *aa_test(void *x) { return __builtin_assume_aligned(x, 16);}\nint main(void) { return 0; }" HAVE_CXX_BUILTIN_ASSUME_ALIGNED) + +-if (NOT WIN32) ++if (MINGW OR NOT WIN32) + set(C_FLAGS_TO_CHECK + # Variable length arrays are way bad, most especially at run time + "-Wvla" +@@ -314,7 +314,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") + set(FREEBSD true) + endif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") + +-if(NOT WIN32) ++if(MINGW OR NOT WIN32) + if(CMAKE_C_COMPILER_ID MATCHES "Intel") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -diag-error 10006 -diag-disable 177 -diag-disable 2304 -diag-disable 2305 -diag-disable 2338 -diag-disable 1418 -diag-disable=remark") + endif() +@@ -351,7 +351,7 @@ add_subdirectory(src/fdr) + + include_directories(${PROJECT_BINARY_DIR}/src/fdr) + +-if(NOT WIN32) ++if(MINGW OR NOT WIN32) + set(RAGEL_C_FLAGS "-Wno-unused") + endif() + +@@ -944,6 +944,6 @@ if (BUILD_STATIC_AND_SHARED OR BUILD_SHARED_LIBS) + install(TARGETS hs_shared DESTINATION lib) + endif() + +-if(NOT WIN32) ++if(MINGW OR NOT WIN32) + add_subdirectory(examples) + endif() + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Wed, 18 May 2016 07:55:44 +0200 +Subject: [PATCH] add compile flag "-posix" to fix printf %llu + +See https://lists.nongnu.org/archive/html/mingw-cross-env-list/2013-04/msg00024.html +The similar problem occurred in examples/simplegrep.c + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1111111..2222222 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -200,6 +200,11 @@ else() + + endif() + ++if (MINGW) ++ set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -posix") ++ set(EXTRA_CXX_FLAGS "${EXTRA_CXX_FLAGS} -posix") ++endif() ++ + CHECK_INCLUDE_FILES(unistd.h HAVE_UNISTD_H) + CHECK_INCLUDE_FILES(intrin.h HAVE_C_INTRIN_H) + CHECK_INCLUDE_FILE_CXX(intrin.h HAVE_CXX_INTRIN_H) +diff --git a/libhs.pc.in b/libhs.pc.in +index 1111111..2222222 100644 +--- a/libhs.pc.in ++++ b/libhs.pc.in +@@ -8,4 +8,4 @@ Description: Intel(R) Hyperscan Library + Version: @HS_VERSION@ + Libs: -L${libdir} -lhs + Libs.private: -lstdc++ -lm +-Cflags: -I${includedir}/hs ++Cflags: -I${includedir}/hs -posix + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Wed, 18 May 2016 07:57:11 +0200 +Subject: [PATCH] fix linking errors in shared mode + +libcorpusomatic depends on libhs (for example, it uses symbol +ue2::ReportManager::getReport). DLL fails to be linked if +sime symbols are not resolved. + +diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt +index 1111111..2222222 100644 +--- a/util/CMakeLists.txt ++++ b/util/CMakeLists.txt +@@ -26,5 +26,5 @@ SET(corpusomatic_SRCS + ng_find_matches.h + ng_find_matches.cpp + ) +-add_library(corpusomatic ${corpusomatic_SRCS}) ++add_library(corpusomatic STATIC ${corpusomatic_SRCS}) + + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Wed, 18 May 2016 07:59:57 +0200 +Subject: [PATCH] install .dll to bin/, not to lib/ + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1111111..2222222 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -926,7 +926,10 @@ if (BUILD_STATIC_AND_SHARED OR BUILD_SHARED_LIBS) + OUTPUT_NAME hs_runtime + MACOSX_RPATH ON + LINKER_LANGUAGE C) +- install(TARGETS hs_runtime_shared DESTINATION lib) ++ install(TARGETS hs_runtime_shared ++ RUNTIME DESTINATION bin ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib) + endif() + + # we want the static lib for testing +@@ -946,7 +949,10 @@ if (BUILD_STATIC_AND_SHARED OR BUILD_SHARED_LIBS) + VERSION ${LIB_VERSION} + SOVERSION ${LIB_SOVERSION} + MACOSX_RPATH ON) +-install(TARGETS hs_shared DESTINATION lib) ++install(TARGETS hs_shared ++ RUNTIME DESTINATION bin ++ ARCHIVE DESTINATION lib ++ LIBRARY DESTINATION lib) + endif() + + if(MINGW OR NOT WIN32) diff --git a/src/hyperscan.mk b/src/hyperscan.mk new file mode 100644 index 00000000..df7f90ca --- /dev/null +++ b/src/hyperscan.mk @@ -0,0 +1,29 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := hyperscan +$(PKG)_IGNORE := +$(PKG)_VERSION := 4.1.0 +$(PKG)_CHECKSUM := b8de3f59c2bd1a8765a5aca5dfdd062766cef67218aedf63df2c92766524b3c1 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz +$(PKG)_URL := https://github.com/01org/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz +$(PKG)_DEPS := gcc boost + +define $(PKG)_UPDATE + $(call MXE_GET_GITHUB_TAGS, 01org/hyperscan, v) +endef + +define $(PKG)_BUILD + mkdir '$(1).build' + cd '$(1).build' && '$(TARGET)-cmake' \ + -DBUILD_SHARED_LIBS=$(if $(BUILD_STATIC),OFF,ON) \ + '$(1)' + $(MAKE) -C '$(1).build' -j '$(JOBS)' + $(MAKE) -C '$(1).build' -j 1 install + + '$(TARGET)-gcc' \ + '$(1)/examples/simplegrep.c' \ + -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \ + `$(TARGET)-pkg-config --cflags --libs libhs` +endef From c2e147be0439d74f3ef29255c1216199d769f3e4 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 18 May 2016 22:43:37 +0200 Subject: [PATCH 0667/1463] sqlite: update --- src/sqlite.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sqlite.mk b/src/sqlite.mk index e97d6a06..ff0a08b1 100644 --- a/src/sqlite.mk +++ b/src/sqlite.mk @@ -3,8 +3,8 @@ PKG := sqlite $(PKG)_IGNORE := -$(PKG)_VERSION := 3120200 -$(PKG)_CHECKSUM := fd00770c9afd39db555c78400e52f55e8bd6568c78be23561abb472a22d09abb +$(PKG)_VERSION := 3130000 +$(PKG)_CHECKSUM := e2797026b3310c9d08bd472f6d430058c6dd139ff9d4e30289884ccd9744086b $(PKG)_SUBDIR := $(PKG)-autoconf-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-autoconf-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.sqlite.org/2016/$($(PKG)_FILE) From 6520d67f9e23e4e4913011167cd7bc2b38ce8735 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Wed, 18 May 2016 20:58:21 +0000 Subject: [PATCH 0668/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index ca9adf86..2eeeec50 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -3629,7 +3629,7 @@ feel free to submit a pull request. sqlite - 3120200 + 3130000 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index e5780c40..e2927ea6 100644 --- a/versions.json +++ b/versions.json @@ -358,7 +358,7 @@ "sparsehash": "2.0.3", "speex": "1.2rc2", "speexdsp": "1.2rc3", - "sqlite": "3120200", + "sqlite": "3130000", "subversion": "1.9.2", "suitesparse": "4.2.1", "t4k_common": "0.1.1", From fe5fc67f3ab02341ad9c24f21646eb42b219df65 Mon Sep 17 00:00:00 2001 From: David Yip Date: Wed, 18 May 2016 02:25:23 -0500 Subject: [PATCH 0669/1463] glm: add rules to download/build version 0.9.7.4 --- index.html | 4 ++++ src/glm-test.cpp | 32 ++++++++++++++++++++++++++++++++ src/glm.mk | 28 ++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+) create mode 100644 src/glm-test.cpp create mode 100644 src/glm.mk diff --git a/index.html b/index.html index 1c7cc168..116e9ae5 100644 --- a/index.html +++ b/index.html @@ -1417,6 +1417,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) glibmm GLibmm + + glm + GLM - OpenGL Mathematics + gmp GMP diff --git a/src/glm-test.cpp b/src/glm-test.cpp new file mode 100644 index 00000000..08e8a325 --- /dev/null +++ b/src/glm-test.cpp @@ -0,0 +1,32 @@ +/* + * This file is part of MXE. + * See index.html for further information. + * + * This file is a test program for glm, adapted from the code sample at + * http://glm.g-truc.net/0.9.7/index.html. + */ + +#include // glm::translate, glm::rotate, glm::scale, glm::perspective +#include // glm::mat4 +#include // glm::vec3 +#include // glm::vec4 +#include // so we can print a calculation result +#include + +glm::mat4 camera(float Translate, glm::vec2 const& Rotate) +{ + glm::mat4 Projection = glm::perspective(45.0f, 4.0f / 3.0f, 0.1f, 100.f); + glm::mat4 View = glm::translate(glm::mat4(1.0f), glm::vec3(0.0f, 0.0f, -Translate)); + View = glm::rotate(View, Rotate.y, glm::vec3(-1.0f, 0.0f, 0.0f)); + View = glm::rotate(View, Rotate.x, glm::vec3(0.0f, 1.0f, 0.0f)); + glm::mat4 Model = glm::scale(glm::mat4(1.0f), glm::vec3(0.5f)); + return Projection * View * Model; +} + +int main() +{ + glm::mat4 m = camera(0.0f, glm::vec2(0.0f, 0.0f)); + std::cout << glm::to_string(m) << std::endl; + + return 0; +} diff --git a/src/glm.mk b/src/glm.mk new file mode 100644 index 00000000..eba83d1b --- /dev/null +++ b/src/glm.mk @@ -0,0 +1,28 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := glm +$(PKG)_IGNORE := +$(PKG)_VERSION := 0.9.7.4 +$(PKG)_CHECKSUM := 0cfa1e40041114cda8ced7e6738860fe6f9a7103d25bcc376adb9840fcf21fe1 +$(PKG)_SUBDIR := glm-$($(PKG)_VERSION) +$(PKG)_FILE := $($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://github.com/g-truc/glm/archive/$($(PKG)_VERSION).tar.gz +$(PKG)_DEPS := gcc + +define $(PKG)_UPDATE + $(call MXE_GET_GITHUB_TAGS, g-truc/glm) +endef + +define $(PKG)_BUILD + mkdir '$(1).build' + + cd '$(1).build' && $(TARGET)-cmake '$(1)' + + $(MAKE) -C '$(1).build' -j '$(JOBS)' install + + '$(TARGET)-g++' \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-glm.exe' +endef + From 3672fda3736ec3d60f5352baac9475e8305aa291 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Thu, 19 May 2016 23:19:22 +0300 Subject: [PATCH 0670/1463] add host compiler version to log see #1351 --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 3f846bf8..ba124ccb 100644 --- a/Makefile +++ b/Makefile @@ -528,6 +528,8 @@ build-only-$(1)_$(3): lsb_release -a 2>/dev/null || sw_vers 2>/dev/null || true autoconf --version 2>/dev/null | head -1 automake --version 2>/dev/null | head -1 + $(BUILD_CC) --version + $(BUILD_CXX) --version python --version perl --version 2>&1 | head -3 rm -rf '$(2)' From fe0cd928ff02c1502320cb9a23f22cffd247eeac Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Fri, 20 May 2016 12:27:43 +0200 Subject: [PATCH 0671/1463] gnutls: update --- src/gnutls.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gnutls.mk b/src/gnutls.mk index 83d9a81d..e0b9939a 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -2,8 +2,8 @@ # See index.html for further information. PKG := gnutls -$(PKG)_VERSION := 3.4.11 -$(PKG)_CHECKSUM := 70ef9c9f95822d363036c6e6b5479750e5b7fc34f50e750c3464a98ec65a9ab8 +$(PKG)_VERSION := 3.4.12 +$(PKG)_CHECKSUM := e3370a3bf60f2ca4a6204461ea99e7d7047ee46f96bc2fb7c63f103312d3c9c7 $(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION) $(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://mirrors.dotsrc.org/gnupg/gnutls/v3.4/$($(PKG)_FILE) From 0d8a981e9dbd231c722a6fe1d73d8262dd959148 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Fri, 20 May 2016 12:27:56 +0200 Subject: [PATCH 0672/1463] curl: update --- src/curl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/curl.mk b/src/curl.mk index c6aa19b8..67b1819e 100644 --- a/src/curl.mk +++ b/src/curl.mk @@ -3,8 +3,8 @@ PKG := curl $(PKG)_IGNORE := -$(PKG)_VERSION := 7.48.0 -$(PKG)_CHECKSUM := df764ca663a6589280fd6ac0adb24051ef26cfefef24451f28f99eb7338894d6 +$(PKG)_VERSION := 7.49.0 +$(PKG)_CHECKSUM := eb0728df1c9224f8b8994d488bda9ddd0ae679485659ab69a13b91ef35755dcb $(PKG)_SUBDIR := curl-$($(PKG)_VERSION) $(PKG)_FILE := curl-$($(PKG)_VERSION).tar.lzma $(PKG)_URL := http://curl.haxx.se/download/$($(PKG)_FILE) From 96dd42e221b8d81c0f4fc1ead2bf9724b0c9bb78 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Fri, 20 May 2016 11:03:13 +0000 Subject: [PATCH 0673/1463] Update versions.json & build-matrix.html --- build-matrix.html | 4 ++-- versions.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 2eeeec50..2bb1f6c4 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -429,7 +429,7 @@ feel free to submit a pull request. curl - 7.48.0 + 7.49.0 ✓ ✓ ✓ @@ -849,7 +849,7 @@ feel free to submit a pull request. gnutls - 3.4.11 + 3.4.12 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index e2927ea6..6722387b 100644 --- a/versions.json +++ b/versions.json @@ -38,7 +38,7 @@ "cryptopp": "5.6.3", "crystalhd": "1", "cunit": "2.1-3", - "curl": "7.48.0", + "curl": "7.49.0", "db": "6.1.26", "dbus": "1.11.2", "dcmtk": "3.6.0", @@ -80,7 +80,7 @@ "glib": "2.44.1", "glibmm": "2.42.0", "gmp": "6.1.0", - "gnutls": "3.4.11", + "gnutls": "3.4.12", "googletest": "1.7.0", "graphicsmagick": "1.3.21", "gsl": "1.16", From d57e22f049c7153cdcf256013056b53574501918 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 21 May 2016 19:51:04 +1000 Subject: [PATCH 0674/1463] openthreads: remove standalone patch --- src/openthreads-1-fixes.patch | 72 ----------------------------------- src/openthreads.mk | 1 - 2 files changed, 73 deletions(-) delete mode 100644 src/openthreads-1-fixes.patch diff --git a/src/openthreads-1-fixes.patch b/src/openthreads-1-fixes.patch deleted file mode 100644 index 2621288c..00000000 --- a/src/openthreads-1-fixes.patch +++ /dev/null @@ -1,72 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Contains ad hoc patches for cross building. - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Rashad Kanavath -Date: Mon, 11 Jan 2016 15:33:57 +1100 -Subject: [PATCH] build standalone openthreads - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1111111..2222222 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -649,7 +649,7 @@ OPTION(OSG_USE_LOCAL_LUA_SOURCE "Enable to use local Lua source when building th - # - IF(ANDROID) - ANDROID_3RD_PARTY() --ELSE() -+ELSEIF(NOT OPENTHREADS_STANDALONE) - # Common to all platforms except android: - FIND_PACKAGE(Freetype) - FIND_PACKAGE(Inventor) -@@ -787,7 +787,7 @@ ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID) - - # Image readers/writers depend on 3rd party libraries except for OS X which - # can use Quicktime. --IF(NOT ANDROID) -+IF(NOT ANDROID AND NOT OPENTHREADS_STANDALONE) - IF(NOT APPLE) - FIND_PACKAGE(GIFLIB) - FIND_PACKAGE(JPEG) -@@ -1044,7 +1044,9 @@ ELSE () - SET(OPENSCENEGRAPH_USER_DEFINED_DYNAMIC_OR_STATIC "STATIC") - ENDIF() - -- -+IF(OPENTHREADS_STANDALONE) -+ADD_SUBDIRECTORY(src/OpenThreads) -+ELSE() - # OSG Core - ADD_SUBDIRECTORY(src) - -@@ -1055,7 +1057,7 @@ ENDIF() - IF (BUILD_OSG_EXAMPLES) - ADD_SUBDIRECTORY(examples) - ENDIF() -- -+ENDIF() - - IF(APPLE AND NOT ANDROID) - -@@ -1250,7 +1252,9 @@ IF(CMAKE_CPACK_COMMAND) - ENDIF() - - # Generate pkg-config configuration files -- -+IF(OPENTHREADS_STANDALONE) -+SET(PKGCONFIG_FILES) -+ELSE() - SET(PKGCONFIG_FILES - openscenegraph - openscenegraph-osg -@@ -1269,6 +1273,7 @@ SET(PKGCONFIG_FILES - openscenegraph-osgAnimation - openscenegraph-osgVolume - ) -+ENDIF() - - IF(QT4_FOUND OR Qt5Widgets_FOUND ) - SET(PKGCONFIG_FILES ${PKGCONFIG_FILES} openscenegraph-osgQt) diff --git a/src/openthreads.mk b/src/openthreads.mk index 3343aaac..f3144631 100644 --- a/src/openthreads.mk +++ b/src/openthreads.mk @@ -19,7 +19,6 @@ define $(PKG)_BUILD cd '$(1).build' && '$(TARGET)-cmake' \ -DDYNAMIC_OPENTHREADS=$(CMAKE_SHARED_BOOL) \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \ - -DOPENTHREADS_STANDALONE=TRUE \ -DOSG_USE_QT=FALSE \ -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE=1 \ -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED=1 \ From 4e12de4c9b9ec5288f933df5492368111099e6e1 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sat, 21 May 2016 10:10:05 +0000 Subject: [PATCH 0675/1463] Update versions.json & build-matrix.html --- build-matrix.html | 18 ++++++++++++++---- versions.json | 1 + 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 2bb1f6c4..caef9264 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -1107,6 +1107,16 @@ feel free to submit a pull request. ✗ + + hyperscan + 4.1.0 + ✓ + ✓ + ✓ + ✓ + ✗ + + icu4c 56.1 @@ -4079,14 +4089,14 @@ feel free to submit a pull request. -Total: 394 +Total: 395
    (+6 virtual +4 native-only) -391 +392 +294 +376 293 -375 -292 15 diff --git a/versions.json b/versions.json index 6722387b..0f605c46 100644 --- a/versions.json +++ b/versions.json @@ -106,6 +106,7 @@ "hdf4": "4.2.10", "hdf5": "1.8.12", "hunspell": "1.3.3", + "hyperscan": "4.1.0", "icu4c": "56.1", "id3lib": "3.8.3", "ilmbase": "2.2.0", From b97e5757bff098584718281cf0ba3836db619f32 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sat, 21 May 2016 10:21:48 +0000 Subject: [PATCH 0676/1463] Update versions.json & build-matrix.html --- build-matrix.html | 18 ++++++++++++++---- versions.json | 1 + 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index caef9264..58aadd93 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -837,6 +837,16 @@ feel free to submit a pull request. ✗ + + glm + 0.9.7.4 + ✓ + ✓ + ✓ + ✓ + ✗ + + gmp 6.1.0 @@ -4089,14 +4099,14 @@ feel free to submit a pull request. -Total: 395 +Total: 396
    (+6 virtual +4 native-only) -392 +393 +295 +377 294 -376 -293 15 diff --git a/versions.json b/versions.json index 0f605c46..68cf0e6a 100644 --- a/versions.json +++ b/versions.json @@ -79,6 +79,7 @@ "glfw3": "3.1.2", "glib": "2.44.1", "glibmm": "2.42.0", + "glm": "0.9.7.4", "gmp": "6.1.0", "gnutls": "3.4.12", "googletest": "1.7.0", From d63f6d39cca99226e8b281a881da8cc97209a473 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 23 May 2016 04:17:31 +0200 Subject: [PATCH 0677/1463] freetds: update --- src/freetds.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/freetds.mk b/src/freetds.mk index a4832731..5be11423 100644 --- a/src/freetds.mk +++ b/src/freetds.mk @@ -3,8 +3,8 @@ PKG := freetds $(PKG)_IGNORE := -$(PKG)_VERSION := 0.95.95 -$(PKG)_CHECKSUM := 170bbe11ffe02cb38ec8f76605d13689e3e405862d7d083526667640f12ea95c +$(PKG)_VERSION := 1.00 +$(PKG)_CHECKSUM := 5d617cc22855814815f815a2a1e354d91e674101ca08e55fbad3e51f14e61040 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := ftp://ftp.freetds.org/pub/$(PKG)/stable/$($(PKG)_FILE) From 4135f9b1227ba56b92ceb8a982016370ad5c8894 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Mon, 23 May 2016 02:18:42 +0000 Subject: [PATCH 0678/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 58aadd93..4dfedb9b 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -629,7 +629,7 @@ feel free to submit a pull request. freetds - 0.95.95 + 1.00 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 68cf0e6a..66d18f32 100644 --- a/versions.json +++ b/versions.json @@ -58,7 +58,7 @@ "fontconfig": "2.11.1", "freeglut": "2.8.1", "freeimage": "3.15.4", - "freetds": "0.95.95", + "freetds": "1.00", "freetype": "2.6.3", "freetype-bootstrap": "2.6.3", "fribidi": "0.19.6", From e6b0ebab0094ae41e1ae4732cf96a9a518833adc Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 26 May 2016 22:58:27 +0200 Subject: [PATCH 0679/1463] libpng: update --- src/libpng.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libpng.mk b/src/libpng.mk index b0d18da0..cbb900aa 100644 --- a/src/libpng.mk +++ b/src/libpng.mk @@ -3,8 +3,8 @@ PKG := libpng $(PKG)_IGNORE := -$(PKG)_VERSION := 1.6.21 -$(PKG)_CHECKSUM := 6c8f1849eb9264219bf5d703601e5abe92a58651ecae927a03d1a1aa15ee2083 +$(PKG)_VERSION := 1.6.22 +$(PKG)_CHECKSUM := 6b5a6ad5c5801ec4d24aacc87a0ed7b666cd586478174f69368a1d7747715226 $(PKG)_SUBDIR := libpng-$($(PKG)_VERSION) $(PKG)_FILE := libpng-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/libpng/libpng16/$($(PKG)_VERSION)/$($(PKG)_FILE) From 7f58b03f44f5145d12f87f8c75d53fcc8cd32d06 Mon Sep 17 00:00:00 2001 From: rr- Date: Thu, 26 May 2016 23:01:24 +0200 Subject: [PATCH 0680/1463] docs: add mini-tutorial on plugins --- plugins/README.md | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/plugins/README.md b/plugins/README.md index 785d1c36..ac7490b0 100644 --- a/plugins/README.md +++ b/plugins/README.md @@ -1,5 +1,22 @@ ### MXE Plugins -A collection of unsupported examples, experiments, tools, and utilities. +MXE lets you override the way packages are built and installed by offering +plugins mechanism. This directory contains a collection of example plugins and +experimental content. Enjoy! -Enjoy! +*Note: the files here should be considered examples only and are unmaintained.* + +##### Rolling your own plugin + +The basic usage is to drop some `*.mk` files in a directory `foo/` and set +`MXE_PLUGIN_DIRS='foo/'` while invoking `make` like this: + +```console +MXE_PLUGINS_DIR=foo/ make libpng +``` + +If needed, you can also pass multiple directories by separating them with a +space: `MXE_PLUGIN_DIRS='foo1/ foo2/'`. + +For details on `*.mk` contents, please consult the contents of this directory +and `src/*.mk`. From 1d4d66426390d845a0d54a219f050fe8d019276d Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Thu, 26 May 2016 21:03:46 +0000 Subject: [PATCH 0681/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 4dfedb9b..a3ce100e 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -1939,7 +1939,7 @@ feel free to submit a pull request. libpng - 1.6.21 + 1.6.22 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 66d18f32..902c4bd6 100644 --- a/versions.json +++ b/versions.json @@ -189,7 +189,7 @@ "libpano13": "2.9.18", "libpaper": "1.1.24+nmu4", "libplist": "1.12", - "libpng": "1.6.21", + "libpng": "1.6.22", "librosco": "0.1.11", "librsvg": "2.40.5", "librtmp": "a107cef", From 6ab369edde1eeac41cf9b98e91fb9aaa7ece3474 Mon Sep 17 00:00:00 2001 From: Daniel Burr Date: Sun, 29 May 2016 08:33:26 +0200 Subject: [PATCH 0682/1463] Always use the included version of libxml --- plugins/native/gettext.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/native/gettext.mk b/plugins/native/gettext.mk index 413671fa..b9c5749e 100644 --- a/plugins/native/gettext.mk +++ b/plugins/native/gettext.mk @@ -8,7 +8,8 @@ $(PKG)_DEPS_$(BUILD) := libiconv define $(PKG)_BUILD_$(BUILD) mkdir '$(1).build' cd '$(1).build' && '$(1)/configure' \ - --prefix='$(PREFIX)/$(TARGET)' + --prefix='$(PREFIX)/$(TARGET)' \ + --with-included-libxml $(MAKE) -C '$(1).build' -j '$(JOBS)' man1_MANS= $(MAKE) -C '$(1).build' -j 1 install man1_MANS= endef From 33d0bec0ac958239eee11da6580157369537eda5 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 30 May 2016 02:40:55 +0300 Subject: [PATCH 0683/1463] update libuv to 1.9.1 The patches are not needed: * https://github.com/libuv/libuv/issues/820 * https://github.com/libuv/libuv/pull/841/ --- src/libuv-1-fixes.patch | 79 ----------------------------------------- src/libuv.mk | 4 +-- 2 files changed, 2 insertions(+), 81 deletions(-) delete mode 100644 src/libuv-1-fixes.patch diff --git a/src/libuv-1-fixes.patch b/src/libuv-1-fixes.patch deleted file mode 100644 index ec8f9578..00000000 --- a/src/libuv-1-fixes.patch +++ /dev/null @@ -1,79 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Contains ad hoc patches for cross building. - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: cjihrig -Date: Mon, 11 Apr 2016 11:11:47 -0400 -Subject: [PATCH] Revert "win,build: remove unused build defines" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This reverts commit 60db5b5a1bb446e4b8a6d15ce277d5f7987bf07a. -Removing the WIN32_LEAN_AND_MEAN definition caused build errors -on mingw64. - -Fixes: https://github.com/libuv/libuv/issues/820 -PR-URL: https://github.com/libuv/libuv/pull/821 -Reviewed-By: Saúl Ibarra Corretgé -Reviewed-By: Ben Noordhuis - -diff --git a/Makefile.am b/Makefile.am -index 1111111..2222222 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -43,6 +43,7 @@ if WINNT - - include_HEADERS += include/uv-win.h include/tree.h - AM_CPPFLAGS += -I$(top_srcdir)/src/win \ -+ -DWIN32_LEAN_AND_MEAN \ - -D_WIN32_WINNT=0x0600 - LIBS += -lws2_32 -lpsapi -liphlpapi -lshell32 -luserenv - libuv_la_SOURCES += src/win/async.c \ -diff --git a/Makefile.mingw b/Makefile.mingw -index 1111111..2222222 100644 ---- a/Makefile.mingw -+++ b/Makefile.mingw -@@ -20,6 +20,7 @@ CFLAGS += -Wall \ - -Iinclude \ - -Isrc \ - -Isrc/win \ -+ -DWIN32_LEAN_AND_MEAN \ - -D_WIN32_WINNT=0x0600 - - INCLUDES = include/stdint-msvc2008.h \ - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Tony Theodore -Date: Tue, 12 Apr 2016 11:06:36 +1000 -Subject: [PATCH] set LIBS in configure.ac instead of Makefile.am - - -diff --git a/Makefile.am b/Makefile.am -index 1111111..2222222 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -45,7 +45,6 @@ include_HEADERS += include/uv-win.h include/tree.h - AM_CPPFLAGS += -I$(top_srcdir)/src/win \ - -DWIN32_LEAN_AND_MEAN \ - -D_WIN32_WINNT=0x0600 --LIBS += -lws2_32 -lpsapi -liphlpapi -lshell32 -luserenv - libuv_la_SOURCES += src/win/async.c \ - src/win/atomicops-inl.h \ - src/win/core.c \ -diff --git a/configure.ac b/configure.ac -index 1111111..2222222 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -58,6 +58,9 @@ AM_CONDITIONAL([NETBSD], [AS_CASE([$host_os],[netbsd*], [true], [false]) - AM_CONDITIONAL([OPENBSD], [AS_CASE([$host_os],[openbsd*], [true], [false])]) - AM_CONDITIONAL([SUNOS], [AS_CASE([$host_os],[solaris*], [true], [false])]) - AM_CONDITIONAL([WINNT], [AS_CASE([$host_os],[mingw*], [true], [false])]) -+AS_CASE([$host_os],[mingw*], [ -+ LIBS="$LIBS -lws2_32 -lpsapi -liphlpapi -lshell32 -luserenv" -+]) - AC_CHECK_HEADERS([sys/ahafs_evProds.h]) - AC_CHECK_PROG(PKG_CONFIG, pkg-config, yes) - AM_CONDITIONAL([HAVE_PKG_CONFIG], [test "x$PKG_CONFIG" != "x"]) diff --git a/src/libuv.mk b/src/libuv.mk index 3db9649c..9ad02de2 100644 --- a/src/libuv.mk +++ b/src/libuv.mk @@ -3,8 +3,8 @@ PKG := libuv $(PKG)_IGNORE := -$(PKG)_VERSION := 1.9.0 -$(PKG)_CHECKSUM := d595b2725abcce851c76239aab038adc126c58714cfb572b2ebb2d21b3593842 +$(PKG)_VERSION := 1.9.1 +$(PKG)_CHECKSUM := e83953782c916d7822ef0b94e8115ce5756fab5300cca173f0de5f5b0e0ae928 $(PKG)_SUBDIR := $(PKG)-v$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-v$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://dist.libuv.org/dist/v$($(PKG)_VERSION)/$($(PKG)_FILE) From b247344bdc579b2bd8b6a54e213f4ddf4081f187 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 5 May 2016 20:24:19 +1000 Subject: [PATCH 0684/1463] libtorrent-rasterbar: update 1.0.7 --> 1.1.0 failing on x86_64-w64-mingw32.static --- ...rent-rasterbar-1-getfileattributesex.patch | 30 --------------- src/libtorrent-rasterbar-2-geoip-win32.patch | 29 --------------- ...eoip-include-winsock2-before-windows.patch | 37 ------------------- ...asterbar-4-ed25519-seed-fix-includes.patch | 30 --------------- src/libtorrent-rasterbar.mk | 14 ++++--- 5 files changed, 8 insertions(+), 132 deletions(-) delete mode 100644 src/libtorrent-rasterbar-1-getfileattributesex.patch delete mode 100644 src/libtorrent-rasterbar-2-geoip-win32.patch delete mode 100644 src/libtorrent-rasterbar-3-geoip-include-winsock2-before-windows.patch delete mode 100644 src/libtorrent-rasterbar-4-ed25519-seed-fix-includes.patch diff --git a/src/libtorrent-rasterbar-1-getfileattributesex.patch b/src/libtorrent-rasterbar-1-getfileattributesex.patch deleted file mode 100644 index ec7abc61..00000000 --- a/src/libtorrent-rasterbar-1-getfileattributesex.patch +++ /dev/null @@ -1,30 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -From 679ad4e2331484fda9da250cb269779daf703698 Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Sat, 29 Aug 2015 10:28:59 +0200 -Subject: [PATCH] file.cpp: use defined GetFileAttributesEx - -This macro was defined as GetFileAttributesEx_ but used -as GetFileAttributesEx. Strange. ---- - src/file.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/file.cpp b/src/file.cpp -index a3219b0..0276033 100644 ---- a/src/file.cpp -+++ b/src/file.cpp -@@ -208,7 +208,7 @@ namespace libtorrent - std::string f = convert_to_native(inf); - #endif - WIN32_FILE_ATTRIBUTE_DATA data; -- if (!GetFileAttributesEx(f.c_str(), GetFileExInfoStandard, &data)) -+ if (!GetFileAttributesEx_(f.c_str(), GetFileExInfoStandard, &data)) - { - ec.assign(GetLastError(), get_system_category()); - return; --- -1.7.10.4 - diff --git a/src/libtorrent-rasterbar-2-geoip-win32.patch b/src/libtorrent-rasterbar-2-geoip-win32.patch deleted file mode 100644 index f37b09aa..00000000 --- a/src/libtorrent-rasterbar-2-geoip-win32.patch +++ /dev/null @@ -1,29 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -From 258068273e70f25b723c4813805e76f92b18264c Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Sat, 29 Aug 2015 11:03:49 +0200 -Subject: [PATCH] GeoIP.c: disable POSIX section - -WIN32 is not defined for some reason. ---- - src/GeoIP.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/GeoIP.c b/src/GeoIP.c -index cb4437e..be2c5e4 100644 ---- a/src/GeoIP.c -+++ b/src/GeoIP.c -@@ -22,7 +22,7 @@ - - #include "libtorrent/ConvertUTF.h" - --#ifndef WIN32 -+#ifndef _WIN32 - #include - #include - #include /* For ntohl */ --- -1.7.10.4 - diff --git a/src/libtorrent-rasterbar-3-geoip-include-winsock2-before-windows.patch b/src/libtorrent-rasterbar-3-geoip-include-winsock2-before-windows.patch deleted file mode 100644 index c15fd129..00000000 --- a/src/libtorrent-rasterbar-3-geoip-include-winsock2-before-windows.patch +++ /dev/null @@ -1,37 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -From 09eb90c58226b667e5ad327520c7bc3ec18617b8 Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Sat, 29 Aug 2015 11:15:52 +0200 -Subject: [PATCH] GeoIP.c: include winsock2.h before windows.h - -Fix a warning: - -In file included from GeoIP.c:35:0: -mxe/usr/i686-w64-mingw32.static/include/winsock2.h:15:2: -warning: #warning Please include winsock2.h before windows.h -[-Wcpp] - #warning Please include winsock2.h before windows.h - ^ ---- - src/GeoIP.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/GeoIP.c b/src/GeoIP.c -index be2c5e4..e1250e0 100644 ---- a/src/GeoIP.c -+++ b/src/GeoIP.c -@@ -31,8 +31,8 @@ - #include - - #else --#include - #include -+#include - #define snprintf _snprintf - #endif - #include --- -1.7.10.4 - diff --git a/src/libtorrent-rasterbar-4-ed25519-seed-fix-includes.patch b/src/libtorrent-rasterbar-4-ed25519-seed-fix-includes.patch deleted file mode 100644 index 43d8887b..00000000 --- a/src/libtorrent-rasterbar-4-ed25519-seed-fix-includes.patch +++ /dev/null @@ -1,30 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -From eddde6d65c1ec97ab473e40ce44cfef2a20e6bd6 Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Sat, 29 Aug 2015 11:20:16 +0200 -Subject: [PATCH] ed25519/src/seed.cpp: fix includes - ---- - ed25519/src/seed.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ed25519/src/seed.cpp b/ed25519/src/seed.cpp -index 7619c66..d9dd1c1 100644 ---- a/ed25519/src/seed.cpp -+++ b/ed25519/src/seed.cpp -@@ -3,8 +3,8 @@ - #ifndef ED25519_NO_SEED - - #ifdef _WIN32 --#include --#include -+#include -+#include - #else - #include - #endif --- -1.7.10.4 - diff --git a/src/libtorrent-rasterbar.mk b/src/libtorrent-rasterbar.mk index 02732fd1..d96baf8f 100644 --- a/src/libtorrent-rasterbar.mk +++ b/src/libtorrent-rasterbar.mk @@ -3,11 +3,13 @@ PKG := libtorrent-rasterbar $(PKG)_IGNORE := -$(PKG)_VERSION := 1.0.7 -$(PKG)_CHECKSUM := 3e16e024b175fefada17471c659fdbcfab235f9619d4f0913faa13cb02ca8d83 +$(PKG)_VERSION := 1.1.0 +$(PKG)_CHECKSUM := 2713df7da4aec5263ac11b6626ea966f368a5a8081103fd8f2f2ed97b5cd731d $(PKG)_SUBDIR := libtorrent-rasterbar-$($(PKG)_VERSION) $(PKG)_FILE := libtorrent-rasterbar-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/arvidn/libtorrent/releases/download/libtorrent-$(subst .,_,$($(PKG)_VERSION))/libtorrent-rasterbar-$($(PKG)_VERSION).tar.gz +# this will likely revert to standard naming in future releases +$(PKG)_URL := https://github.com/arvidn/libtorrent/releases/download/libtorrent-1_1/libtorrent-rasterbar-$($(PKG)_VERSION).tar.gz $(PKG)_DEPS := gcc boost openssl define $(PKG)_UPDATE @@ -17,14 +19,14 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && \ - ./configure \ + cd '$(1)' && ./configure \ $(MXE_CONFIGURE_OPTS) \ PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \ - --with-boost-system=boost_system-mt \ + --with-boost='$(PREFIX)/$(TARGET)' \ --disable-debug \ --disable-tests \ - --disable-examples + --disable-examples \ + CXXFLAGS='-D_WIN32_WINNT=0x0501' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef From dea554d03877640f4345922839e8ececda71fda4 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 29 May 2016 23:04:24 +0300 Subject: [PATCH 0685/1463] libtorrent-rasterbar: fix internal gcc error on logs of x86_64-w64-mingw32.static: before: https://gist.github.com/7c61dde0bca9160ae335e8a117862b14 after: https://gist.github.com/f429d35c8600c450606028822649afa8 Flags "-g -O2" had been there before CXXFLAGS was set. This commit brings them back. --- src/libtorrent-rasterbar.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libtorrent-rasterbar.mk b/src/libtorrent-rasterbar.mk index d96baf8f..7a1c7532 100644 --- a/src/libtorrent-rasterbar.mk +++ b/src/libtorrent-rasterbar.mk @@ -26,7 +26,7 @@ define $(PKG)_BUILD --disable-debug \ --disable-tests \ --disable-examples \ - CXXFLAGS='-D_WIN32_WINNT=0x0501' + CXXFLAGS='-D_WIN32_WINNT=0x0501 -g -O2' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef From 8bd70f6d4428602dbb0931fa13683ac84a2d9dae Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 30 May 2016 01:21:44 +0300 Subject: [PATCH 0686/1463] qbittorrent, libtorrent: Boost.Asio is header only Fix link errors in qbittorrent after libtorrent-rasterbar 1.1.0. Disable BOOST_ASIO_SEPARATE_COMPILATION See http://www.boost.org/doc/libs/1_45_0/doc/html/boost_asio/using.html --- plugins/apps/qbittorrent-1-fixes.patch | 38 ++++++++++++++++++++++++++ src/libtorrent-rasterbar-1-fixes.patch | 33 ++++++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 src/libtorrent-rasterbar-1-fixes.patch diff --git a/plugins/apps/qbittorrent-1-fixes.patch b/plugins/apps/qbittorrent-1-fixes.patch index e5e19c63..457f35bb 100644 --- a/plugins/apps/qbittorrent-1-fixes.patch +++ b/plugins/apps/qbittorrent-1-fixes.patch @@ -54,3 +54,41 @@ index 1111111..2222222 100755 if test -r "$QT_QMAKE/qmake-qt4"; then eval "$as_ac_File=yes" else + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Mon, 30 May 2016 00:09:20 +0200 +Subject: [PATCH] disable BOOST_ASIO_SEPARATE_COMPILATION + +After upgrading libtorrent-rasterbar to 1.1.0, qbittorrent fails to link +main executable with undefined symbols in boost_asio: + + ./release/application.o:application.cpp:(.text.startup+0x83): + undefined reference to `boost::asio::detail::winsock_init_base::startup + (boost::asio::detail::winsock_init_base::data&, unsigned char, + unsigned char)' + +diff --git a/cmake/Modules/winconf.cmake b/cmake/Modules/winconf.cmake +index 1111111..2222222 100644 +--- a/cmake/Modules/winconf.cmake ++++ b/cmake/Modules/winconf.cmake +@@ -5,7 +5,6 @@ + set(LibtorrentRasterbar_USE_STATIC_LIBS True) + set(LibtorrentRasterbar_CUSTOM_DEFINITIONS + -DBOOST_ALL_NO_LIB -DBOOST_ASIO_HASH_MAP_BUCKETS=1021 +- -DBOOST_ASIO_SEPARATE_COMPILATION + -DBOOST_EXCEPTION_DISABLE + -DBOOST_SYSTEM_STATIC_LINK=1 + -DTORRENT_USE_OPENSSL +diff --git a/winconf.pri b/winconf.pri +index 1111111..2222222 100644 +--- a/winconf.pri ++++ b/winconf.pri +@@ -21,7 +21,6 @@ LIBS += $$quote(-LC:/qBittorrent/openssl/lib) + # LIBTORRENT DEFINES + DEFINES += BOOST_ALL_NO_LIB + DEFINES += BOOST_ASIO_HASH_MAP_BUCKETS=1021 +-DEFINES += BOOST_ASIO_SEPARATE_COMPILATION + # After 1.55 some Windows users reported regular UI freezes. + # This makes ASIO use the pre-1.56 way of doing things. See issue #2003 + DEFINES += BOOST_ASIO_DISABLE_CONNECTEX diff --git a/src/libtorrent-rasterbar-1-fixes.patch b/src/libtorrent-rasterbar-1-fixes.patch new file mode 100644 index 00000000..0e43d235 --- /dev/null +++ b/src/libtorrent-rasterbar-1-fixes.patch @@ -0,0 +1,33 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Mon, 30 May 2016 00:10:30 +0200 +Subject: [PATCH] disable BOOST_ASIO_SEPARATE_COMPILATION + +After upgrading libtorrent-rasterbar to 1.1.0, qbittorrent fails to link +main executable with undefined symbols in boost_asio: + + ./release/application.o:application.cpp:(.text.startup+0x83): + undefined reference to `boost::asio::detail::winsock_init_base::startup + (boost::asio::detail::winsock_init_base::data&, unsigned char, + unsigned char)' + +diff --git a/include/libtorrent/config.hpp b/include/libtorrent/config.hpp +index 1111111..2222222 100644 +--- a/include/libtorrent/config.hpp ++++ b/include/libtorrent/config.hpp +@@ -64,10 +64,6 @@ POSSIBILITY OF SUCH DAMAGE. + #error TORRENT_DEBUG_BUFFERS only works if you also disable pool allocators with TORRENT_DISABLE_POOL_ALLOCATOR + #endif + +-#if !defined BOOST_ASIO_SEPARATE_COMPILATION && !defined BOOST_ASIO_DYN_LINK +-#define BOOST_ASIO_SEPARATE_COMPILATION +-#endif +- + #ifndef _MSC_VER + #ifndef __STDC_FORMAT_MACROS + #define __STDC_FORMAT_MACROS 1 From 9f1a2f567db8f8a8ed1df97c77def9c519c43ee8 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 30 May 2016 01:23:50 +0300 Subject: [PATCH 0687/1463] qbittorrent: link with boost_random, boost_chrono --- plugins/apps/qbittorrent-1-fixes.patch | 28 ++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/plugins/apps/qbittorrent-1-fixes.patch b/plugins/apps/qbittorrent-1-fixes.patch index 457f35bb..fe4c17a0 100644 --- a/plugins/apps/qbittorrent-1-fixes.patch +++ b/plugins/apps/qbittorrent-1-fixes.patch @@ -55,6 +55,34 @@ index 1111111..2222222 100755 eval "$as_ac_File=yes" else +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Sun, 29 May 2016 23:35:25 +0200 +Subject: [PATCH] link with boost_random and boost_chrono + +libtorrent-rasterbar 1.1.0 uses them + +diff --git a/winconf-mingw.pri b/winconf-mingw.pri +index 1111111..2222222 100644 +--- a/winconf-mingw.pri ++++ b/winconf-mingw.pri +@@ -23,11 +23,15 @@ RC_FILE = qbittorrent_mingw.rc + # Adapt the lib names/versions accordingly + CONFIG(debug, debug|release) { + LIBS += libtorrent-rasterbar \ ++ libboost_random-mt \ ++ libboost_chrono-mt \ + libboost_system-mt \ + libboost_filesystem-mt \ + libboost_thread_win32-mt + } else { + LIBS += libtorrent-rasterbar \ ++ libboost_random-mt \ ++ libboost_chrono-mt \ + libboost_system-mt \ + libboost_filesystem-mt \ + libboost_thread_win32-mt + From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 30 May 2016 00:09:20 +0200 From 94dbe52f3d990491263b6c84fc4bd11f0e63149a Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Mon, 30 May 2016 06:45:32 +0000 Subject: [PATCH 0688/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index a3ce100e..c63f6d86 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -2069,7 +2069,7 @@ feel free to submit a pull request. libtorrent-rasterbar - 1.0.7 + 1.1.0 ✓ ✗ ✓ diff --git a/versions.json b/versions.json index 902c4bd6..88ac7fe6 100644 --- a/versions.json +++ b/versions.json @@ -202,7 +202,7 @@ "libssh2": "1.7.0", "libsvm": "3.20", "libtool": "2.4.4", - "libtorrent-rasterbar": "1.0.7", + "libtorrent-rasterbar": "1.1.0", "libunistring": "0.9.4", "libusb": "1.2.6.0", "libusb1": "1.0.19", From 9bfff3af9d67d4fb3246cbe41bdda0c9b42e3f76 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Mon, 30 May 2016 07:31:27 +0000 Subject: [PATCH 0689/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index c63f6d86..230c7882 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -2109,7 +2109,7 @@ feel free to submit a pull request. libuv - 1.9.0 + 1.9.1 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 88ac7fe6..fe69844f 100644 --- a/versions.json +++ b/versions.json @@ -206,7 +206,7 @@ "libunistring": "0.9.4", "libusb": "1.2.6.0", "libusb1": "1.0.19", - "libuv": "1.9.0", + "libuv": "1.9.1", "libvpx": "1.5.0", "libwebp": "0.4.4", "libwebsockets": "1.4-chrome43-firefox-36", From e52bf75c00a4fcd64bbaca5f7d5f19fd924c107e Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 30 May 2016 12:40:57 +0200 Subject: [PATCH 0690/1463] curl: update --- src/curl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/curl.mk b/src/curl.mk index 67b1819e..2f86bbdc 100644 --- a/src/curl.mk +++ b/src/curl.mk @@ -3,8 +3,8 @@ PKG := curl $(PKG)_IGNORE := -$(PKG)_VERSION := 7.49.0 -$(PKG)_CHECKSUM := eb0728df1c9224f8b8994d488bda9ddd0ae679485659ab69a13b91ef35755dcb +$(PKG)_VERSION := 7.49.1 +$(PKG)_CHECKSUM := 540dd7e2017293ac13c925951a8e3187382b6fe7be045d5806912aae3c1f7c0c $(PKG)_SUBDIR := curl-$($(PKG)_VERSION) $(PKG)_FILE := curl-$($(PKG)_VERSION).tar.lzma $(PKG)_URL := http://curl.haxx.se/download/$($(PKG)_FILE) From a29a826b02c15995a47463e551909c352a3065db Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Mon, 30 May 2016 10:45:34 +0000 Subject: [PATCH 0691/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 230c7882..ad370c89 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -429,7 +429,7 @@ feel free to submit a pull request. curl - 7.49.0 + 7.49.1 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index fe69844f..f16cf4ec 100644 --- a/versions.json +++ b/versions.json @@ -38,7 +38,7 @@ "cryptopp": "5.6.3", "crystalhd": "1", "cunit": "2.1-3", - "curl": "7.49.0", + "curl": "7.49.1", "db": "6.1.26", "dbus": "1.11.2", "dcmtk": "3.6.0", From 31ecd36182a69667641b659156474544641fdbf4 Mon Sep 17 00:00:00 2001 From: Thomas Danckaert Date: Thu, 3 Mar 2016 16:26:22 +0100 Subject: [PATCH 0692/1463] Treat files ending in .tar.Z as gzipped tar files. --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ba124ccb..8a4fabc6 100644 --- a/Makefile +++ b/Makefile @@ -176,6 +176,7 @@ SHORT_PKG_VERSION = \ UNPACK_ARCHIVE = \ $(if $(filter %.tgz, $(1)),tar xzf '$(1)', \ $(if $(filter %.tar.gz, $(1)),tar xzf '$(1)', \ + $(if $(filter %.tar.Z, $(1)),tar xzf '$(1)', \ $(if $(filter %.tbz2, $(1)),tar xjf '$(1)', \ $(if $(filter %.tar.bz2, $(1)),tar xjf '$(1)', \ $(if $(filter %.tar.lzma,$(1)),xz -dc -F lzma '$(1)' | tar xf -, \ @@ -184,7 +185,7 @@ UNPACK_ARCHIVE = \ $(if $(filter %.7z, $(1)),7za x '$(1)', \ $(if $(filter %.zip, $(1)),unzip -q '$(1)', \ $(if $(filter %.deb, $(1)),ar x '$(1)' && tar xf data.tar*, \ - $(error Unknown archive format: $(1)))))))))))) + $(error Unknown archive format: $(1))))))))))))) UNPACK_PKG_ARCHIVE = \ $(call UNPACK_ARCHIVE,$(PKG_DIR)/$($(1)_FILE)) From b21ca7c1b6cb6a5c9714bcad30d87ab71f1d3e21 Mon Sep 17 00:00:00 2001 From: Thomas Danckaert Date: Thu, 3 Mar 2016 16:27:41 +0100 Subject: [PATCH 0693/1463] Add package 'HDF-EOS5'. http://hdfeos.org/software/library.php "The HDF-EOS5 is a software library designed built on HDF5* to support the same Grid/Point/Swath functionality in HDF-EOS 2 and to the extent possible it will be built with the same calling sequences as the original HDF-EOS 2 library." --- index.html | 4 + src/hdf-eos5-1-fixes.patch | 158 +++++++++++++++++++++++++++++++++++++ src/hdf-eos5-test.c | 33 ++++++++ src/hdf-eos5.mk | 34 ++++++++ 4 files changed, 229 insertions(+) create mode 100644 src/hdf-eos5-1-fixes.patch create mode 100644 src/hdf-eos5-test.c create mode 100644 src/hdf-eos5.mk diff --git a/index.html b/index.html index 69823910..25edd9fd 100644 --- a/index.html +++ b/index.html @@ -1517,6 +1517,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) harfbuzz HarfBuzz + + hdf-eos5 + HDF-EOS5 + hdf4 HDF4 diff --git a/src/hdf-eos5-1-fixes.patch b/src/hdf-eos5-1-fixes.patch new file mode 100644 index 00000000..3850246a --- /dev/null +++ b/src/hdf-eos5-1-fixes.patch @@ -0,0 +1,158 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Thomas Danckaert +Date: Fri, 27 May 2016 17:39:23 +0200 +Subject: [PATCH] fixes + + +diff --git a/configure.ac b/configure.ac +index 1111111..2222222 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -104,17 +104,7 @@ dnl Check if -Df2cFortran is specified + dnl Running only the preprocessor may not be a good idea + dnl because this can be hard-coded. + AC_MSG_CHECKING([for fc2Fortran macro]) +-AC_CACHE_VAL([he5_cv_f2cFortran_defined], +- [AC_TRY_RUN([ +- int main(void) +- { +- #ifdef f2cFortran +- return 0; +- #else +- return 1; +- #endif +- } +- ], [he5_cv_f2cFortran_defined=yes], [he5_cv_f2cFortran_defined=no],)]) ++AC_CACHE_VAL([he5_cv_f2cFortran_defined],[he5_cv_f2cFortran_defined=yes]) + if test ${he5_cv_f2cFortran_defined} = "yes"; then + F2CFORTRAN_MACRO="yes" + AC_MSG_RESULT([defined]) +@@ -124,18 +114,7 @@ else + fi + + if test ${he5_cv_f2cFortran_defined} = "yes"; then +- AC_CHECK_SIZEOF([int*]) +- AC_CACHE_VAL([he5_cv_32ptr], +- [AC_TRY_RUN([ +- int main(void) +- { +-#ifdef SIZEOF_INTP +- return SIZEOF_INTP == 4 ? 0 : 1; +-#else +-#error SIZEOF_INTP is not defined +-#endif +- } +- ], [he5_cv_32ptr=yes], [he5_cv_32ptr=no],)]) ++ AC_CACHE_VAL([he5_cv_32ptr],[he5_cv_32ptr=no]) + if test ${he5_cv_32ptr} = "yes"; then + AC_MSG_NOTICE([possibly 32 bit system]) + F2CFORTRAN_32PTR="yes" +@@ -417,20 +396,7 @@ fi + + # Check whether HDF5 threadsafety is enabled + AC_MSG_CHECKING([if HDF5 threadsafe mode is enabled]) +-AC_TRY_RUN([ +-#include "hdf5.h" +- +-int main(void) { +-#ifdef H5_HAVE_THREADSAFE +- return 0; +-#else +- return 1; +-#endif +-} ], +- [ AC_MSG_RESULT([yes]) +- THREADSAFE="yes"], +- [AC_MSG_RESULT([no]) +- THREADSAFE="no"]) ++THREADSAFE=no + + # Record threadsafe status in config.h and for Makefiles + if test "X$THREADSAFE" = "Xyes"; then +@@ -445,24 +411,7 @@ if test "x$HAVE_HDF5" = "xyes"; then + dnl Check if HDF5 is linked with SZIP encoder + + AC_MSG_CHECKING([for hdf5 szip decoding filter]) +- AC_CACHE_VAL([he5_cv_hdf5_szip_can_decode], +- [AC_TRY_RUN([ +- #include +- #include +- +- int main(int argc, char **argv) +- { +- herr_t ret; +- unsigned int flags = 0; +- int decoder = 0; +- +- ret = H5Zget_filter_info(H5Z_FILTER_SZIP, &flags); +- if (ret < 0) exit(1); +- decoder = flags & H5Z_FILTER_CONFIG_DECODE_ENABLED; +- if (decoder) exit(0); +- else exit(1); +- } +- ], [he5_cv_hdf5_szip_can_decode=yes], [he5_cv_hdf5_szip_can_decode=no],)]) ++ AC_CACHE_VAL([he5_cv_hdf5_szip_can_decode],[he5_cv_hdf5_szip_can_decode=no]) + if test ${he5_cv_hdf5_szip_can_decode} = "yes"; then + AC_DEFINE(HAVE_HDF5_SZIP_DECODER, 1, + [Define if HDF5 has szip decoder filter]) +@@ -474,24 +423,7 @@ if test "x$HAVE_HDF5" = "xyes"; then + fi + + AC_MSG_CHECKING([for hdf5 szip encoding filter]) +- AC_CACHE_VAL([he5_cv_hdf5_szip_can_encode], +- [AC_TRY_RUN([ +- #include +- #include +- +- int main(int argc, char **argv) +- { +- herr_t ret; +- unsigned int flags = 0; +- int encoder = 0; +- +- ret = H5Zget_filter_info(H5Z_FILTER_SZIP, &flags); +- if (ret < 0) exit(1); +- encoder = flags & H5Z_FILTER_CONFIG_ENCODE_ENABLED; +- if (encoder) exit(0); +- else exit(1); +- } +- ], [he5_cv_hdf5_szip_can_encode=yes], [he5_cv_hdf5_szip_can_encode=no],)]) ++ AC_CACHE_VAL([he5_cv_hdf5_szip_can_encode],[he5_cv_hdf5_szip_can_encode=no]) + + if test ${he5_cv_hdf5_szip_can_encode} = "yes"; then + AC_DEFINE(HAVE_HDF5_SZIP_ENCODER, 1, + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Thomas Danckaert +Date: Fri, 27 May 2016 17:49:30 +0200 +Subject: [PATCH] Fix compilation without SZIP. + +A wrongly placed #endif causes a missing symbol 'HE5_EHHEisHE5' when +compiling without szip. Bug & fix reported upstream. + +diff --git a/src/EHapi.c b/src/EHapi.c +index 1111111..2222222 100755 +--- a/src/EHapi.c ++++ b/src/EHapi.c +@@ -11379,6 +11379,7 @@ int HE5_szip_can_encode(void ) + return(-1); + } + ++#endif /* H5_HAVE_FILTER_SZIP */ + + + /*----------------------------------------------------------------------------| +@@ -11509,8 +11510,6 @@ HE5_EHHEisHE5(char *filename) + } + } + +-#endif /* H5_HAVE_FILTER_SZIP */ +- + + #ifndef __cplusplus + diff --git a/src/hdf-eos5-test.c b/src/hdf-eos5-test.c new file mode 100644 index 00000000..b803dbdc --- /dev/null +++ b/src/hdf-eos5-test.c @@ -0,0 +1,33 @@ +/* + * This file is part of MXE. + * See index.html for further information. + */ + +#include "HE5_HdfEosDef.h" + +int main() { + + char filename[] = "test.he5"; + hid_t output_file = HE5_SWopen(filename, H5F_ACC_TRUNC); + char swathname[] = "testswath"; + hid_t swath_id = HE5_SWcreate(output_file, swathname); + + char dimension[] = "dummydim"; + HE5_SWdefdim(swath_id, dimension, 10); + char fieldname[] = "test_field"; + HE5_SWdefdatafield(swath_id, fieldname, dimension, NULL, HE5T_NATIVE_FLOAT, 0); + + hssize_t start[HE5_DTSETRANKMAX] = {0}; + hsize_t edge[HE5_DTSETRANKMAX] = {10}; + float testdata[10]; + + for(unsigned int i=0; i<10; ++i) + testdata[i] = (float)i; + + HE5_SWwritefield(swath_id, fieldname, start, NULL, edge, testdata); + + HE5_SWdetach(swath_id); + HE5_SWclose(output_file); + + return 0; +} diff --git a/src/hdf-eos5.mk b/src/hdf-eos5.mk new file mode 100644 index 00000000..626930f1 --- /dev/null +++ b/src/hdf-eos5.mk @@ -0,0 +1,34 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := hdf-eos5 +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.15 +$(PKG)_CHECKSUM := 119588067abf139c1c600a4519b880d04a3933049576c88acdc8ff6fc71803dd +$(PKG)_SUBDIR := hdfeos5 +$(PKG)_FILE := HDF-EOS5.$($(PKG)_VERSION).tar.Z +$(PKG)_URL := ftp://edhs1.gsfc.nasa.gov/edhs/hdfeos5/latest_release/$($(PKG)_FILE) +$(PKG)_DEPS := gcc hdf5 + +define $(PKG)_UPDATE + echo 'TODO: write update script for hdf-eos5.' >&2; + echo $(hdf-eos5_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && chmod -R ugo+w . + cd '$(1)' && autoconf + cd '$(1)' && ./configure \ + $(MXE_CONFIGURE_OPTS) \ + --enable-install-include + + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install + + '$(TARGET)-gcc' \ + -std=c99 -W -Wall -Werror -pedantic \ + '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \ + -lhe5_hdfeos -lhdf5_hl -lhdf5 -lz +endef + +$(PKG)_BUILD_SHARED = From 88024041f535cbbdb590ef2f0abeeb9ceaa8ab4d Mon Sep 17 00:00:00 2001 From: Thomas Danckaert Date: Thu, 3 Mar 2016 17:20:11 +0100 Subject: [PATCH 0694/1463] Add package 'HDF-EOS2'. http://hdfeos.org/software/library.php "The HDF-EOS2 is a software library designed built on HDF4 to support EOS-specific data structures, namely Grid, Point, and Swath. The new data structures are constructed from standard HDF data objects, using EOS conventions, through the use of a software library. A key feature of HDF-EOS files is that instrument-independent services, such as subsetting by geolocation, can be applied to the files across a wide variety of data products." --- index.html | 4 ++ src/hdf-eos2-1-fixes.patch | 138 +++++++++++++++++++++++++++++++++++++ src/hdf-eos2-test.c | 39 +++++++++++ src/hdf-eos2.mk | 36 ++++++++++ 4 files changed, 217 insertions(+) create mode 100644 src/hdf-eos2-1-fixes.patch create mode 100644 src/hdf-eos2-test.c create mode 100644 src/hdf-eos2.mk diff --git a/index.html b/index.html index 25edd9fd..cf0ec3dd 100644 --- a/index.html +++ b/index.html @@ -1517,6 +1517,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) harfbuzz HarfBuzz + + hdf-eos2 + HDF-EOS2 + hdf-eos5 HDF-EOS5 diff --git a/src/hdf-eos2-1-fixes.patch b/src/hdf-eos2-1-fixes.patch new file mode 100644 index 00000000..5f085373 --- /dev/null +++ b/src/hdf-eos2-1-fixes.patch @@ -0,0 +1,138 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Thomas Danckaert +Date: Thu, 3 Mar 2016 17:13:29 +0100 +Subject: [PATCH] Remove AC_TRY_RUN to fix cross compiling. + + +diff --git a/configure.ac b/configure.ac +index 1111111..2222222 100755 +--- a/configure.ac ++++ b/configure.ac +@@ -160,17 +160,7 @@ dnl Check if -Df2cFortran is specified + dnl Running only the preprocessor may not be a good idea + dnl because this can be hard-coded. + AC_MSG_CHECKING([for fc2Fortran macro]) +-AC_CACHE_VAL([he2_cv_f2cFortran_defined], +- [AC_TRY_RUN([ +- int main(void) +- { +- #ifdef f2cFortran +- return 0; +- #else +- return 1; +- #endif +- } +- ], [he2_cv_f2cFortran_defined=yes], [he2_cv_f2cFortran_defined=no],)]) ++AC_CACHE_VAL([he2_cv_f2cFortran_defined],[he2_cv_f2cFortran_defined=yes]) + if test ${he2_cv_f2cFortran_defined} = "yes"; then + F2CFORTRAN_MACRO="yes" + AC_MSG_RESULT([defined]) +@@ -181,18 +171,7 @@ fi + + if test ${he2_cv_f2cFortran_defined} = "yes"; then + +- AC_CHECK_SIZEOF([int*]) +- AC_CACHE_VAL([he2_cv_32ptr], +- [AC_TRY_RUN([ +- int main(void) +- { +-#ifdef SIZEOF_INTP +- return SIZEOF_INTP == 4 ? 0 : 1; +-#else +-#error SIZEOF_INTP is not defined +-#endif +- } +- ], [he2_cv_32ptr=yes], [he2_cv_32ptr=no],)]) ++ AC_CACHE_VAL([he2_cv_32ptr],[he2_cv_32ptr=no]) + if test ${he2_cv_32ptr} = "yes"; then + AC_MSG_NOTICE([possibly 32 bit system]) + F2CFORTRAN_32PTR="yes" +@@ -346,32 +325,9 @@ if test "X$HAVE_SZLIB" = "Xyes"; then + + AC_MSG_CHECKING([for szlib encoder]) + +- AC_CACHE_VAL([he2_cv_szlib_functional], +- [AC_TRY_RUN([ +- #include +- #include +- +- int main(void) +- { +- SZ_encoder_enabled(); +- exit(0); +- } +- ], [he2_cv_szlib_functional=yes], [he2_cv_szlib_functional=no],)]) +- +- AC_CACHE_VAL([he2_cv_szlib_can_encode], +- [AC_TRY_RUN([ +- #include +- #include +- +- int main(void) +- { +- /* SZ_encoder_enabled returns 1 if encoder is present */ +- if(SZ_encoder_enabled() == 1) +- exit(0); +- else +- exit(1); +- } +- ], [he2_cv_szlib_can_encode=yes], [he2_cv_szlib_can_encode=no],)]) ++ AC_CACHE_VAL([he2_cv_szlib_functional],[he2_cv_szlib_functional=no]) ++ ++ AC_CACHE_VAL([he2_cv_szlib_can_encode],[he2_cv_szlib_can_encode=no]) + + CC="$saved_CC" + rm -f $SZIP_CC +@@ -477,22 +433,7 @@ if test "x$HAVE_HDF4" = "xyes"; then + dnl Check if HDF4 is linked with SZIP encoder + + AC_MSG_CHECKING([for hdf4 szip decoding filter]) +- AC_CACHE_VAL([he2_cv_hdf4_szip_can_decode], +- [AC_TRY_RUN([ +- #include +- +- int main(void) +- { +- comp_coder_t codertype = COMP_CODE_SZIP; +- uint32 configinfo; +- int decoder = 0; +- +- HCget_config_info(codertype, &configinfo); +- decoder = configinfo & COMP_DECODER_ENABLED; +- if (decoder) exit(0); +- else exit(1); +- } +- ], [he2_cv_hdf4_szip_can_decode=yes], [he2_cv_hdf4_szip_can_decode=no],)]) ++ AC_CACHE_VAL([he2_cv_hdf4_szip_can_decode],[he2_cv_hdf4_szip_can_decode=no]) + if test ${he2_cv_hdf4_szip_can_decode} = "yes"; then + AC_DEFINE(HAVE_HDF4_SZIP_DECODER, 1, + [Define if HDF4 has szip decoder filter]) +@@ -502,22 +443,7 @@ if test "x$HAVE_HDF4" = "xyes"; then + fi + + AC_MSG_CHECKING([for hdf4 szip encoding filter]) +- AC_CACHE_VAL([he2_cv_hdf4_szip_can_encode], +- [AC_TRY_RUN([ +- #include +- +- int main(void) +- { +- comp_coder_t codertype = COMP_CODE_SZIP; +- uint32 configinfo; +- int encoder = 0; +- +- HCget_config_info(codertype, &configinfo); +- encoder = configinfo & COMP_ENCODER_ENABLED; +- if (encoder) exit(0); +- else exit(1); +- } +- ], [he2_cv_hdf4_szip_can_encode=yes], [he2_cv_hdf4_szip_can_encode=no],)]) ++ AC_CACHE_VAL([he2_cv_hdf4_szip_can_encode],[he2_cv_hdf4_szip_can_encode=no]) + + if test ${he2_cv_hdf4_szip_can_encode} = "yes"; then + AC_DEFINE(HAVE_HDF4_SZIP_ENCODER, 1, diff --git a/src/hdf-eos2-test.c b/src/hdf-eos2-test.c new file mode 100644 index 00000000..ac5f2e11 --- /dev/null +++ b/src/hdf-eos2-test.c @@ -0,0 +1,39 @@ +/* + * This file is part of MXE. + * See index.html for further information. + */ + +#include +#include +#include + +#include + +int main() { + char filename[] = "test.he4"; + int fid = SWopen(filename, DFACC_CREATE); + char swathname[] = "myswath"; + int swid = SWcreate(fid, swathname); + + char dimname[] = "mydim"; + const int32 dimlen = 10; + int rc = SWdefdim(swid, dimname, dimlen); + printf("SWdefdim: %d\n", rc); + char fieldname[] = "test_field"; + rc = SWdefdatafield(swid, fieldname, dimname, DFNT_FLOAT, 0); + printf("SWdefdatafield: %d\n", rc); + + int32 start = 0; + int32 edge = dimlen; + float data[dimlen]; + for (int i=0; i&2; + echo $(hdf-eos2_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)' && chmod -R ugo+w . + cd '$(1)' && autoconf + cd '$(1)' && \ + ac_cv_func_malloc_0_nonnull=yes \ + ac_cv_func_realloc_0_nonnull=yes \ + ./configure $(MXE_CONFIGURE_OPTS) \ + --enable-install-include + + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install + + '$(TARGET)-gcc' \ + -std=c99 -W -Wall -Werror -pedantic \ + '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \ + -lhdfeos -lmfhdf -ldf -lz -ljpeg -lportablexdr -lws2_32 +endef + +$(PKG)_BUILD_SHARED = From 6a3a4a49d2d2ed616c405b00be0c82874287516d Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Tue, 31 May 2016 05:43:55 +0000 Subject: [PATCH 0695/1463] Update versions.json & build-matrix.html --- build-matrix.html | 26 +++++++++++++++++++++++--- versions.json | 2 ++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index ad370c89..07d64fc3 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -1087,6 +1087,26 @@ feel free to submit a pull request. ✗ + + hdf-eos2 + 19v1.00 + ✓ + ✗ + ✓ + ✗ + ✗ + + + + hdf-eos5 + 1.15 + ✓ + ✗ + ✓ + ✗ + ✗ + + hdf4 4.2.10 @@ -4099,13 +4119,13 @@ feel free to submit a pull request. -Total: 396 +Total: 398
    (+6 virtual +4 native-only) -393 +395 295 -377 +379 294 15 diff --git a/versions.json b/versions.json index f16cf4ec..00e4b56b 100644 --- a/versions.json +++ b/versions.json @@ -104,6 +104,8 @@ "gtksourceviewmm2": "2.10.3", "guile": "1.8.8", "harfbuzz": "1.2.7", + "hdf-eos2": "19v1.00", + "hdf-eos5": "1.15", "hdf4": "4.2.10", "hdf5": "1.8.12", "hunspell": "1.3.3", From a55377705a05ec9ea63f0769129610d63ae2c3c0 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 1 Jun 2016 11:47:57 +0200 Subject: [PATCH 0696/1463] gdb: update --- src/gdb.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gdb.mk b/src/gdb.mk index 9e0d82dd..e4c1eb9c 100644 --- a/src/gdb.mk +++ b/src/gdb.mk @@ -2,8 +2,8 @@ # See index.html for further information. PKG := gdb -$(PKG)_VERSION := 7.11 -$(PKG)_CHECKSUM := 7a434116cb630d77bb40776e8f5d3937bed11dea56bafebb4d2bc5dd389fe5c1 +$(PKG)_VERSION := 7.11.1 +$(PKG)_CHECKSUM := e9216da4e3755e9f414c1aa0026b626251dfc57ffe572a266e98da4f6988fc70 $(PKG)_SUBDIR := gdb-$($(PKG)_VERSION) $(PKG)_FILE := gdb-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://ftp.gnu.org/pub/gnu/$(PKG)/$($(PKG)_FILE) From 02995af840e2d2fb450d9fec3a24aa82f0380860 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Wed, 1 Jun 2016 09:55:14 +0000 Subject: [PATCH 0697/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 07d64fc3..d04b6398 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -719,7 +719,7 @@ feel free to submit a pull request. gdb - 7.11 + 7.11.1 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 00e4b56b..9bad5f2f 100644 --- a/versions.json +++ b/versions.json @@ -67,7 +67,7 @@ "gcc": "4.9.3", "gd": "2.1.0", "gdal": "2.0.2", - "gdb": "7.11", + "gdb": "7.11.1", "gdk-pixbuf": "2.32.3", "gendef": "4.0.6", "geoip-database": "20150317-1", From 959bb5f85d8e271e517328d13a81703825219218 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Fri, 3 Jun 2016 03:32:33 +1000 Subject: [PATCH 0698/1463] fix native plugins when additional dirs are specified When plugins are specified on the command line, automatic native plugins are not included (for darwin and wheezy): ``` $ make gmsl-print-MXE_PLUGIN_DIRS MXE_PLUGIN_DIRS=plugins/apps/ MXE_PLUGIN_DIRS = plugins/apps/ ``` https://www.gnu.org/software/make/manual/make.html#Override-Directive https://github.com/mxe/mxe/issues/1259#issuecomment-217376756 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8a4fabc6..b3275a74 100644 --- a/Makefile +++ b/Makefile @@ -324,7 +324,7 @@ all: all-filtered # Build native requirements for certain systems OS_SHORT_NAME := $(call lc,$(shell lsb_release -sc 2>/dev/null || uname -s)) -MXE_PLUGIN_DIRS += $(realpath $(TOP_DIR)/plugins/native/$(OS_SHORT_NAME)) +override MXE_PLUGIN_DIRS += $(realpath $(TOP_DIR)/plugins/native/$(OS_SHORT_NAME)) .PHONY: check-requirements define CHECK_REQUIREMENT From 284f0a7ec3b43c0a918e3d5c85dc19f3ca561962 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Fri, 3 Jun 2016 21:06:03 +0300 Subject: [PATCH 0699/1463] protobuf: use official release tarball instead of tarball from git tag --- src/protobuf.mk | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/protobuf.mk b/src/protobuf.mk index 3a5051a3..5e8596ed 100644 --- a/src/protobuf.mk +++ b/src/protobuf.mk @@ -4,21 +4,19 @@ PKG := protobuf $(PKG)_IGNORE := $(PKG)_VERSION := 2.6.1 -$(PKG)_CHECKSUM := 2667b7cda4a6bc8a09e5463adf3b5984e08d94e72338277affa8594d8b6e5cd1 +$(PKG)_CHECKSUM := dbbd7bdd2381633995404de65a945ff1a7610b0da14593051b4738c90c6dd164 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://github.com/google/$(PKG)/archive/$($(PKG)_VERSION).tar.gz -$(PKG)_DEPS := gcc zlib googletest +$(PKG)_URL := https://github.com/google/protobuf/releases/download/v$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_DEPS := gcc zlib define $(PKG)_UPDATE $(call MXE_GET_GITHUB_TAGS, google/protobuf, v) endef define $(PKG)_BUILD - $(call PREPARE_PKG_SOURCE,googletest,$(1)) - cd '$(1)' && mv googletest-release-$(googletest_VERSION)/ gtest # First step: Build for host system in order to create "protoc" binary. - cd '$(1)' && ./autogen.sh && ./configure \ + cd '$(1)' && ./configure \ --disable-shared $(MAKE) -C '$(1)' -j '$(JOBS)' cp '$(1)/src/protoc' '$(PREFIX)/bin/$(TARGET)-protoc' From 057a4228b31184fd227f6a2f14b12bb8c685fdea Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 5 Jun 2016 15:22:40 +0300 Subject: [PATCH 0700/1463] hyperscan: open file in binary mode See also https://github.com/01org/hyperscan/pull/26 --- src/hyperscan-1-fixes.patch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/hyperscan-1-fixes.patch b/src/hyperscan-1-fixes.patch index 658cb0ac..e545176e 100644 --- a/src/hyperscan-1-fixes.patch +++ b/src/hyperscan-1-fixes.patch @@ -6447,3 +6447,26 @@ index 1111111..2222222 100644 endif() if(MINGW OR NOT WIN32) + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Sat, 4 Jun 2016 00:00:24 +0200 +Subject: [PATCH] simplegrep: open file in binary mode + +Otherwise it hangs on binary files (MinGW). + +See https://github.com/01org/hyperscan/pull/26 + +diff --git a/examples/simplegrep.c b/examples/simplegrep.c +index 1111111..2222222 100644 +--- a/examples/simplegrep.c ++++ b/examples/simplegrep.c +@@ -77,7 +77,7 @@ static int eventHandler(unsigned int id, unsigned long long from, + * length with its length. Returns NULL on failure. + */ + static char *readInputData(const char *inputFN, unsigned int *length) { +- FILE *f = fopen(inputFN, "r"); ++ FILE *f = fopen(inputFN, "rb"); + if (!f) { + fprintf(stderr, "ERROR: unable to open file \"%s\": %s\n", inputFN, + strerror(errno)); From d285dcb26d53e47dd89db8ef3f8fd7159d049842 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 5 Jun 2016 15:25:11 +0300 Subject: [PATCH 0701/1463] hyperscan: fix crash in aligned_zmalloc aligned_zmalloc backed by posix_* functions causes crash in native Windows (and not in wine) with the following traceback: https://i.imgur.com/FBHPgvn.png --- src/hyperscan-1-fixes.patch | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/src/hyperscan-1-fixes.patch b/src/hyperscan-1-fixes.patch index e545176e..5df08e56 100644 --- a/src/hyperscan-1-fixes.patch +++ b/src/hyperscan-1-fixes.patch @@ -6090,28 +6090,6 @@ index 1111111..2222222 100644 #ifndef likely #define likely(x) __builtin_expect(!!(x), 1) #endif -diff --git a/src/util/alloc.cpp b/src/util/alloc.cpp -index 1111111..2222222 100644 ---- a/src/util/alloc.cpp -+++ b/src/util/alloc.cpp -@@ -61,7 +61,7 @@ namespace ue2 { - - void *aligned_malloc_internal(size_t size, size_t align) { - void *mem; --#if !defined(_WIN32) -+#if !NATIVE_WIN32 - int rv = posix_memalign(&mem, align, size); - if (rv != 0) { - DEBUG_PRINTF("posix_memalign returned %d when asked for %zu bytes\n", -@@ -85,7 +85,7 @@ void aligned_free_internal(void *ptr) { - return; - } - --#if defined(_WIN32) -+#if NATIVE_WIN32 - _aligned_free(ptr); - #else - free(ptr); diff --git a/src/util/bitutils.h b/src/util/bitutils.h index 1111111..2222222 100644 --- a/src/util/bitutils.h From 62c2fcbb154fbf5e899f90f492fb124158a1030c Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Sat, 4 Jun 2016 13:10:55 -0500 Subject: [PATCH 0702/1463] Add plugin file to compile some libraries with Qt 5 only (instead of using Qt 4). --- plugins/qt5-deps/overrides.mk | 60 +++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 plugins/qt5-deps/overrides.mk diff --git a/plugins/qt5-deps/overrides.mk b/plugins/qt5-deps/overrides.mk new file mode 100644 index 00000000..403f1b37 --- /dev/null +++ b/plugins/qt5-deps/overrides.mk @@ -0,0 +1,60 @@ +# This file is part of MXE. +# See index.html for further information. + +poppler_DEPS := gcc cairo curl freetype glib jpeg lcms libpng qtbase tiff zlib + +define poppler_BUILD + # Note: Specifying LIBS explicitly is necessary for configure to properly + # pick up libtiff (otherwise linking a minimal test program fails not + # because libtiff is not found, but because some references are + # undefined) + cd '$(1)' \ + && PATH='$(PREFIX)/$(TARGET)/qt/bin:$(PATH)' \ + ./configure \ + --host='$(TARGET)' \ + --build="`config.guess`" \ + --prefix='$(PREFIX)/$(TARGET)' \ + --disable-silent-rules \ + --disable-shared \ + --enable-static \ + --enable-xpdf-headers \ + --enable-poppler-qt5 \ + --enable-zlib \ + --enable-cms=lcms2 \ + --enable-libcurl \ + --enable-libtiff \ + --enable-libjpeg \ + --enable-libpng \ + --enable-poppler-glib \ + --enable-poppler-cpp \ + --enable-cairo-output \ + --enable-splash-output \ + --enable-compile-warnings=yes \ + --enable-introspection=auto \ + --disable-libopenjpeg \ + --disable-gtk-test \ + --disable-utils \ + --disable-gtk-doc \ + --disable-gtk-doc-html \ + --disable-gtk-doc-pdf \ + --with-font-configuration=win32 \ + PKG_CONFIG_PATH_$(subst .,_,$(subst -,_,$(TARGET)))='$(PREFIX)/$(TARGET)/qt/lib/pkgconfig' \ + CXXFLAGS=-D_WIN32_WINNT=0x0500 \ + LIBTIFF_LIBS="`'$(TARGET)-pkg-config' libtiff-4 --libs`" + PATH='$(PREFIX)/$(TARGET)/qt/bin:$(PATH)' \ + $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= + $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= + + # Test program + '$(TARGET)-g++' \ + -W -Wall -Werror -ansi -pedantic \ + '$(2).cxx' -o '$(PREFIX)/$(TARGET)/bin/test-poppler.exe' \ + `'$(TARGET)-pkg-config' poppler poppler-cpp --cflags --libs` +endef + +poppler_BUILD_SHARED = + +openscenegraph_DEPS := gcc boost curl dcmtk freetype gdal giflib gstreamer \ + gta jasper jpeg libpng openal openexr openthreads poppler \ + qtbase tiff zlib + From 409a8ce08ca9d0bc4bc525925c3b507036901ac4 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 5 Jun 2016 18:54:00 +0300 Subject: [PATCH 0703/1463] hyperscan: add a note on compilation without AVX2 --- src/hyperscan.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/hyperscan.mk b/src/hyperscan.mk index df7f90ca..65e585fc 100644 --- a/src/hyperscan.mk +++ b/src/hyperscan.mk @@ -16,6 +16,8 @@ endef define $(PKG)_BUILD mkdir '$(1).build' + # Add the following options to run on (virtual) machine without AVX2 + # -DCMAKE_C_FLAGS="-march=core2" -DCMAKE_CXX_FLAGS="-march=core2" cd '$(1).build' && '$(TARGET)-cmake' \ -DBUILD_SHARED_LIBS=$(if $(BUILD_STATIC),OFF,ON) \ '$(1)' From cc2d9c5379e6df9d0a3813615ca0b8187cdc32a4 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 5 Jun 2016 19:20:15 +0300 Subject: [PATCH 0704/1463] update hyperscan from 4.1.0 to 4.2.0 Some patches are not needed anymore: * "add Libs.private to fix linking errors" was fixed in https://github.com/01org/hyperscan/issues/18 * "fix linking against gtest in shared mode" and "fix linking errors in shared mode" were fixed in https://github.com/01org/hyperscan/issues/19 * "install .dll to bin/, not to lib/" https://github.com/01org/hyperscan/pull/21 --- src/hyperscan-1-fixes.patch | 219 +++++++++++++----------------------- src/hyperscan.mk | 4 +- 2 files changed, 80 insertions(+), 143 deletions(-) diff --git a/src/hyperscan-1-fixes.patch b/src/hyperscan-1-fixes.patch index 5df08e56..f2027766 100644 --- a/src/hyperscan-1-fixes.patch +++ b/src/hyperscan-1-fixes.patch @@ -55,22 +55,22 @@ index 1111111..2222222 100644 SET(hs_HEADERS src/hs.h src/hs_common.h -@@ -935,7 +927,6 @@ endif() +@@ -979,15 +971,12 @@ endif() # we want the static lib for testing add_library(hs STATIC ${hs_SRCS} $) -add_dependencies(hs ragel_Parser) - add_dependencies(hs autogen_compiler autogen_teddy_compiler) - +- if (NOT BUILD_SHARED_LIBS) -@@ -944,7 +935,6 @@ endif() + install(TARGETS hs DESTINATION lib) + endif() if (BUILD_STATIC_AND_SHARED OR BUILD_SHARED_LIBS) add_library(hs_shared SHARED ${hs_SRCS} $) - add_dependencies(hs_shared ragel_Parser) - add_dependencies(hs_shared autogen_compiler autogen_teddy_compiler) set_target_properties(hs_shared PROPERTIES OUTPUT_NAME hs + VERSION ${LIB_VERSION} diff --git a/src/parser/Parser.cpp b/src/parser/Parser.cpp new file mode 100644 index 1111111..2222222 @@ -5534,7 +5534,7 @@ index 1111111..2222222 100644 @@ -17,7 +15,6 @@ set(expressionutil_SRCS ExpressionParser.cpp ) - add_library(expressionutil ${expressionutil_SRCS}) + add_library(expressionutil STATIC ${expressionutil_SRCS}) -add_dependencies(expressionutil ragel_ExpressionParser) SET(corpusomatic_SRCS @@ -5929,45 +5929,6 @@ index 1111111..2222222 + return (cs != ExpressionParser_error) && (p == pe); +} -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Wed, 18 May 2016 01:10:30 +0200 -Subject: [PATCH] add Libs.private to fix linking errors - -See https://github.com/01org/hyperscan/issues/18 - -diff --git a/libhs.pc.in b/libhs.pc.in -index 1111111..2222222 100644 ---- a/libhs.pc.in -+++ b/libhs.pc.in -@@ -7,4 +7,5 @@ Name: libhs - Description: Intel(R) Hyperscan Library - Version: @HS_VERSION@ - Libs: -L${libdir} -lhs -+Libs.private: -lstdc++ -lm - Cflags: -I${includedir}/hs - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Wed, 18 May 2016 01:12:02 +0200 -Subject: [PATCH] fix linking against gtest in shared mode - -See https://github.com/01org/hyperscan/issues/19 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1111111..2222222 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -214,7 +214,7 @@ CHECK_FUNCTION_EXISTS(_aligned_malloc HAVE__ALIGNED_MALLOC) - CHECK_C_COMPILER_FLAG(-fvisibility=hidden HAS_C_HIDDEN) - CHECK_CXX_COMPILER_FLAG(-fvisibility=hidden HAS_CXX_HIDDEN) - --if (RELEASE_BUILD) -+if (RELEASE_BUILD AND NOT BUILD_STATIC_AND_SHARED AND NOT BUILD_SHARED_LIBS) - if (HAS_C_HIDDEN) - set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -fvisibility=hidden") - endif() - From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 18 May 2016 01:25:59 +0200 @@ -5998,6 +5959,19 @@ index 1111111..2222222 100644 #define SNPRINTF_COMPAT _snprintf #else #define SNPRINTF_COMPAT snprintf +diff --git a/src/nfa/mcclellan_common_impl.h b/src/nfa/mcclellan_common_impl.h +index 1111111..2222222 100644 +--- a/src/nfa/mcclellan_common_impl.h ++++ b/src/nfa/mcclellan_common_impl.h +@@ -26,7 +26,7 @@ + * POSSIBILITY OF SUCH DAMAGE. + */ + +-#if defined(__INTEL_COMPILER) || defined(__clang__) || defined(_WIN32) || defined(__GNUC__) && (__GNUC__ < 4) ++#if defined(__INTEL_COMPILER) || defined(__clang__) || NATIVE_WIN32 || defined(__GNUC__) && (__GNUC__ < 4) + #define really_flatten + #else + #define really_flatten __attribute__ ((flatten)) diff --git a/src/nfa/nfa_internal.h b/src/nfa/nfa_internal.h index 1111111..2222222 100644 --- a/src/nfa/nfa_internal.h @@ -6011,28 +5985,6 @@ index 1111111..2222222 100644 /* Use for functions that return an integer. */ #define NFA_API_NO_IMPL(...) \ -diff --git a/src/rose/rose_internal.h b/src/rose/rose_internal.h -index 1111111..2222222 100644 ---- a/src/rose/rose_internal.h -+++ b/src/rose/rose_internal.h -@@ -637,7 +637,7 @@ struct lit_benefits { - } expected; - }; - --#if defined(_WIN32) -+#if NATIVE_WIN32 - #pragma pack(push, 1) - #endif - // Rose runtime state -@@ -645,7 +645,7 @@ struct RoseRuntimeState { - u8 stored_depth; /* depth at stream boundary */ - u8 flags; /* high bit true if delay rebuild needed */ - u8 broken; /* user has requested that we stop matching */ --#if defined(_WIN32) -+#if NATIVE_WIN32 - }; - #pragma pack(pop) - #else diff --git a/src/ue2common.h b/src/ue2common.h index 1111111..2222222 100644 --- a/src/ue2common.h @@ -6112,16 +6064,21 @@ index 1111111..2222222 100644 unsigned long r; _BitScanReverse(&r, x); return 31 - r; -@@ -86,7 +86,7 @@ u32 clz32(u32 x) { +@@ -86,11 +86,11 @@ u32 clz32(u32 x) { static really_inline u32 clz64(u64a x) { assert(x); // behaviour not defined for x == 0 --#if defined(_WIN32) -+#if NATIVE_WIN32 +-#if defined(_WIN64) ++#if NATIVE_WIN32 && defined(_WIN64) unsigned long r; _BitScanReverse64(&r, x); return 63 - r; -@@ -99,7 +99,7 @@ u32 clz64(u64a x) { +-#elif defined(_WIN32) ++#elif NATIVE_WIN32 + unsigned long x1 = (u32)x; + unsigned long x2 = (u32)(x >> 32); + unsigned long r; +@@ -109,7 +109,7 @@ u32 clz64(u64a x) { static really_inline u32 ctz32(u32 x) { assert(x); // behaviour not defined for x == 0 @@ -6130,15 +6087,20 @@ index 1111111..2222222 100644 unsigned long r; _BitScanForward(&r, x); return r; -@@ -111,7 +111,7 @@ u32 ctz32(u32 x) { +@@ -121,11 +121,11 @@ u32 ctz32(u32 x) { static really_inline u32 ctz64(u64a x) { assert(x); // behaviour not defined for x == 0 --#if defined(_WIN32) -+#if NATIVE_WIN32 +-#if defined(_WIN64) ++#if NATIVE_WIN32 && defined(_WIN64) unsigned long r; _BitScanForward64(&r, x); return r; +-#elif defined(_WIN32) ++#elif NATIVE_WIN32 + unsigned long r; + if (_BitScanForward(&r, (u32)x)) { + return (u32)r; diff --git a/src/util/cpuid_flags.c b/src/util/cpuid_flags.c index 1111111..2222222 100644 --- a/src/util/cpuid_flags.c @@ -6161,19 +6123,41 @@ index 1111111..2222222 100644 __cpuid_count(op, leaf, *eax, *ebx, *ecx, *edx); #else unsigned int a[4]; +@@ -74,7 +74,7 @@ void cpuid(unsigned int op, unsigned int leaf, unsigned int *eax, + + static inline + u64a xgetbv(u32 op) { +-#if defined(_WIN32) || defined(__INTEL_COMPILER) ++#if NATIVE_WIN32 || defined(__INTEL_COMPILER) + return _xgetbv(op); + #else + u32 a, d; +diff --git a/src/util/make_unique.h b/src/util/make_unique.h +index 1111111..2222222 100644 +--- a/src/util/make_unique.h ++++ b/src/util/make_unique.h +@@ -29,7 +29,7 @@ + #ifndef UTIL_MAKE_UNIQUE_H + #define UTIL_MAKE_UNIQUE_H + +-#if (defined(_WIN32) || defined(_WIN64)) && (_MSC_VER > 1700) ++#if NATIVE_WIN32 && (_MSC_VER > 1700) + // VC++ 2013 onwards has make_unique in the STL + #define USE_STD + #include diff --git a/src/util/popcount.h b/src/util/popcount.h index 1111111..2222222 100644 --- a/src/util/popcount.h +++ b/src/util/popcount.h -@@ -40,7 +40,7 @@ +@@ -38,7 +38,7 @@ + // We have a native popcount where the compiler has defined __POPCNT__. + #if defined(__POPCNT__) + #define HAVE_POPCOUNT_INSTR +-#elif defined(_WIN32) && defined(__AVX__) // TODO: fix win preproc ++#elif NATIVE_WIN32 && defined(__AVX__) // TODO: fix win preproc #define HAVE_POPCOUNT_INSTR #endif --#if defined(_WIN32) && defined(__AVX__) // TODO: fix win preproc -+#if NATIVE_WIN32 && defined(__AVX__) // TODO: fix win preproc - #define HAVE_POPCOUNT_INSTR - #define __builtin_popcount __popcnt - #define __builtin_popcountll __popcnt64 diff --git a/src/util/shuffle.h b/src/util/shuffle.h index 1111111..2222222 100644 --- a/src/util/shuffle.h @@ -6317,17 +6301,26 @@ index 1111111..2222222 100644 if(CMAKE_C_COMPILER_ID MATCHES "Intel") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -diag-error 10006 -diag-disable 177 -diag-disable 2304 -diag-disable 2305 -diag-disable 2338 -diag-disable 1418 -diag-disable=remark") endif() -@@ -351,7 +351,7 @@ add_subdirectory(src/fdr) +@@ -345,7 +345,7 @@ endif() + configure_file(${CMAKE_MODULE_PATH}/config.h.in ${PROJECT_BINARY_DIR}/config.h) + configure_file(src/hs_version.h.in ${PROJECT_BINARY_DIR}/hs_version.h) + +-if (NOT WIN32) ++if (MINGW OR NOT WIN32) + # expand out library names for pkgconfig static link info + foreach (LIB ${CMAKE_CXX_IMPLICIT_LINK_LIBRARIES}) + # this is fragile, but protects us from toolchain specific files +@@ -364,7 +364,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_C_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CXX_FLAGS}") - include_directories(${PROJECT_BINARY_DIR}/src/fdr) -if(NOT WIN32) +if(MINGW OR NOT WIN32) set(RAGEL_C_FLAGS "-Wno-unused") endif() -@@ -944,6 +944,6 @@ if (BUILD_STATIC_AND_SHARED OR BUILD_SHARED_LIBS) - install(TARGETS hs_shared DESTINATION lib) +@@ -988,6 +988,6 @@ install(TARGETS hs_shared + LIBRARY DESTINATION lib) endif() -if(NOT WIN32) @@ -6366,66 +6359,10 @@ index 1111111..2222222 100644 @@ -8,4 +8,4 @@ Description: Intel(R) Hyperscan Library Version: @HS_VERSION@ Libs: -L${libdir} -lhs - Libs.private: -lstdc++ -lm + Libs.private: @PRIVATE_LIBS@ -Cflags: -I${includedir}/hs +Cflags: -I${includedir}/hs -posix -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Wed, 18 May 2016 07:57:11 +0200 -Subject: [PATCH] fix linking errors in shared mode - -libcorpusomatic depends on libhs (for example, it uses symbol -ue2::ReportManager::getReport). DLL fails to be linked if -sime symbols are not resolved. - -diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt -index 1111111..2222222 100644 ---- a/util/CMakeLists.txt -+++ b/util/CMakeLists.txt -@@ -26,5 +26,5 @@ SET(corpusomatic_SRCS - ng_find_matches.h - ng_find_matches.cpp - ) --add_library(corpusomatic ${corpusomatic_SRCS}) -+add_library(corpusomatic STATIC ${corpusomatic_SRCS}) - - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Wed, 18 May 2016 07:59:57 +0200 -Subject: [PATCH] install .dll to bin/, not to lib/ - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1111111..2222222 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -926,7 +926,10 @@ if (BUILD_STATIC_AND_SHARED OR BUILD_SHARED_LIBS) - OUTPUT_NAME hs_runtime - MACOSX_RPATH ON - LINKER_LANGUAGE C) -- install(TARGETS hs_runtime_shared DESTINATION lib) -+ install(TARGETS hs_runtime_shared -+ RUNTIME DESTINATION bin -+ ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION lib) - endif() - - # we want the static lib for testing -@@ -946,7 +949,10 @@ if (BUILD_STATIC_AND_SHARED OR BUILD_SHARED_LIBS) - VERSION ${LIB_VERSION} - SOVERSION ${LIB_SOVERSION} - MACOSX_RPATH ON) --install(TARGETS hs_shared DESTINATION lib) -+install(TARGETS hs_shared -+ RUNTIME DESTINATION bin -+ ARCHIVE DESTINATION lib -+ LIBRARY DESTINATION lib) - endif() - - if(MINGW OR NOT WIN32) - From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sat, 4 Jun 2016 00:00:24 +0200 diff --git a/src/hyperscan.mk b/src/hyperscan.mk index 65e585fc..71134f7f 100644 --- a/src/hyperscan.mk +++ b/src/hyperscan.mk @@ -3,8 +3,8 @@ PKG := hyperscan $(PKG)_IGNORE := -$(PKG)_VERSION := 4.1.0 -$(PKG)_CHECKSUM := b8de3f59c2bd1a8765a5aca5dfdd062766cef67218aedf63df2c92766524b3c1 +$(PKG)_VERSION := 4.2.0 +$(PKG)_CHECKSUM := d06d8f31a62e5d2903a8ccf07696e02cadf4de2024dc3b558d410d913c81dbef $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_URL := https://github.com/01org/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz From f4eb0316ec83eaefd1300da4a6d4afb787148134 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 5 Jun 2016 19:50:33 +0300 Subject: [PATCH 0705/1463] hyperscan: update line numbers in the diff I moved them to another commit to separate from major changes. --- src/hyperscan-1-fixes.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/hyperscan-1-fixes.patch b/src/hyperscan-1-fixes.patch index f2027766..e6954bb2 100644 --- a/src/hyperscan-1-fixes.patch +++ b/src/hyperscan-1-fixes.patch @@ -41,7 +41,7 @@ index 1111111..2222222 100644 option(OPTIMISE "Turns off compiler optimizations (on by default unless debug output enabled or coverage testing)" TRUE) option(DEBUG_OUTPUT "Enable debug output (warning: very verbose)" FALSE) -@@ -362,12 +356,10 @@ set(RAGEL_C_FLAGS "-Wno-unused") +@@ -375,12 +369,10 @@ set(RAGEL_C_FLAGS "-Wno-unused") endif() set_source_files_properties( @@ -5941,7 +5941,7 @@ diff --git a/cmake/config.h.in b/cmake/config.h.in index 1111111..2222222 100644 --- a/cmake/config.h.in +++ b/cmake/config.h.in -@@ -99,3 +99,4 @@ +@@ -89,3 +89,4 @@ /* define if this is a release build. */ #cmakedefine RELEASE_BUILD @@ -6114,7 +6114,7 @@ index 1111111..2222222 100644 #include #endif -@@ -54,7 +54,7 @@ +@@ -60,7 +60,7 @@ static __inline void cpuid(unsigned int op, unsigned int leaf, unsigned int *eax, unsigned int *ebx, unsigned int *ecx, unsigned int *edx) { @@ -6223,7 +6223,7 @@ diff --git a/unit/hyperscan/test_util.h b/unit/hyperscan/test_util.h index 1111111..2222222 100644 --- a/unit/hyperscan/test_util.h +++ b/unit/hyperscan/test_util.h -@@ -35,7 +35,7 @@ +@@ -37,7 +37,7 @@ #include "hs.h" #ifndef UNUSED @@ -6283,7 +6283,7 @@ index 1111111..2222222 100644 message(FATAL_ERROR "Windows DLLs currently not supported") else() message(STATUS "Building shared libraries") -@@ -227,7 +227,7 @@ endif() +@@ -238,7 +238,7 @@ include (${CMAKE_MODULE_PATH}/arch.cmake) CHECK_C_SOURCE_COMPILES("void *aa_test(void *x) { return __builtin_assume_aligned(x, 16);}\nint main(void) { return 0; }" HAVE_CC_BUILTIN_ASSUME_ALIGNED) CHECK_CXX_SOURCE_COMPILES("void *aa_test(void *x) { return __builtin_assume_aligned(x, 16);}\nint main(void) { return 0; }" HAVE_CXX_BUILTIN_ASSUME_ALIGNED) @@ -6292,7 +6292,7 @@ index 1111111..2222222 100644 set(C_FLAGS_TO_CHECK # Variable length arrays are way bad, most especially at run time "-Wvla" -@@ -314,7 +314,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") +@@ -325,7 +325,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") set(FREEBSD true) endif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") @@ -6340,7 +6340,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index 1111111..2222222 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -200,6 +200,11 @@ else() +@@ -208,6 +208,11 @@ else() endif() From 3b3af3e8b952eb3aafa14f70e6f69a5121f25f20 Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Sun, 5 Jun 2016 17:35:41 -0500 Subject: [PATCH 0706/1463] Simplify overrides, and add shared build support to poppler. --- plugins/qt5-deps/overrides.mk | 59 ++--------------------------------- src/openscenegraph.mk | 5 ++- src/poppler.mk | 15 ++++----- 3 files changed, 12 insertions(+), 67 deletions(-) diff --git a/plugins/qt5-deps/overrides.mk b/plugins/qt5-deps/overrides.mk index 403f1b37..c437086c 100644 --- a/plugins/qt5-deps/overrides.mk +++ b/plugins/qt5-deps/overrides.mk @@ -1,60 +1,5 @@ # This file is part of MXE. # See index.html for further information. -poppler_DEPS := gcc cairo curl freetype glib jpeg lcms libpng qtbase tiff zlib - -define poppler_BUILD - # Note: Specifying LIBS explicitly is necessary for configure to properly - # pick up libtiff (otherwise linking a minimal test program fails not - # because libtiff is not found, but because some references are - # undefined) - cd '$(1)' \ - && PATH='$(PREFIX)/$(TARGET)/qt/bin:$(PATH)' \ - ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ - --disable-silent-rules \ - --disable-shared \ - --enable-static \ - --enable-xpdf-headers \ - --enable-poppler-qt5 \ - --enable-zlib \ - --enable-cms=lcms2 \ - --enable-libcurl \ - --enable-libtiff \ - --enable-libjpeg \ - --enable-libpng \ - --enable-poppler-glib \ - --enable-poppler-cpp \ - --enable-cairo-output \ - --enable-splash-output \ - --enable-compile-warnings=yes \ - --enable-introspection=auto \ - --disable-libopenjpeg \ - --disable-gtk-test \ - --disable-utils \ - --disable-gtk-doc \ - --disable-gtk-doc-html \ - --disable-gtk-doc-pdf \ - --with-font-configuration=win32 \ - PKG_CONFIG_PATH_$(subst .,_,$(subst -,_,$(TARGET)))='$(PREFIX)/$(TARGET)/qt/lib/pkgconfig' \ - CXXFLAGS=-D_WIN32_WINNT=0x0500 \ - LIBTIFF_LIBS="`'$(TARGET)-pkg-config' libtiff-4 --libs`" - PATH='$(PREFIX)/$(TARGET)/qt/bin:$(PATH)' \ - $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= - - # Test program - '$(TARGET)-g++' \ - -W -Wall -Werror -ansi -pedantic \ - '$(2).cxx' -o '$(PREFIX)/$(TARGET)/bin/test-poppler.exe' \ - `'$(TARGET)-pkg-config' poppler poppler-cpp --cflags --libs` -endef - -poppler_BUILD_SHARED = - -openscenegraph_DEPS := gcc boost curl dcmtk freetype gdal giflib gstreamer \ - gta jasper jpeg libpng openal openexr openthreads poppler \ - qtbase tiff zlib - +poppler_DEPS := $(filter-out qt ,$(poppler_DEPS)) qtbase +openscenegraph_DEPS := $(filter-out qt ,$(openscenegraph_DEPS)) qtbase diff --git a/src/openscenegraph.mk b/src/openscenegraph.mk index de3fda27..0ebb2e27 100644 --- a/src/openscenegraph.mk +++ b/src/openscenegraph.mk @@ -32,6 +32,9 @@ define $(PKG)_BUILD -DBUILD_OSG_APPLICATIONS=OFF \ -DPOPPLER_HAS_CAIRO_EXITCODE=0 \ -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE=1 \ - -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED=1 + -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED=1 \ + $(if $(filter qtbase,$(PKG)_DEPS), \ + -DDESIRED_QT_VERSION=4, \ + -DDESIRED_QT_VERSION=5) $(MAKE) -C '$(1).build' -j '$(JOBS)' install VERBOSE=1 endef diff --git a/src/poppler.mk b/src/poppler.mk index e569d84c..305b40f0 100644 --- a/src/poppler.mk +++ b/src/poppler.mk @@ -24,14 +24,14 @@ define $(PKG)_BUILD cd '$(1)' \ && PATH='$(PREFIX)/$(TARGET)/qt/bin:$(PATH)' \ ./configure \ - --host='$(TARGET)' \ - --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ + $(MXE_CONFIGURE_OPTS) \ --disable-silent-rules \ - --disable-shared \ - --enable-static \ --enable-xpdf-headers \ - --enable-poppler-qt4 \ + $(if $(filter qtbase,$(PKG)_DEPS), \ + --enable-poppler-qt4 \ + --disable-poppler-qt5, \ + --disable-poppler-qt4 \ + --enable-poppler-qt5) \ --enable-zlib \ --enable-cms=lcms2 \ --enable-libcurl \ @@ -64,6 +64,3 @@ define $(PKG)_BUILD '$(2).cxx' -o '$(PREFIX)/$(TARGET)/bin/test-poppler.exe' \ `'$(TARGET)-pkg-config' poppler poppler-cpp --cflags --libs` endef - -$(PKG)_BUILD_SHARED = - From 8fa63000873378c52b443f640accdf07692c11df Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 7 Jun 2016 01:40:07 +0300 Subject: [PATCH 0707/1463] update lua from 5.3.2 to 5.3.3 --- src/lua.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lua.mk b/src/lua.mk index 6452bf8b..908e2c7e 100644 --- a/src/lua.mk +++ b/src/lua.mk @@ -3,10 +3,10 @@ PKG := lua $(PKG)_IGNORE := -$(PKG)_VERSION := 5.3.2 +$(PKG)_VERSION := 5.3.3 # Shared version and luarocks subdir $(PKG)_SHORTVER := $(call SHORT_PKG_VERSION,$(PKG)) -$(PKG)_CHECKSUM := c740c7bb23a936944e1cc63b7c3c5351a8976d7867c5252c8854f7b2af9da68f +$(PKG)_CHECKSUM := 5113c06884f7de453ce57702abaac1d618307f33f6789fa870e87a59d772aca2 $(PKG)_SUBDIR := lua-$($(PKG)_VERSION) $(PKG)_FILE := lua-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.lua.org/ftp/$($(PKG)_FILE) From 8b3b780330bc194ace5eabb2d68ade22b37925e1 Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Mon, 6 Jun 2016 19:07:46 -0500 Subject: [PATCH 0708/1463] Modify patch to openscenegraph to require finding qt5 or qt4. --- src/openscenegraph-1-fixes.patch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/openscenegraph-1-fixes.patch b/src/openscenegraph-1-fixes.patch index a372c1da..057e636d 100644 --- a/src/openscenegraph-1-fixes.patch +++ b/src/openscenegraph-1-fixes.patch @@ -182,3 +182,26 @@ index 1111111..2222222 100644 IF(GSTREAMER_FOUND AND GLIB_FOUND) ADD_SUBDIRECTORY(gstreamer) ENDIF() + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Saikrishna Arcot +Date: Mon, 6 Jun 2016 19:06:00 -0500 +Subject: [PATCH] Require the presence of either qt5 or qt4. + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1111111..2222222 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -712,9 +712,9 @@ IF(OSG_USE_QT AND NOT ANDROID) + + IF (DESIRED_QT_VERSION) + IF (DESIRED_QT_VERSION MATCHES 5) +- FIND_PACKAGE(Qt5Widgets) ++ FIND_PACKAGE(Qt5Widgets REQUIRED) + ELSEIF (DESIRED_QT_VERSION MATCHES 4) +- FIND_PACKAGE(Qt4) ++ FIND_PACKAGE(Qt4 REQUIRED) + ELSE() + FIND_PACKAGE(Qt3) + ENDIF() From dc299744a0591ec487cea1d8a6ba064583410fef Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 7 Jun 2016 17:45:13 +0200 Subject: [PATCH 0709/1463] gnutls: update --- src/gnutls.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gnutls.mk b/src/gnutls.mk index e0b9939a..a9a1445f 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -2,8 +2,8 @@ # See index.html for further information. PKG := gnutls -$(PKG)_VERSION := 3.4.12 -$(PKG)_CHECKSUM := e3370a3bf60f2ca4a6204461ea99e7d7047ee46f96bc2fb7c63f103312d3c9c7 +$(PKG)_VERSION := 3.4.13 +$(PKG)_CHECKSUM := fd3386e8e72725980bcd7f40949aa0121dcb7650b5147c6490e794555ed25859 $(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION) $(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://mirrors.dotsrc.org/gnupg/gnutls/v3.4/$($(PKG)_FILE) From 9a425d8ae3aac7b394beb62d36505b25659d6195 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Tue, 7 Jun 2016 15:47:45 +0000 Subject: [PATCH 0710/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index d04b6398..aaf94049 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -859,7 +859,7 @@ feel free to submit a pull request. gnutls - 3.4.12 + 3.4.13 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 9bad5f2f..12714d3c 100644 --- a/versions.json +++ b/versions.json @@ -81,7 +81,7 @@ "glibmm": "2.42.0", "glm": "0.9.7.4", "gmp": "6.1.0", - "gnutls": "3.4.12", + "gnutls": "3.4.13", "googletest": "1.7.0", "graphicsmagick": "1.3.21", "gsl": "1.16", From 929674df0eb3c05af9dbb68eee256ca96a730e91 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Tue, 7 Jun 2016 18:57:51 +0000 Subject: [PATCH 0711/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index aaf94049..1078ccc6 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -2229,7 +2229,7 @@ feel free to submit a pull request. lua - 5.3.2 + 5.3.3 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 12714d3c..ab01e9db 100644 --- a/versions.json +++ b/versions.json @@ -218,7 +218,7 @@ "libzip": "0.11.2", "llvm": "3.4", "log4cxx": "0.10.0", - "lua": "5.3.2", + "lua": "5.3.3", "luabind": "0.9.1", "luajit": "2.0.4", "lzma": "920", From 4a2dfcebb211c82523612e14f25acfde55b7c7c3 Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Tue, 7 Jun 2016 17:34:26 -0500 Subject: [PATCH 0712/1463] Get value of variable instead of using the variable name itself. --- src/openscenegraph.mk | 2 +- src/poppler.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openscenegraph.mk b/src/openscenegraph.mk index 0ebb2e27..2f31a8e9 100644 --- a/src/openscenegraph.mk +++ b/src/openscenegraph.mk @@ -33,7 +33,7 @@ define $(PKG)_BUILD -DPOPPLER_HAS_CAIRO_EXITCODE=0 \ -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE=1 \ -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED=1 \ - $(if $(filter qtbase,$(PKG)_DEPS), \ + $(if $(filter qtbase,$($(PKG)_DEPS)), \ -DDESIRED_QT_VERSION=4, \ -DDESIRED_QT_VERSION=5) $(MAKE) -C '$(1).build' -j '$(JOBS)' install VERBOSE=1 diff --git a/src/poppler.mk b/src/poppler.mk index 305b40f0..1a5dbca8 100644 --- a/src/poppler.mk +++ b/src/poppler.mk @@ -27,7 +27,7 @@ define $(PKG)_BUILD $(MXE_CONFIGURE_OPTS) \ --disable-silent-rules \ --enable-xpdf-headers \ - $(if $(filter qtbase,$(PKG)_DEPS), \ + $(if $(filter qtbase,$($(PKG)_DEPS)), \ --enable-poppler-qt4 \ --disable-poppler-qt5, \ --disable-poppler-qt4 \ From e90f19d9c8899cf481898b5481efb60e837460ab Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Wed, 8 Jun 2016 08:24:13 +0000 Subject: [PATCH 0713/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 1078ccc6..642e6b34 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -1139,7 +1139,7 @@ feel free to submit a pull request. hyperscan - 4.1.0 + 4.2.0 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index ab01e9db..c35c8e08 100644 --- a/versions.json +++ b/versions.json @@ -109,7 +109,7 @@ "hdf4": "4.2.10", "hdf5": "1.8.12", "hunspell": "1.3.3", - "hyperscan": "4.1.0", + "hyperscan": "4.2.0", "icu4c": "56.1", "id3lib": "3.8.3", "ilmbase": "2.2.0", From a3c8d4b5eb194efe7c8d060923d0cbad51e80ebc Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Wed, 8 Jun 2016 08:41:52 -0500 Subject: [PATCH 0714/1463] Another fix to the makefiles. --- src/openscenegraph.mk | 4 ++-- src/poppler.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/openscenegraph.mk b/src/openscenegraph.mk index 2f31a8e9..325df098 100644 --- a/src/openscenegraph.mk +++ b/src/openscenegraph.mk @@ -34,7 +34,7 @@ define $(PKG)_BUILD -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE=1 \ -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED=1 \ $(if $(filter qtbase,$($(PKG)_DEPS)), \ - -DDESIRED_QT_VERSION=4, \ - -DDESIRED_QT_VERSION=5) + -DDESIRED_QT_VERSION=5, \ + -DDESIRED_QT_VERSION=4) $(MAKE) -C '$(1).build' -j '$(JOBS)' install VERBOSE=1 endef diff --git a/src/poppler.mk b/src/poppler.mk index 1a5dbca8..ef799229 100644 --- a/src/poppler.mk +++ b/src/poppler.mk @@ -28,8 +28,8 @@ define $(PKG)_BUILD --disable-silent-rules \ --enable-xpdf-headers \ $(if $(filter qtbase,$($(PKG)_DEPS)), \ - --enable-poppler-qt4 \ - --disable-poppler-qt5, \ + --enable-poppler-qt5 \ + --disable-poppler-qt4, \ --disable-poppler-qt4 \ --enable-poppler-qt5) \ --enable-zlib \ From 8e58fb9363c910757c299163cc9fd019a73b47bf Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Thu, 9 Jun 2016 07:40:36 -0500 Subject: [PATCH 0715/1463] Fix Poppler makefile...again. --- src/poppler.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/poppler.mk b/src/poppler.mk index ef799229..35fe2ffa 100644 --- a/src/poppler.mk +++ b/src/poppler.mk @@ -30,8 +30,8 @@ define $(PKG)_BUILD $(if $(filter qtbase,$($(PKG)_DEPS)), \ --enable-poppler-qt5 \ --disable-poppler-qt4, \ - --disable-poppler-qt4 \ - --enable-poppler-qt5) \ + --disable-poppler-qt5 \ + --enable-poppler-qt4) \ --enable-zlib \ --enable-cms=lcms2 \ --enable-libcurl \ From 5b52ff4bc16bdc2e88f7e85338a7cfbffe918b43 Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Thu, 9 Jun 2016 08:44:19 -0500 Subject: [PATCH 0716/1463] Fix openthreads compilation. --- src/openthreads.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/src/openthreads.mk b/src/openthreads.mk index f3144631..c6f2d577 100644 --- a/src/openthreads.mk +++ b/src/openthreads.mk @@ -20,6 +20,7 @@ define $(PKG)_BUILD -DDYNAMIC_OPENTHREADS=$(CMAKE_SHARED_BOOL) \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \ -DOSG_USE_QT=FALSE \ + -DPOPPLER_HAS_CAIRO_EXITCODE=0 \ -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE=1 \ -D_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED=1 \ '$(1)' From b85d79650ac6a7bb45759b12deae37ae40c8538a Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Fri, 10 Jun 2016 22:36:15 +0200 Subject: [PATCH 0717/1463] update: gettext libpng wget --- src/gettext.mk | 4 ++-- src/libpng.mk | 4 ++-- src/wget.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gettext.mk b/src/gettext.mk index 03982cfd..ad858b7d 100644 --- a/src/gettext.mk +++ b/src/gettext.mk @@ -3,8 +3,8 @@ PKG := gettext $(PKG)_IGNORE := -$(PKG)_VERSION := 0.19.7 -$(PKG)_CHECKSUM := 5386d2a40500295783c6a52121adcf42a25519e2d23675950619c9e69558c23f +$(PKG)_VERSION := 0.19.8 +$(PKG)_CHECKSUM := 3da4f6bd79685648ecf46dab51d66fcdddc156f41ed07e580a696a38ac61d48f $(PKG)_SUBDIR := gettext-$($(PKG)_VERSION) $(PKG)_FILE := gettext-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://ftp.gnu.org/pub/gnu/gettext/$($(PKG)_FILE) diff --git a/src/libpng.mk b/src/libpng.mk index cbb900aa..1e54805d 100644 --- a/src/libpng.mk +++ b/src/libpng.mk @@ -3,8 +3,8 @@ PKG := libpng $(PKG)_IGNORE := -$(PKG)_VERSION := 1.6.22 -$(PKG)_CHECKSUM := 6b5a6ad5c5801ec4d24aacc87a0ed7b666cd586478174f69368a1d7747715226 +$(PKG)_VERSION := 1.6.23 +$(PKG)_CHECKSUM := 6d921e7bdaec56e9f6594463ec1fe1981c3cd2d5fc925d3781e219b5349262f1 $(PKG)_SUBDIR := libpng-$($(PKG)_VERSION) $(PKG)_FILE := libpng-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/libpng/libpng16/$($(PKG)_VERSION)/$($(PKG)_FILE) diff --git a/src/wget.mk b/src/wget.mk index bf5f7bab..750b581c 100644 --- a/src/wget.mk +++ b/src/wget.mk @@ -2,8 +2,8 @@ # See index.html for further information. PKG := wget -$(PKG)_VERSION := 1.17.1 -$(PKG)_CHECKSUM := fe559b61eb9cc01635ac6206a14e02cb51591838c35fa83c7a4aacae0bdd97c9 +$(PKG)_VERSION := 1.18 +$(PKG)_CHECKSUM := b5b55b75726c04c06fe253daec9329a6f1a3c0c1878e3ea76ebfebc139ea9cc1 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://ftp.gnu.org/gnu/$(PKG)/$($(PKG)_FILE) From 8eaa5cde7a9db4499ecd069dc68d8d3a2e388cb3 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Fri, 10 Jun 2016 20:37:16 +0000 Subject: [PATCH 0718/1463] Update versions.json & build-matrix.html --- build-matrix.html | 6 +++--- versions.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 642e6b34..523c1a2c 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -769,7 +769,7 @@ feel free to submit a pull request. gettext - 0.19.7 + 0.19.8 ✓ ✓ ✓ @@ -1959,7 +1959,7 @@ feel free to submit a pull request. libpng - 1.6.22 + 1.6.23 ✓ ✓ ✓ @@ -3959,7 +3959,7 @@ feel free to submit a pull request. wget - 1.17.1 + 1.18 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index c35c8e08..bc1a940e 100644 --- a/versions.json +++ b/versions.json @@ -72,7 +72,7 @@ "gendef": "4.0.6", "geoip-database": "20150317-1", "geos": "3.4.2", - "gettext": "0.19.7", + "gettext": "0.19.8", "giflib": "5.0.5", "glew": "1.12.0", "glfw2": "2.7.9", @@ -191,7 +191,7 @@ "libpano13": "2.9.18", "libpaper": "1.1.24+nmu4", "libplist": "1.12", - "libpng": "1.6.22", + "libpng": "1.6.23", "librosco": "0.1.11", "librsvg": "2.40.5", "librtmp": "a107cef", @@ -391,7 +391,7 @@ "vtk6": "6.3.0", "waf": "1.8.17", "wavpack": "4.75.2", - "wget": "1.17.1", + "wget": "1.18", "widl": "4.0.6", "winpcap": "4_1_3", "wt": "3.3.5", From 5bdb2c2912cad3058554cd3f3325440b0998651d Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 11 Jun 2016 18:47:04 +0200 Subject: [PATCH 0719/1463] gettext: update --- src/gettext.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gettext.mk b/src/gettext.mk index ad858b7d..09a2d4dd 100644 --- a/src/gettext.mk +++ b/src/gettext.mk @@ -3,8 +3,8 @@ PKG := gettext $(PKG)_IGNORE := -$(PKG)_VERSION := 0.19.8 -$(PKG)_CHECKSUM := 3da4f6bd79685648ecf46dab51d66fcdddc156f41ed07e580a696a38ac61d48f +$(PKG)_VERSION := 0.19.8.1 +$(PKG)_CHECKSUM := ff942af0e438ced4a8b0ea4b0b6e0d6d657157c5e2364de57baa279c1c125c43 $(PKG)_SUBDIR := gettext-$($(PKG)_VERSION) $(PKG)_FILE := gettext-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://ftp.gnu.org/pub/gnu/gettext/$($(PKG)_FILE) From d6ddf0f589b30e0a36c130fb44ca9813d2545d8d Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sat, 11 Jun 2016 16:48:34 +0000 Subject: [PATCH 0720/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 523c1a2c..a33b40de 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -769,7 +769,7 @@ feel free to submit a pull request. gettext - 0.19.8 + 0.19.8.1 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index bc1a940e..0bf93f1e 100644 --- a/versions.json +++ b/versions.json @@ -72,7 +72,7 @@ "gendef": "4.0.6", "geoip-database": "20150317-1", "geos": "3.4.2", - "gettext": "0.19.8", + "gettext": "0.19.8.1", "giflib": "5.0.5", "glew": "1.12.0", "glfw2": "2.7.9", From 4d43e1fe47318688d161c704895b40d26a69b3f7 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sat, 11 Jun 2016 21:34:45 +0300 Subject: [PATCH 0721/1463] build-pkg: prefix evn. vars with "MXE_BUILD_PKG" to distinguish them from environment variables of MXE itself. --- tools/build-pkg.lua | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index 9cda06fa..3a5a25f6 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -16,14 +16,15 @@ Build in directory /usr/lib/mxe This directory can not be changed in .deb packages. To prevent build-pkg from creating deb packages, -set environment variable MXE_NO_DEBS to 1 +set environment variable MXE_BUILD_PKG_NO_DEBS to 1 In this case fakeroot and dpkg-deb are not needed. -To switch off the second pass, set MXE_NO_SECOND_PASS to 1. +To switch off the second pass, set +MXE_BUILD_PKG_NO_SECOND_PASS to 1. See https://github.com/mxe/mxe/issues/1111 To limit number of packages being built to x, -set environment variable MXE_MAX_ITEMS to x, +set environment variable MXE_BUILD_PKG_MAX_ITEMS to x. The following error: > fakeroot, while creating message channels: Invalid argument @@ -33,9 +34,9 @@ can be caused by leaked ipc resources originating in fakeroot. How to remove them: http://stackoverflow.com/a/4262545 ]] -local max_items = tonumber(os.getenv('MXE_MAX_ITEMS')) -local no_debs = os.getenv('MXE_NO_DEBS') -local no_second_pass = os.getenv('MXE_NO_SECOND_PASS') +local max_items = tonumber(os.getenv('MXE_BUILD_PKG_MAX_ITEMS')) +local no_debs = os.getenv('MXE_BUILD_PKG_NO_DEBS') +local no_second_pass = os.getenv('MXE_BUILD_PKG_NO_SECOND_PASS') local TODAY = os.date("%Y%m%d") From fba599d2d7cacc6d46aa39091664f219ce8eb879 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sat, 11 Jun 2016 21:54:26 +0300 Subject: [PATCH 0722/1463] build-pkg: add env. var to change targets MXE_BUILD_PKG_TARGETS --- tools/build-pkg.lua | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/build-pkg.lua b/tools/build-pkg.lua index 3a5a25f6..0056249e 100755 --- a/tools/build-pkg.lua +++ b/tools/build-pkg.lua @@ -26,6 +26,11 @@ See https://github.com/mxe/mxe/issues/1111 To limit number of packages being built to x, set environment variable MXE_BUILD_PKG_MAX_ITEMS to x. +To set list of MXE targets to build, +set environment variable MXE_BUILD_PKG_TARGETS to +the list of targets separated by space. +By default, all 4 major targets are built. + The following error: > fakeroot, while creating message channels: Invalid argument > This may be due to a lack of SYSV IPC support. @@ -37,6 +42,7 @@ How to remove them: http://stackoverflow.com/a/4262545 local max_items = tonumber(os.getenv('MXE_BUILD_PKG_MAX_ITEMS')) local no_debs = os.getenv('MXE_BUILD_PKG_NO_DEBS') local no_second_pass = os.getenv('MXE_BUILD_PKG_NO_SECOND_PASS') +local build_targets = os.getenv('MXE_BUILD_PKG_TARGETS') local TODAY = os.date("%Y%m%d") @@ -64,6 +70,12 @@ local TARGETS = { 'i686-w64-mingw32.shared', 'x86_64-w64-mingw32.shared', } +if build_targets then + TARGETS = {} + for target in build_targets:gmatch('(%S+)') do + table.insert(TARGETS, target) + end +end local function echo(fmt, ...) print(fmt:format(...)) From aab2b702534827d49a84975ad586a8a0ca303004 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 12 Jun 2016 02:08:38 +0300 Subject: [PATCH 0723/1463] create tmp-*/readonly instead of usr/readonly Removing MXE directory with "rm -rf" used to fail on file usr/readonly/.gitkeep because directory usr/readonly was readonly. Now readonly directory is created in tmp-* directory and .gitkeep is not created for it (because tmp-* is not under usr/). Problems with removing MXE directory are fixed even in case of interrupted build. fix #1221 --- Makefile | 15 ++++++++------- src/mxe-conf.mk | 7 ------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index b3275a74..cd45f8c2 100644 --- a/Makefile +++ b/Makefile @@ -158,7 +158,7 @@ PRELOAD_VARS := LD_PRELOAD DYLD_FORCE_FLAT_NAMESPACE DYLD_INSERT_LIBRARIES # basic working shell environment and mxe variables # see http://www.linuxfromscratch.org/lfs/view/stable/chapter04/settingenvironment.html ENV_WHITELIST := EDITOR HOME LANG PATH %PROXY %proxy PS1 TERM -ENV_WHITELIST += MAKE% MXE% $(PRELOAD_VARS) +ENV_WHITELIST += MAKE% MXE% $(PRELOAD_VARS) WINEPREFIX # OS/Distro related issues - "unsafe" but practical # 1. https://github.com/mxe/mxe/issues/697 @@ -166,10 +166,6 @@ ENV_WHITELIST += ACLOCAL_PATH LD_LIBRARY_PATH unexport $(filter-out $(ENV_WHITELIST),$(shell env | cut -d '=' -f1)) -# disable wine with readonly directory (created by mxe-conf) -# see https://github.com/mxe/mxe/issues/841 -export WINEPREFIX=$(PREFIX)/readonly - SHORT_PKG_VERSION = \ $(word 1,$(subst ., ,$($(1)_VERSION))).$(word 2,$(subst ., ,$($(1)_VERSION))) @@ -494,7 +490,7 @@ $(PREFIX)/$(3)/installed/$(1): $(PKG_MAKEFILES) \ @$(PRINTF_FMT) '[message]' '$(1)' '$(3) $($(call LOOKUP_PKG_RULE,$(1),MESSAGE,$(3)))') @touch '$(LOG_DIR)/$(TIMESTAMP)/$(1)_$(3)' @ln -sf '$(TIMESTAMP)/$(1)_$(3)' '$(LOG_DIR)/$(1)_$(3)' - @if ! (time $(PRELOAD) $(MAKE) -f '$(MAKEFILE)' 'build-only-$(1)_$(3)' WGET=false) &> '$(LOG_DIR)/$(TIMESTAMP)/$(1)_$(3)'; then \ + @if ! (time $(PRELOAD) WINEPREFIX='$(2)/readonly' $(MAKE) -f '$(MAKEFILE)' 'build-only-$(1)_$(3)' WGET=false) &> '$(LOG_DIR)/$(TIMESTAMP)/$(1)_$(3)'; then \ echo; \ echo 'Failed to build package $(1) for target $(3)!'; \ echo '------------------------------------------------------------'; \ @@ -535,6 +531,12 @@ build-only-$(1)_$(3): perl --version 2>&1 | head -3 rm -rf '$(2)' mkdir -p '$(2)' + + # disable wine with readonly directory + # see https://github.com/mxe/mxe/issues/841 + mkdir -p '$(2)/readonly' + chmod 0555 '$(2)/readonly' + $$(if $(value $(call LOOKUP_PKG_RULE,$(1),FILE,$(3))),\ $$(call PREPARE_PKG_SOURCE,$(1),$(2))) $$(call $(call LOOKUP_PKG_RULE,$(1),BUILD,$(3)),$(2)/$($(1)_SUBDIR),$(TOP_DIR)/src/$(1)-test) @@ -634,7 +636,6 @@ BUILD_PKG_TMP_FILES := *-*.list mxe-*.tar.xz mxe-*.deb* wheezy jessie .PHONY: clean clean: - @[ -d "$$WINEPREFIX" ] && chmod 0755 "$$WINEPREFIX" || true rm -rf $(call TMP_DIR,*) $(PREFIX) \ $(addprefix $(TOP_DIR)/, $(BUILD_PKG_TMP_FILES)) diff --git a/src/mxe-conf.mk b/src/mxe-conf.mk index 45ba6a30..83a92b0f 100644 --- a/src/mxe-conf.mk +++ b/src/mxe-conf.mk @@ -107,13 +107,6 @@ define $(PKG)_BUILD_$(BUILD) cd '$(1)' && autoreconf -fiv cd '$(1)' && ./configure - #create readonly directory to force wine to fail - mkdir -p "$$WINEPREFIX" - [ -f "$$WINEPREFIX/.gitkeep" ] \ - || chmod 0755 "$$WINEPREFIX" \ - && touch "$$WINEPREFIX/.gitkeep" - chmod 0555 "$$WINEPREFIX" - #create script "wine" in a directory which is in PATH mkdir -p '$(PREFIX)/$(BUILD)/bin/' (echo '#!/usr/bin/env bash'; \ From 1f60ecc3737235cab776120b1876d2a8fa912edc Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 12 Jun 2016 16:02:45 +0300 Subject: [PATCH 0724/1463] patch-tool-mxe: rename existing .git directories winpcap has directory wpcap/libpcap/.git in its source tree. Git considers wpcap/libpcap to be a submodule, which is unwanted. --- patch.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/patch.mk b/patch.mk index c67e7b39..508de824 100644 --- a/patch.mk +++ b/patch.mk @@ -22,6 +22,8 @@ define INIT_GIT # if PKG_SUBDIR is ".", the following will move gits/tmp/pkg mv '$(abspath $(GITS_DIR)/tmp/$(1)/$($(1)_SUBDIR))' '$(call GIT_DIR,$(1))' rm -rf '$(GITS_DIR)/tmp' + # rename existing .git directories if any + find '$(call GIT_DIR,$(1))' -name .git -prune -exec sh -c 'mv "$$0" "$$0"_' {} \; # initialize git $(call GIT_CMD,$(1)) init $(call GIT_CMD,$(1)) add -A From 4e4f031a698507c06483036b138d7c98815daa5c Mon Sep 17 00:00:00 2001 From: darealshinji Date: Mon, 13 Jun 2016 15:01:58 +0200 Subject: [PATCH 0725/1463] djvulibre 3.5.27 (shared-only) --- src/djvulibre-1-fixes.patch | 340 ++++-------------------------------- src/djvulibre.mk | 25 ++- 2 files changed, 40 insertions(+), 325 deletions(-) diff --git a/src/djvulibre-1-fixes.patch b/src/djvulibre-1-fixes.patch index 89d92c9b..e8f30042 100644 --- a/src/djvulibre-1-fixes.patch +++ b/src/djvulibre-1-fixes.patch @@ -1,311 +1,31 @@ -This file is part of MXE. -See index.html for further information. - -Contains ad hoc patches for cross building. - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: darealshinji -Date: Sat, 9 Apr 2016 12:50:15 +0200 -Subject: [PATCH] skip desktopfiles - -Desktop files not needed for MXE. - -diff --git a/Makefile.in b/Makefile.in -index 1111111..2222222 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -32,7 +32,7 @@ SUBDIRS_FIRST = libdjvu tools - @XML_YES@SUBDIRS_XML = xmltools - @XML_NO@SUBDIRS_XML = - --SUBDIRS_LAST = desktopfiles -+@DESKTOP_YES@SUBDIRS_LAST = desktopfiles - - SUBDIRS = ${SUBDIRS_FIRST} ${SUBDIRS_XML} ${SUBDIRS_I18N} ${SUBDIRS_LAST} - - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: darealshinji -Date: Sat, 9 Apr 2016 12:50:50 +0200 -Subject: [PATCH] Add .exe to binary filenames - - -diff --git a/tools/Makefile.in b/tools/Makefile.in -index 1111111..2222222 100644 ---- a/tools/Makefile.in -+++ b/tools/Makefile.in -@@ -28,6 +28,8 @@ datadir = @datadir@ - libdir = @libdir@ - mandir = @mandir@ - -+EXEEXT = @EXEEXT@ -+ - CC = @CC@ - CXX = @CXX@ - RM = @RM@ -@@ -60,10 +62,10 @@ CXXFLAGS = ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@ - - SUBDIRS = jb2cmp - --PROGRAMS = bzz c44 cjb2 cpaldjvu csepdjvu \ -- ddjvu djvm djvmcvt djvudump \ -- djvups djvuextract djvumake \ -- djvused djvutxt djvuserve -+PROGRAMS = bzz$(EXEEXT) c44$(EXEEXT) cjb2$(EXEEXT) cpaldjvu$(EXEEXT) csepdjvu$(EXEEXT) \ -+ ddjvu$(EXEEXT) djvm$(EXEEXT) djvmcvt$(EXEEXT) djvudump$(EXEEXT) \ -+ djvups$(EXEEXT) djvuextract$(EXEEXT) djvumake$(EXEEXT) \ -+ djvused$(EXEEXT) djvutxt$(EXEEXT) djvuserve$(EXEEXT) - - SCRIPTS = djvudigital any2djvu - -@@ -117,63 +119,63 @@ annotate: annotate.o - ${LIBTOOL} --mode=link \ - ${CXX} -o $@ ${CXXFLAGS} annotate.o ${LIBDJVU} ${LIBS} - --bzz: bzz.o -+bzz$(EXEEXT): bzz.o - ${LIBTOOL} --mode=link \ - ${CXX} -o $@ ${CXXFLAGS} bzz.o ${LIBDJVU} ${LIBS} - --c44: c44.o -+c44$(EXEEXT): c44.o - ${LIBTOOL} --mode=link \ - ${CXX} -o $@ ${CXXFLAGS} c44.o ${LIBDJVU} ${LIBS} - --cjb2: cjb2.o ${JB2OBJS} -+cjb2$(EXEEXT): cjb2.o ${JB2OBJS} - ${LIBTOOL} --mode=link \ - ${CXX} -o $@ ${CXXFLAGS} cjb2.o ${JB2OBJS} ${LIBDJVU} ${MORELIBS} - --cpaldjvu: cpaldjvu.o ${JB2OBJS} -+cpaldjvu$(EXEEXT): cpaldjvu.o ${JB2OBJS} - ${LIBTOOL} --mode=link \ - ${CXX} -o $@ ${CXXFLAGS} cpaldjvu.o ${JB2OBJS} ${LIBDJVU} ${LIBS} - --csepdjvu: csepdjvu.o ${JB2OBJS} -+csepdjvu$(EXEEXT): csepdjvu.o ${JB2OBJS} - ${LIBTOOL} --mode=link \ - ${CXX} -o $@ ${CXXFLAGS} csepdjvu.o ${JB2OBJS} ${LIBDJVU} ${LIBS} - --ddjvu: ddjvu.o tiff2pdf.o -+ddjvu$(EXEEXT): ddjvu.o tiff2pdf.o - ${LIBTOOL} --mode=link \ - ${CXX} -o $@ ${CXXFLAGS} ddjvu.o tiff2pdf.o ${LIBDJVU} ${MORELIBS} - --djvm: djvm.o -+djvm$(EXEEXT): djvm.o - ${LIBTOOL} --mode=link \ - ${CXX} -o $@ ${CXXFLAGS} djvm.o ${LIBDJVU} ${LIBS} - --djvmcvt: djvmcvt.o -+djvmcvt$(EXEEXT): djvmcvt.o - ${LIBTOOL} --mode=link \ - ${CXX} -o $@ ${CXXFLAGS} djvmcvt.o ${LIBDJVU} ${LIBS} - --djvudump: djvudump.o -+djvudump$(EXEEXT): djvudump.o - ${LIBTOOL} --mode=link \ - ${CXX} -o $@ ${CXXFLAGS} djvudump.o ${LIBDJVU} ${LIBS} - --djvups: djvups.o -+djvups$(EXEEXT): djvups.o - ${LIBTOOL} --mode=link \ - ${CXX} -o $@ ${CXXFLAGS} djvups.o ${LIBDJVU} ${LIBS} - --djvuextract: djvuextract.o -+djvuextract$(EXEEXT): djvuextract.o - ${LIBTOOL} --mode=link \ - ${CXX} -o $@ ${CXXFLAGS} djvuextract.o ${LIBDJVU} ${LIBS} - --djvumake: djvumake.o -+djvumake$(EXEEXT): djvumake.o - ${LIBTOOL} --mode=link \ - ${CXX} -o $@ ${CXXFLAGS} djvumake.o ${LIBDJVU} ${LIBS} - --djvused: djvused.o -+djvused$(EXEEXT): djvused.o - ${LIBTOOL} --mode=link \ - ${CXX} -o $@ ${CXXFLAGS} djvused.o ${LIBDJVU} ${LIBS} - --djvutxt: djvutxt.o -+djvutxt$(EXEEXT): djvutxt.o - ${LIBTOOL} --mode=link \ - ${CXX} -o $@ ${CXXFLAGS} djvutxt.o ${LIBDJVU} ${LIBS} - --djvuserve: djvuserve.o -+djvuserve$(EXEEXT): djvuserve.o - ${LIBTOOL} --mode=link \ - ${CXX} -o $@ ${CXXFLAGS} djvuserve.o ${LIBDJVU} ${LIBS} - -diff --git a/xmltools/Makefile.in b/xmltools/Makefile.in -index 1111111..2222222 100644 ---- a/xmltools/Makefile.in -+++ b/xmltools/Makefile.in -@@ -28,6 +28,8 @@ datadir = @datadir@ - libdir = @libdir@ - mandir = @mandir@ - -+EXEEXT = @EXEEXT@ -+ - CC = @CC@ - CXX = @CXX@ - RM = @RM@ -@@ -55,7 +57,7 @@ LIBS= @LDFLAGS@ @LIBS@ - CFLAGS = ${FLAGS} @CPPFLAGS@ @CFLAGS@ - CXXFLAGS = ${FLAGS} ${CXXRPOFLAGS} @CPPFLAGS@ @CXXFLAGS@ - --PROGRAMS = djvutoxml djvuxmlparser -+PROGRAMS = djvutoxml$(EXEEXT) djvuxmlparser$(EXEEXT) - - all: ${PROGRAMS} djvuxml.1 - -@@ -97,11 +99,11 @@ djvuxml.1: ${srcdir}/djvuxml.1.in - sed < ${srcdir}/djvuxml.1.in > djvuxml.1 \ - -e 's,DATADIR,${datadir},' - --djvutoxml: djvutoxml.o -+djvutoxml$(EXEEXT): djvutoxml.o - ${LIBTOOL} --mode=link \ - ${CXX} -o $@ ${CXXFLAGS} djvutoxml.o ${LIBDJVU} ${LIBS} - --djvuxmlparser: djvuxmlparser.o -+djvuxmlparser$(EXEEXT): djvuxmlparser.o - ${LIBTOOL} --mode=link \ - ${CXX} -o $@ ${CXXFLAGS} djvuxmlparser.o ${LIBDJVU} ${LIBS} - - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: darealshinji -Date: Sat, 9 Apr 2016 12:52:55 +0200 -Subject: [PATCH] precision - -Source: https://github.com/msys2/MINGW-packages/tree/master/mingw-w64-djvulibre - -diff --git a/libdjvu/DjVuPort.cpp b/libdjvu/DjVuPort.cpp -index 1111111..2222222 100644 ---- a/libdjvu/DjVuPort.cpp -+++ b/libdjvu/DjVuPort.cpp -@@ -466,11 +466,11 @@ DjVuPortcaster::compute_closure(const DjVuPort * src, GPList &list, bo - // Sort in depth order - int max_dist=0; - for(pos=set;pos;++pos) -- if (max_dist < (int)(long)set[pos]) -- max_dist = (int)(long)set[pos]; -+ if (max_dist < (int)(size_t)set[pos]) -+ max_dist = (int)(size_t)set[pos]; - GArray > lists(0,max_dist); - for(pos=set;pos;++pos) -- lists[(int)(long)set[pos]].append(set.key(pos)); -+ lists[(int)(size_t)set[pos]].append(set.key(pos)); - for(int dist=0;dist<=max_dist;dist++) - for(pos=lists[dist];pos;++pos) - { -diff --git a/libdjvu/GBitmap.cpp b/libdjvu/GBitmap.cpp -index 1111111..2222222 100644 ---- a/libdjvu/GBitmap.cpp -+++ b/libdjvu/GBitmap.cpp -@@ -469,7 +469,7 @@ GBitmap::share() - { - if (!monitorptr) - { -- unsigned long x = (unsigned long)this; -+ size_t x = (size_t)this; - monitorptr = &monitors[(x^(x>>5)) % NMONITORS]; - } - } -diff --git a/libdjvu/GContainer.h b/libdjvu/GContainer.h -index 1111111..2222222 100644 ---- a/libdjvu/GContainer.h -+++ b/libdjvu/GContainer.h -@@ -178,7 +178,7 @@ hash(const unsigned long & x) - static inline unsigned int - hash(const void * const & x) - { -- return (unsigned long) x; -+ return (unsigned long)((size_t) x); +--- a/libdjvu/Makefile.am ++++ b/libdjvu/Makefile.am +@@ -33,6 +33,8 @@ + libdjvulibre_la_LDFLAGS = -no-undefined -version-info $(version_info) + + if HAVE_OS_WIN32 ++libdjvulibre_la_CPPFLAGS += -DDJVUAPI_EXPORT ++libdjvulibre_la_CPPFLAGS += -DDDJVUAPI_EXPORT -DMINILISPAPI_EXPORT + libdjvulibre_la_LDFLAGS += -Wl,--export-all-symbols + endif + +--- a/libdjvu/miniexp.cpp ++++ b/libdjvu/miniexp.cpp +@@ -383,14 +383,16 @@ } - - /** Hashing function (float). */ -diff --git a/libdjvu/IW44EncodeCodec.cpp b/libdjvu/IW44EncodeCodec.cpp -index 1111111..2222222 100644 ---- a/libdjvu/IW44EncodeCodec.cpp -+++ b/libdjvu/IW44EncodeCodec.cpp -@@ -310,7 +310,7 @@ static const int d16[] = {16,16}; - static inline void - mmx_fv_1 ( short* &q, short* e, int s, int s3 ) - { -- while (q -Date: Sun, 10 Apr 2016 14:58:05 +0200 -Subject: [PATCH] fix linking errors in shared builds - -> the presence -> of any one __declspec(dllexport) in any object file disables the -> auto-export feature, so if you declare any symbol dllexport you have to -> mark them all (or explicily -Wl,--export-all-symbols.) - -See http://mingw-users.1079350.n2.nabble.com/MinGW-produces-incorrect-dll-a-files-tp1109211p1109231.html - -./configure adds -Wl,--export-all-symbols if host matches "*-mingw32", -but MXE's host is "i686-w64-mingw32.shared". This patch changes the -pattern to "*-mingw32*". - -diff --git a/configure.ac b/configure.ac -index 1111111..2222222 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -69,7 +69,7 @@ AC_SUBST(DLLFLAGS) - - # Special cases - case "$host" in -- *-mingw32) -+ *-mingw32*) - DLLFLAGS="$DLLFLAGS -Wl,--export-all-symbols" - LIBS=-lmsvcp60 - ;; + # endif + // -- Very black magic to clean tls variables. ++/* + # ifdef _M_IX86 + # pragma comment (linker, "/INCLUDE:_tlscb") + # else + # pragma comment (linker, "/INCLUDE:tlscb") + # endif + # pragma const_seg(".CRT$XLB") ++*/ + extern "C" PIMAGE_TLS_CALLBACK tlscb = gctls_cb; +-# pragma const_seg() ++/* # pragma const_seg() */ + + #else + // No threads diff --git a/src/djvulibre.mk b/src/djvulibre.mk index c61eb4b6..c899469e 100644 --- a/src/djvulibre.mk +++ b/src/djvulibre.mk @@ -2,13 +2,11 @@ # See index.html for further information. PKG := djvulibre -$(PKG)_IGNORE := 3.5.27 -$(PKG)_SHORTVER := 3.5.25 -$(PKG)_VERSION := $($(PKG)_SHORTVER).3 -$(PKG)_CHECKSUM := 898d7ed6dd2fa311a521baa95407a91b20a872d80c45e8245442d64f142cb1e0 -$(PKG)_SUBDIR := $(PKG)-$($(PKG)_SHORTVER) +$(PKG)_VERSION := 3.5.27 +$(PKG)_CHECKSUM := e69668252565603875fb88500cde02bf93d12d48a3884e472696c896e81f505f +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/djvu/DjVuLibre/$($(PKG)_SHORTVER)/$($(PKG)_FILE) +$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/djvu/DjVuLibre/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc jpeg tiff zlib define $(PKG)_UPDATE @@ -17,16 +15,13 @@ define $(PKG)_UPDATE head -1 endef -define $(PKG)_BUILD - cd '$(1)' && autoreconf -fi && CPPFLAGS='-DDLL_EXPORT' ./configure \ - $(MXE_CONFIGURE_OPTS) \ - --disable-desktopfiles - $(MAKE) -C '$(1)' -j '$(JOBS)' - $(MAKE) -C '$(1)/libdjvu' -j 1 install-lib \ - install-include install-pkgconfig +define $(PKG)_BUILD_SHARED + cd '$(1)' && automake + cd '$(1)' && ./configure $(MXE_CONFIGURE_OPTS) --disable-desktopfiles + $(MAKE) -C '$(1)' -j '$(JOBS)' install-strip '$(TARGET)-g++' \ - -W -Wall -Werror -pedantic -DDLL_EXPORT \ + -W -Wall -Werror -pedantic \ '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG).exe' \ - `'$(TARGET)-pkg-config' ddjvuapi --libs` + `'$(TARGET)-pkg-config' ddjvuapi --cflags --libs` endef From 2bafd7b4be2eb4b31ff2b7856c140c716856f039 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 12 Jun 2016 00:27:03 +0300 Subject: [PATCH 0726/1463] add tool install-deps --- tools/install-deps | 81 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100755 tools/install-deps diff --git a/tools/install-deps b/tools/install-deps new file mode 100755 index 00000000..d4daee6c --- /dev/null +++ b/tools/install-deps @@ -0,0 +1,81 @@ +#!/bin/bash + +set -xue + +if [[ "$OSTYPE" =~ "linux" ]]; then + if which apt-get && which dpkg; then + # Debian or Ubuntu + apt-get install \ + autoconf automake autopoint bash bison bzip2 flex gettext\ + git g++ gperf intltool libffi-dev libgdk-pixbuf2.0-dev \ + libtool libltdl-dev libssl-dev libxml-parser-perl make \ + openssl p7zip-full patch perl pkg-config python ruby scons \ + sed unzip wget xz-utils + if ! [[ `uname -m` =~ "i686" ]]; then + apt-get install g++-multilib libc6-dev-i386 + fi + DIST=`lsb_release -si` + REL=`lsb_release -sr` + if [[ $DIST =~ "Debian" ]] && (( `echo "$REL > 8" | bc -l` )) || \ + [[ $DIST =~ "Ubuntu" ]] && (( `echo "$REL > 14.10" | bc -l` )); then + apt-get install libtool-bin + fi + # install Lua for build-pkg + apt-get install lua5.1 + elif which yum; then + # Fedora + yum install \ + autoconf automake bash bison bzip2 flex gcc-c++ \ + gdk-pixbuf2-devel gettext git gperf intltool make \ + sed libffi-devel libtool openssl-devel p7zip patch \ + perl pkgconfig python ruby scons unzip wget xz + elif which pacman-g2; then + # Frugalware + pacman-g2 -S \ + autoconf automake bash bzip2 bison flex gcc gdk-pixbuf2\ + gettext git gperf intltool make sed libffi libtool \ + openssl patch perl perl-xml-parser pkgconfig python \ + ruby scons unzip wget xz xz-lzma + elif which emerge; then + # Gentoo + emerge \ + sys-devel/autoconf sys-devel/automake app-shells/bash \ + sys-devel/bison app-arch/bzip2 \ + sys-devel/flex sys-devel/gcc sys-devel/gettext \ + dev-vcs/git dev-util/gperf dev-util/intltool \ + sys-devel/make sys-apps/sed dev-libs/libffi \ + sys-devel/libtool dev-libs/openssl app-arch/p7zip \ + sys-devel/patch dev-lang/perl dev-perl/XML-Parser \ + dev-util/pkgconfig dev-lang/python dev-lang/ruby \ + dev-util/scons app-arch/unzip net-misc/wget \ + app-arch/xz-utils x11-libs/gdk-pixbuf + elif which zypper; then + # openSUSE + zypper install -R \ + autoconf automake bash bison bzip2 flex gcc-c++ \ + gdk-pixbuf-devel gettext-tools git gperf intltool \ + libffi-devel libtool make openssl libopenssl-devel \ + p7zip patch perl perl-XML-Parser pkg-config python \ + ruby scons sed unzip wget xz + if ! [[ `uname -m` =~ i686 ]]; then + zypper install -R \ + gcc-32bit glibc-devel-32bit libgcc46-32bit \ + libgomp46-32bit libstdc++46-devel-32bit + fi + fi +elif [[ "$OSTYPE" == "darwin"* ]]; then + port install \ + autoconf automake bison coreutils flex gettext \ + gdk-pixbuf2 glib2 gnutar gsed intltool libffi libtool \ + openssl p5-xml-parser p7zip pkgconfig scons wget xz +elif [[ "$OSTYPE" == "freebsd"* ]]; then + pkg install \ + automake autoconf bash bison coreutils flex \ + gcc gdk-pixbuf2 gettext git glib gmake gperf gsed intltool libffi \ + libtool openssl p5-XML-Parser p7zip patch perl5 \ + pkgconf python ruby scons unzip wget + pkg install file +else + echo "unknown: $OSTYPE" + exit 1 +fi From 35909aded2a94f4334b0dca4a8bcda2375f246a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20M=C3=BCllenhaupt?= Date: Tue, 14 Jun 2016 21:15:00 +0200 Subject: [PATCH 0727/1463] Update README.md --- plugins/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/README.md b/plugins/README.md index ac7490b0..803aab47 100644 --- a/plugins/README.md +++ b/plugins/README.md @@ -12,7 +12,7 @@ The basic usage is to drop some `*.mk` files in a directory `foo/` and set `MXE_PLUGIN_DIRS='foo/'` while invoking `make` like this: ```console -MXE_PLUGINS_DIR=foo/ make libpng +MXE_PLUGIN_DIRS=foo/ make libpng ``` If needed, you can also pass multiple directories by separating them with a From a2ce8e3c7fc12309edab783098477f86a0e5ffdb Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 16 Jun 2016 01:10:06 +0200 Subject: [PATCH 0728/1463] update: libgcrypt libgpg_error --- src/libgcrypt.mk | 4 ++-- src/libgpg_error.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libgcrypt.mk b/src/libgcrypt.mk index 781b7265..7e898a66 100644 --- a/src/libgcrypt.mk +++ b/src/libgcrypt.mk @@ -3,8 +3,8 @@ PKG := libgcrypt $(PKG)_IGNORE := -$(PKG)_VERSION := 1.7.0 -$(PKG)_CHECKSUM := b0e67ea74474939913c4d9d9ef4ef5ec378efbe2bebe36389dee319c79bffa92 +$(PKG)_VERSION := 1.7.1 +$(PKG)_CHECKSUM := 450d9cfcbf1611c64dbe3bd04b627b83379ef89f11406d94c8bba305e36d7a95 $(PKG)_SUBDIR := libgcrypt-$($(PKG)_VERSION) $(PKG)_FILE := libgcrypt-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://mirrors.dotsrc.org/gcrypt/libgcrypt/$($(PKG)_FILE) diff --git a/src/libgpg_error.mk b/src/libgpg_error.mk index 3d5941b0..0514f219 100644 --- a/src/libgpg_error.mk +++ b/src/libgpg_error.mk @@ -3,8 +3,8 @@ PKG := libgpg_error $(PKG)_IGNORE := -$(PKG)_VERSION := 1.21 -$(PKG)_CHECKSUM := b7dbdb3cad63a740e9f0c632a1da32d4afdb694ec86c8625c98ea0691713b84d +$(PKG)_VERSION := 1.23 +$(PKG)_CHECKSUM := 7f0c7f65b98c4048f649bfeebfa4d4c1559707492962504592b985634c939eaa $(PKG)_SUBDIR := libgpg-error-$($(PKG)_VERSION) $(PKG)_FILE := libgpg-error-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://mirrors.dotsrc.org/gcrypt/libgpg-error/$($(PKG)_FILE) From 35bafc66ee96d8cacb5b7796af581b12787e3f5f Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Wed, 15 Jun 2016 23:11:34 +0000 Subject: [PATCH 0729/1463] Update versions.json & build-matrix.html --- build-matrix.html | 4 ++-- versions.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index a33b40de..f5762a04 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -1569,7 +1569,7 @@ feel free to submit a pull request. libgcrypt - 1.7.0 + 1.7.1 ✓ ✓ ✓ @@ -1649,7 +1649,7 @@ feel free to submit a pull request. libgpg_error - 1.21 + 1.23 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 0bf93f1e..28704ec8 100644 --- a/versions.json +++ b/versions.json @@ -152,7 +152,7 @@ "libffi": "3.2.1", "libftdi": "0.20", "libftdi1": "1.2", - "libgcrypt": "1.7.0", + "libgcrypt": "1.7.1", "libgda": "4.2.13", "libgdamm": "4.1.3", "libgee": "0.5.0", @@ -160,7 +160,7 @@ "libgit2": "0.23.2", "libglade": "2.6.4", "libgnurx": "2.6.1", - "libgpg_error": "1.21", + "libgpg_error": "1.23", "libgsasl": "1.8.0", "libgsf": "1.14.30", "libharu": "2.2.1", From 6fe4b2838d00bc020b99d4670d9238783976f4cf Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Fri, 10 Jun 2016 01:47:26 +0300 Subject: [PATCH 0730/1463] libjpeg-turbo: update from 1.4.1 to 1.5.0 Drop unneeded patches. --- src/libjpeg-turbo-1-fixes.patch | 80 ++++----------------------------- src/libjpeg-turbo.mk | 4 +- 2 files changed, 10 insertions(+), 74 deletions(-) diff --git a/src/libjpeg-turbo-1-fixes.patch b/src/libjpeg-turbo-1-fixes.patch index 69d97063..05557af1 100644 --- a/src/libjpeg-turbo-1-fixes.patch +++ b/src/libjpeg-turbo-1-fixes.patch @@ -3,94 +3,30 @@ See index.html for further information. Contains ad hoc patches for cross building. -From aba5b24329e9f7209e47d400648e01a1de516e5e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MXE Date: Sun, 6 Sep 2015 23:16:12 +1000 -Subject: [PATCH 1/3] fix typedef conflicts +Subject: [PATCH] fix typedef conflicts taken from: https://aur.archlinux.org/cgit/aur.git/tree/0001-header-compat.mingw.patch?h=mingw-w64-libjpeg-turbo + diff --git a/jmorecfg.h b/jmorecfg.h -index 108e7de..ea74b4f 100644 +index 1111111..2222222 100644 --- a/jmorecfg.h +++ b/jmorecfg.h -@@ -12,6 +12,12 @@ +@@ -14,7 +14,13 @@ * optimizations. Most users will not need to touch this file. */ +/* prevents conflicts */ +#if defined(__MINGW32__) +#include /* typedefs INT16 and INT32 */ -+ + +#define HAVE_BOOLEAN +#endif - ++ /* * Maximum number of components (color channels) allowed in JPEG image. -@@ -112,6 +118,7 @@ typedef char JOCTET; - #endif /* HAVE_UNSIGNED_CHAR */ - - -+#ifndef _BASETSD_H_ /* basestd.h from mingw-w64 defines UINT8, UINT16, INT16, INT32 */ - /* These typedefs are used for various table entries and so forth. - * They must be at least as wide as specified; but making them too big - * won't cost a huge amount of memory, so we don't provide special -@@ -150,6 +157,7 @@ typedef short INT16; - #ifndef XMD_H /* X11/xmd.h correctly defines INT32 */ - typedef long INT32; - #endif -+#endif - - /* Datatype used for image dimensions. The JPEG standard only supports - * images up to 64K*64K due to 16-bit fields in SOF markers. Therefore --- -2.3.2 (Apple Git-55) - - -From 49614a87a8a028fd7ce93edbbe8b5b79b9c97213 Mon Sep 17 00:00:00 2001 -From: MXE -Date: Sun, 6 Sep 2015 23:17:23 +1000 -Subject: [PATCH 2/3] include stdio.h - -taken from: -https://aur.archlinux.org/cgit/aur.git/tree/libjpeg-turbo-1.3.1-libmng-compatibility.patch?h=mingw-w64-libjpeg-turbo - -diff --git a/jpeglib.h b/jpeglib.h -index 9615c5d..f5fffe5 100644 ---- a/jpeglib.h -+++ b/jpeglib.h -@@ -28,6 +28,7 @@ - #endif - #include "jmorecfg.h" /* seldom changed options */ - -+#include - - #ifdef __cplusplus - #ifndef DONT_USE_EXTERN_C --- -2.3.2 (Apple Git-55) - - -From e7a2f20d69b45f76834aeb71ff08c3f4b487f944 Mon Sep 17 00:00:00 2001 -From: MXE -Date: Mon, 21 Sep 2015 20:34:03 +1000 -Subject: [PATCH 3/3] install dll to bin - - -diff --git a/ltmain.sh b/ltmain.sh -index a968835..f9cf33d 100644 ---- a/ltmain.sh -+++ b/ltmain.sh -@@ -5229,7 +5229,7 @@ fi\ - # place dlname in correct position for cygwin - tdlname=$dlname - case $host,$output,$installed,$module,$dlname in -- *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; -+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../../bin/$dlname ;; - esac - $echo > $output "\ - # $outputname - a libtool library file --- -2.3.2 (Apple Git-55) - + * To meet the letter of the JPEG spec, set this to 255. However, darn diff --git a/src/libjpeg-turbo.mk b/src/libjpeg-turbo.mk index 59f7210d..812a75ec 100644 --- a/src/libjpeg-turbo.mk +++ b/src/libjpeg-turbo.mk @@ -3,8 +3,8 @@ PKG := libjpeg-turbo $(PKG)_IGNORE := -$(PKG)_VERSION := 1.4.1 -$(PKG)_CHECKSUM := 4bf5bad4ce85625bffbbd9912211e06790e00fb982b77724af7211034efafb08 +$(PKG)_VERSION := 1.5.0 +$(PKG)_CHECKSUM := 9f397c31a67d2b00ee37597da25898b03eb282ccd87b135a50a69993b6a2035f $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE) From 1be3717e10d2fbd880d3d038f1c062897e184ef3 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Thu, 16 Jun 2016 11:47:08 +0000 Subject: [PATCH 0731/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index f5762a04..6fad5cf8 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -1759,7 +1759,7 @@ feel free to submit a pull request. libjpeg-turbo - 1.4.1 + 1.5.0 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 28704ec8..c985668e 100644 --- a/versions.json +++ b/versions.json @@ -171,7 +171,7 @@ "libidn": "1.32", "libieee1284": "0.2.11", "libircclient": "1.8", - "libjpeg-turbo": "1.4.1", + "libjpeg-turbo": "1.5.0", "liblaxjson": "1.0.5", "liblo": "0.28rc", "liblqr-1": "0.4.2", From 341bca52d5399403a2faa6efe225a3313225b392 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 16 Jun 2016 18:30:48 +0200 Subject: [PATCH 0732/1463] upgrade to Qt 5.7.0 --- index.html | 4 -- src/qt3d-1.patch | 53 ---------------- src/qt3d.mk | 17 +++--- src/qtactiveqt.mk | 2 +- src/qtbase-1-fixes.patch | 124 ++++++-------------------------------- src/qtbase.mk | 12 ++-- src/qtcanvas3d.mk | 2 +- src/qtconnectivity.mk | 2 +- src/qtdeclarative.mk | 2 +- src/qtenginio.mk | 23 ------- src/qtgraphicaleffects.mk | 2 +- src/qtimageformats.mk | 2 +- src/qtlocation.mk | 2 +- src/qtmultimedia-1.patch | 29 --------- src/qtmultimedia.mk | 2 +- src/qtquickcontrols.mk | 2 +- src/qtquickcontrols2.mk | 2 +- src/qtscript.mk | 2 +- src/qtsensors.mk | 2 +- src/qtserialport.mk | 2 +- src/qtsvg.mk | 2 +- src/qttools.mk | 2 +- src/qttranslations.mk | 2 +- src/qtwebchannel.mk | 2 +- src/qtwebengine.mk | 2 +- src/qtwebkit.mk | 2 +- src/qtwebsockets.mk | 2 +- src/qtwebview.mk | 2 +- src/qtwinextras.mk | 2 +- src/qtxmlpatterns.mk | 2 +- 30 files changed, 59 insertions(+), 249 deletions(-) delete mode 100644 src/qt3d-1.patch delete mode 100644 src/qtenginio.mk delete mode 100644 src/qtmultimedia-1.patch diff --git a/index.html b/index.html index cf0ec3dd..8df5c9da 100644 --- a/index.html +++ b/index.html @@ -2329,10 +2329,6 @@ local-pkg-list: $(LOCAL_PKG_LIST) qtdeclarative Qt - - qtenginio - Qt - qtgraphicaleffects Qt diff --git a/src/qt3d-1.patch b/src/qt3d-1.patch deleted file mode 100644 index 3193f32f..00000000 --- a/src/qt3d-1.patch +++ /dev/null @@ -1,53 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -From f38bd703f75e6cdf234ed8e99560bd65e4f775ea Mon Sep 17 00:00:00 2001 -From: Mark Brand -Date: Fri, 17 Oct 2014 22:30:46 +0200 -Subject: [PATCH] fix static linking - - -diff --git a/src/quick3d/quick3d.pro b/src/quick3d/quick3d.pro -index 03cdd28..5b8e2ef 100644 ---- a/src/quick3d/quick3d.pro -+++ b/src/quick3d/quick3d.pro -@@ -9,7 +9,7 @@ gcov { - CONFIG += static - QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage - QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage --} else { -+} else:!static { - CONFIG += dll - } - -diff --git a/src/threed/threed.pro b/src/threed/threed.pro -index cb5f1d1..8d2be9b 100644 ---- a/src/threed/threed.pro -+++ b/src/threed/threed.pro -@@ -11,7 +11,7 @@ gcov { - CONFIG += static - QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage - QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage --} else { -+} else:!static { - CONFIG += dll - } - - -From: Boris Pek -Date: Wed, 04 May 2016 11:41:04 +0300 -Subject: [PATCH] fix build with GCC >= 6.x - -diff --git a/3rdparty/assimp/code/DXFLoader.cpp b/3rdparty/assimp/code/DXFLoader.cpp -index e372d60..2c1a13d 100644 ---- a/3rdparty/assimp/code/DXFLoader.cpp -+++ b/3rdparty/assimp/code/DXFLoader.cpp -@@ -84,7 +84,7 @@ - - // ------------------------------------------------------------------------------------------------ - // Constructor to be privately used by Importer --DXFImporter::DXFImporter() : buffer(0), groupCode(0), bRepeat(false), mDefaultLayer(false) -+DXFImporter::DXFImporter() : buffer(0), groupCode(0), bRepeat(false) - { - memset(cursor,0,sizeof(cursor)); - } diff --git a/src/qt3d.mk b/src/qt3d.mk index 22883562..1a4efa9a 100644 --- a/src/qt3d.mk +++ b/src/qt3d.mk @@ -1,20 +1,23 @@ # This file is part of MXE. # See index.html for further information. + PKG := qt3d $(PKG)_IGNORE := -$(PKG)_VERSION := bcdbf04b74cc7ded4d7b2471347f51b54ff8584b -$(PKG)_CHECKSUM := 7e5e553f0132bc801f11f318f58b4fe3b8b1fd930f4acc23e97757fb6c76049c -$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) -$(PKG)_FILE := qt-$(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://github.com/qtproject/qt3d/archive/$($(PKG)_VERSION).tar.gz +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := a8248a1779b561ea450e92345e8187bacac359df0e92ad61a1ad7652bb233e29 +$(PKG)_SUBDIR = $(subst qtbase,qt3d,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qt3d,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qt3d,$(qtbase_URL)) $(PKG)_DEPS := gcc qtbase qtdeclarative -$(PKG)_UPDATE = $(call MXE_GET_GITHUB_SHA, qtproject/qt3d, master) +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef define $(PKG)_BUILD # invoke qmake with removed debug options as a workaround for # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG+=git_build CONFIG-='debug debug_and_release' + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install endef diff --git a/src/qtactiveqt.mk b/src/qtactiveqt.mk index 2e6fd6bf..f17803f5 100644 --- a/src/qtactiveqt.mk +++ b/src/qtactiveqt.mk @@ -4,7 +4,7 @@ PKG := qtactiveqt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 6adc7be3859d2c0e54ed7edf6caa35e3863dfa3d476ea40cd9acf7c965ca3277 +$(PKG)_CHECKSUM := 9b78055dbd3c59e6cc312cd88ffb8503a34cfc397f26114039b38c5894913c91 $(PKG)_SUBDIR = $(subst qtbase,qtactiveqt,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtactiveqt,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtactiveqt,$(qtbase_URL)) diff --git a/src/qtbase-1-fixes.patch b/src/qtbase-1-fixes.patch index e7541357..bab33dc3 100644 --- a/src/qtbase-1-fixes.patch +++ b/src/qtbase-1-fixes.patch @@ -3,10 +3,10 @@ See index.html for further information. Contains ad hoc patches for cross building. -From 54b168c305f54e60de0e32501b166faa7f5913e0 Mon Sep 17 00:00:00 2001 +From 9e13228f4af09b93f6cd123635784e4988694ac2 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 6 Aug 2015 23:35:08 +0200 -Subject: [PATCH 1/8] fix qwindows plugin linking with system-freetype (MXE +Subject: [PATCH 1/6] fix qwindows plugin linking with system-freetype (MXE specific) Change-Id: I8783e3ab2d19011b083dd3c471107298a17293c4 @@ -22,13 +22,13 @@ index 39280de..e152b0d 100644 + win32:shared:LIBS_PRIVATE += -lfreetype } -- -2.5.0 +2.7.4 -From 26b89d11b4e51d3aa2aab14dd52216ef8b1c7950 Mon Sep 17 00:00:00 2001 +From 2d7638835de6b5f16cf64e6cf4eede1f8a9ccedb Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 21 Jun 2014 13:12:49 +0200 -Subject: [PATCH 2/8] use pkg-config for harfbuzz (MXE specific) +Subject: [PATCH 2/6] use pkg-config for harfbuzz (MXE specific) Change-Id: Id4e4c37d68b63c9f480d72a561d95d4d2a5ded50 @@ -55,13 +55,13 @@ index 7443368..c24e684 100644 + PKGCONFIG += harfbuzz } -- -2.5.0 +2.7.4 -From fa5ca49b4ffc1911a597b294ef2d4b5ecb983cad Mon Sep 17 00:00:00 2001 +From 172b7bf1f113b1ea443a64ad4f9a2ecda6ee06e2 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 8 Dec 2014 14:15:12 +0100 -Subject: [PATCH 3/8] fix oci config test on windows +Subject: [PATCH 3/6] fix oci config test on windows Change-Id: If1ce2241682259ca495b0ba68bf18410f8548922 @@ -75,21 +75,21 @@ index 3ffda1d..39b6f3759 100644 -LIBS += -lclntsh +!win32:LIBS += -lclntsh -- -2.5.0 +2.7.4 -From 7fd641a032c7b4ce1b14d7ca02da646b0a0c34d5 Mon Sep 17 00:00:00 2001 +From 7756e4e14ae5b33fea04416bd4f238ca1dfe4d30 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 6 Aug 2015 13:24:56 +0200 -Subject: [PATCH 4/8] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows +Subject: [PATCH 4/6] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows Change-Id: I53c110ef40e3d14cc49fa23aa5d294611cac2ffa diff --git a/configure b/configure -index 7651e29..4a4b478 100755 +index 43b55f0..de2c3ec 100755 --- a/configure +++ b/configure -@@ -4575,7 +4575,7 @@ fi +@@ -4656,7 +4656,7 @@ fi [ "$XPLATFORM_ANDROID" = "yes" ] && QMakeVar add styles "android" # check IPC support @@ -99,13 +99,13 @@ index 7651e29..4a4b478 100755 if compileTest unix/ipc_posix "ipc_posix" ; then QCONFIG_FLAGS="$QCONFIG_FLAGS QT_POSIX_IPC" -- -2.5.0 +2.7.4 -From 959d3a71bced8c00967a16f23c6f9305e56fafcd Mon Sep 17 00:00:00 2001 +From e40fdb058ec440d14e3037c530f8181561622f50 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 6 Oct 2015 09:53:20 +0200 -Subject: [PATCH 5/8] fix building mysql driver under mingw +Subject: [PATCH 5/6] fix building mysql driver under mingw Change-Id: I9c4e821d5b3a6919566c6b684cb4916827feb6a9 @@ -123,73 +123,13 @@ index 3cfb614..8b7063f 100644 !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) { use_libmysqlclient_r:LIBS += -lmysqlclient_r -- -2.5.0 +2.7.4 -From a6f45e15cf19e29afc5f42d1e87feb2b4f7e9532 Mon Sep 17 00:00:00 2001 -From: Boris Nagaev -Date: Sun, 18 Oct 2015 23:11:28 +0300 -Subject: [PATCH 6/8] configure: fix log corruption with option -v - -This bug occurs if ./configure is called with -v on systems on -which fd proc entries point to the files/devices they are open -on instead of being magic nodes which would basically dup() the -actual fds (e.g., Linux). - -In this case, the command "tee $tty" appends to /dev/stderr, which -may be already opened by the parent process. This breaks the log file. - -Normally, the log file starts with - - This is the Qt Open Source Edition. - ... - -but with `-v` flag it would start with output of awkprog and maybe -some zero bytes. Zero bytes are observed on Debian Wheezy. - - DEFAULT_INCDIRS=... - ... - ^@^@^@^@^@^@^@^@^@^@^@^@... - Done running configuration tests. - ... - -To fix this problem, the output of `...` is saved to a variable, and -then eval'd and echo'd (if -v). - -This solution was found by Tony Theodore. -https://github.com/mxe/mxe/issues/938#issuecomment-149770348 - -Change-Id: Id0c28598890e813774cc92f38ee46a0697b34e77 -Reviewed-by: Oswald Buddenhagen -Reviewed-by: Thiago Macieira -(cherry picked from commit 45fe3f1cde1e516d1ddccddb5e33ea4316497c36) - -diff --git a/configure b/configure -index 4a4b478..a5c0fd5 100755 ---- a/configure -+++ b/configure -@@ -3639,10 +3639,9 @@ END { - print "DEFAULT_LIBDIRS=\"/lib\n/usr/lib\"\n"; - }' - --unset tty --[ "$OPT_VERBOSE" = "yes" ] && tty=/dev/stderr --eval "`LC_ALL=C $TEST_COMPILER $SYSROOT_FLAG $TEST_COMPILER_CXXFLAGS -xc++ -E -v - < /dev/null 2>&1 > /dev/null | $AWK "$awkprog" | tee $tty`" --unset tty -+awkprog_result=`LC_ALL=C $TEST_COMPILER $SYSROOT_FLAG $TEST_COMPILER_CXXFLAGS -xc++ -E -v - < /dev/null 2>&1 > /dev/null | $AWK "$awkprog"` -+eval "$awkprog_result" -+[ "$OPT_VERBOSE" = "yes" ] && echo "$awkprog_result" - - echo "Done running configuration tests." - --- -2.5.0 - - -From 6064564099df17f7cddded8ec0c68d9e57d29ae9 Mon Sep 17 00:00:00 2001 +From 236aecbd657f06d0b18bc25b93d5390ac644daaf Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 26 Aug 2015 12:45:43 +0100 -Subject: [PATCH 7/8] cmake: Rearrange STATIC vs INTERFACE targets +Subject: [PATCH 6/6] cmake: Rearrange STATIC vs INTERFACE targets Otherwise we attempt to add_library(Qt5::UiPlugin STATIC IMPORTED) for header-only modules when building Qt5 statically. @@ -219,29 +159,5 @@ index d2358ca..6b1dc95 100644 !!ENDIF !!ENDIF -- -2.5.0 - - -From e74803bac8aa2fd2106f678b2b11584fdb582bc3 Mon Sep 17 00:00:00 2001 -From: Boris Pek -Date: Wed, 24 Feb 2016 19:39:46 +0300 -Subject: [PATCH 8/8] Fix ar error: `u' modifier ignored since `D' is the - default (see `U') - - -diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf -index 61963c7..25cf750 100644 ---- a/mkspecs/win32-g++/qmake.conf -+++ b/mkspecs/win32-g++/qmake.conf -@@ -104,7 +104,7 @@ QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2 - QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain - - QMAKE_IDL = midl --QMAKE_LIB = $${CROSS_COMPILE}ar -ru -+QMAKE_LIB = $${CROSS_COMPILE}ar -rc - QMAKE_RC = $${CROSS_COMPILE}windres - - QMAKE_STRIP = $${CROSS_COMPILE}strip --- -2.5.0 +2.7.4 diff --git a/src/qtbase.mk b/src/qtbase.mk index e4575be3..d803d19a 100644 --- a/src/qtbase.mk +++ b/src/qtbase.mk @@ -3,12 +3,12 @@ PKG := qtbase $(PKG)_IGNORE := -$(PKG)_VERSION := 5.6.0 -$(PKG)_CHECKSUM := 6efa8a5c559e92b2e526d48034e858023d5fd3c39115ac1bfd3bb65834dbd67a +$(PKG)_VERSION := 5.7.0 +$(PKG)_CHECKSUM := 3e7b6d123cab23a587ccbc45173296b33786faa409dba0494e4658fda3ede646 $(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz -$(PKG)_URL := http://download.qt.io/official_releases/qt/5.6/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) -$(PKG)_DEPS := gcc dbus fontconfig freetds freetype harfbuzz jpeg libpng libmysqlclient openssl pcre postgresql sqlite zlib +$(PKG)_URL := http://download.qt.io/official_releases/qt/5.7/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) +$(PKG)_DEPS := gcc dbus freetds harfbuzz jpeg libpng libmysqlclient openssl pcre postgresql sqlite zlib define $(PKG)_UPDATE $(WGET) -q -O- http://download.qt-project.org/official_releases/qt/5.5/ | \ @@ -52,8 +52,8 @@ define $(PKG)_BUILD -system-libpng \ -system-libjpeg \ -system-sqlite \ - -fontconfig \ - -system-freetype \ + -no-fontconfig \ + -no-freetype \ -system-harfbuzz \ -system-pcre \ -openssl-linked \ diff --git a/src/qtcanvas3d.mk b/src/qtcanvas3d.mk index dca97f2a..cb200860 100644 --- a/src/qtcanvas3d.mk +++ b/src/qtcanvas3d.mk @@ -4,7 +4,7 @@ PKG := qtcanvas3d $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 66add59e826a0161f4a4dc3ec0b44c17fad1451390b4f7c67af23ee7429d9ecf +$(PKG)_CHECKSUM := 7871b3fd4c1a561c5b3eb57746e8504bc5d8fa626f9df578e619f9e823e3bd97 $(PKG)_SUBDIR = $(subst qtbase,qtcanvas3d,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtcanvas3d,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtcanvas3d,$(qtbase_URL)) diff --git a/src/qtconnectivity.mk b/src/qtconnectivity.mk index 31a48395..b9466716 100644 --- a/src/qtconnectivity.mk +++ b/src/qtconnectivity.mk @@ -4,7 +4,7 @@ PKG := qtconnectivity $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 0c5cb0c100006759b6954a36e7dc66f8f1ac2b61b3f639152cf6ecb8d48a40eb +$(PKG)_CHECKSUM := 9844ca7ec5be187a77dfd7e95051fb267006f6c77157ecb0b8ceeac103a32703 $(PKG)_SUBDIR = $(subst qtbase,qtconnectivity,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtconnectivity,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtconnectivity,$(qtbase_URL)) diff --git a/src/qtdeclarative.mk b/src/qtdeclarative.mk index d1223953..bb686a6c 100644 --- a/src/qtdeclarative.mk +++ b/src/qtdeclarative.mk @@ -4,7 +4,7 @@ PKG := qtdeclarative $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 8c55f053f0e348577b56da541af74d02d0f2b61c9a6c15152b03dad03dfde04c +$(PKG)_CHECKSUM := 86de6239f3aee2e5f561c16ad7b6e47d8f341c293d4ed11c85acbc21888cf9f4 $(PKG)_SUBDIR = $(subst qtbase,qtdeclarative,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtdeclarative,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtdeclarative,$(qtbase_URL)) diff --git a/src/qtenginio.mk b/src/qtenginio.mk deleted file mode 100644 index 83e566e6..00000000 --- a/src/qtenginio.mk +++ /dev/null @@ -1,23 +0,0 @@ -# This file is part of MXE. -# See index.html for further information. - -PKG := qtenginio -$(PKG)_IGNORE := -$(PKG)_VERSION = 1.6.0 -$(PKG)_CHECKSUM := 627ddcfbbfc3ec1a83c9dbb5f24287b5cd6cb5d3b9d09af4d1c444c6ac147f0c -$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION) -$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz -$(PKG)_URL := $(subst $(qtbase_FILE),$($(PKG)_FILE),$(qtbase_URL)) -$(PKG)_DEPS := gcc qtbase - -define $(PKG)_UPDATE - echo $(qtbase_VERSION) -endef - -define $(PKG)_BUILD - # invoke qmake with removed debug options as a workaround for - # https://bugreports.qt-project.org/browse/QTBUG-30898 - cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' - $(MAKE) -C '$(1)' -j '$(JOBS)' - $(MAKE) -C '$(1)' -j 1 install -endef diff --git a/src/qtgraphicaleffects.mk b/src/qtgraphicaleffects.mk index 5706c266..18d13651 100644 --- a/src/qtgraphicaleffects.mk +++ b/src/qtgraphicaleffects.mk @@ -4,7 +4,7 @@ PKG := qtgraphicaleffects $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 01e911fdcf85a13b927cba341d15a0baeead3eba85c4532b1b45bb5c334416e8 +$(PKG)_CHECKSUM := c816539ce345e502425a94c624332df78f53aeebc460d76b53b79b59cb938de7 $(PKG)_SUBDIR = $(subst qtbase,qtgraphicaleffects,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtgraphicaleffects,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtgraphicaleffects,$(qtbase_URL)) diff --git a/src/qtimageformats.mk b/src/qtimageformats.mk index cfe44f42..0e867d5a 100644 --- a/src/qtimageformats.mk +++ b/src/qtimageformats.mk @@ -4,7 +4,7 @@ PKG := qtimageformats $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 2c854275a689a513ba24f4266cc6017d76875336671c2c8801b4b7289081bada +$(PKG)_CHECKSUM := ef3344a44194d1414be585f8c8a652ffe217c663a22b6e26d3bb5e114f3f62e5 $(PKG)_SUBDIR = $(subst qtbase,qtimageformats,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtimageformats,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtimageformats,$(qtbase_URL)) diff --git a/src/qtlocation.mk b/src/qtlocation.mk index f3542036..b7a87f51 100644 --- a/src/qtlocation.mk +++ b/src/qtlocation.mk @@ -4,7 +4,7 @@ PKG := qtlocation $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 360e1519d0fcafe4f86923d224e76d56dd785dfb0e1a19fd2e2b0016799653c9 +$(PKG)_CHECKSUM := 70273367342493a77c050f033a92d96e79925aa70308746e9681d8661f4aa865 $(PKG)_SUBDIR = $(subst qtbase,qtlocation,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtlocation,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtlocation,$(qtbase_URL)) diff --git a/src/qtmultimedia-1.patch b/src/qtmultimedia-1.patch deleted file mode 100644 index 82471da0..00000000 --- a/src/qtmultimedia-1.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a0ac50f7a95b3f66519fac62e892b98376576036 Mon Sep 17 00:00:00 2001 -From: Mark Brand -Date: Wed, 16 Mar 2016 15:18:00 +0100 -Subject: [PATCH] fix include case - -Change-Id: I135deca455ca2ff6bb3969aca990fe9d1c2dd345 - -diff --git a/src/plugins/common/evr/evrdefs.h b/src/plugins/common/evr/evrdefs.h -index 3b2c253..7b1af05 100644 ---- a/src/plugins/common/evr/evrdefs.h -+++ b/src/plugins/common/evr/evrdefs.h -@@ -35,12 +35,12 @@ - #define EVRDEFS_H - - #include --#include -+#include - #include - #include - #include - #include --#include -+#include - - extern const CLSID clsid_EnhancedVideoRenderer; - extern const GUID mr_VIDEO_RENDER_SERVICE; --- -2.5.0 - diff --git a/src/qtmultimedia.mk b/src/qtmultimedia.mk index df798fc9..ab435908 100644 --- a/src/qtmultimedia.mk +++ b/src/qtmultimedia.mk @@ -4,7 +4,7 @@ PKG := qtmultimedia $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 103f99d6cd266f5c4485546a75ef0c6ee7e88dc901a0be21447cf89159370686 +$(PKG)_CHECKSUM := 05ae705bda224a600b06e390aa7b1448c4a6a52d2d37842d2121fb4a5d84b559 $(PKG)_SUBDIR = $(subst qtbase,qtmultimedia,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtmultimedia,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtmultimedia,$(qtbase_URL)) diff --git a/src/qtquickcontrols.mk b/src/qtquickcontrols.mk index 46a2d6b3..4f870106 100644 --- a/src/qtquickcontrols.mk +++ b/src/qtquickcontrols.mk @@ -4,7 +4,7 @@ PKG := qtquickcontrols $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := ec0896792f2a08d109ab3791aa4e47747aab22ebfad281005c4bf8f26f9f788b +$(PKG)_CHECKSUM := d8e19a77100fff109585ccc62116e63dd11ce9486056a8eb5b64159b7ecdec32 $(PKG)_SUBDIR = $(subst qtbase,qtquickcontrols,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtquickcontrols,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtquickcontrols,$(qtbase_URL)) diff --git a/src/qtquickcontrols2.mk b/src/qtquickcontrols2.mk index e7fc90c9..c004abf9 100644 --- a/src/qtquickcontrols2.mk +++ b/src/qtquickcontrols2.mk @@ -4,7 +4,7 @@ PKG := qtquickcontrols2 $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 59ec6ea2282931bc0d0748b3979a52e1a322e7ef8d1e5490b8a34931e8b9fee0 +$(PKG)_CHECKSUM := 63f5b0777992c32bd602b88de657e202cd6d5e8ba0371c6d5da16fb8c7481045 $(PKG)_SUBDIR = $(subst qtbase,qtquickcontrols2,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtquickcontrols2,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtquickcontrols2,$(qtbase_URL)) diff --git a/src/qtscript.mk b/src/qtscript.mk index d8ce6df8..5632e0ba 100644 --- a/src/qtscript.mk +++ b/src/qtscript.mk @@ -4,7 +4,7 @@ PKG := qtscript $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := ac7475197d9a0f3c7284f002390e2427fef84ec90dc590630431a848099c5042 +$(PKG)_CHECKSUM := 9c44e1fd294989ae62b1e452c25fd15574042e84e1377b59cd9ec67241428000 $(PKG)_SUBDIR = $(subst qtbase,qtscript,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtscript,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtscript,$(qtbase_URL)) diff --git a/src/qtsensors.mk b/src/qtsensors.mk index 2ace18df..f5ec184f 100644 --- a/src/qtsensors.mk +++ b/src/qtsensors.mk @@ -4,7 +4,7 @@ PKG := qtsensors $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 518f392fec5e01aaa7f95e9141678cc99b02ed067ebbd24c38c1420067c59c2e +$(PKG)_CHECKSUM := 283dcc66a24c4367e865fa8301b6ea04d0cb78bd0f166fd09a6bb42e1e3731be $(PKG)_SUBDIR = $(subst qtbase,qtsensors,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtsensors,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtsensors,$(qtbase_URL)) diff --git a/src/qtserialport.mk b/src/qtserialport.mk index 0f12d860..eeef50e7 100644 --- a/src/qtserialport.mk +++ b/src/qtserialport.mk @@ -4,7 +4,7 @@ PKG := qtserialport $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 16ee7fb66bb997df674a12a7a5a1450e2a2b860c8d34d237f3631d9f60853c1f +$(PKG)_CHECKSUM := 5ce150d843a243854736489d4a71205a8ca8dc8f93626ec29d1aa7a249a08265 $(PKG)_SUBDIR = $(subst qtbase,qtserialport,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtserialport,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtserialport,$(qtbase_URL)) diff --git a/src/qtsvg.mk b/src/qtsvg.mk index 6aa713d9..f59511c9 100644 --- a/src/qtsvg.mk +++ b/src/qtsvg.mk @@ -4,7 +4,7 @@ PKG := qtsvg $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 798799319138bb40b6187f4ecc1099956a0d62148f78512e9cb085d1fa5f641f +$(PKG)_CHECKSUM := a1f89f035aed48bf8843ff1880c4b54dc2e3a5160dbd743aec03e13831cdd881 $(PKG)_SUBDIR = $(subst qtbase,qtsvg,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtsvg,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtsvg,$(qtbase_URL)) diff --git a/src/qttools.mk b/src/qttools.mk index d2ec8647..b7c3709c 100644 --- a/src/qttools.mk +++ b/src/qttools.mk @@ -4,7 +4,7 @@ PKG := qttools $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 0d244c61bbe5505cb94310e980b06ef13dd573511e80ccbdc060f71d5462219d +$(PKG)_CHECKSUM := 6f45ad73cf6a6fea20d93d881551e938b7f7a62b6d50bf98b5f8c0b70e4d9500 $(PKG)_SUBDIR = $(subst qtbase,qttools,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttools,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttools,$(qtbase_URL)) diff --git a/src/qttranslations.mk b/src/qttranslations.mk index 16673367..4fe159da 100644 --- a/src/qttranslations.mk +++ b/src/qttranslations.mk @@ -4,7 +4,7 @@ PKG := qttranslations $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 9809351f0922b2d91aeb5d8e5756665eea0b2cbcaab74a570f6e5bf08574cd49 +$(PKG)_CHECKSUM := 0a0ed428f6a3a01b49c80e0d2b80199f66d77578588d2929923097c77c795a6d $(PKG)_SUBDIR = $(subst qtbase,qttranslations,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qttranslations,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qttranslations,$(qtbase_URL)) diff --git a/src/qtwebchannel.mk b/src/qtwebchannel.mk index 136b25be..045874d5 100644 --- a/src/qtwebchannel.mk +++ b/src/qtwebchannel.mk @@ -4,7 +4,7 @@ PKG := qtwebchannel $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := c25424935e866e77f31e5ebc50fc97eaedd4d77f6e967bfc59ce7fa6a7b4c14f +$(PKG)_CHECKSUM := 3ab4cd177cc742ee5015f2b7f943c16ce13380b840f824436b5005485b749816 $(PKG)_SUBDIR = $(subst qtbase,qtwebchannel,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtwebchannel,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtwebchannel,$(qtbase_URL)) diff --git a/src/qtwebengine.mk b/src/qtwebengine.mk index bc1c60fa..f21db08a 100644 --- a/src/qtwebengine.mk +++ b/src/qtwebengine.mk @@ -4,7 +4,7 @@ PKG := qtwebengine $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 8aa2b5ad6c9f98a781aa99303eab3a40bbe74d26a543eea6b4145f5f47c76a03 +$(PKG)_CHECKSUM := 985762fff5cd8a1a0d2a644a4a51238676898685f9ff1a78c3f2800025d6dc5d $(PKG)_SUBDIR = $(subst qtbase,qtwebengine,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtwebengine,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtwebengine,$(qtbase_URL)) diff --git a/src/qtwebkit.mk b/src/qtwebkit.mk index 1a758eb9..22e4e28f 100644 --- a/src/qtwebkit.mk +++ b/src/qtwebkit.mk @@ -4,7 +4,7 @@ PKG := qtwebkit $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 9ca72373841f3a868a7bcc696956cdb0ad7f5e678c693659f6f0b919fdd16dfe +$(PKG)_CHECKSUM := c7a3253cbf8e6035c54c3b08d8a9457bd82efbce71d4b363c8f753fd07bd34df $(PKG)_SUBDIR = $(subst qtbase,qtwebkit,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtwebkit,$(qtbase_FILE)) $(PKG)_URL = $(subst /submodules/,/,$(subst official_releases/qt,community_releases,$(subst qtbase,qtwebkit,$(qtbase_URL)))) diff --git a/src/qtwebsockets.mk b/src/qtwebsockets.mk index 60a898ad..a087ec91 100644 --- a/src/qtwebsockets.mk +++ b/src/qtwebsockets.mk @@ -4,7 +4,7 @@ PKG := qtwebsockets $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 268ab869fe3d0d22abd9668851155db79aff2f386bc448051b6ef477841d719f +$(PKG)_CHECKSUM := 741be11a907f82807a786e6a53ae7316c0b3864491b692e8719c381e0f158b43 $(PKG)_SUBDIR = $(subst qtbase,qtwebsockets,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtwebsockets,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtwebsockets,$(qtbase_URL)) diff --git a/src/qtwebview.mk b/src/qtwebview.mk index fa239998..78efc17b 100644 --- a/src/qtwebview.mk +++ b/src/qtwebview.mk @@ -4,7 +4,7 @@ PKG := qtwebview $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := a48fa53e9e012102774c3faa6c99113918442f891952cd97ef67e05544800b57 +$(PKG)_CHECKSUM := 801a3faf312fa0235d489c63aa224d477a70cfe1b1ef7803cbe311a8c29e51c4 $(PKG)_SUBDIR = $(subst qtbase,qtwebview,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtwebview,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtwebview,$(qtbase_URL)) diff --git a/src/qtwinextras.mk b/src/qtwinextras.mk index 9a307197..13a69d71 100644 --- a/src/qtwinextras.mk +++ b/src/qtwinextras.mk @@ -4,7 +4,7 @@ PKG := qtwinextras $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := 58951c5334a7dc7f9c3fd62747c1420cced6318dec9ec845a3d14b1e10a8bb93 +$(PKG)_CHECKSUM := 8dabe231a4fdaa74acc2f79a44391a49ef779db8d0acf41cbb29f2c71d9e07ba $(PKG)_SUBDIR = $(subst qtbase,qtwinextras,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtwinextras,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtwinextras,$(qtbase_URL)) diff --git a/src/qtxmlpatterns.mk b/src/qtxmlpatterns.mk index c628e52d..dc5b6af7 100644 --- a/src/qtxmlpatterns.mk +++ b/src/qtxmlpatterns.mk @@ -4,7 +4,7 @@ PKG := qtxmlpatterns $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_CHECKSUM := baed1b3bd3f010b8c4a96b4ca7a595b665d43d2e5758b55a364dbc9f2ac819d4 +$(PKG)_CHECKSUM := 38882a4ea5d711be07d10695759359045f7f9d64727a65e1d5e6515d55c7e20b $(PKG)_SUBDIR = $(subst qtbase,qtxmlpatterns,$(qtbase_SUBDIR)) $(PKG)_FILE = $(subst qtbase,qtxmlpatterns,$(qtbase_FILE)) $(PKG)_URL = $(subst qtbase,qtxmlpatterns,$(qtbase_URL)) From e64fb04b50a9bc6bfb1e8465d8fafe09c8af4c32 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Fri, 17 Jun 2016 13:20:59 +0000 Subject: [PATCH 0733/1463] Update versions.json & build-matrix.html --- build-matrix.html | 70 ++++++++++++++++++++--------------------------- versions.json | 53 ++++++++++++++++++----------------- 2 files changed, 56 insertions(+), 67 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 6fad5cf8..6a775867 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -3059,7 +3059,7 @@ feel free to submit a pull request. qt3d - bcdbf04b74cc… + 5.7.0 ✓ ✓ ✓ @@ -3069,7 +3069,7 @@ feel free to submit a pull request. qt5 - 5.6.0 + 5.7.0 ✗ ✗ ✗ @@ -3079,7 +3079,7 @@ feel free to submit a pull request. qtactiveqt - 5.6.0 + 5.7.0 ✓ ✓ ✓ @@ -3089,7 +3089,7 @@ feel free to submit a pull request. qtbase - 5.6.0 + 5.7.0 ✓ ✓ ✓ @@ -3099,7 +3099,7 @@ feel free to submit a pull request. qtcanvas3d - 5.6.0 + 5.7.0 ✓ ✓ ✓ @@ -3109,7 +3109,7 @@ feel free to submit a pull request. qtconnectivity - 5.6.0 + 5.7.0 ✓ ✓ ✓ @@ -3119,17 +3119,7 @@ feel free to submit a pull request. qtdeclarative - 5.6.0 - ✓ - ✓ - ✓ - ✓ - ✗ - - - - qtenginio - 1.6.0 + 5.7.0 ✓ ✓ ✓ @@ -3139,7 +3129,7 @@ feel free to submit a pull request. qtgraphicaleffects - 5.6.0 + 5.7.0 ✓ ✓ ✓ @@ -3149,7 +3139,7 @@ feel free to submit a pull request. qtimageformats - 5.6.0 + 5.7.0 ✓ ✓ ✓ @@ -3159,7 +3149,7 @@ feel free to submit a pull request. qtlocation - 5.6.0 + 5.7.0 ✓ ✓ ✓ @@ -3169,7 +3159,7 @@ feel free to submit a pull request. qtmultimedia - 5.6.0 + 5.7.0 ✓ ✓ ✓ @@ -3189,7 +3179,7 @@ feel free to submit a pull request. qtquickcontrols - 5.6.0 + 5.7.0 ✓ ✓ ✓ @@ -3199,7 +3189,7 @@ feel free to submit a pull request. qtquickcontrols2 - 5.6.0 + 5.7.0 ✓ ✓ ✓ @@ -3209,7 +3199,7 @@ feel free to submit a pull request. qtscript - 5.6.0 + 5.7.0 ✓ ✓ ✓ @@ -3219,7 +3209,7 @@ feel free to submit a pull request. qtsensors - 5.6.0 + 5.7.0 ✓ ✓ ✓ @@ -3229,7 +3219,7 @@ feel free to submit a pull request. qtserialport - 5.6.0 + 5.7.0 ✓ ✓ ✓ @@ -3269,7 +3259,7 @@ feel free to submit a pull request. qtsvg - 5.6.0 + 5.7.0 ✓ ✓ ✓ @@ -3289,7 +3279,7 @@ feel free to submit a pull request. qttools - 5.6.0 + 5.7.0 ✓ ✓ ✓ @@ -3299,7 +3289,7 @@ feel free to submit a pull request. qttranslations - 5.6.0 + 5.7.0 ✓ ✓ ✓ @@ -3309,7 +3299,7 @@ feel free to submit a pull request. qtwebchannel - 5.6.0 + 5.7.0 ✓ ✓ ✓ @@ -3319,7 +3309,7 @@ feel free to submit a pull request. qtwebengine - 5.6.0 + 5.7.0 ✓ ✓ ✓ @@ -3329,7 +3319,7 @@ feel free to submit a pull request. qtwebkit - 5.6.0 + 5.7.0 ✗ ✓ ✗ @@ -3339,7 +3329,7 @@ feel free to submit a pull request. qtwebsockets - 5.6.0 + 5.7.0 ✓ ✓ ✓ @@ -3349,7 +3339,7 @@ feel free to submit a pull request. qtwebview - 5.6.0 + 5.7.0 ✓ ✓ ✓ @@ -3359,7 +3349,7 @@ feel free to submit a pull request. qtwinextras - 5.6.0 + 5.7.0 ✓ ✓ ✓ @@ -3379,7 +3369,7 @@ feel free to submit a pull request. qtxmlpatterns - 5.6.0 + 5.7.0 ✓ ✓ ✓ @@ -4119,14 +4109,14 @@ feel free to submit a pull request. -Total: 398 +Total: 397
    (+6 virtual +4 native-only) -395 -295 -379 +394 294 +378 +293 15 diff --git a/versions.json b/versions.json index c985668e..c70a9ba7 100644 --- a/versions.json +++ b/versions.json @@ -301,39 +301,38 @@ "qjson": "0.8.1", "qscintilla2": "2.8.4", "qt": "4.8.7", - "qt3d": "bcdbf04b74cc7ded4d7b2471347f51b54ff8584b", - "qt5": "5.6.0", - "qtactiveqt": "5.6.0", - "qtbase": "5.6.0", - "qtcanvas3d": "5.6.0", - "qtconnectivity": "5.6.0", - "qtdeclarative": "5.6.0", - "qtenginio": "1.6.0", - "qtgraphicaleffects": "5.6.0", - "qtimageformats": "5.6.0", - "qtlocation": "5.6.0", - "qtmultimedia": "5.6.0", + "qt3d": "5.7.0", + "qt5": "5.7.0", + "qtactiveqt": "5.7.0", + "qtbase": "5.7.0", + "qtcanvas3d": "5.7.0", + "qtconnectivity": "5.7.0", + "qtdeclarative": "5.7.0", + "qtgraphicaleffects": "5.7.0", + "qtimageformats": "5.7.0", + "qtlocation": "5.7.0", + "qtmultimedia": "5.7.0", "qtofficeopenxml": "02dda4a46f92a843eaba5f5a021952860eadfe01", - "qtquickcontrols": "5.6.0", - "qtquickcontrols2": "5.6.0", - "qtscript": "5.6.0", - "qtsensors": "5.6.0", - "qtserialport": "5.6.0", + "qtquickcontrols": "5.7.0", + "qtquickcontrols2": "5.7.0", + "qtscript": "5.7.0", + "qtsensors": "5.7.0", + "qtserialport": "5.7.0", "qtserialport_qt4": "5c3b6cc770", "qtservice": "ad9bc46", "qtsparkle_qt4": "8882e6ef86cdb79db7932307309d005411fd0c20", - "qtsvg": "5.6.0", + "qtsvg": "5.7.0", "qtsystems": "4e3a7ed", - "qttools": "5.6.0", - "qttranslations": "5.6.0", - "qtwebchannel": "5.6.0", - "qtwebengine": "5.6.0", - "qtwebkit": "5.6.0", - "qtwebsockets": "5.6.0", - "qtwebview": "5.6.0", - "qtwinextras": "5.6.0", + "qttools": "5.7.0", + "qttranslations": "5.7.0", + "qtwebchannel": "5.7.0", + "qtwebengine": "5.7.0", + "qtwebkit": "5.7.0", + "qtwebsockets": "5.7.0", + "qtwebview": "5.7.0", + "qtwinextras": "5.7.0", "qtxlsxwriter": "ad90b6a2c21b300138ceb9fe9030a5917230f92d", - "qtxmlpatterns": "5.6.0", + "qtxmlpatterns": "5.7.0", "qwt": "6.1.1", "qwt_qt4": "6.1.1", "qwtplot3d": "0.2.7", From 9bb85786a6c66265b90f272ed31a73e2616daa99 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Fri, 10 Jun 2016 04:05:42 +1000 Subject: [PATCH 0734/1463] isl: enabled shared builds --- src/isl.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/isl.mk b/src/isl.mk index 3fe3b763..2423a360 100644 --- a/src/isl.mk +++ b/src/isl.mk @@ -26,8 +26,6 @@ define $(PKG)_BUILD cd '$(1)' && ./configure \ $(MXE_CONFIGURE_OPTS) \ --with-gmp-prefix='$(PREFIX)/$(TARGET)' - $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j '$(JOBS)' $(if $(BUILD_SHARED),LDFLAGS=-no-undefined) $(MAKE) -C '$(1)' -j '$(JOBS)' install endef - -$(PKG)_BUILD_SHARED = From c21bf8a169f23203396b39979c44c75edf8cbfac Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Fri, 10 Jun 2016 04:05:20 +1000 Subject: [PATCH 0735/1463] cloog: enabled shared and cross builds --- src/cloog.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/cloog.mk b/src/cloog.mk index 40d4c8b7..eb206c3b 100644 --- a/src/cloog.mk +++ b/src/cloog.mk @@ -22,13 +22,11 @@ define $(PKG)_UPDATE tail -1 endef -define $(PKG)_BUILD_$(BUILD) +define $(PKG)_BUILD cd '$(1)' && ./configure \ $(MXE_CONFIGURE_OPTS) \ --with-gmp-prefix='$(PREFIX)/$(TARGET)' \ --with-isl-prefix='$(PREFIX)/$(TARGET)' - $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j '$(JOBS)' $(if $(BUILD_SHARED),LDFLAGS=-no-undefined) $(MAKE) -C '$(1)' -j '$(JOBS)' install endef - -$(PKG)_BUILD_SHARED = From ff8278ad07ad8fae10fa439969c297190804e4a8 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Fri, 10 Jun 2016 04:06:52 +1000 Subject: [PATCH 0736/1463] add host toolchain example plugin --- plugins/examples/host-toolchain/README.md | 24 +++++++++ .../examples/host-toolchain/binutils-host.mk | 26 ++++++++++ .../examples/host-toolchain/gcc-host-1.patch | 1 + plugins/examples/host-toolchain/gcc-host.mk | 50 +++++++++++++++++++ 4 files changed, 101 insertions(+) create mode 100644 plugins/examples/host-toolchain/README.md create mode 100644 plugins/examples/host-toolchain/binutils-host.mk create mode 120000 plugins/examples/host-toolchain/gcc-host-1.patch create mode 100644 plugins/examples/host-toolchain/gcc-host.mk diff --git a/plugins/examples/host-toolchain/README.md b/plugins/examples/host-toolchain/README.md new file mode 100644 index 00000000..1478edf5 --- /dev/null +++ b/plugins/examples/host-toolchain/README.md @@ -0,0 +1,24 @@ +Cross Compiling a Host Toolchain +-------------------------------- + +This plugin demonstrates a minimal working toolchain built with MXE to +execute on a Windows host. To build: + +``` +make gcc-host MXE_PLUGIN_DIRS=plugins/examples/host-toolchain/ +``` + +This will run the usual steps to build a cross-compiler, then build a +second pass to cross-compile the basic toolchain (`binutils` and `gcc`). + +Once complete, copy `usr/{target}` to an appropriate Windows machine +and execute the `usr\{target}\bin\test-gcc-host.bat` batch file. This +builds and runs the `libgomp` test as a sanity check. + +Why? +---- + +Simply for curiosity, it's hard to see a practical use for this. Certainly, +attempting to use it as a way to bootstrap MXE on Windows would strain +one's sanity and cross-compiling is the recommended way (even if that means +running a Linux VM on Windows). diff --git a/plugins/examples/host-toolchain/binutils-host.mk b/plugins/examples/host-toolchain/binutils-host.mk new file mode 100644 index 00000000..678fed8e --- /dev/null +++ b/plugins/examples/host-toolchain/binutils-host.mk @@ -0,0 +1,26 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := binutils-host +$(PKG)_IGNORE = $(binutils_IGNORE) +$(PKG)_VERSION = $(binutils_VERSION) +$(PKG)_CHECKSUM = $(binutils_CHECKSUM) +$(PKG)_SUBDIR = $(binutils_SUBDIR) +$(PKG)_FILE = $(binutils_FILE) +$(PKG)_URL = $(binutils_URL) +$(PKG)_URL_2 = $(binutils_URL_2) +$(PKG)_DEPS := gcc + +define $(PKG)_UPDATE + echo $(binutils_VERSION) +endef + +define $(PKG)_BUILD + $(subst --disable-werror,\ + --disable-werror \ + --prefix='$(PREFIX)/$(TARGET)' \ + --host='$(TARGET)',\ + $(binutils_BUILD)) + + #rm -rf '$(PREFIX)/$(TARGET)/$(TARGET)' +endef diff --git a/plugins/examples/host-toolchain/gcc-host-1.patch b/plugins/examples/host-toolchain/gcc-host-1.patch new file mode 120000 index 00000000..d63be568 --- /dev/null +++ b/plugins/examples/host-toolchain/gcc-host-1.patch @@ -0,0 +1 @@ +src/gcc-1.patch \ No newline at end of file diff --git a/plugins/examples/host-toolchain/gcc-host.mk b/plugins/examples/host-toolchain/gcc-host.mk new file mode 100644 index 00000000..897c5ca4 --- /dev/null +++ b/plugins/examples/host-toolchain/gcc-host.mk @@ -0,0 +1,50 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := gcc-host +$(PKG)_IGNORE = $(gcc_IGNORE) +$(PKG)_VERSION = $(gcc_VERSION) +$(PKG)_CHECKSUM = $(gcc_CHECKSUM) +$(PKG)_SUBDIR = $(gcc_SUBDIR) +$(PKG)_FILE = $(gcc_FILE) +$(PKG)_URL = $(gcc_URL) +$(PKG)_URL_2 = $(gcc_URL_2) +$(PKG)_DEPS := gcc binutils-host cloog gmp isl mpfr mpc + +define $(PKG)_UPDATE + echo $(gcc_VERSION) +endef + +define $(PKG)_BUILD + mkdir '$(1).build' + cd '$(1).build' && '$(1)/configure' \ + --host='$(TARGET)' \ + --target='$(TARGET)' \ + --build='$(BUILD)' \ + --prefix='$(PREFIX)/$(TARGET)' \ + --with-native-system-header-dir='$(PREFIX)/$(TARGET)/include' \ + --enable-languages='c,c++,objc,fortran' \ + --enable-version-specific-runtime-libs \ + --with-gcc \ + --with-gnu-ld \ + --with-gnu-as \ + --disable-nls \ + $(if $(BUILD_STATIC),--disable-shared) \ + --disable-multilib \ + --without-x \ + --disable-win32-registry \ + --enable-threads=$(MXE_GCC_THREADS) \ + --enable-libgomp \ + --with-{cloog,gmp,isl,mpc,mpfr}='$(PREFIX)/$(TARGET)' + + $(MAKE) -C '$(1).build' -j '$(JOBS)' + $(MAKE) -C '$(1).build' -j 1 install + + # test compilation on host + cp '$(TOP_DIR)/src/pthreads-libgomp-test.c' '$(PREFIX)/$(TARGET)/bin/test-$(PKG).c' + (printf 'set PATH=..\\bin;%%PATH%%\r\n'; \ + printf 'gcc test-$(PKG).c -o test-$(PKG).exe -fopenmp -v\r\n'; \ + printf 'test-$(PKG).exe\r\n'; \ + printf 'pause\r\n';) \ + > '$(PREFIX)/$(TARGET)/bin/test-$(PKG).bat' +endef From ac14bad436384916a4b40effc1b0528a9b751ee6 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 18 Jun 2016 16:44:41 +1000 Subject: [PATCH 0737/1463] openblas: add pthreads dependency missing since #958 fixes #1384 --- src/openblas.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openblas.mk b/src/openblas.mk index 209d187b..acaf0511 100644 --- a/src/openblas.mk +++ b/src/openblas.mk @@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := 73c40ace5978282224e5e122a41c8388c5a19e65a6f2329c2b7c0b61bacc9 $(PKG)_SUBDIR := OpenBLAS-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz $(PKG)_URL := http://github.com/xianyi/OpenBLAS/archive/v$($(PKG)_VERSION).tar.gz -$(PKG)_DEPS := gcc +$(PKG)_DEPS := gcc pthreads define $(PKG)_UPDATE $(WGET) -q -O- 'https://github.com/xianyi/OpenBLAS/releases' | \ From d62f9121c21e2f53d45da95b940df582de1135f8 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 18 Jun 2016 11:31:01 +0200 Subject: [PATCH 0738/1463] add new qt5 modules qtcharts qtdatavis3d qtdeclarative-render2d qtgamepad qtpurchasing qtscxml qtserialbus qtvirtualkeyboard https://wiki.qt.io/New_Features_in_Qt_5.7 --- index.html | 32 ++++++++++++++++++++++++++++++++ src/qtcharts.mk | 23 +++++++++++++++++++++++ src/qtdatavis3d.mk | 23 +++++++++++++++++++++++ src/qtdeclarative-render2d.mk | 23 +++++++++++++++++++++++ src/qtgamepad.mk | 23 +++++++++++++++++++++++ src/qtpurchasing.mk | 23 +++++++++++++++++++++++ src/qtscxml.mk | 23 +++++++++++++++++++++++ src/qtserialbus.mk | 23 +++++++++++++++++++++++ src/qtvirtualkeyboard.mk | 23 +++++++++++++++++++++++ 9 files changed, 216 insertions(+) create mode 100644 src/qtcharts.mk create mode 100644 src/qtdatavis3d.mk create mode 100644 src/qtdeclarative-render2d.mk create mode 100644 src/qtgamepad.mk create mode 100644 src/qtpurchasing.mk create mode 100644 src/qtscxml.mk create mode 100644 src/qtserialbus.mk create mode 100644 src/qtvirtualkeyboard.mk diff --git a/index.html b/index.html index 8df5c9da..74545015 100644 --- a/index.html +++ b/index.html @@ -2321,14 +2321,30 @@ local-pkg-list: $(LOCAL_PKG_LIST) qtcanvas3d Qt + + qtcharts + Qt + qtconnectivity Qt + + qtdatavis3d + Qt + qtdeclarative Qt + + qtdeclarative-render2d + Qt + + + qtgamepad + Qt + qtgraphicaleffects Qt @@ -2349,6 +2365,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) qtofficeopenxml QtOfficeOpenXml + + qtpurchasing + Qt + qtquickcontrols Qt @@ -2357,6 +2377,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) qtquickcontrols2 Qt + + qtscxml + Qt + qtscript Qt @@ -2365,6 +2389,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) qtsensors Qt + + qtserialbus + Qt + qtserialport Qt @@ -2397,6 +2425,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) qttranslations Qt + + qtvirtualkeyboard + Qt + qtwebchannel Qt diff --git a/src/qtcharts.mk b/src/qtcharts.mk new file mode 100644 index 00000000..c80d1e77 --- /dev/null +++ b/src/qtcharts.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qtcharts +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := 2bc8a87375c7aeebde2e4cd2408c92c91ec3fed9e6e8b5fde789131b532d5243 +$(PKG)_SUBDIR = $(subst qtbase,qtcharts,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtcharts,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtcharts,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase qtdeclarative qtmultimedia + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + # invoke qmake with removed debug options as a workaround for + # https://bugreports.qt-project.org/browse/QTBUG-30898 + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/src/qtdatavis3d.mk b/src/qtdatavis3d.mk new file mode 100644 index 00000000..ed8d77ee --- /dev/null +++ b/src/qtdatavis3d.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qtdatavis3d +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := 9a5d7a383dce211a904bca3b8b6054bb448148ca07cede2bd46d255de016e8a2 +$(PKG)_SUBDIR = $(subst qtbase,qtdatavis3d,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtdatavis3d,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtdatavis3d,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase qtdeclarative qtmultimedia + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + # invoke qmake with removed debug options as a workaround for + # https://bugreports.qt-project.org/browse/QTBUG-30898 + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/src/qtdeclarative-render2d.mk b/src/qtdeclarative-render2d.mk new file mode 100644 index 00000000..0469cc08 --- /dev/null +++ b/src/qtdeclarative-render2d.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qtdeclarative-render2d +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := 0613298f653b147bb3c26d0f0ee0bb95fec74894d07575f1953e8a7fe248c8e1 +$(PKG)_SUBDIR = $(subst qtbase,qtdeclarative-render2d,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtdeclarative-render2d,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtdeclarative-render2d,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase qtdeclarative + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + # invoke qmake with removed debug options as a workaround for + # https://bugreports.qt-project.org/browse/QTBUG-30898 + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/src/qtgamepad.mk b/src/qtgamepad.mk new file mode 100644 index 00000000..892f408d --- /dev/null +++ b/src/qtgamepad.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qtgamepad +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := 5898f7bc002d0ac65b698043f24f3e2ff2bb7ca7735f43b74e37056c2db5663c +$(PKG)_SUBDIR = $(subst qtbase,qtgamepad,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtgamepad,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtgamepad,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase qtdeclarative + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + # invoke qmake with removed debug options as a workaround for + # https://bugreports.qt-project.org/browse/QTBUG-30898 + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/src/qtpurchasing.mk b/src/qtpurchasing.mk new file mode 100644 index 00000000..62d58501 --- /dev/null +++ b/src/qtpurchasing.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qtpurchasing +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := 7e514a3cb98addd0b1344a69c494afe4546d854d43340760aed00ad0062664b5 +$(PKG)_SUBDIR = $(subst qtbase,qtpurchasing,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtpurchasing,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtpurchasing,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase qtdeclarative + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + # invoke qmake with removed debug options as a workaround for + # https://bugreports.qt-project.org/browse/QTBUG-30898 + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/src/qtscxml.mk b/src/qtscxml.mk new file mode 100644 index 00000000..ad0f6b1c --- /dev/null +++ b/src/qtscxml.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qtscxml +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := 370b13d76c9a2ddf05336e797edf7f54d41db6063e3b921e0825dd6dd26c51f1 +$(PKG)_SUBDIR = $(subst qtbase,qtscxml,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtscxml,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtscxml,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase qtdeclarative + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + # invoke qmake with removed debug options as a workaround for + # https://bugreports.qt-project.org/browse/QTBUG-30898 + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/src/qtserialbus.mk b/src/qtserialbus.mk new file mode 100644 index 00000000..602d0b93 --- /dev/null +++ b/src/qtserialbus.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qtserialbus +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := 2c437ace393e9dcf170990b519cec59c5cbcfc3c830e46116abb52549dc15d38 +$(PKG)_SUBDIR = $(subst qtbase,qtserialbus,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtserialbus,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtserialbus,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase qtserialport + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + # invoke qmake with removed debug options as a workaround for + # https://bugreports.qt-project.org/browse/QTBUG-30898 + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef diff --git a/src/qtvirtualkeyboard.mk b/src/qtvirtualkeyboard.mk new file mode 100644 index 00000000..dbb02896 --- /dev/null +++ b/src/qtvirtualkeyboard.mk @@ -0,0 +1,23 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := qtvirtualkeyboard +$(PKG)_IGNORE := +$(PKG)_VERSION = $(qtbase_VERSION) +$(PKG)_CHECKSUM := df433de68e23b173b87b422038bc9f3e53349035c11a2b2e495122274664ff2f +$(PKG)_SUBDIR = $(subst qtbase,qtvirtualkeyboard,$(qtbase_SUBDIR)) +$(PKG)_FILE = $(subst qtbase,qtvirtualkeyboard,$(qtbase_FILE)) +$(PKG)_URL = $(subst qtbase,qtvirtualkeyboard,$(qtbase_URL)) +$(PKG)_DEPS := gcc qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg + +define $(PKG)_UPDATE + echo $(qtbase_VERSION) +endef + +define $(PKG)_BUILD + # invoke qmake with removed debug options as a workaround for + # https://bugreports.qt-project.org/browse/QTBUG-30898 + cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' CONFIG-='debug debug_and_release' + $(MAKE) -C '$(1)' -j '$(JOBS)' + $(MAKE) -C '$(1)' -j 1 install +endef From f1ad4716102a575bacde2df5750b679391e57cf2 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sat, 18 Jun 2016 09:34:53 +0000 Subject: [PATCH 0739/1463] Update versions.json & build-matrix.html --- build-matrix.html | 90 ++++++++++++++++++++++++++++++++++++++++++++--- versions.json | 8 +++++ 2 files changed, 93 insertions(+), 5 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 6a775867..172323d4 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -3107,6 +3107,16 @@ feel free to submit a pull request. ✗ + + qtcharts + 5.7.0 + ✓ + ✓ + ✓ + ✓ + ✗ + + qtconnectivity 5.7.0 @@ -3117,6 +3127,16 @@ feel free to submit a pull request. ✗ + + qtdatavis3d + 5.7.0 + ✓ + ✓ + ✓ + ✓ + ✗ + + qtdeclarative 5.7.0 @@ -3127,6 +3147,26 @@ feel free to submit a pull request. ✗ + + qtdeclarative-render2d + 5.7.0 + ✓ + ✓ + ✓ + ✓ + ✗ + + + + qtgamepad + 5.7.0 + ✓ + ✓ + ✓ + ✓ + ✗ + + qtgraphicaleffects 5.7.0 @@ -3177,6 +3217,16 @@ feel free to submit a pull request. ✗ + + qtpurchasing + 5.7.0 + ✓ + ✓ + ✓ + ✓ + ✗ + + qtquickcontrols 5.7.0 @@ -3207,6 +3257,16 @@ feel free to submit a pull request. ✗ + + qtscxml + 5.7.0 + ✓ + ✓ + ✓ + ✓ + ✗ + + qtsensors 5.7.0 @@ -3217,6 +3277,16 @@ feel free to submit a pull request. ✗ + + qtserialbus + 5.7.0 + ✓ + ✓ + ✓ + ✓ + ✗ + + qtserialport 5.7.0 @@ -3297,6 +3367,16 @@ feel free to submit a pull request. ✗ + + qtvirtualkeyboard + 5.7.0 + ✓ + ✓ + ✓ + ✓ + ✗ + + qtwebchannel 5.7.0 @@ -4109,14 +4189,14 @@ feel free to submit a pull request. -Total: 397 +Total: 405
    (+6 virtual +4 native-only) -394 -294 -378 -293 +402 +302 +386 +301 15 diff --git a/versions.json b/versions.json index c70a9ba7..4f89d8d7 100644 --- a/versions.json +++ b/versions.json @@ -306,17 +306,24 @@ "qtactiveqt": "5.7.0", "qtbase": "5.7.0", "qtcanvas3d": "5.7.0", + "qtcharts": "5.7.0", "qtconnectivity": "5.7.0", + "qtdatavis3d": "5.7.0", "qtdeclarative": "5.7.0", + "qtdeclarative-render2d": "5.7.0", + "qtgamepad": "5.7.0", "qtgraphicaleffects": "5.7.0", "qtimageformats": "5.7.0", "qtlocation": "5.7.0", "qtmultimedia": "5.7.0", "qtofficeopenxml": "02dda4a46f92a843eaba5f5a021952860eadfe01", + "qtpurchasing": "5.7.0", "qtquickcontrols": "5.7.0", "qtquickcontrols2": "5.7.0", "qtscript": "5.7.0", + "qtscxml": "5.7.0", "qtsensors": "5.7.0", + "qtserialbus": "5.7.0", "qtserialport": "5.7.0", "qtserialport_qt4": "5c3b6cc770", "qtservice": "ad9bc46", @@ -325,6 +332,7 @@ "qtsystems": "4e3a7ed", "qttools": "5.7.0", "qttranslations": "5.7.0", + "qtvirtualkeyboard": "5.7.0", "qtwebchannel": "5.7.0", "qtwebengine": "5.7.0", "qtwebkit": "5.7.0", From 1eff41fe4791ccf35665a1a03976f7ab02e0e919 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 18 Jun 2016 11:46:25 +0200 Subject: [PATCH 0740/1463] update pcre --- src/pcre.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pcre.mk b/src/pcre.mk index 0bc76295..c538e451 100644 --- a/src/pcre.mk +++ b/src/pcre.mk @@ -3,8 +3,8 @@ PKG := pcre $(PKG)_IGNORE := -$(PKG)_VERSION := 8.38 -$(PKG)_CHECKSUM := b9e02d36e23024d6c02a2e5b25204b3a4fa6ade43e0a5f869f254f49535079df +$(PKG)_VERSION := 8.39 +$(PKG)_CHECKSUM := b858099f82483031ee02092711689e7245586ada49e534a06e678b8ea9549e8b $(PKG)_SUBDIR := pcre-$($(PKG)_VERSION) $(PKG)_FILE := pcre-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/pcre/pcre/$($(PKG)_VERSION)/$($(PKG)_FILE) From 09d6ec6a633dfe3a352e917630c53abbe2641944 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sat, 18 Jun 2016 09:48:03 +0000 Subject: [PATCH 0741/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 172323d4..66bdb858 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -2759,7 +2759,7 @@ feel free to submit a pull request. pcre - 8.38 + 8.39 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 4f89d8d7..3160b563 100644 --- a/versions.json +++ b/versions.json @@ -271,7 +271,7 @@ "pango": "1.37.4", "pangomm": "2.34.0", "pcl": "1.7.2", - "pcre": "8.38", + "pcre": "8.39", "pdcurses": "3.4", "pdflib_lite": "7.0.5p3", "pfstools": "2.0.4", From a4077c1bd7dbeba310106f10abdd91999cfafd32 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 18 Jun 2016 12:39:37 +0200 Subject: [PATCH 0742/1463] update qwt --- src/qwt-1-fixes-crlf.patch | 60 +++++--------------------------------- src/qwt.mk | 4 +-- 2 files changed, 10 insertions(+), 54 deletions(-) diff --git a/src/qwt-1-fixes-crlf.patch b/src/qwt-1-fixes-crlf.patch index d5c3c962..5668bea4 100644 --- a/src/qwt-1-fixes-crlf.patch +++ b/src/qwt-1-fixes-crlf.patch @@ -3,69 +3,25 @@ See index.html for further information. Contains ad hoc patches for cross building. -From 254b0588efb05c757b29b392bb8d147f35c836a7 Mon Sep 17 00:00:00 2001 -From: MXE +From 888c3a631c821e3d27efbcd3da6247c3a5add135 Mon Sep 17 00:00:00 2001 +From: Tony Theodore Date: Tue, 9 Dec 2014 20:10:47 +1100 -Subject: [PATCH 1/2] fix install prefix +Subject: [PATCH] fix install prefix diff --git a/qwtconfig.pri b/qwtconfig.pri -index 6c7ed0a..fcc91da 100644 +index 1fe6055..3a69039 100644 --- a/qwtconfig.pri +++ b/qwtconfig.pri -@@ -23,7 +23,7 @@ unix { +@@ -24,7 +24,7 @@ unix { } win32 { - QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION -+# QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION ++ # QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION + # QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION-qt-$$QT_VERSION } - QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc -- -1.9.3 (Apple Git-50) - - -From c2481957edc8346d17d9157137bfb61c7db5fdaa Mon Sep 17 00:00:00 2001 -From: MXE -Date: Tue, 9 Dec 2014 20:15:24 +1100 -Subject: [PATCH 2/2] fix for deprecated QT_STATIC_CONST* macros - -taken from: -http://sourceforge.net/p/qwt/code/2063/ - -diff --git a/src/qwt_transform.cpp b/src/qwt_transform.cpp -index d42b046..5e7fa1d 100644 ---- a/src/qwt_transform.cpp -+++ b/src/qwt_transform.cpp -@@ -15,10 +15,10 @@ - #endif - - //! Smallest allowed value for logarithmic scales: 1.0e-150 --QT_STATIC_CONST_IMPL double QwtLogTransform::LogMin = 1.0e-150; -+const double QwtLogTransform::LogMin = 1.0e-150; - - //! Largest allowed value for logarithmic scales: 1.0e150 --QT_STATIC_CONST_IMPL double QwtLogTransform::LogMax = 1.0e150; -+const double QwtLogTransform::LogMax = 1.0e150; - - //! Constructor - QwtTransform::QwtTransform() -diff --git a/src/qwt_transform.h b/src/qwt_transform.h -index 13eeef2..ae28ac4 100644 ---- a/src/qwt_transform.h -+++ b/src/qwt_transform.h -@@ -107,8 +107,8 @@ public: - - virtual QwtTransform *copy() const; - -- QT_STATIC_CONST double LogMin; -- QT_STATIC_CONST double LogMax; -+ static const double LogMin; -+ static const double LogMax; - }; - - /*! --- -1.9.3 (Apple Git-50) +2.7.4 diff --git a/src/qwt.mk b/src/qwt.mk index 1a26c5f2..ffe2212d 100644 --- a/src/qwt.mk +++ b/src/qwt.mk @@ -2,8 +2,8 @@ # See index.html for further information. PKG := qwt -$(PKG)_VERSION := 6.1.1 -$(PKG)_CHECKSUM := 675966a9e0b883fa5c70e2cee14a74f67bc0f8beb26fa33b4fea510517443c94 +$(PKG)_VERSION := 6.1.3 +$(PKG)_CHECKSUM := 027c32c0473a682c1db5b9cb02ebed5e39a4fbb0afd2306e23b1113c30006042 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $($(PKG)_SUBDIR).zip $(PKG)_WEBSITE := http://qwt.sourceforge.net/ From 9bcde899de5ff461e623a5a7b9e54ae94b9eba71 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sat, 18 Jun 2016 10:41:20 +0000 Subject: [PATCH 0743/1463] Update versions.json & build-matrix.html --- build-matrix.html | 4 ++-- versions.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 66bdb858..9a9abd40 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -3459,7 +3459,7 @@ feel free to submit a pull request. qwt - 6.1.1 + 6.1.3 ✓ ✓ ✓ @@ -3469,7 +3469,7 @@ feel free to submit a pull request. qwt_qt4 - 6.1.1 + 6.1.3 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 3160b563..4cc6b5c7 100644 --- a/versions.json +++ b/versions.json @@ -341,8 +341,8 @@ "qtwinextras": "5.7.0", "qtxlsxwriter": "ad90b6a2c21b300138ceb9fe9030a5917230f92d", "qtxmlpatterns": "5.7.0", - "qwt": "6.1.1", - "qwt_qt4": "6.1.1", + "qwt": "6.1.3", + "qwt_qt4": "6.1.3", "qwtplot3d": "0.2.7", "readline": "6.3", "rubberband": "1.8.1", From 96df2d7470df33b89b7f7e935938bebbf60b9385 Mon Sep 17 00:00:00 2001 From: Saikrishna Arcot Date: Wed, 8 Jun 2016 14:02:49 -0500 Subject: [PATCH 0744/1463] Add plugin for compiling mingw-w64 with secure APIs enabled. --- src/gcc.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gcc.mk b/src/gcc.mk index 4a48e8d3..52889ece 100644 --- a/src/gcc.mk +++ b/src/gcc.mk @@ -76,7 +76,8 @@ define $(PKG)_BUILD_mingw-w64 --host='$(TARGET)' \ --prefix='$(PREFIX)/$(TARGET)' \ --enable-sdk=all \ - --enable-idl + --enable-idl \ + $(mingw-w64-headers_CONFIGURE_OPTS) $(MAKE) -C '$(1).headers-build' install # build standalone gcc From 2b9e0114bef90d47ee23e7cfab959c80420f36d8 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sat, 18 Jun 2016 16:00:05 +0000 Subject: [PATCH 0745/1463] Update versions.json & build-matrix.html --- build-matrix.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 9a9abd40..9968bdb9 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -2911,9 +2911,9 @@ feel free to submit a pull request. poppler 0.30.0 ✓ - ✗ ✓ - ✗ + ✓ + ✓ ✗ @@ -4194,9 +4194,9 @@ Total: 405 +4 native-only) 402 -302 +303 386 -301 +302 15 From ac52a067e966f0ed79cd4c2e361180a64f6b9f3b Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Sun, 19 Jun 2016 10:30:48 +0200 Subject: [PATCH 0746/1463] qtbase: fix build with -fontconfig and -system-freetype for MS Windows https://github.com/mxe/mxe/pull/1400 --- src/qtbase-1-fixes.patch | 39 +++++++++++++++++++++++++++++++++------ src/qtbase.mk | 4 ++-- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/src/qtbase-1-fixes.patch b/src/qtbase-1-fixes.patch index bab33dc3..a873011b 100644 --- a/src/qtbase-1-fixes.patch +++ b/src/qtbase-1-fixes.patch @@ -6,7 +6,7 @@ Contains ad hoc patches for cross building. From 9e13228f4af09b93f6cd123635784e4988694ac2 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 6 Aug 2015 23:35:08 +0200 -Subject: [PATCH 1/6] fix qwindows plugin linking with system-freetype (MXE +Subject: [PATCH 1/7] fix qwindows plugin linking with system-freetype (MXE specific) Change-Id: I8783e3ab2d19011b083dd3c471107298a17293c4 @@ -28,7 +28,7 @@ index 39280de..e152b0d 100644 From 2d7638835de6b5f16cf64e6cf4eede1f8a9ccedb Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 21 Jun 2014 13:12:49 +0200 -Subject: [PATCH 2/6] use pkg-config for harfbuzz (MXE specific) +Subject: [PATCH 2/7] use pkg-config for harfbuzz (MXE specific) Change-Id: Id4e4c37d68b63c9f480d72a561d95d4d2a5ded50 @@ -61,7 +61,7 @@ index 7443368..c24e684 100644 From 172b7bf1f113b1ea443a64ad4f9a2ecda6ee06e2 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 8 Dec 2014 14:15:12 +0100 -Subject: [PATCH 3/6] fix oci config test on windows +Subject: [PATCH 3/7] fix oci config test on windows Change-Id: If1ce2241682259ca495b0ba68bf18410f8548922 @@ -81,7 +81,7 @@ index 3ffda1d..39b6f3759 100644 From 7756e4e14ae5b33fea04416bd4f238ca1dfe4d30 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 6 Aug 2015 13:24:56 +0200 -Subject: [PATCH 4/6] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows +Subject: [PATCH 4/7] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows Change-Id: I53c110ef40e3d14cc49fa23aa5d294611cac2ffa @@ -105,7 +105,7 @@ index 43b55f0..de2c3ec 100755 From e40fdb058ec440d14e3037c530f8181561622f50 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 6 Oct 2015 09:53:20 +0200 -Subject: [PATCH 5/6] fix building mysql driver under mingw +Subject: [PATCH 5/7] fix building mysql driver under mingw Change-Id: I9c4e821d5b3a6919566c6b684cb4916827feb6a9 @@ -129,7 +129,7 @@ index 3cfb614..8b7063f 100644 From 236aecbd657f06d0b18bc25b93d5390ac644daaf Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 26 Aug 2015 12:45:43 +0100 -Subject: [PATCH 6/6] cmake: Rearrange STATIC vs INTERFACE targets +Subject: [PATCH 6/7] cmake: Rearrange STATIC vs INTERFACE targets Otherwise we attempt to add_library(Qt5::UiPlugin STATIC IMPORTED) for header-only modules when building Qt5 statically. @@ -161,3 +161,30 @@ index d2358ca..6b1dc95 100644 -- 2.7.4 + +From b9823e1159af3c8b43fdedfae3106af8dec30e1d Mon Sep 17 00:00:00 2001 +From: Boris Pek +Date: Sun, 19 Jun 2016 02:10:42 +0300 +Subject: [PATCH 7/7] fix build with -fontconfig and -system-freetype for MS + Windows + + +diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp +index 7224f41..617a449 100644 +--- a/src/plugins/platforms/minimal/qminimalintegration.cpp ++++ b/src/plugins/platforms/minimal/qminimalintegration.cpp +@@ -120,7 +120,11 @@ QPlatformFontDatabase *QMinimalIntegration::fontDatabase() const + if (m_options & EnableFonts) { + #ifndef QT_NO_FONTCONFIG + if (!m_fontDatabase) ++#ifdef Q_OS_WIN ++ m_fontDatabase = new QBasicFontDatabase; ++#else // !Q_OS_WIN + m_fontDatabase = new QGenericUnixFontDatabase; ++#endif + #else + return QPlatformIntegration::fontDatabase(); + #endif +-- +2.7.4 + diff --git a/src/qtbase.mk b/src/qtbase.mk index d803d19a..b66a1a4c 100644 --- a/src/qtbase.mk +++ b/src/qtbase.mk @@ -52,8 +52,8 @@ define $(PKG)_BUILD -system-libpng \ -system-libjpeg \ -system-sqlite \ - -no-fontconfig \ - -no-freetype \ + -fontconfig \ + -system-freetype \ -system-harfbuzz \ -system-pcre \ -openssl-linked \ From 1b54790496c063e79bc70b1fb27511fd94929524 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sun, 19 Jun 2016 10:58:26 +0200 Subject: [PATCH 0747/1463] qtbase: restore fontconfig and freetype to deps Follow-up to ac52a067e966f0ed79cd4c2e361180a64f6b9f3b --- src/qtbase.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qtbase.mk b/src/qtbase.mk index b66a1a4c..7267785a 100644 --- a/src/qtbase.mk +++ b/src/qtbase.mk @@ -8,7 +8,7 @@ $(PKG)_CHECKSUM := 3e7b6d123cab23a587ccbc45173296b33786faa409dba0494e4658fda3ede $(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://download.qt.io/official_releases/qt/5.7/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE) -$(PKG)_DEPS := gcc dbus freetds harfbuzz jpeg libpng libmysqlclient openssl pcre postgresql sqlite zlib +$(PKG)_DEPS := gcc dbus fontconfig freetds freetype harfbuzz jpeg libpng libmysqlclient openssl pcre postgresql sqlite zlib define $(PKG)_UPDATE $(WGET) -q -O- http://download.qt-project.org/official_releases/qt/5.5/ | \ From e4ce3b3e34e5bd46698da81e3496c19c69a7357d Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sun, 19 Jun 2016 13:28:43 +0000 Subject: [PATCH 0748/1463] Update versions.json & build-matrix.html --- build-matrix.html | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 9968bdb9..865eca2c 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -330,10 +330,10 @@ feel free to submit a pull request. cloog 0.18.1 - ✗ - ✗ - ✗ - ✗ + ✓ + ✓ + ✓ + ✓ ✓ @@ -1191,9 +1191,9 @@ feel free to submit a pull request. isl 0.12.2 ✓ - ✗ ✓ - ✗ + ✓ + ✓ ✓ @@ -4189,14 +4189,14 @@ feel free to submit a pull request. -Total: 405 +Total: 406
    (+6 virtual -+4 native-only) ++3 native-only) -402 -303 -386 -302 +403 +305 +387 +304 15 From 1fdca56e74331eaa05faec9fd1ee93f26e37fc9f Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 21 Jun 2016 02:03:22 +0200 Subject: [PATCH 0749/1463] qtbase: updated fontconfig/freetype patch --- src/qtbase-1-fixes.patch | 92 ++++++++++++++++++++++++++++------------ 1 file changed, 64 insertions(+), 28 deletions(-) diff --git a/src/qtbase-1-fixes.patch b/src/qtbase-1-fixes.patch index a873011b..80ece60e 100644 --- a/src/qtbase-1-fixes.patch +++ b/src/qtbase-1-fixes.patch @@ -6,7 +6,7 @@ Contains ad hoc patches for cross building. From 9e13228f4af09b93f6cd123635784e4988694ac2 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 6 Aug 2015 23:35:08 +0200 -Subject: [PATCH 1/7] fix qwindows plugin linking with system-freetype (MXE +Subject: [PATCH 1/8] fix qwindows plugin linking with system-freetype (MXE specific) Change-Id: I8783e3ab2d19011b083dd3c471107298a17293c4 @@ -28,7 +28,7 @@ index 39280de..e152b0d 100644 From 2d7638835de6b5f16cf64e6cf4eede1f8a9ccedb Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 21 Jun 2014 13:12:49 +0200 -Subject: [PATCH 2/7] use pkg-config for harfbuzz (MXE specific) +Subject: [PATCH 2/8] use pkg-config for harfbuzz (MXE specific) Change-Id: Id4e4c37d68b63c9f480d72a561d95d4d2a5ded50 @@ -61,7 +61,7 @@ index 7443368..c24e684 100644 From 172b7bf1f113b1ea443a64ad4f9a2ecda6ee06e2 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 8 Dec 2014 14:15:12 +0100 -Subject: [PATCH 3/7] fix oci config test on windows +Subject: [PATCH 3/8] fix oci config test on windows Change-Id: If1ce2241682259ca495b0ba68bf18410f8548922 @@ -81,7 +81,7 @@ index 3ffda1d..39b6f3759 100644 From 7756e4e14ae5b33fea04416bd4f238ca1dfe4d30 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 6 Aug 2015 13:24:56 +0200 -Subject: [PATCH 4/7] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows +Subject: [PATCH 4/8] configure: don't set QT_NO_SYSTEMSEMAPHORE for Windows Change-Id: I53c110ef40e3d14cc49fa23aa5d294611cac2ffa @@ -105,7 +105,7 @@ index 43b55f0..de2c3ec 100755 From e40fdb058ec440d14e3037c530f8181561622f50 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 6 Oct 2015 09:53:20 +0200 -Subject: [PATCH 5/7] fix building mysql driver under mingw +Subject: [PATCH 5/8] fix building mysql driver under mingw Change-Id: I9c4e821d5b3a6919566c6b684cb4916827feb6a9 @@ -129,7 +129,7 @@ index 3cfb614..8b7063f 100644 From 236aecbd657f06d0b18bc25b93d5390ac644daaf Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Wed, 26 Aug 2015 12:45:43 +0100 -Subject: [PATCH 6/7] cmake: Rearrange STATIC vs INTERFACE targets +Subject: [PATCH 6/8] cmake: Rearrange STATIC vs INTERFACE targets Otherwise we attempt to add_library(Qt5::UiPlugin STATIC IMPORTED) for header-only modules when building Qt5 statically. @@ -162,29 +162,65 @@ index d2358ca..6b1dc95 100644 2.7.4 -From b9823e1159af3c8b43fdedfae3106af8dec30e1d Mon Sep 17 00:00:00 2001 +From 0d1b11391894345be8a1fe084afb3799fc828488 Mon Sep 17 00:00:00 2001 +From: Thiago Macieira +Date: Wed, 18 May 2016 14:40:20 -0700 +Subject: [PATCH 7/8] Fix linking of the minimal platform plugin on OS X + +platformsupport/fontdatabases/fontdatabases.pri disables all font +databases except CoreText on OS X, so this is required for +linking. Otherwise, we get undefined reference linker errors: + +Undefined symbols for architecture x86_64: + "vtable for QBasicFontDatabase", referenced from: + QMinimalIntegration::fontDatabase() const in + qminimalintegration.o + +Change-Id: I31298e973803b4d6eedbf61607056114d1556584 +Reviewed-by: Jake Petroules +(cherry picked from commit 16864c42d6bc0ee6b3e3fa03123ef5884557ceea) + +diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro +index 0d31d66..bd6f2d8 100644 +--- a/src/plugins/platforms/minimal/minimal.pro ++++ b/src/plugins/platforms/minimal/minimal.pro +@@ -11,6 +11,7 @@ HEADERS = qminimalintegration.h \ + OTHER_FILES += minimal.json + + CONFIG += qpa/genericunixfontdatabase ++darwin: DEFINES += QT_NO_FONTCONFIG + + PLUGIN_TYPE = platforms + PLUGIN_CLASS_NAME = QMinimalIntegrationPlugin +-- +2.7.4 + + +From f504f5805be3cc27e19632e15b29eaaaac0e92e8 Mon Sep 17 00:00:00 2001 From: Boris Pek -Date: Sun, 19 Jun 2016 02:10:42 +0300 -Subject: [PATCH 7/7] fix build with -fontconfig and -system-freetype for MS - Windows - - -diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp -index 7224f41..617a449 100644 ---- a/src/plugins/platforms/minimal/qminimalintegration.cpp -+++ b/src/plugins/platforms/minimal/qminimalintegration.cpp -@@ -120,7 +120,11 @@ QPlatformFontDatabase *QMinimalIntegration::fontDatabase() const - if (m_options & EnableFonts) { - #ifndef QT_NO_FONTCONFIG - if (!m_fontDatabase) -+#ifdef Q_OS_WIN -+ m_fontDatabase = new QBasicFontDatabase; -+#else // !Q_OS_WIN - m_fontDatabase = new QGenericUnixFontDatabase; -+#endif - #else - return QPlatformIntegration::fontDatabase(); - #endif +Date: Sun, 19 Jun 2016 03:15:43 +0300 +Subject: [PATCH 8/8] Fix build of the minimal platform plugin for MS Windows + +when qtbase is configured with -fontconfig and -system-freetype. + +This fix is necessary after 060e0f6628fd185994911307c59f5355acaaf18f. +Used the same approach as in 16864c42d6bc0ee6b3e3fa03123ef5884557ceea. + +Change-Id: Idece0dc11d89e38266c95de1769be751c06324ef +(cherry picked from commit 02d2969fafe5088bb1c80eb58b2736df447326cd) + +diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro +index bd6f2d8..4b63461 100644 +--- a/src/plugins/platforms/minimal/minimal.pro ++++ b/src/plugins/platforms/minimal/minimal.pro +@@ -12,6 +12,7 @@ OTHER_FILES += minimal.json + + CONFIG += qpa/genericunixfontdatabase + darwin: DEFINES += QT_NO_FONTCONFIG ++win32: DEFINES += QT_NO_FONTCONFIG + + PLUGIN_TYPE = platforms + PLUGIN_CLASS_NAME = QMinimalIntegrationPlugin -- 2.7.4 From c6a18793baccff76e52218028dec5608cddbe090 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sat, 25 Jun 2016 21:57:03 +0200 Subject: [PATCH 0750/1463] update: expat freetds gmp --- src/expat.mk | 4 ++-- src/freetds.mk | 4 ++-- src/gmp.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/expat.mk b/src/expat.mk index 65822fc5..2a930c37 100644 --- a/src/expat.mk +++ b/src/expat.mk @@ -3,8 +3,8 @@ PKG := expat $(PKG)_IGNORE := -$(PKG)_VERSION := 2.1.1 -$(PKG)_CHECKSUM := aff584e5a2f759dcfc6d48671e9529f6afe1e30b0cd6a4cec200cbe3f793de67 +$(PKG)_VERSION := 2.2.0 +$(PKG)_CHECKSUM := d9e50ff2d19b3538bd2127902a89987474e1a4db8e43a66a4d1a712ab9a504ff $(PKG)_SUBDIR := expat-$($(PKG)_VERSION) $(PKG)_FILE := expat-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/expat/expat/$($(PKG)_VERSION)/$($(PKG)_FILE) diff --git a/src/freetds.mk b/src/freetds.mk index 5be11423..592274ff 100644 --- a/src/freetds.mk +++ b/src/freetds.mk @@ -3,8 +3,8 @@ PKG := freetds $(PKG)_IGNORE := -$(PKG)_VERSION := 1.00 -$(PKG)_CHECKSUM := 5d617cc22855814815f815a2a1e354d91e674101ca08e55fbad3e51f14e61040 +$(PKG)_VERSION := 1.00.6 +$(PKG)_CHECKSUM := b59cf0b48ea53095657a99583b853205df4e9dc295119cfbf4b1cdc0da9ba828 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := ftp://ftp.freetds.org/pub/$(PKG)/stable/$($(PKG)_FILE) diff --git a/src/gmp.mk b/src/gmp.mk index d1b872d5..44a361a7 100644 --- a/src/gmp.mk +++ b/src/gmp.mk @@ -3,8 +3,8 @@ PKG := gmp $(PKG)_IGNORE := -$(PKG)_VERSION := 6.1.0 -$(PKG)_CHECKSUM := 68dadacce515b0f8a54f510edf07c1b636492bcdb8e8d54c56eb216225d16989 +$(PKG)_VERSION := 6.1.1 +$(PKG)_CHECKSUM := d36e9c05df488ad630fff17edb50051d6432357f9ce04e34a09b3d818825e831 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz $(PKG)_URL := https://gmplib.org/download/$(PKG)/$($(PKG)_FILE) From 4824bdea11b9627bb85e058550f1d46d2ccb5d1d Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Sat, 25 Jun 2016 19:58:48 +0000 Subject: [PATCH 0751/1463] Update versions.json & build-matrix.html --- build-matrix.html | 6 +++--- versions.json | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 865eca2c..6f395289 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -509,7 +509,7 @@ feel free to submit a pull request. expat - 2.1.1 + 2.2.0 ✓ ✓ ✓ @@ -629,7 +629,7 @@ feel free to submit a pull request. freetds - 1.00 + 1.00.6 ✓ ✓ ✓ @@ -849,7 +849,7 @@ feel free to submit a pull request. gmp - 6.1.0 + 6.1.1 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 4cc6b5c7..cb07f2f2 100644 --- a/versions.json +++ b/versions.json @@ -46,7 +46,7 @@ "dlfcn-win32": "1.0.0", "eigen": "3.2.5", "exiv2": "0.25", - "expat": "2.1.1", + "expat": "2.2.0", "faad2": "2.7", "fdk-aac": "0.1.4", "ffmpeg": "3.0", @@ -58,7 +58,7 @@ "fontconfig": "2.11.1", "freeglut": "2.8.1", "freeimage": "3.15.4", - "freetds": "1.00", + "freetds": "1.00.6", "freetype": "2.6.3", "freetype-bootstrap": "2.6.3", "fribidi": "0.19.6", @@ -80,7 +80,7 @@ "glib": "2.44.1", "glibmm": "2.42.0", "glm": "0.9.7.4", - "gmp": "6.1.0", + "gmp": "6.1.1", "gnutls": "3.4.13", "googletest": "1.7.0", "graphicsmagick": "1.3.21", From 107fc242c89d6bd3b8c9a576776aee83a628b5ac Mon Sep 17 00:00:00 2001 From: Matthias Geier Date: Mon, 27 Jun 2016 10:25:00 +0200 Subject: [PATCH 0752/1463] libsndfile: update 1.0.25 -> 1.0.27 The patch is not necessary anymore, see https://github.com/erikd/libsndfile/pull/76. --- src/libsndfile-1-fixes.patch | 28 ---------------------------- src/libsndfile.mk | 4 ++-- 2 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 src/libsndfile-1-fixes.patch diff --git a/src/libsndfile-1-fixes.patch b/src/libsndfile-1-fixes.patch deleted file mode 100644 index 23f51d9c..00000000 --- a/src/libsndfile-1-fixes.patch +++ /dev/null @@ -1,28 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -Taken from https://github.com/erikd/libsndfile/pull/76 - -From 9ce0175df1fcb3db7a63ba8a72712b4676a3af86 Mon Sep 17 00:00:00 2001 -From: Timothy Gu -Date: Mon, 1 Sep 2014 11:05:13 -0700 -Subject: [PATCH] configure.ac: Fix detection of MinGW - -Signed-off-by: Timothy Gu - -diff --git a/configure.ac b/configure.ac -index 20ba55a..d25201c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -168,7 +168,7 @@ unset ac_cv_sizeof_off_t - AC_CHECK_SIZEOF(off_t,1) # Fake default value. - - case "$host_os" in -- mingw32msvc | mingw32) -+ mingw32*) - TYPEOF_SF_COUNT_T="__int64" - SF_COUNT_MAX="0x7FFFFFFFFFFFFFFFLL" - SIZEOF_SF_COUNT_T=8 --- -1.9.1 - diff --git a/src/libsndfile.mk b/src/libsndfile.mk index 5292bdf6..a6cfb2a3 100644 --- a/src/libsndfile.mk +++ b/src/libsndfile.mk @@ -3,8 +3,8 @@ PKG := libsndfile $(PKG)_IGNORE := -$(PKG)_VERSION := 1.0.25 -$(PKG)_CHECKSUM := 59016dbd326abe7e2366ded5c344c853829bebfd1702ef26a07ef662d6aa4882 +$(PKG)_VERSION := 1.0.27 +$(PKG)_CHECKSUM := a391952f27f4a92ceb2b4c06493ac107896ed6c76be9a613a4731f076d30fac0 $(PKG)_SUBDIR := libsndfile-$($(PKG)_VERSION) $(PKG)_FILE := libsndfile-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.mega-nerd.com/libsndfile/files/$($(PKG)_FILE) From ffa37e45c53ec5fadc7930412230452992c375af Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Tue, 28 Jun 2016 17:28:46 +0000 Subject: [PATCH 0753/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index 6f395289..c68b0c11 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -2029,7 +2029,7 @@ feel free to submit a pull request. libsndfile - 1.0.25 + 1.0.27 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index cb07f2f2..9700242e 100644 --- a/versions.json +++ b/versions.json @@ -198,7 +198,7 @@ "libsamplerate": "0.1.8", "libshout": "2.4.1", "libsigc++": "2.4.0", - "libsndfile": "1.0.25", + "libsndfile": "1.0.27", "libsodium": "1.0.6", "libsoup": "2.54.0.1", "libssh2": "1.7.0", From ad11e753ddede848ee734ec4999f218f455fdfe2 Mon Sep 17 00:00:00 2001 From: Pavel Vatagin Date: Tue, 28 Jun 2016 22:56:39 +0300 Subject: [PATCH 0754/1463] virtual package googletest is not required anymore --- index.html | 4 ---- src/googletest.mk | 15 --------------- 2 files changed, 19 deletions(-) delete mode 100644 src/googletest.mk diff --git a/index.html b/index.html index 74545015..67e257e2 100644 --- a/index.html +++ b/index.html @@ -1429,10 +1429,6 @@ local-pkg-list: $(LOCAL_PKG_LIST) gnutls GnuTLS - - googletest - Google Test - graphicsmagick GraphicsMagick diff --git a/src/googletest.mk b/src/googletest.mk deleted file mode 100644 index e5a902f1..00000000 --- a/src/googletest.mk +++ /dev/null @@ -1,15 +0,0 @@ -# This file is part of MXE. -# See index.html for further information. - -PKG := googletest -$(PKG)_IGNORE := -$(PKG)_VERSION := 1.7.0 -$(PKG)_CHECKSUM := f73a6546fdf9fce9ff93a5015e0333a8af3062a152a9ad6bcb772c96687016cc -$(PKG)_SUBDIR := $(PKG)-release-$($(PKG)_VERSION) -$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://github.com/google/$(PKG)/archive/release-$($(PKG)_VERSION).tar.gz -$(PKG)_DEPS := - -define $(PKG)_UPDATE - $(call MXE_GET_GITHUB_TAGS, google/googletest, release-) -endef From 8f27dbac8cf48f2edabbb24b26e5292003262e36 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Tue, 28 Jun 2016 20:13:29 +0000 Subject: [PATCH 0755/1463] Update versions.json & build-matrix.html --- build-matrix.html | 12 +----------- versions.json | 1 - 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index c68b0c11..bb2f1be0 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -867,16 +867,6 @@ feel free to submit a pull request. ✗ - - googletest - 1.7.0 - ✗ - ✗ - ✗ - ✗ - ✗ - - graphicsmagick 1.3.21 @@ -4190,7 +4180,7 @@ feel free to submit a pull request. Total: 406 -
    (+6 virtual +
    (+5 virtual +3 native-only) 403 diff --git a/versions.json b/versions.json index 9700242e..db1e54a7 100644 --- a/versions.json +++ b/versions.json @@ -82,7 +82,6 @@ "glm": "0.9.7.4", "gmp": "6.1.1", "gnutls": "3.4.13", - "googletest": "1.7.0", "graphicsmagick": "1.3.21", "gsl": "1.16", "gsoap": "2.8.22", From 04027754fa0984e81a5eca1b33707f29fafe6d93 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 28 Jun 2016 22:14:46 +0300 Subject: [PATCH 0756/1463] qtsystems: update checksum The file changed in upstream. The only difference is that top-level directory of the original file is qtproject-qtsystems-4e3a7ed and in new version it is qt-qtsystems-4e3a7ed. fix #1405 --- src/qtsystems.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qtsystems.mk b/src/qtsystems.mk index 03867e87..09c1e3de 100644 --- a/src/qtsystems.mk +++ b/src/qtsystems.mk @@ -3,8 +3,8 @@ PKG := qtsystems $(PKG)_IGNORE := $(PKG)_VERSION := 4e3a7ed -$(PKG)_CHECKSUM := 4aceb62b7e3135a1f29a31d71467d1c519ee25c36e1aa0b96b72540af5b198e3 -$(PKG)_SUBDIR := qtproject-$(PKG)-$($(PKG)_VERSION) +$(PKG)_CHECKSUM := 710d2b80f9125fb03fdb67dd6f3c4dd51396981e812fd4a3ea99b1b1290853e5 +$(PKG)_SUBDIR := qt-$(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/qtproject/qtsystems/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc qtbase qtdeclarative qtxmlpatterns From f0d60ac7def28bc7bc7af08ca4f9b91936fac3a7 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 29 Jun 2016 01:30:31 +0300 Subject: [PATCH 0757/1463] install-deps: run apt-get with --yes Otherwise it will make interactive prompts. --- tools/install-deps | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/install-deps b/tools/install-deps index d4daee6c..5daf90d0 100755 --- a/tools/install-deps +++ b/tools/install-deps @@ -5,23 +5,23 @@ set -xue if [[ "$OSTYPE" =~ "linux" ]]; then if which apt-get && which dpkg; then # Debian or Ubuntu - apt-get install \ + apt-get --yes install \ autoconf automake autopoint bash bison bzip2 flex gettext\ git g++ gperf intltool libffi-dev libgdk-pixbuf2.0-dev \ libtool libltdl-dev libssl-dev libxml-parser-perl make \ openssl p7zip-full patch perl pkg-config python ruby scons \ sed unzip wget xz-utils if ! [[ `uname -m` =~ "i686" ]]; then - apt-get install g++-multilib libc6-dev-i386 + apt-get --yes install g++-multilib libc6-dev-i386 fi DIST=`lsb_release -si` REL=`lsb_release -sr` if [[ $DIST =~ "Debian" ]] && (( `echo "$REL > 8" | bc -l` )) || \ [[ $DIST =~ "Ubuntu" ]] && (( `echo "$REL > 14.10" | bc -l` )); then - apt-get install libtool-bin + apt-get --yes install libtool-bin fi # install Lua for build-pkg - apt-get install lua5.1 + apt-get --yes install lua5.1 elif which yum; then # Fedora yum install \ From 7003fa837b20fac0ea04a59fc122d7073eb43204 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 29 Jun 2016 01:40:28 +0300 Subject: [PATCH 0758/1463] install-deps: fix syntax in condition for libtool Without external `(` and `)` the condition is evaluated to false on Debian Jessie. --- tools/install-deps | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/install-deps b/tools/install-deps index 5daf90d0..a7cd4cbb 100755 --- a/tools/install-deps +++ b/tools/install-deps @@ -16,8 +16,8 @@ if [[ "$OSTYPE" =~ "linux" ]]; then fi DIST=`lsb_release -si` REL=`lsb_release -sr` - if [[ $DIST =~ "Debian" ]] && (( `echo "$REL > 8" | bc -l` )) || \ - [[ $DIST =~ "Ubuntu" ]] && (( `echo "$REL > 14.10" | bc -l` )); then + if ( [[ $DIST =~ "Debian" ]] && (( `echo "$REL > 8" | bc -l` )) ) || \ + ( [[ $DIST =~ "Ubuntu" ]] && (( `echo "$REL > 14.10" | bc -l` )) ); then apt-get --yes install libtool-bin fi # install Lua for build-pkg From b328e24458f66693bbc943eb654dd463c8eba167 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 29 Jun 2016 01:42:19 +0300 Subject: [PATCH 0759/1463] install-deps: install bc to compare versions --- tools/install-deps | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/install-deps b/tools/install-deps index a7cd4cbb..1b7b4333 100755 --- a/tools/install-deps +++ b/tools/install-deps @@ -14,6 +14,8 @@ if [[ "$OSTYPE" =~ "linux" ]]; then if ! [[ `uname -m` =~ "i686" ]]; then apt-get --yes install g++-multilib libc6-dev-i386 fi + # install bc to compare Debian releases + apt-get --yes install bc DIST=`lsb_release -si` REL=`lsb_release -sr` if ( [[ $DIST =~ "Debian" ]] && (( `echo "$REL > 8" | bc -l` )) ) || \ From 29a663bef78330939abcb59451b8910a478d2256 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 29 Jun 2016 19:24:46 +0300 Subject: [PATCH 0760/1463] qtsystems: rename github.com/{qtproject => qt} See #1405 --- src/qtsystems.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qtsystems.mk b/src/qtsystems.mk index 09c1e3de..aff7bb12 100644 --- a/src/qtsystems.mk +++ b/src/qtsystems.mk @@ -6,7 +6,7 @@ $(PKG)_VERSION := 4e3a7ed $(PKG)_CHECKSUM := 710d2b80f9125fb03fdb67dd6f3c4dd51396981e812fd4a3ea99b1b1290853e5 $(PKG)_SUBDIR := qt-$(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://github.com/qtproject/qtsystems/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_URL := https://github.com/qt/qtsystems/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc qtbase qtdeclarative qtxmlpatterns define $(PKG)_UPDATE From a85ea2a3613c43d133f41dd6f5fa6056b942b231 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 29 Jun 2016 19:26:09 +0300 Subject: [PATCH 0761/1463] fix downloading of qtserialport_qt4 The project was moved from github.com/qtproject to github.com/qt. See #1405 --- src/qtserialport_qt4.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qtserialport_qt4.mk b/src/qtserialport_qt4.mk index ee3c8f4b..cdda5391 100644 --- a/src/qtserialport_qt4.mk +++ b/src/qtserialport_qt4.mk @@ -4,8 +4,8 @@ PKG := qtserialport_qt4 $(PKG)_IGNORE := $(PKG)_VERSION := 5c3b6cc770 -$(PKG)_CHECKSUM := 4e0bee3bd608b67e47dfbf2baa7f5ed7d9e39a3da16e4cc6056ffd0a4baa1495 -$(PKG)_GH_USER := qtproject +$(PKG)_CHECKSUM := d49c1cd4bb47706561f52c07d6075bb9931700d3bcae656ef3b6d3db3eb014ab +$(PKG)_GH_USER := qt $(PKG)_GH_REPO := qtserialport $(PKG)_GH_TREE := qt4-dev $(PKG)_SUBDIR := $($(PKG)_GH_USER)-$($(PKG)_GH_REPO)-$(call substr,$($(PKG)_VERSION),1,7) From 04f7e771aaa26d9a2cb7c5c0d1fdd454b91f5ce2 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 29 Jun 2016 23:29:42 +0300 Subject: [PATCH 0762/1463] Travis: check that all packages can be downloaded --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index d6c9eea9..f730d447 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ sudo: false script: - make build-matrix.html versions.json - if [ "$GH_TOKEN" != "" ]; then ./tools/travis-push.sh; fi + - make download -j 6 -k env: global: From 4f0f589becf9a0998acb9d78ee89adf58d286ce3 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Sat, 18 Jun 2016 17:01:19 +0300 Subject: [PATCH 0763/1463] freeglut: update from 2.8.1 to 3.0.0 --- src/freeglut-1-fixes.patch | 99 +++++++++++------------ src/freeglut-2-fix-autoconf-version.patch | 15 ---- src/freeglut.mk | 24 +++--- 3 files changed, 61 insertions(+), 77 deletions(-) delete mode 100644 src/freeglut-2-fix-autoconf-version.patch diff --git a/src/freeglut-1-fixes.patch b/src/freeglut-1-fixes.patch index c7398340..985078a8 100644 --- a/src/freeglut-1-fixes.patch +++ b/src/freeglut-1-fixes.patch @@ -3,58 +3,55 @@ See index.html for further information. Contains ad hoc patches for cross building. -From dc54ddf47055db70aeb19c618a70bd5448cff836 Mon Sep 17 00:00:00 2001 -From: Mark Brand -Date: Thu, 11 Apr 2013 08:50:44 +0200 -Subject: [PATCH] add pkg-config support +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Pek +Date: Sat, 18 Jun 2016 16:24:52 +0300 +Subject: [PATCH] Back compatibility with older freeglut packages in MXE -based on -http://old.nabble.com/-PATCH--Add-pkgconfig-file-td23312302.html -proposed to upstream -https://sourceforge.net/tracker/?func=detail&aid=3511842&group_id=1032&atid=101032 - -diff --git a/Makefile.am b/Makefile.am -index 39c5628..b504bc6 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -68,3 +68,6 @@ dist-hook: +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1111111..2222222 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,7 +11,7 @@ INCLUDE(GNUInstallDirs) + # CMAKE_ARCHIVE_OUTPUT_DIRECTORY instead. + # Static libraries end up in CMAKE_ARCHIVE_OUTPUT_DIRECTORY on all + # platforms. +-SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) ++SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) + SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) + SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) - libtool: $(LIBTOOL_DEPS) - $(SHELL) ./config.status --recheck -+ -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = glut.pc -diff --git a/configure.ac b/configure.ac -index 4f194d9..71e696d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -125,5 +125,6 @@ AC_CONFIG_FILES([ - progs/demos/spaceball/Makefile - progs/demos/subwin/Makefile - src/Makefile -+ glut.pc - ]) - AC_OUTPUT -diff --git a/glut.pc.in b/glut.pc.in -new file mode 100644 -index 0000000..ea57c4a ---- /dev/null -+++ b/glut.pc.in -@@ -0,0 +1,13 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@/@PACKAGE@ -+ -+Name: glut -+Description: A freely licensed alternative to the GLUT library -+Version: @VERSION@ -+Libs: -L${libdir} -lglut -+Libs.private: -lglu32 -lopengl32 -lwinmm -lgdi32 -mwindows -+Cflags: -I${includedir} -+Cflags.private: -DFREEGLUT_STATIC +@@ -53,9 +53,9 @@ ENDIF() + OPTION(FREEGLUT_GLES "Use OpenGL ES (requires EGL)" OFF) + + # option to build either as "glut" (ON) or "freeglut" (OFF) +-IF(NOT WIN32) ++#IF(NOT WIN32) + OPTION(FREEGLUT_REPLACE_GLUT "Be a replacement for GLUT" ON) +-ENDIF() ++#ENDIF() + + + SET(FREEGLUT_HEADERS +@@ -346,12 +346,18 @@ ENDIF() + + + IF(WIN32) ++ IF(FREEGLUT_REPLACE_GLUT) ++ SET(LIBNAME glut) ++ ELSE() ++ SET(LIBNAME freeglut) ++ ENDIF() + --- -1.8.1.4 - + LIST(APPEND LIBS winmm) + IF(FREEGLUT_BUILD_SHARED_LIBS) +- SET_TARGET_PROPERTIES(freeglut PROPERTIES COMPILE_FLAGS -DFREEGLUT_EXPORTS) ++ SET_TARGET_PROPERTIES(freeglut PROPERTIES COMPILE_FLAGS -DFREEGLUT_EXPORTS OUTPUT_NAME ${LIBNAME}) + ENDIF() + IF(FREEGLUT_BUILD_STATIC_LIBS) +- SET_TARGET_PROPERTIES(freeglut_static PROPERTIES COMPILE_FLAGS -DFREEGLUT_STATIC) ++ SET_TARGET_PROPERTIES(freeglut_static PROPERTIES COMPILE_FLAGS -DFREEGLUT_STATIC OUTPUT_NAME ${LIBNAME}) + # need to set machine:x64 for linker, at least for VC10, and + # doesn't hurt for older compilers: + # http://public.kitware.com/Bug/view.php?id=11240#c22768 diff --git a/src/freeglut-2-fix-autoconf-version.patch b/src/freeglut-2-fix-autoconf-version.patch deleted file mode 100644 index f0525d69..00000000 --- a/src/freeglut-2-fix-autoconf-version.patch +++ /dev/null @@ -1,15 +0,0 @@ -This file is part of MXE. -See index.html for further information. - -diff --git a/configure.ac b/configure.ac ---- a/configure.ac 2013-02-08 23:55:11.000000000 +0100 -+++ b/configure.ac 2013-04-12 15:23:57.161451656 +0200 -@@ -2,7 +2,7 @@ - - AC_INIT([freeglut library],[2.8.1],[freeglut-bugs@lists.sourceforge.net],[freeglut]) - AM_INIT_AUTOMAKE --AC_PREREQ([2.69]) -+AC_PREREQ([2.67]) - AC_CONFIG_SRCDIR([AUTHORS]) - AC_CONFIG_HEADERS([config.h]) - diff --git a/src/freeglut.mk b/src/freeglut.mk index 78f3061a..fbf835cb 100644 --- a/src/freeglut.mk +++ b/src/freeglut.mk @@ -3,9 +3,9 @@ PKG := freeglut $(PKG)_IGNORE := -$(PKG)_VERSION := 2.8.1 -$(PKG)_CHECKSUM := dde46626a62a1cd9cf48a11951cdd592e7067c345cffe193a149dfd47aef999a -$(PKG)_SUBDIR := freeglut-$(word 1,$(subst -, ,$($(PKG)_VERSION))) +$(PKG)_VERSION := 3.0.0 +$(PKG)_CHECKSUM := 2a43be8515b01ea82bcfa17d29ae0d40bd128342f0930cd1f375f1ff999f76a2 +$(PKG)_SUBDIR := freeglut-$($(PKG)_VERSION) $(PKG)_FILE := freeglut-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/freeglut/freeglut/$($(PKG)_VERSION)/$($(PKG)_FILE) $(PKG)_DEPS := gcc @@ -17,16 +17,18 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && ./autogen.sh - cd '$(1)' && ./configure \ - $(MXE_CONFIGURE_OPTS) \ - --enable-replace-glut \ - --disable-debug \ - --without-x - $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= $(if $(BUILD_STATIC),EXPORT_FLAGS='-DFREEGLUT_STATIC') + mkdir '$(1).build' + cd '$(1).build' && $(TARGET)-cmake '$(1)' \ + -DFREEGLUT_GLES=OFF \ + -DFREEGLUT_BUILD_DEMOS=OFF \ + -DFREEGLUT_REPLACE_GLUT=ON \ + -DFREEGLUT_BUILD_STATIC_LIBS=$(if $(BUILD_STATIC),true,false) \ + -DFREEGLUT_BUILD_SHARED_LIBS=$(if $(BUILD_STATIC),false,true) + $(MAKE) -C '$(1).build' -j '$(JOBS)' install '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ '$(2).c' -o '$(PREFIX)/$(TARGET)/bin/test-freeglut.exe' \ - `'$(TARGET)-pkg-config' glut --cflags --libs` + $(if $(BUILD_STATIC),-DFREEGLUT_STATIC) \ + -L'$(PREFIX)/$(TARGET)/lib' -lglut -lglu32 -lopengl32 -lgdi32 -lwinmm endef From 8acc43c958b0e8ba8e94611e74aecc5690543365 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Thu, 30 Jun 2016 00:29:35 +0300 Subject: [PATCH 0764/1463] freeglut: separate build and install --- src/freeglut.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/freeglut.mk b/src/freeglut.mk index fbf835cb..a22ca0a7 100644 --- a/src/freeglut.mk +++ b/src/freeglut.mk @@ -24,7 +24,8 @@ define $(PKG)_BUILD -DFREEGLUT_REPLACE_GLUT=ON \ -DFREEGLUT_BUILD_STATIC_LIBS=$(if $(BUILD_STATIC),true,false) \ -DFREEGLUT_BUILD_SHARED_LIBS=$(if $(BUILD_STATIC),false,true) - $(MAKE) -C '$(1).build' -j '$(JOBS)' install + $(MAKE) -C '$(1).build' -j '$(JOBS)' + $(MAKE) -C '$(1).build' -j 1 install '$(TARGET)-gcc' \ -W -Wall -Werror -ansi -pedantic \ From 141a4ad30a50122f1d7e67a4402e430dfc2f8d04 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Wed, 29 Jun 2016 21:59:02 +0000 Subject: [PATCH 0765/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index bb2f1be0..a35c9378 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -609,7 +609,7 @@ feel free to submit a pull request. freeglut - 2.8.1 + 3.0.0 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index db1e54a7..80e415a2 100644 --- a/versions.json +++ b/versions.json @@ -56,7 +56,7 @@ "flann": "1.8.4", "fltk": "1.3.3", "fontconfig": "2.11.1", - "freeglut": "2.8.1", + "freeglut": "3.0.0", "freeimage": "3.15.4", "freetds": "1.00.6", "freetype": "2.6.3", From 84c07b6c1754ab8f74790e281da991d1bbac7eef Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 30 Jun 2016 00:09:49 +0200 Subject: [PATCH 0766/1463] fix patch for qwt_qt4 Should have been donen when qwt was updated in commit a4077c1bd7dbeba310106f10abdd91999cfafd32. --- src/qwt_qt4-1-fixes-crlf.patch | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/qwt_qt4-1-fixes-crlf.patch b/src/qwt_qt4-1-fixes-crlf.patch index 18b83a4e..1caf7dd3 100644 --- a/src/qwt_qt4-1-fixes-crlf.patch +++ b/src/qwt_qt4-1-fixes-crlf.patch @@ -1,14 +1,25 @@ This file is part of MXE. See index.html for further information. ---- qwt-6.0.1/qwtconfig.pri 2011-08-01 16:34:05.000000000 +0200 -+++ qwt-6.0.1/qwtconfig.pri 2011-12-03 10:14:53.371757822 +0100 -@@ -23,7 +23,7 @@ +From 888c3a631c821e3d27efbcd3da6247c3a5add135 Mon Sep 17 00:00:00 2001 +From: Tony Theodore +Date: Tue, 9 Dec 2014 20:10:47 +1100 +Subject: [PATCH] fix install prefix + + +diff --git a/qwtconfig.pri b/qwtconfig.pri +index 1fe6055..3a69039 100644 +--- a/qwtconfig.pri ++++ b/qwtconfig.pri +@@ -24,7 +24,7 @@ unix { } win32 { - QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION -+# QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION ++ # QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION + # QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION-qt-$$QT_VERSION } - QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc +-- +2.7.4 + From 33a65822956c08e38463a69e0479b8a0b632b726 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 29 Jun 2016 01:52:04 +0300 Subject: [PATCH 0767/1463] plugins/README: clarify how to enable many plugins fix #1407 --- plugins/README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/plugins/README.md b/plugins/README.md index 803aab47..56b0b8b1 100644 --- a/plugins/README.md +++ b/plugins/README.md @@ -16,7 +16,12 @@ MXE_PLUGIN_DIRS=foo/ make libpng ``` If needed, you can also pass multiple directories by separating them with a -space: `MXE_PLUGIN_DIRS='foo1/ foo2/'`. +space: `MXE_PLUGIN_DIRS='foo1/ foo2/'`. A plugin takes effect only if it is +provided in `MXE_PLUGIN_DIRS`. If you run `make` multiple times, do not +remove a plugin path from `MXE_PLUGIN_DIRS`, otherwise MXE will rebuild +without the plugin. For example, if you want to build qbittorrent from +`apps` plugin with gcc 6 provided by `gcc6` plugin, set `MXE_PLUGIN_DIRS` +to 'plugins/gcc6 plugins/apps' and then run `make qbittorrent`. For details on `*.mk` contents, please consult the contents of this directory and `src/*.mk`. From 85de732ad49a3b4827d02b8c46c98a59f41ef6c6 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 4 Jul 2016 14:26:12 +1000 Subject: [PATCH 0768/1463] fix multiple downloads of same file see #1415 fixes #1079 --- Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index cd45f8c2..17f844e8 100644 --- a/Makefile +++ b/Makefile @@ -426,7 +426,12 @@ define PKG_RULE download-$(1): $(addprefix download-,$($(1)_DEPS)) download-only-$(1) .PHONY: download-only-$(1) -download-only-$(1): +# Packages can share a source archive to build different sets of features +# or dependencies (see bfd/binutils openscenegraph/openthreads qwt/qwt_qt4). +# Use a double-colon rule to allow multiple definitions: +# https://www.gnu.org/software/make/manual/html_node/Double_002dColon.html +download-only-$(1): download-only-$($(1)_FILE) +download-only-$($(1)_FILE):: $(and $($(1)_URL), @[ -d '$(LOG_DIR)/$(TIMESTAMP)' ] || mkdir -p '$(LOG_DIR)/$(TIMESTAMP)' @if ! $(call CHECK_PKG_ARCHIVE,$(1)); then \ From 0030112958d14b4c9885979d0bc1d7b782e7741f Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 4 Jul 2016 15:26:13 +1000 Subject: [PATCH 0769/1463] Makefile: note use of target-specific variables --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index cd45f8c2..82e0e58c 100644 --- a/Makefile +++ b/Makefile @@ -508,6 +508,9 @@ $(PREFIX)/$(3)/installed/$(1): $(PKG_MAKEFILES) \ .PHONY: build-only-$(1)_$(3) +# target-specific variables provide an extra level of scoping so that named +# variables can be used in package build rules: +# https://www.gnu.org/software/make/manual/html_node/Target_002dspecific.html build-only-$(1)_$(3): PKG = $(1) build-only-$(1)_$(3): TARGET = $(3) build-only-$(1)_$(3): BUILD_$(if $(findstring shared,$(3)),SHARED,STATIC) = TRUE From 422eab6f0a79172d0391baebe8b4cebd83f663b2 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 4 Jul 2016 19:58:50 +1000 Subject: [PATCH 0770/1463] plugins/README: expand background and usage --- plugins/README.md | 167 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 149 insertions(+), 18 deletions(-) diff --git a/plugins/README.md b/plugins/README.md index 56b0b8b1..9f8726cb 100644 --- a/plugins/README.md +++ b/plugins/README.md @@ -1,27 +1,158 @@ ### MXE Plugins -MXE lets you override the way packages are built and installed by offering -plugins mechanism. This directory contains a collection of example plugins and -experimental content. Enjoy! +#### Overview -*Note: the files here should be considered examples only and are unmaintained.* +MXE aims to provide a stable toolchain and feature-rich set of libraries to +be as broadly applicable as possible. Many use cases fall outside this main +objective and plugins are a way to bridge the gap without official framework +support. -##### Rolling your own plugin +The most common cases include: -The basic usage is to drop some `*.mk` files in a directory `foo/` and set -`MXE_PLUGIN_DIRS='foo/'` while invoking `make` like this: +##### Additional packages -```console -MXE_PLUGIN_DIRS=foo/ make libpng + - building handy tools to run on host + - cross-compiled interpreters and packages + - examples of packaging complete builds for projects using MXE + +The `apps`, `luarocks`, and `native` directories are generally supported by +the project, each plugin package should have an identified `$(PKG)_OWNER` as +a primary contact familiar with the specifics of the plugin. + +##### Customisation + + - alternate compiler versions + - minimal features/dependencies + - building a host toolchain + +The `examples` and `gcc*` directories contain some starting points for +experiments or long-lived customisations. Attempts to do such things with +`git` branches can lead to an outdated core MXE and using plugins allows a +nice separation while still keeping all local changes under source control. + +These are experimental and will be deprecated over time as framework support +is added to handle the various forms of customisation. + +##### Internal MXE uses + +The `native` plugin contains sub-directories with symlinks to a subset of +packages in the parent directory. These "sub-plugins" are automatically +activated on certain systems where the standard package-manager versions are +known to cause issues. These are supported but subject to change or removal +over time and should not be used directly. + +#### Usage + +The current implementation is very lightweight and a `plugin` is simply a +directory containing *.mk files. When a plugin is activated with: + +``` +make MXE_PLUGIN_DIRS=/path/to/foo +``` + +MXE will: + + - include all core packages + - include `/path/to/foo/*.mk` + - create a target for each `*.mk` file + - create an `all-foo` target + +Multiple plugins can be activated on the command line with an escaped +space-separated list: + +``` +make MXE_PLUGIN_DIRS='/path/to/foo /path/to/foo2' +``` + +To ensure plugins are activated across multiple invocations of `make`, the +`MXE_PLUGIN_DIRS` variable must always be specified either on the command line +or by adding an entry in `settings.mk` + +*N.B.* Setting `MXE_PLUGIN_DIRS` via the environment is not guaranteed to +work in future versions. + +For example, if you want to build keepassx from the `apps` plugin with +a minimal qt run: + +``` +make keepassx MXE_PLUGIN_DIRS='plugins/examples/custom-qt-min plugins/apps' ``` -If needed, you can also pass multiple directories by separating them with a -space: `MXE_PLUGIN_DIRS='foo1/ foo2/'`. A plugin takes effect only if it is -provided in `MXE_PLUGIN_DIRS`. If you run `make` multiple times, do not -remove a plugin path from `MXE_PLUGIN_DIRS`, otherwise MXE will rebuild -without the plugin. For example, if you want to build qbittorrent from -`apps` plugin with gcc 6 provided by `gcc6` plugin, set `MXE_PLUGIN_DIRS` -to 'plugins/gcc6 plugins/apps' and then run `make qbittorrent`. +To build all packages in `luarocks`: + +``` +$ make all-luarocks MXE_PLUGIN_DIRS=plugins/luarocks +``` + +To **always** use your desired plugin: + +``` +echo 'override MXE_PLUGIN_DIRS += /path/to/foo' >> settings.mk +``` + +Note that multiple entries in `settings.mk` should not be escaped: + +``` +echo 'override MXE_PLUGIN_DIRS += /path/to/foo /path/to/foo2' >> settings.mk +``` + +To review which plugins are activated, use the `gmsl-print-*` target: + +``` +make gmsl-print-MXE_PLUGIN_DIRS MXE_PLUGIN_DIRS='/foo /bar' +``` + +#### Creating plugins + +The two main use cases lead to different styles of plugin. The first case of +additional packages follows normal MXE guidelines and reviewing the contents of +`src/*.mk`, or the `apps` and `luarocks` plugins should help getting started. +This type of package will also work with normal MXE features such as updates +and patches. + +The customisation style (override/overlay) can be trickier since any arbitrary +`make` statements can be used. Most normal variables should be overriden with +[simply expanded variables](https://www.gnu.org/software/make/manual/html_node/Flavors.html#Flavors) +i.e. using `:=` instead of `=`. For example, to change a package version: + +```make +PKG := foo +$(PKG)_VERSION := 1.2.3 +$(PKG)_CHECKSUM := 09c4c85cab... +``` + +In this case, the behaviour of `make update-package-foo` may not be able to +determine the correct file to update with the new version and checksum and +`make` may not detect that the target should be rebuilt (depending on how +files are named). This is an on-going work that will be addressed. + +To change the set of patches applied: + +```make +foo_PATHCES := /path/to/fisrt.patch /path/to/second.patch +``` + +To apply no patches: + +```make +foo_PATHCES := +``` + +To alter dependencies and components: + +```make +qt_DEPS := gcc dbus jpeg libmng libpng openssl tiff zlib + +qt_BUILD := \ + $(subst -accessibility ,-no-accessibility ,\ + $(subst -qt-sql-,-no-sql-,\ + $(qt_BUILD))) + +qt_BUILD_SHARED := \ + $(subst -static ,-shared ,\ + $(subst -no-webkit ,-webkit ,\ + $(qt_BUILD))) +``` -For details on `*.mk` contents, please consult the contents of this directory -and `src/*.mk`. +Note the order of inclusion is indeterminate so multiple plugins should not +be chained or attempt to add/modify the same package. From f0e9cf6f5db5ff2782b4a98a9e5066f2e65c1295 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 4 Jul 2016 20:01:48 +1000 Subject: [PATCH 0771/1463] plugins/qt5-deps: move to examples --- plugins/{ => examples}/qt5-deps/overrides.mk | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename plugins/{ => examples}/qt5-deps/overrides.mk (100%) diff --git a/plugins/qt5-deps/overrides.mk b/plugins/examples/qt5-deps/overrides.mk similarity index 100% rename from plugins/qt5-deps/overrides.mk rename to plugins/examples/qt5-deps/overrides.mk From a0a3340772dd42ce0c36686aea6debd55513c346 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 5 Jul 2016 16:23:22 +1000 Subject: [PATCH 0772/1463] Makefile: allow packages to specify a list of zero or more patches --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2edab45f..ab617616 100644 --- a/Makefile +++ b/Makefile @@ -190,7 +190,11 @@ UNPACK_PKG_ARCHIVE = \ # all files for extension plugins will be considered for outdated checks PKG_MAKEFILES = $(realpath $(sort $(wildcard $(addsuffix /$(1).mk, $(TOP_DIR)/src $(MXE_PLUGIN_DIRS))))) PKG_TESTFILES = $(realpath $(sort $(wildcard $(addsuffix /$(1)-test*, $(TOP_DIR)/src $(MXE_PLUGIN_DIRS))))) -PKG_PATCHES = $(realpath $(sort $(wildcard $(addsuffix /$(1)-[0-9]*.patch, $(TOP_DIR)/src $(MXE_PLUGIN_DIRS))))) +# allow packages to specify a list of zero or more patches +PKG_PATCHES = $(if $(findstring undefined,$(origin $(1)_PATCHES)), \ + $(realpath $(sort $(wildcard $(addsuffix /$(1)-[0-9]*.patch, $(TOP_DIR)/src $(MXE_PLUGIN_DIRS))))) \ + $(else), \ + $($(1)_PATCHES)) define PREPARE_PKG_SOURCE cd '$(2)' && $(call UNPACK_PKG_ARCHIVE,$(1)) From 5b666dc4792e6ca0c1fe027ecb4098a239ea515e Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 5 Jul 2016 16:24:42 +1000 Subject: [PATCH 0773/1463] custom-qt-min plugin: fix for doc example --- plugins/examples/custom-qt-min/overrides.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/examples/custom-qt-min/overrides.mk b/plugins/examples/custom-qt-min/overrides.mk index bbb12236..f5e5e3a7 100644 --- a/plugins/examples/custom-qt-min/overrides.mk +++ b/plugins/examples/custom-qt-min/overrides.mk @@ -75,6 +75,7 @@ define qt_BUILD $(MAKE) -C '$(1)' -j '$(JOBS)' rm -rf '$(PREFIX)/$(TARGET)/qt' $(MAKE) -C '$(1)' -j 1 install + ln -sf '$(PREFIX)/$(TARGET)/qt/bin/qmake' '$(PREFIX)/bin/$(TARGET)'-qmake-qt4 mkdir '$(1)/test-qt' cd '$(1)/test-qt' && '$(PREFIX)/$(TARGET)/qt/bin/qmake' '$(PWD)/$(2).pro' From b27725c753dacc8ff53a526dd67427a6984b8175 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Tue, 5 Jul 2016 19:11:51 +1000 Subject: [PATCH 0774/1463] plugins/README.md: fix typos --- plugins/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/README.md b/plugins/README.md index 9f8726cb..62009386 100644 --- a/plugins/README.md +++ b/plugins/README.md @@ -129,13 +129,13 @@ files are named). This is an on-going work that will be addressed. To change the set of patches applied: ```make -foo_PATHCES := /path/to/fisrt.patch /path/to/second.patch +foo_PATCHES := /path/to/first.patch /path/to/second.patch ``` To apply no patches: ```make -foo_PATHCES := +foo_PATCHES := ``` To alter dependencies and components: From ed68885143b335bebc789fa86fb6dc381bfea9ea Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sat, 25 Jun 2016 20:27:24 +0300 Subject: [PATCH 0775/1463] add Go plugin --- plugins/go/README.md | 34 ++++++++++ plugins/go/go-1-fixes.patch | 108 ++++++++++++++++++++++++++++++++ plugins/go/go-native.mk | 31 +++++++++ plugins/go/go.mk | 59 +++++++++++++++++ plugins/go/src/mxe-test/main.go | 7 +++ 5 files changed, 239 insertions(+) create mode 100644 plugins/go/README.md create mode 100644 plugins/go/go-1-fixes.patch create mode 100644 plugins/go/go-native.mk create mode 100644 plugins/go/go.mk create mode 100644 plugins/go/src/mxe-test/main.go diff --git a/plugins/go/README.md b/plugins/go/README.md new file mode 100644 index 00000000..60c3bfd3 --- /dev/null +++ b/plugins/go/README.md @@ -0,0 +1,34 @@ +# Go plugin for MXE + +See also article [cross-compile go code, including cgo][1] +by Dimitri John Ledkov. + +[1]: http://blog.surgut.co.uk/2014/06/cross-compile-go-code-including-cgo.html + +Package `go-native` installs native Go 1.4. This version of Go +doesn't depend on Go installation. + +Package `go` uses native Go 1.4 as a bootstrap and installs Go 1.6 +as a cross-compiler to windows/386 or windows/amd64. Versions of +Go starting with 1.5 need Go installation to build. + +To build Go packages for windows/386 or windows/amd64, you have to set +the [GOPATH](https://golang.org/doc/code.html#GOPATH) environment variable +and call `usr/bin/$(TARGET)-go` wrapper script. + +## Example + +Building [gohs](https://github.com/flier/gohs), GoLang Binding of +[HyperScan](https://01.org/hyperscan). + +``` +$ MXE_PLUGIN_DIRS=plugins/go make hyperscan go +$ mkdir gopath +$ GOPATH=`pwd`/gopath ./usr/bin/i686-w64-mingw32.static-go get \ + github.com/flier/gohs/examples/simplegrep +$ ./gopath/bin/windows_386/simplegrep.exe root /etc/passwd +Scanning 42 bytes with Hyperscan +root:x:0:0:root:/root:/bin/bash +root:x:0:0:root:/root:/bin/bash +root:x:0:0:root:/root:/bin/bash +``` diff --git a/plugins/go/go-1-fixes.patch b/plugins/go/go-1-fixes.patch new file mode 100644 index 00000000..27281c76 --- /dev/null +++ b/plugins/go/go-1-fixes.patch @@ -0,0 +1,108 @@ +This file is part of MXE. +See index.html for further information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Boris Nagaev +Date: Sat, 25 Jun 2016 13:51:06 +0200 +Subject: [PATCH] cgo: add environmental variable override for pkg-config + +Allow overriding default name of `pkg-config` utility via +environmental variable PKG_CONFIG (same as used by autoconf +pkg.m4 macros). This facilitates easy cross-compilation of cgo +code. + +Original patch against Go <= 1.4 was written by +xnox_canonical in 2014. +Source: https://codereview.appspot.com/104960043/ + +Rebased against Go 1.6.2 by Boris Nagaev . + +diff --git a/src/cmd/dist/build.go b/src/cmd/dist/build.go +index 1111111..2222222 100644 +--- a/src/cmd/dist/build.go ++++ b/src/cmd/dist/build.go +@@ -41,6 +41,7 @@ var ( + defaultldflags string + defaultcxxtarget string + defaultcctarget string ++ defaultpkgconfigtarget string + rebuildall bool + defaultclang bool + +@@ -203,6 +204,12 @@ func xinit() { + } + defaultcxxtarget = b + ++ b = os.Getenv("PKG_CONFIG") ++ if b == "" { ++ b = "pkg-config" ++ } ++ defaultpkgconfigtarget = b ++ + // For tools being invoked but also for os.ExpandEnv. + os.Setenv("GO386", go386) + os.Setenv("GOARCH", goarch) +diff --git a/src/cmd/dist/buildgo.go b/src/cmd/dist/buildgo.go +index 1111111..2222222 100644 +--- a/src/cmd/dist/buildgo.go ++++ b/src/cmd/dist/buildgo.go +@@ -15,6 +15,7 @@ import "fmt" + // package main + // const defaultCC = + // const defaultCXX = ++// const defaultPkgConfig = + // + // It is invoked to write cmd/go/zdefaultcc.go + // but we also write cmd/cgo/zdefaultcc.go +@@ -27,8 +28,9 @@ func mkzdefaultcc(dir, file string) { + "package main\n"+ + "\n"+ + "const defaultCC = `%s`\n"+ +- "const defaultCXX = `%s`\n", +- defaultcctarget, defaultcxxtarget) ++ "const defaultCXX = `%s`\n"+ ++ "const defaultPkgConfig = `%s`\n", ++ defaultcctarget, defaultcxxtarget, defaultpkgconfigtarget) + + writefile(out, file, writeSkipSame) + +diff --git a/src/cmd/go/build.go b/src/cmd/go/build.go +index 1111111..2222222 100644 +--- a/src/cmd/go/build.go ++++ b/src/cmd/go/build.go +@@ -1575,13 +1575,19 @@ func (b *builder) build(a *action) (err error) { + return nil + } + ++// pkgconfigCmd returns a pkg-config binary name ++// defaultPkgConfig is defined in zdefaultcc.go, written by cmd/dist. ++func (b *builder) pkgconfigCmd() string { ++ return envList("PKG_CONFIG", defaultPkgConfig)[0] ++} ++ + // Calls pkg-config if needed and returns the cflags/ldflags needed to build the package. + func (b *builder) getPkgConfigFlags(p *Package) (cflags, ldflags []string, err error) { + if pkgs := p.CgoPkgConfig; len(pkgs) > 0 { + var out []byte +- out, err = b.runOut(p.Dir, p.ImportPath, nil, "pkg-config", "--cflags", pkgs) ++ out, err = b.runOut(p.Dir, p.ImportPath, nil, b.pkgconfigCmd(), "--cflags", pkgs) + if err != nil { +- b.showOutput(p.Dir, "pkg-config --cflags "+strings.Join(pkgs, " "), string(out)) ++ b.showOutput(p.Dir, b.pkgconfigCmd()+" --cflags "+strings.Join(pkgs, " "), string(out)) + b.print(err.Error() + "\n") + err = errPrintedOutput + return +@@ -1589,9 +1595,9 @@ func (b *builder) getPkgConfigFlags(p *Package) (cflags, ldflags []string, err e + if len(out) > 0 { + cflags = strings.Fields(string(out)) + } +- out, err = b.runOut(p.Dir, p.ImportPath, nil, "pkg-config", "--libs", pkgs) ++ out, err = b.runOut(p.Dir, p.ImportPath, nil, b.pkgconfigCmd(), "--libs", pkgs) + if err != nil { +- b.showOutput(p.Dir, "pkg-config --libs "+strings.Join(pkgs, " "), string(out)) ++ b.showOutput(p.Dir, b.pkgconfigCmd()+" --libs "+strings.Join(pkgs, " "), string(out)) + b.print(err.Error() + "\n") + err = errPrintedOutput + return diff --git a/plugins/go/go-native.mk b/plugins/go/go-native.mk new file mode 100644 index 00000000..fb724efe --- /dev/null +++ b/plugins/go/go-native.mk @@ -0,0 +1,31 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := go-native +$(PKG)_WEBSITE := https://golang.org/ +$(PKG)_OWNER := https://github.com/starius +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.4.3 +$(PKG)_CHECKSUM := 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 +$(PKG)_SUBDIR := go +$(PKG)_FILE := go$($(PKG)_VERSION).src.tar.gz +$(PKG)_URL := https://storage.googleapis.com/golang/$($(PKG)_FILE) +$(PKG)_DEPS_$(BUILD) := +$(PKG)_TARGETS := $(BUILD) + +define $(PKG)_UPDATE + $(WGET) -q -O- 'https://golang.org/dl/' | \ + $(SED) -n 's,.*go\(1.4.[0-9][^>]*\)\.src\.tar.*,\1,p' | \ + $(SORT) -h | tail -1 +endef + +define $(PKG)_BUILD + cd '$(1)/src' && \ + GOROOT_FINAL='$(PREFIX)/$(TARGET)/go' \ + ./make.bash + + mkdir -p '$(PREFIX)/$(TARGET)/go' + for d in include src bin pkg; do \ + cp -a '$(1)'/$$d '$(PREFIX)/$(TARGET)/go/' ; \ + done +endef diff --git a/plugins/go/go.mk b/plugins/go/go.mk new file mode 100644 index 00000000..36764061 --- /dev/null +++ b/plugins/go/go.mk @@ -0,0 +1,59 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := go +$(PKG)_WEBSITE := https://golang.org/ +$(PKG)_OWNER := https://github.com/starius +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.6.2 +$(PKG)_CHECKSUM := 787b0b750d037016a30c6ed05a8a70a91b2e9db4bd9b1a2453aa502a63f1bccc +$(PKG)_SUBDIR := go +$(PKG)_FILE := go$($(PKG)_VERSION).src.tar.gz +$(PKG)_URL := https://storage.googleapis.com/golang/$($(PKG)_FILE) +$(PKG)_DEPS := + +define $(PKG)_UPDATE + $(WGET) -q -O- 'https://golang.org/dl/' | \ + $(SED) -n 's,.*go\(1.6.[0-9][^>]*\)\.src\.tar.*,\1,p' | \ + $(SORT) -h | tail -1 +endef + +define $(PKG)_BUILD + cd '$(1)/src' && \ + GOROOT_BOOTSTRAP='$(PREFIX)/$(BUILD)/go' \ + GOROOT_FINAL='$(PREFIX)/$(TARGET)/go' \ + GOOS=windows \ + GOARCH='$(if $(findstring x86_64,$(TARGET)),amd64,386)' \ + ./make.bash + + mkdir -p '$(PREFIX)/$(TARGET)/go' + for d in include src bin pkg; do \ + cp -a '$(1)'/$$d '$(PREFIX)/$(TARGET)/go/' ; \ + done + + #create prefixed go wrapper script + mkdir -p '$(PREFIX)/bin/$(TARGET)' + (echo '#!/usr/bin/env bash'; \ + echo 'echo "== Using MXE Go wrapper: $(PREFIX)/bin/$(TARGET)-go"'; \ + echo 'set -xue'; \ + echo 'CGO_ENABLED=1 \'; \ + echo 'GOOS=windows \'; \ + echo 'GOARCH=$(if $(findstring x86_64,$(TARGET)),amd64,386) \'; \ + echo 'CC=$(PREFIX)/bin/$(TARGET)-gcc \'; \ + echo 'CXX=$(PREFIX)/bin/$(TARGET)-g++ \'; \ + echo 'PKG_CONFIG=$(PREFIX)/bin/$(TARGET)-pkg-config \'; \ + echo 'exec $(PREFIX)/$(TARGET)/go/bin/go \'; \ + echo '"$$@"'; \ + ) \ + > '$(PREFIX)/bin/$(TARGET)-go' + chmod 0755 '$(PREFIX)/bin/$(TARGET)-go' + + GOPATH=$(PWD)/plugins/go \ + '$(TARGET)-go' build \ + -o '$(PREFIX)/$(TARGET)/go/bin/test-go.exe' \ + mxe-test +endef + +# -buildmode=shared not supported on windows +# See https://golang.org/s/execmodes +$(PKG)_BUILD_SHARED = diff --git a/plugins/go/src/mxe-test/main.go b/plugins/go/src/mxe-test/main.go new file mode 100644 index 00000000..c6d46fb4 --- /dev/null +++ b/plugins/go/src/mxe-test/main.go @@ -0,0 +1,7 @@ +package main + +import "fmt" + +func main() { + fmt.Printf("hello, world\n") +} From d9241c0ffefabf20f035163d66b279652400886d Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Tue, 5 Jul 2016 21:38:03 +0300 Subject: [PATCH 0776/1463] libxml2: update from 2.9.2 to 2.9.4 --- src/libxml2.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libxml2.mk b/src/libxml2.mk index 47408af6..ec9a7965 100644 --- a/src/libxml2.mk +++ b/src/libxml2.mk @@ -3,8 +3,8 @@ PKG := libxml2 $(PKG)_IGNORE := -$(PKG)_VERSION := 2.9.2 -$(PKG)_CHECKSUM := 5178c30b151d044aefb1b08bf54c3003a0ac55c59c866763997529d60770d5bc +$(PKG)_VERSION := 2.9.4 +$(PKG)_CHECKSUM := ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c $(PKG)_SUBDIR := libxml2-$($(PKG)_VERSION) $(PKG)_FILE := libxml2-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://xmlsoft.org/sources/$($(PKG)_FILE) From 8a81846382e9fa6a9430d832e6b42eff26cb022e Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Tue, 5 Jul 2016 21:53:19 +0300 Subject: [PATCH 0777/1463] libxslt: update from 1.1.28 to 1.1.29 --- src/libxslt-1-fixes.patch | 4 ++-- src/libxslt.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libxslt-1-fixes.patch b/src/libxslt-1-fixes.patch index 78b797ce..d590a1e1 100644 --- a/src/libxslt-1-fixes.patch +++ b/src/libxslt-1-fixes.patch @@ -5,7 +5,7 @@ Contains ad hoc patches for cross building. From 5cdef88cc0bd288b4814509062234b72d27dc176 Mon Sep 17 00:00:00 2001 From: MXE -Date: Tue, 4 Jun 2013 17:28:16 +1000 +Date: Tue, 05 Jul 2016 21:12:38 +0300 Subject: [PATCH] fix for deprecated mkdir @@ -18,7 +18,7 @@ index 965175f..be36f4b 100644 ret = xsltCheckWritePath(sec, ctxt, directory); if (ret == 1) - ret = mkdir(directory, 0755); -+ ret = _mkdir(directory, 0755); ++ ret = _mkdir(directory); } xmlFree(directory); if (ret < 0) diff --git a/src/libxslt.mk b/src/libxslt.mk index 9d6e16b5..7378444e 100644 --- a/src/libxslt.mk +++ b/src/libxslt.mk @@ -3,8 +3,8 @@ PKG := libxslt $(PKG)_IGNORE := -$(PKG)_VERSION := 1.1.28 -$(PKG)_CHECKSUM := 5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c +$(PKG)_VERSION := 1.1.29 +$(PKG)_CHECKSUM := b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce $(PKG)_SUBDIR := libxslt-$($(PKG)_VERSION) $(PKG)_FILE := libxslt-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://xmlsoft.org/sources/$($(PKG)_FILE) From f75ecc9e9daca08ae9ac85f152f37ba5d610276e Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Tue, 5 Jul 2016 21:37:38 +0300 Subject: [PATCH 0778/1463] giflib: update from 5.0.5 to 5.1.4 --- src/giflib.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/giflib.mk b/src/giflib.mk index bc0e5187..8fcc1326 100644 --- a/src/giflib.mk +++ b/src/giflib.mk @@ -3,15 +3,15 @@ PKG := giflib $(PKG)_IGNORE := -$(PKG)_VERSION := 5.0.5 -$(PKG)_CHECKSUM := 606d8a366b1c625ab60d62faeca807a799a2b9e88cbdf2a02bfcdf4429bf8609 +$(PKG)_VERSION := 5.1.4 +$(PKG)_CHECKSUM := df27ec3ff24671f80b29e6ab1c4971059c14ac3db95406884fc26574631ba8d5 $(PKG)_SUBDIR := giflib-$($(PKG)_VERSION) $(PKG)_FILE := giflib-$($(PKG)_VERSION).tar.bz2 -$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/giflib/giflib-5.x/$($(PKG)_FILE) +$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/giflib/$($(PKG)_FILE) $(PKG)_DEPS := gcc define $(PKG)_UPDATE - $(WGET) -q -O- 'http://sourceforge.net/projects/giflib/files/giflib-5.x/' | \ + $(WGET) -q -O- 'http://sourceforge.net/projects/giflib/files/' | \ grep ']*\)\.tar.*,\1,p' | \ head -1 @@ -23,4 +23,4 @@ define $(PKG)_BUILD CPPFLAGS='-D_OPEN_BINARY' echo 'all:' > '$(1)/doc/Makefile' $(MAKE) -C '$(1)/lib' -j '$(JOBS)' install -endef \ No newline at end of file +endef From be13247f6144eef4f05aa3f0248ff9db666eff96 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Tue, 5 Jul 2016 21:53:37 +0300 Subject: [PATCH 0779/1463] fontconfig: update from 2.11.1 to 2.12.0 --- ...1-fix_mktemp_s.patch => fontconfig-1-fixes.patch} | 12 ++++++------ src/fontconfig.mk | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) rename src/{fontconfig-1-fix_mktemp_s.patch => fontconfig-1-fixes.patch} (79%) diff --git a/src/fontconfig-1-fix_mktemp_s.patch b/src/fontconfig-1-fixes.patch similarity index 79% rename from src/fontconfig-1-fix_mktemp_s.patch rename to src/fontconfig-1-fixes.patch index 88520a34..e3218c41 100644 --- a/src/fontconfig-1-fix_mktemp_s.patch +++ b/src/fontconfig-1-fixes.patch @@ -2,21 +2,21 @@ This file is part of MXE. See index.html for further information. From da6c9bfc3d57f3aa192972717cb5c84a56e1c422 Mon Sep 17 00:00:00 2001 -From: Mark Brand -Date: Fri, 29 Mar 2013 10:21:29 +0100 +From: MXE +Date: Tue, 05 Jul 2016 21:56:34 +0300 Subject: [PATCH] fix mktemp_s diff --git a/configure.ac b/configure.ac -index 1086a9a..d9fa572 100644 +index f8dadf1..bde05c8 100644 --- a/configure.ac +++ b/configure.ac -@@ -150,7 +150,7 @@ AC_TYPE_PID_T +@@ -160,7 +160,7 @@ AC_TYPE_PID_T # Checks for library functions. AC_FUNC_VPRINTF AC_FUNC_MMAP --AC_CHECK_FUNCS([link mkstemp mkostemp _mktemp_s mkdtemp getopt getopt_long getprogname getexecname rand random lrand48 random_r rand_r readlink regcomp regerror regexec regfree fstatvfs fstatfs lstat]) -+AC_CHECK_FUNCS([link mkstemp mkostemp _mktemp mkdtemp getopt getopt_long getprogname getexecname rand random lrand48 random_r rand_r readlink regcomp regerror regexec regfree fstatvfs fstatfs lstat]) +-AC_CHECK_FUNCS([link mkstemp mkostemp _mktemp_s mkdtemp getopt getopt_long getprogname getexecname rand random lrand48 random_r rand_r readlink fstatvfs fstatfs lstat]) ++AC_CHECK_FUNCS([link mkstemp mkostemp _mktemp mkdtemp getopt getopt_long getprogname getexecname rand random lrand48 random_r rand_r readlink fstatvfs fstatfs lstat]) dnl AC_CHECK_FUNCS doesn't check for header files. dnl posix_fadvise() may be not available in older libc. diff --git a/src/fontconfig.mk b/src/fontconfig.mk index e8f2b8ee..6b68c929 100644 --- a/src/fontconfig.mk +++ b/src/fontconfig.mk @@ -3,8 +3,8 @@ PKG := fontconfig $(PKG)_IGNORE := -$(PKG)_VERSION := 2.11.1 -$(PKG)_CHECKSUM := dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99 +$(PKG)_VERSION := 2.12.0 +$(PKG)_CHECKSUM := b433e4efff1f68fdd8aac221ed1df3ff1e580ffedbada020a703fe64017d8224 $(PKG)_SUBDIR := fontconfig-$($(PKG)_VERSION) $(PKG)_FILE := fontconfig-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://fontconfig.org/release/$($(PKG)_FILE) From 78af2c4712b179a1afdf702251a3e568cbd7c265 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Mon, 4 Jul 2016 08:33:41 +0300 Subject: [PATCH 0780/1463] proj: update from 4.9.1 to 4.9.2 --- src/proj-1-fixes.patch | 12 ------------ src/proj.mk | 4 ++-- 2 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 src/proj-1-fixes.patch diff --git a/src/proj-1-fixes.patch b/src/proj-1-fixes.patch deleted file mode 100644 index 3792b1c0..00000000 --- a/src/proj-1-fixes.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -bruN proj-4.9.1.original/src/Makefile.in proj-4.9.1/src/Makefile.in ---- proj-4.9.1.original/src/Makefile.in 2016-04-05 10:59:38.834624359 +0200 -+++ proj-4.9.1/src/Makefile.in 2016-04-05 11:00:11.073813213 +0200 -@@ -400,7 +400,7 @@ - multistresstest_LDADD = libproj.la -lpthread - test228_LDADD = libproj.la -lpthread - lib_LTLIBRARIES = libproj.la --libproj_la_LDFLAGS = -no-undefined -version-info 9:0:0 -+libproj_la_LDFLAGS = -no-undefined -version-info 0:0:0 - libproj_la_SOURCES = \ - pj_list.h \ - PJ_aeqd.c PJ_gnom.c PJ_laea.c PJ_mod_ster.c \ diff --git a/src/proj.mk b/src/proj.mk index 5581ced0..39d08d64 100644 --- a/src/proj.mk +++ b/src/proj.mk @@ -3,8 +3,8 @@ PKG := proj $(PKG)_IGNORE := -$(PKG)_VERSION := 4.9.1 -$(PKG)_CHECKSUM := fca0388f3f8bc5a1a803d2f6ff30017532367992b30cf144f2d39be88f36c319 +$(PKG)_VERSION := 4.9.2 +$(PKG)_CHECKSUM := 60bf9ad1ed1c18158e652dfff97865ba6fb2b67f1511bc8dceae4b3c7e657796 $(PKG)_SUBDIR := proj-$($(PKG)_VERSION) $(PKG)_FILE := proj-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://download.osgeo.org/proj/$($(PKG)_FILE) From 23a6803b2e91f827cdbc6f13cbe983dc30e1c69d Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Tue, 5 Jul 2016 22:18:50 +0300 Subject: [PATCH 0781/1463] gdal: update from 2.0.2 to 2.1.0 --- src/gdal-1-fixes.patch | 47 ++++++++++++++++++++++-------------------- src/gdal.mk | 4 ++-- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/src/gdal-1-fixes.patch b/src/gdal-1-fixes.patch index 4544444a..67b5895e 100644 --- a/src/gdal-1-fixes.patch +++ b/src/gdal-1-fixes.patch @@ -1,15 +1,16 @@ This file is part of MXE. See index.html for further information. -From ffcbf5c48eb8d8ae6a1c20e1496f1866d7903af8 Mon Sep 17 00:00:00 2001 -From: Timothy Gu +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MXE Date: Sat, 18 Oct 2014 18:25:34 -0400 Subject: [PATCH 1/2] Fix geos detection -Signed-off-by: Timothy Gu diff --git a/m4/geos.m4 b/m4/geos.m4 -index 386a2c8..cda1510 100644 +index 1111111..2222222 100644 --- a/m4/geos.m4 +++ b/m4/geos.m4 @@ -121,14 +121,14 @@ AC_DEFUN([GEOS_INIT],[ @@ -30,31 +31,36 @@ index 386a2c8..cda1510 100644 AC_CHECK_LIB([geos_c], [GEOSversion], --- -1.9.1 - -From 3c60ec35bec710dc9e8fd6f0606abb7646b4f8eb Mon Sep 17 00:00:00 2001 -From: Timothy Gu -Date: Sat, 18 Oct 2014 18:33:43 -0400 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MXE +Date: Tue, 5 Jul 2016 22:23:16 +0300 Subject: [PATCH 2/2] Use AC_PATH_TOOL for config scripts -Signed-off-by: Timothy Gu diff --git a/configure.in b/configure.in -index a0cf595..8ab4b5a 100644 +index 1111111..2222222 100644 --- a/configure.in +++ b/configure.in -@@ -640,7 +640,7 @@ AC_ARG_WITH(pg, +@@ -866,7 +866,7 @@ AC_ARG_WITH(pg, [Include PostgreSQL GDAL/OGR Support (ARG=path to pg_config)]),,) if test "x$with_pg" = "xyes" -o "x$with_pg" = "x" ; then - AC_PATH_PROG(PG_CONFIG, pg_config, no) + AC_PATH_TOOL(PG_CONFIG, pg_config, no) - else + else PG_CONFIG=$with_pg fi -@@ -1719,10 +1719,10 @@ else +@@ -2016,7 +2016,7 @@ KEA_CONFIG=no + AC_ARG_WITH(kea,[ --with-kea[=ARG] Include kealib (ARG=path to kea-config) [[default=yes]]],,) + + if test "$with_kea" = "yes" -o "x$with_kea" = "x" ; then +- AC_PATH_PROG(KEA_CONFIG, kea-config, no) ++ AC_PATH_TOOL(KEA_CONFIG, kea-config, no) + else + KEA_CONFIG=$with_kea + fi +@@ -2079,10 +2079,10 @@ else dnl find nc-config location unset ac_cv_path_NETCDF_NCCONFIG if test "$with_netcdf" = "yes" -o "$with_netcdf" = "" ; then @@ -67,7 +73,7 @@ index a0cf595..8ab4b5a 100644 fi dnl test nc-config -@@ -2447,7 +2447,7 @@ MYSQL_CONFIG=no +@@ -2832,7 +2832,7 @@ MYSQL_CONFIG=no AC_ARG_WITH(mysql,[ --with-mysql[=ARG] Include MySQL (ARG=path to mysql_config) [[default=no]]],,) if test "$with_mysql" = "yes" ; then @@ -76,7 +82,7 @@ index a0cf595..8ab4b5a 100644 else if test "x$with_mysql" != "x" ; then MYSQL_CONFIG=$with_mysql -@@ -2756,7 +2756,7 @@ if test "`basename xx/$with_curl`" = "curl-config" ; then +@@ -3162,7 +3162,7 @@ if test "`basename xx/$with_curl`" = "curl-config" ; then elif test "$with_curl" = "no" ; then LIBCURL_CONFIG=no else @@ -85,7 +91,7 @@ index a0cf595..8ab4b5a 100644 fi if test "$LIBCURL_CONFIG" != "no" ; then -@@ -2798,7 +2798,7 @@ if test "`basename xx/$with_xml2`" = "xml2-config" ; then +@@ -3204,7 +3204,7 @@ if test "`basename xx/$with_xml2`" = "xml2-config" ; then elif test "$with_xml2" = "no" ; then LIBXML2_CONFIG=no else @@ -95,7 +101,7 @@ index a0cf595..8ab4b5a 100644 if test "$LIBXML2_CONFIG" != "no" ; then diff --git a/m4/geos.m4 b/m4/geos.m4 -index cda1510..3fb4490 100644 +index 1111111..2222222 100644 --- a/m4/geos.m4 +++ b/m4/geos.m4 @@ -58,7 +58,7 @@ AC_DEFUN([GEOS_INIT],[ @@ -116,6 +122,3 @@ index cda1510..3fb4490 100644 [] ) --- -1.9.1 - diff --git a/src/gdal.mk b/src/gdal.mk index ff54ca40..ff785b58 100644 --- a/src/gdal.mk +++ b/src/gdal.mk @@ -3,8 +3,8 @@ PKG := gdal $(PKG)_IGNORE := -$(PKG)_VERSION := 2.0.2 -$(PKG)_CHECKSUM := db7722caf8d9dd798ec18012b9cacf40a518918466126a88b9fd277bd7d40cc4 +$(PKG)_VERSION := 2.1.0 +$(PKG)_CHECKSUM := eb499b18e5c5262a803bb7530ae56e95c3293be7b26c74bcadf67489203bf2cd $(PKG)_SUBDIR := gdal-$($(PKG)_VERSION) $(PKG)_FILE := gdal-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://download.osgeo.org/gdal/$($(PKG)_VERSION)/$($(PKG)_FILE) From b57e1bc835830f89cbfd60712dbe59892229dfb0 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 6 Jul 2016 19:09:41 +1000 Subject: [PATCH 0782/1463] go plugin: fix build on darwin build fails with: ``` fatal error: runtime: bsdthread_register error (unset DYLD_INSERT_LIBRARIES) ``` building with `-ldflags -linkmode=external`[1] and `CGO_ENABLED=1` has no affect on `go-native`, it does let `go` bootstrap, but then fails with a similar error: ``` fatal error: runtime: bsdthread_register error ``` easiest to unset DYLD_INSERT_LIBRARIES - no need to check for `darwin` as it only exists on that platform. [1] https://github.com/golang/go/issues/8801#issuecomment-66460009 --- plugins/go/go-native.mk | 1 + plugins/go/go.mk | 2 ++ 2 files changed, 3 insertions(+) diff --git a/plugins/go/go-native.mk b/plugins/go/go-native.mk index fb724efe..2278d2c1 100644 --- a/plugins/go/go-native.mk +++ b/plugins/go/go-native.mk @@ -22,6 +22,7 @@ endef define $(PKG)_BUILD cd '$(1)/src' && \ GOROOT_FINAL='$(PREFIX)/$(TARGET)/go' \ + DYLD_INSERT_LIBRARIES= \ ./make.bash mkdir -p '$(PREFIX)/$(TARGET)/go' diff --git a/plugins/go/go.mk b/plugins/go/go.mk index 36764061..a28f0ed9 100644 --- a/plugins/go/go.mk +++ b/plugins/go/go.mk @@ -24,6 +24,7 @@ define $(PKG)_BUILD GOROOT_FINAL='$(PREFIX)/$(TARGET)/go' \ GOOS=windows \ GOARCH='$(if $(findstring x86_64,$(TARGET)),amd64,386)' \ + DYLD_INSERT_LIBRARIES= \ ./make.bash mkdir -p '$(PREFIX)/$(TARGET)/go' @@ -39,6 +40,7 @@ define $(PKG)_BUILD echo 'CGO_ENABLED=1 \'; \ echo 'GOOS=windows \'; \ echo 'GOARCH=$(if $(findstring x86_64,$(TARGET)),amd64,386) \'; \ + echo 'DYLD_INSERT_LIBRARIES= \'; \ echo 'CC=$(PREFIX)/bin/$(TARGET)-gcc \'; \ echo 'CXX=$(PREFIX)/bin/$(TARGET)-g++ \'; \ echo 'PKG_CONFIG=$(PREFIX)/bin/$(TARGET)-pkg-config \'; \ From 0c7d75309e775f3c7d3e4634ec0727484ddcf441 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Wed, 6 Jul 2016 00:33:05 +0300 Subject: [PATCH 0783/1463] oce: update from 0.16.1 to 0.17.2 --- src/oce.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/oce.mk b/src/oce.mk index 79a70e67..97c5c2f9 100644 --- a/src/oce.mk +++ b/src/oce.mk @@ -3,8 +3,8 @@ PKG := oce $(PKG)_IGNORE := -$(PKG)_VERSION := 0.16.1 -$(PKG)_CHECKSUM := d31030c8da4a1b33f767d0d59895a995c8eabc8fc65cbe0558734f6021ea2f57 +$(PKG)_VERSION := 0.17.2 +$(PKG)_CHECKSUM := 8d9995360cd531cbd4a7aa4ca5ed969f08ec7c7a37755e2f3d4ef832c1b2f56e $(PKG)_SUBDIR := $(PKG)-OCE-$($(PKG)_VERSION) $(PKG)_FILE := OCE-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/tpaviot/oce/archive/$($(PKG)_FILE) @@ -18,15 +18,16 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && cmake . \ - -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \ + mkdir '$(1).build' + cd '$(1).build' && $(TARGET)-cmake '$(1)' \ -DOCE_BUILD_SHARED_LIB=$(if $(BUILD_STATIC),FALSE,TRUE) \ -DOCE_INSTALL_PREFIX=$(PREFIX)/$(TARGET) \ -DOCE_INSTALL_BIN_DIR=$(PREFIX)/$(TARGET)/bin \ -DOCE_INSTALL_LIB_DIR=$(PREFIX)/$(TARGET)/lib \ -DOCE_INSTALL_CMAKE_DATA_DIR=$(PREFIX)/$(TARGET)/lib/cmake/OCE - $(MAKE) -C '$(1)' -j '$(JOBS)' install VERBOSE=1 + $(MAKE) -C '$(1).build' -j '$(JOBS)' VERBOSE=1 + $(MAKE) -C '$(1).build' -j 1 install cd '$(1)/examples/find_package_oce' && cmake . -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' $(MAKE) -C '$(1)/examples/find_package_oce' From 1d4a6c891b3f9cc9f2dd4fbcacc432a90fd50f73 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Thu, 7 Jul 2016 01:47:19 +0300 Subject: [PATCH 0784/1463] README of go plugin: use make var. instead of env --- plugins/go/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/go/README.md b/plugins/go/README.md index 60c3bfd3..6d3c7ddd 100644 --- a/plugins/go/README.md +++ b/plugins/go/README.md @@ -22,7 +22,7 @@ Building [gohs](https://github.com/flier/gohs), GoLang Binding of [HyperScan](https://01.org/hyperscan). ``` -$ MXE_PLUGIN_DIRS=plugins/go make hyperscan go +$ make hyperscan go MXE_PLUGIN_DIRS=plugins/go $ mkdir gopath $ GOPATH=`pwd`/gopath ./usr/bin/i686-w64-mingw32.static-go get \ github.com/flier/gohs/examples/simplegrep From 346eb2e35813572b1f5b9d6e5d0ae7d76cd1ac88 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 7 Jul 2016 01:41:45 +0200 Subject: [PATCH 0785/1463] gnutls: update --- src/gnutls.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gnutls.mk b/src/gnutls.mk index a9a1445f..8f306875 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -2,8 +2,8 @@ # See index.html for further information. PKG := gnutls -$(PKG)_VERSION := 3.4.13 -$(PKG)_CHECKSUM := fd3386e8e72725980bcd7f40949aa0121dcb7650b5147c6490e794555ed25859 +$(PKG)_VERSION := 3.4.14 +$(PKG)_CHECKSUM := 35deddf2779b76ac11057de38bf380b8066c05de21b94263ad5b6dfa75dfbb23 $(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION) $(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://mirrors.dotsrc.org/gnupg/gnutls/v3.4/$($(PKG)_FILE) From 7eed6a5d7a7bb92910e0923aef454b3ab49f0d33 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Wed, 6 Jul 2016 23:42:56 +0000 Subject: [PATCH 0786/1463] Update versions.json & build-matrix.html --- build-matrix.html | 2 +- versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index a35c9378..bb0afa8a 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -859,7 +859,7 @@ feel free to submit a pull request. gnutls - 3.4.13 + 3.4.14 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index 80e415a2..db69318d 100644 --- a/versions.json +++ b/versions.json @@ -81,7 +81,7 @@ "glibmm": "2.42.0", "glm": "0.9.7.4", "gmp": "6.1.1", - "gnutls": "3.4.13", + "gnutls": "3.4.14", "graphicsmagick": "1.3.21", "gsl": "1.16", "gsoap": "2.8.22", From 02487b56e6aa02fc52afa4337562a259c29baef0 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Thu, 7 Jul 2016 02:47:45 +0000 Subject: [PATCH 0787/1463] Update versions.json & build-matrix.html --- build-matrix.html | 14 +++++++------- versions.json | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build-matrix.html b/build-matrix.html index bb0afa8a..9f7c9281 100644 --- a/build-matrix.html +++ b/build-matrix.html @@ -599,7 +599,7 @@ feel free to submit a pull request. fontconfig - 2.11.1 + 2.12.0 ✓ ✓ ✓ @@ -709,7 +709,7 @@ feel free to submit a pull request. gdal - 2.0.2 + 2.1.0 ✓ ✓ ✓ @@ -779,7 +779,7 @@ feel free to submit a pull request. giflib - 5.0.5 + 5.1.4 ✓ ✓ ✓ @@ -2169,7 +2169,7 @@ feel free to submit a pull request. libxml2 - 2.9.2 + 2.9.4 ✓ ✓ ✓ @@ -2179,7 +2179,7 @@ feel free to submit a pull request. libxslt - 1.1.28 + 1.1.29 ✓ ✓ ✓ @@ -2549,7 +2549,7 @@ feel free to submit a pull request. oce - 0.16.1 + 0.17.2 ✓ ✓ ✓ @@ -2969,7 +2969,7 @@ feel free to submit a pull request. proj - 4.9.1 + 4.9.2 ✓ ✓ ✓ diff --git a/versions.json b/versions.json index db69318d..23521aa3 100644 --- a/versions.json +++ b/versions.json @@ -55,7 +55,7 @@ "flac": "1.3.1", "flann": "1.8.4", "fltk": "1.3.3", - "fontconfig": "2.11.1", + "fontconfig": "2.12.0", "freeglut": "3.0.0", "freeimage": "3.15.4", "freetds": "1.00.6", @@ -66,14 +66,14 @@ "gc": "7.2e", "gcc": "4.9.3", "gd": "2.1.0", - "gdal": "2.0.2", + "gdal": "2.1.0", "gdb": "7.11.1", "gdk-pixbuf": "2.32.3", "gendef": "4.0.6", "geoip-database": "20150317-1", "geos": "3.4.2", "gettext": "0.19.8.1", - "giflib": "5.0.5", + "giflib": "5.1.4", "glew": "1.12.0", "glfw2": "2.7.9", "glfw3": "3.1.2", @@ -212,8 +212,8 @@ "libwebp": "0.4.4", "libwebsockets": "1.4-chrome43-firefox-36", "libxml++": "2.37.2", - "libxml2": "2.9.2", - "libxslt": "1.1.28", + "libxml2": "2.9.4", + "libxslt": "1.1.29", "libzip": "0.11.2", "llvm": "3.4", "log4cxx": "0.10.0", @@ -250,7 +250,7 @@ "ocaml-lablgtk2": "2.16.0", "ocaml-native": "4.00.1", "ocaml-xml-light": "2.2", - "oce": "0.16.1", + "oce": "0.17.2", "ogg": "1.3.2", "old": "0.17", "openal": "1.16.0", @@ -292,7 +292,7 @@ "portmidi": "217", "postgresql": "9.2.4", "primesieve": "5.5.0", - "proj": "4.9.1", + "proj": "4.9.2", "protobuf": "2.6.1", "pthreads": "POSIX 1003.1-2001", "qdbm": "1.8.78", From 9ebb730d86dfc9ea416368b2b9042297e3eff9d6 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Thu, 7 Jul 2016 14:13:46 +1000 Subject: [PATCH 0788/1463] oce: disable installing dependent libs this breaks static builds and appears to only be useful for creating self-contained bundles --- src/oce.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/oce.mk b/src/oce.mk index 97c5c2f9..234ba513 100644 --- a/src/oce.mk +++ b/src/oce.mk @@ -24,7 +24,8 @@ define $(PKG)_BUILD -DOCE_INSTALL_PREFIX=$(PREFIX)/$(TARGET) \ -DOCE_INSTALL_BIN_DIR=$(PREFIX)/$(TARGET)/bin \ -DOCE_INSTALL_LIB_DIR=$(PREFIX)/$(TARGET)/lib \ - -DOCE_INSTALL_CMAKE_DATA_DIR=$(PREFIX)/$(TARGET)/lib/cmake/OCE + -DOCE_INSTALL_CMAKE_DATA_DIR=$(PREFIX)/$(TARGET)/lib/cmake/OCE \ + -DOCE_AUTOINSTALL_DEPENDENT_LIBS=OFF $(MAKE) -C '$(1).build' -j '$(JOBS)' VERBOSE=1 $(MAKE) -C '$(1).build' -j 1 install From d13ee525423d12255a9e161ccbbea6b1c6225c11 Mon Sep 17 00:00:00 2001 From: Sergey Perepelitsa Date: Mon, 4 Jul 2016 16:59:54 +0300 Subject: [PATCH 0789/1463] xxHash lib added --- index.html | 4 ++++ src/xxhash-1-fixes.patch | 23 +++++++++++++++++++++++ src/xxhash.mk | 28 ++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 src/xxhash-1-fixes.patch create mode 100644 src/xxhash.mk diff --git a/index.html b/index.html index 67e257e2..902f94e1 100644 --- a/index.html +++ b/index.html @@ -2749,6 +2749,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) zziplib ZZIPlib + + xxhash + xxHash + From fea10aa7591b09a5815ce4073c120a97daca2b19 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 19 Dec 2016 00:22:29 +0100 Subject: [PATCH 1099/1463] libdvdetect: add dependency on openssl It depends through Requires.private. Broken build: https://gist.github.com/c1606f613d18fbcdf938941145f5fbbb --- src/libdvdetect.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libdvdetect.mk b/src/libdvdetect.mk index 43c134fe..652c4a67 100644 --- a/src/libdvdetect.mk +++ b/src/libdvdetect.mk @@ -7,7 +7,7 @@ $(PKG)_CHECKSUM := b098e04660532df78836f50bc0a8044b66c6659b07a6bff6609724ad30a87 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://github.com/nschlia/libdvdetect/releases/download/RELEASE_0_71/$(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_DEPS := gcc tinyxml +$(PKG)_DEPS := gcc openssl tinyxml define $(PKG)_UPDATE $(call MXE_GET_GITHUB_TAGS, libdvdetect/libdvdetect, release-) From 82b4e014af55e59679eebe09238a79cf55f6bcfb Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Mon, 12 Dec 2016 22:55:00 +0100 Subject: [PATCH 1100/1463] update tor to 0.2.9.8 --- plugins/apps/tor-1-fixes.patch | 10 +++++----- plugins/apps/tor.mk | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/apps/tor-1-fixes.patch b/plugins/apps/tor-1-fixes.patch index 63160947..b305e8a6 100644 --- a/plugins/apps/tor-1-fixes.patch +++ b/plugins/apps/tor-1-fixes.patch @@ -16,16 +16,16 @@ diff --git a/src/common/compat.c b/src/common/compat.c index 1111111..2222222 100644 --- a/src/common/compat.c +++ b/src/common/compat.c -@@ -101,7 +101,7 @@ - #ifdef HAVE_SYS_UTIME_H - #include +@@ -116,7 +116,7 @@ SecureZeroMemory(PVOID ptr, SIZE_T cnt) + #ifdef HAVE_SIGNAL_H + #include #endif -#ifdef HAVE_SYS_MMAN_H +#if 0 #include #endif #ifdef HAVE_SYS_SYSLIMITS_H -@@ -191,7 +191,7 @@ tor_rename(const char *path_old, const char *path_new) +@@ -204,7 +204,7 @@ tor_rename(const char *path_old, const char *path_new) sandbox_intern_string(path_new)); } @@ -38,7 +38,7 @@ diff --git a/src/common/compat.h b/src/common/compat.h index 1111111..2222222 100644 --- a/src/common/compat.h +++ b/src/common/compat.h -@@ -285,7 +285,7 @@ typedef struct tor_mmap_t { +@@ -311,7 +311,7 @@ typedef struct tor_mmap_t { size_t size; /**< Size of the file. */ /* None of the fields below should be accessed from outside compat.c */ diff --git a/plugins/apps/tor.mk b/plugins/apps/tor.mk index 4ac4e721..2b8ebf2a 100644 --- a/plugins/apps/tor.mk +++ b/plugins/apps/tor.mk @@ -2,8 +2,8 @@ PKG := tor $(PKG)_IGNORE := -$(PKG)_VERSION := 0.2.6.10 -$(PKG)_CHECKSUM := 0542c0efe43b86619337862fa7eb02c7a74cb23a79d587090628a5f0f1224b8d +$(PKG)_VERSION := 0.2.9.8 +$(PKG)_CHECKSUM := fbdd33d3384574297b88744622382008d1e0f9ddd300d330746c464b7a7d746a $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := https://torproject.org/dist/$($(PKG)_FILE) From eddecf84b056ac9b02bc376e3bf0a4b7b6f759bc Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Wed, 21 Dec 2016 05:15:38 +0100 Subject: [PATCH 1101/1463] native upx: disable asm It fails to build on 32-bit Ubuntu due to attempt to use ASM version. See http://lists.nongnu.org/archive/html/mingw-cross-env-list/2016-12/msg00000.html --- src/upx.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/src/upx.mk b/src/upx.mk index 3f252110..eeeea903 100644 --- a/src/upx.mk +++ b/src/upx.mk @@ -48,6 +48,7 @@ define $(PKG)_BUILD_$(BUILD) CC='$(BUILD_CC)' \ PKG_CONFIG='$(PREFIX)/$(BUILD)/bin/pkgconf' \ LIBS='-L$(PREFIX)/$(BUILD)/lib -lucl -lz' \ + CXXFLAGS=-DUCL_NO_ASM \ CXXFLAGS_WERROR= \ exeext= cp '$(1)/src/upx' '$(PREFIX)/$(BUILD)/bin/' From 5cd51be53b43bbe5c8a026e1d6d69a819207b69a Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 21 Dec 2016 14:04:05 +0100 Subject: [PATCH 1102/1463] update curl --- src/curl.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/curl.mk b/src/curl.mk index 7c94b3a3..43d245dc 100644 --- a/src/curl.mk +++ b/src/curl.mk @@ -2,8 +2,8 @@ PKG := curl $(PKG)_IGNORE := -$(PKG)_VERSION := 7.51.0 -$(PKG)_CHECKSUM := 9eef5f6bbb972ffc631f4c76cfe93161bf5186926133c77267b24f5191700518 +$(PKG)_VERSION := 7.52.0 +$(PKG)_CHECKSUM := c8f0114c7c72c8627d716416326593d061274b208cdf123c418c20c6dbe009c2 $(PKG)_SUBDIR := curl-$($(PKG)_VERSION) $(PKG)_FILE := curl-$($(PKG)_VERSION).tar.lzma $(PKG)_URL := http://curl.haxx.se/download/$($(PKG)_FILE) From 36eb1cf5b9d2ea35403159b0246d4211098ce739 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 21 Dec 2016 14:04:42 +0100 Subject: [PATCH 1103/1463] update gcc6 to 6.3.0 --- plugins/gcc6/gcc6-overlay.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/gcc6/gcc6-overlay.mk b/plugins/gcc6/gcc6-overlay.mk index beada618..286c8648 100644 --- a/plugins/gcc6/gcc6-overlay.mk +++ b/plugins/gcc6/gcc6-overlay.mk @@ -17,8 +17,8 @@ $(PKG)_URL := http://isl.gforge.inria.fr/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://gcc.gnu.org/pub/gcc/infrastructure/$($(PKG)_FILE) PKG := gcc -$(PKG)_VERSION := 6.2.0 -$(PKG)_CHECKSUM := 9944589fc722d3e66308c0ce5257788ebd7872982a718aa2516123940671b7c5 +$(PKG)_VERSION := 6.3.0 +$(PKG)_CHECKSUM := f06ae7f3f790fbf0f018f6d40e844451e6bc3b7bc96e128e63b09825c1f8b29f $(PKG)_SUBDIR := gcc-$($(PKG)_VERSION) $(PKG)_FILE := gcc-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://ftp.gnu.org/pub/gnu/gcc/gcc-$($(PKG)_VERSION)/$($(PKG)_FILE) From d6ab5f64b81f4692fd8c24e99404b6915133a530 Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Wed, 21 Dec 2016 14:07:16 +0000 Subject: [PATCH 1104/1463] Update versions.json & build-matrix.html --- docs/build-matrix.html | 2 +- docs/versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/build-matrix.html b/docs/build-matrix.html index a18c1459..988a09ab 100644 --- a/docs/build-matrix.html +++ b/docs/build-matrix.html @@ -429,7 +429,7 @@ feel free to submit a pull request. curl - 7.51.0 + 7.52.0 ✓ ✓ ✓ diff --git a/docs/versions.json b/docs/versions.json index 6e90ae3f..784ce92e 100644 --- a/docs/versions.json +++ b/docs/versions.json @@ -38,7 +38,7 @@ "cryptopp": "5.6.3", "crystalhd": "1", "cunit": "2.1-3", - "curl": "7.51.0", + "curl": "7.52.0", "db": "6.1.26", "dbus": "1.11.8", "dcmtk": "3.6.0", From 2cf71a20ebc4558001a2d030324a015de953831d Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Fri, 30 Sep 2016 23:38:08 +0100 Subject: [PATCH 1105/1463] apps: add ricochet 1.1.4 --- plugins/apps/ricochet.mk | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 plugins/apps/ricochet.mk diff --git a/plugins/apps/ricochet.mk b/plugins/apps/ricochet.mk new file mode 100644 index 00000000..7765a677 --- /dev/null +++ b/plugins/apps/ricochet.mk @@ -0,0 +1,28 @@ +# This file is part of MXE. See LICENSE.md for licensing information. + +PKG := ricochet +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.1.4 +$(PKG)_CHECKSUM := f5f32caa3480def1de5c93010c6bf5f5789ddcba34bf09fc0feab67696d0c374 +$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) +$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION)-src.tar.bz2 +$(PKG)_URL := https://ricochet.im/releases/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_WEBSITE := https://ricochet.im/ +$(PKG)_OWNER := https://github.com/starius +$(PKG)_DEPS := gcc openssl protobuf qt5 + +define $(PKG)_UPDATE + $(call MXE_GET_GITHUB_TAGS, ricochet-im/ricochet, v) +endef + +define $(PKG)_BUILD + # TODO: add libasan and libubsan and let ricochet use them. + # See https://github.com/ricochet-im/ricochet/blob/master/BUILDING.md#hardening + cd '$(BUILD_DIR)' && \ + '$(TARGET)-qmake-qt5' \ + OPENSSLDIR='$(PREFIX)/$(TARGET)' \ + PROTOBUFDIR='$(PREFIX)/$(TARGET)' \ + '$(SOURCE_DIR)' + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' + cp '$(BUILD_DIR)'/release/ricochet.exe '$(PREFIX)/$(TARGET)/bin/' +endef From 52d6a741e85511a55f3b382250e84fa6918251fa Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 22 Dec 2016 13:33:38 +0100 Subject: [PATCH 1106/1463] update libgpg_error --- src/libgpg_error.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libgpg_error.mk b/src/libgpg_error.mk index 405752f3..d787fee0 100644 --- a/src/libgpg_error.mk +++ b/src/libgpg_error.mk @@ -2,8 +2,8 @@ PKG := libgpg_error $(PKG)_IGNORE := -$(PKG)_VERSION := 1.25 -$(PKG)_CHECKSUM := f628f75843433b38b05af248121beb7db5bd54bb2106f384edac39934261320c +$(PKG)_VERSION := 1.26 +$(PKG)_CHECKSUM := 4c4bcbc90116932e3acd37b37812d8653b1b189c1904985898e860af818aee69 $(PKG)_SUBDIR := libgpg-error-$($(PKG)_VERSION) $(PKG)_FILE := libgpg-error-$($(PKG)_VERSION).tar.bz2 $(PKG)_URL := http://mirrors.dotsrc.org/gcrypt/libgpg-error/$($(PKG)_FILE) From ad43c7004d3a618827baaedc546ce9b22b25ed9f Mon Sep 17 00:00:00 2001 From: MXEBot as Travis CI Date: Thu, 22 Dec 2016 12:39:30 +0000 Subject: [PATCH 1107/1463] Update versions.json & build-matrix.html --- docs/build-matrix.html | 2 +- docs/versions.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/build-matrix.html b/docs/build-matrix.html index 988a09ab..33a6b818 100644 --- a/docs/build-matrix.html +++ b/docs/build-matrix.html @@ -1709,7 +1709,7 @@ feel free to submit a pull request. libgpg_error - 1.25 + 1.26 ✓ ✓ ✓ diff --git a/docs/versions.json b/docs/versions.json index 784ce92e..ccaabab7 100644 --- a/docs/versions.json +++ b/docs/versions.json @@ -166,7 +166,7 @@ "libgit2": "0.23.2", "libglade": "2.6.4", "libgnurx": "2.6.1", - "libgpg_error": "1.25", + "libgpg_error": "1.26", "libgsasl": "1.8.0", "libgsf": "1.14.30", "libharu": "2.2.1", From f06ef1c01b1a93b9e3bfff5ea2e66992c35547ed Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 18 Dec 2016 06:22:25 +0100 Subject: [PATCH 1108/1463] mv docs/versions.json docs/packages.json See https://github.com/mxe/mxe/issues/1422 --- .travis.yml | 2 +- Makefile | 4 ++-- docs/index.html | 2 +- docs/{versions.json => packages.json} | 0 tools/mxe-activate | 2 +- tools/travis-push.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename docs/{versions.json => packages.json} (100%) diff --git a/.travis.yml b/.travis.yml index 937c3236..aa8b2157 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: c sudo: false script: - - make docs/build-matrix.html docs/versions.json + - make docs/build-matrix.html docs/packages.json - if [ "$GH_TOKEN" != "" ]; then ./tools/travis-push.sh; fi - make download -j 6 -k MXE_PLUGIN_DIRS="$(./tools/plugins-with-additional-packages.sh)" diff --git a/Makefile b/Makefile index 044adb56..f8ea6da1 100644 --- a/Makefile +++ b/Makefile @@ -864,8 +864,8 @@ docs/build-matrix.html: $(foreach 1,$(PKGS),$(PKG_MAKEFILES)) @echo '' >> $@ @echo '' >> $@ -.PHONY: docs/versions.json -docs/versions.json: $(foreach 1,$(PKGS),$(PKG_MAKEFILES)) +.PHONY: docs/packages.json +docs/packages.json: $(foreach 1,$(PKGS),$(PKG_MAKEFILES)) @echo '{' > $@ @{$(foreach PKG,$(PKGS), \ echo ' "$(PKG)": \ diff --git a/docs/index.html b/docs/index.html index a2b5c59a..67ba60ea 100644 --- a/docs/index.html +++ b/docs/index.html @@ -2827,7 +2827,7 @@ local-pkg-list: $(LOCAL_PKG_LIST) } function loadVersionCache(doneCallback) { var request = new XMLHttpRequest(); - request.open('GET', 'versions.json', true); + request.open('GET', 'packages.json', true); request.onreadystatechange = function reqCallback() { if (request.readyState === 4) { if (request.status === 200) { diff --git a/docs/versions.json b/docs/packages.json similarity index 100% rename from docs/versions.json rename to docs/packages.json diff --git a/tools/mxe-activate b/tools/mxe-activate index 1abffb89..3d45e78c 100644 --- a/tools/mxe-activate +++ b/tools/mxe-activate @@ -56,7 +56,7 @@ _mxe() ;; [!-]*) pkgs+=" docs/build-matrix.html \ - docs/versions.json \ + docs/packages.json \ check-requirements \ clean \ clean-junk \ diff --git a/tools/travis-push.sh b/tools/travis-push.sh index 6a7b3f7a..c8d4b1b5 100755 --- a/tools/travis-push.sh +++ b/tools/travis-push.sh @@ -8,5 +8,5 @@ git config --global push.default simple git config credential.helper "store --file=.git/credentials" echo "https://${GH_TOKEN}:@github.com" > .git/credentials git remote set-url origin 'https://github.com/mxe/mxe.git' -git commit -a -m 'Update versions.json & build-matrix.html' || true +git commit -a -m 'Update packages.json & build-matrix.html' || true git push origin HEAD:master From 5d832ebf703325cf693a48d092cc4c697d216b57 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sat, 17 Dec 2016 21:54:32 +0100 Subject: [PATCH 1109/1463] core packages are now a plugin See https://github.com/mxe/mxe/issues/1422 --- Makefile | 44 ++++++++++++++++---------------------------- patch.mk | 8 ++++---- 2 files changed, 20 insertions(+), 32 deletions(-) diff --git a/Makefile b/Makefile index f8ea6da1..25cb9d67 100644 --- a/Makefile +++ b/Makefile @@ -49,8 +49,6 @@ GIT_HEAD := $(shell git rev-parse HEAD) TIMESTAMP := $(shell date +%Y%m%d_%H%M%S) PKG_DIR := $(PWD)/pkg TMP_DIR = $(MXE_TMP)/tmp-$(1) -PKGS := $(call set_create,\ - $(shell $(SED) -n 's/^.* class="package">\([^<]*\)<.*$$/\1/p' '$(TOP_DIR)/docs/index.html')) BUILD := $(shell '$(EXT_DIR)/config.guess') PATH := $(PREFIX)/$(BUILD)/bin:$(PREFIX)/bin:$(PATH) @@ -60,10 +58,9 @@ STRIP_LIB := $(false) STRIP_EXE := $(true) # All pkgs have (implied) order-only dependencies on MXE_CONF_PKGS. -# These aren't meaningful to the pkg list in docs/index.html so +# These aren't meaningful to the pkg list in http://mxe.cc/#packages so # use a list in case we want to separate autotools, cmake etc. MXE_CONF_PKGS := mxe-conf -PKGS += $(MXE_CONF_PKGS) # define some whitespace variables define newline @@ -196,11 +193,11 @@ UNPACK_PKG_ARCHIVE = \ # some shortcuts for awareness of MXE_PLUGIN_DIRS # all files for extension plugins will be considered for outdated checks -PKG_MAKEFILES = $(realpath $(sort $(wildcard $(addsuffix /$(1).mk, $(TOP_DIR)/src $(MXE_PLUGIN_DIRS))))) -PKG_TESTFILES = $(realpath $(sort $(wildcard $(addsuffix /$(1)-test*, $(TOP_DIR)/src $(MXE_PLUGIN_DIRS))))) +PKG_MAKEFILES = $(realpath $(sort $(wildcard $(addsuffix /$(1).mk, $(MXE_PLUGIN_DIRS))))) +PKG_TESTFILES = $(realpath $(sort $(wildcard $(addsuffix /$(1)-test*, $(MXE_PLUGIN_DIRS))))) # allow packages to specify a list of zero or more patches PKG_PATCHES = $(if $(findstring undefined,$(origin $(1)_PATCHES)), \ - $(realpath $(sort $(wildcard $(addsuffix /$(1)-[0-9]*.patch, $(TOP_DIR)/src $(MXE_PLUGIN_DIRS))))) \ + $(realpath $(sort $(wildcard $(addsuffix /$(1)-[0-9]*.patch, $(MXE_PLUGIN_DIRS))))) \ $(else), \ $($(1)_PATCHES)) @@ -310,14 +307,8 @@ endif LIST_NMAX = $(shell echo '$(strip $(1))' | tr ' ' '\n' | sort -n | tail -1) LIST_NMIN = $(shell echo '$(strip $(1))' | tr ' ' '\n' | sort -n | head -1) -NPROCS := $(shell nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 1) -JOBS_AUTO := $(call LIST_NMIN, $(DEFAULT_MAX_JOBS) $(NPROCS)) -JOBS := $(strip $(if $(findstring undefined,$(origin JOBS)),\ - $(if $(and $(MAKECMDGOALS),$(filter $(MAKECMDGOALS),$(PKGS))), \ - $(info [using autodetected $(JOBS_AUTO) job(s)])) \ - $(JOBS_AUTO)\ - ,\ - $(JOBS))) +NPROCS := $(shell nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo 1) +JOBS := $(call LIST_NMIN, $(DEFAULT_MAX_JOBS) $(NPROCS)) # cache some target string manipulation functions # `memoize` and `uc` from gmsl @@ -347,6 +338,9 @@ LOOKUP_PKG_RULE = $(strip \ .PHONY: all all: all-filtered +# Core packages. +override MXE_PLUGIN_DIRS += $(realpath $(TOP_DIR)/src) + # Build native requirements for certain systems OS_SHORT_NAME := $(call lc,$(shell lsb_release -sc 2>/dev/null || uname -s)) override MXE_PLUGIN_DIRS += $(realpath $(TOP_DIR)/plugins/native/$(OS_SHORT_NAME)) @@ -394,12 +388,6 @@ $(PREFIX)/installed/print-git-oneline-$(GIT_HEAD): | $(PREFIX)/installed/.gitkee @rm -f '$(PREFIX)/installed/print-git-oneline-'* @touch '$@' -# include core MXE packages and set base filenames -include $(patsubst %,$(TOP_DIR)/src/%.mk,$(PKGS)) -$(foreach PKG,$(PKGS),\ - $(eval $(PKG)_MAKEFILE := $(realpath $(TOP_DIR)/src/$(PKG).mk)) \ - $(eval $(PKG)_TEST_FILE := $(realpath $(wildcard $(TOP_DIR)/src/$(PKG)-test.*)))) - # include files from MXE_PLUGIN_DIRS, set base filenames and `all-` target PLUGIN_FILES := $(realpath $(wildcard $(addsuffix /*.mk,$(MXE_PLUGIN_DIRS)))) PLUGIN_PKGS := $(basename $(notdir $(PLUGIN_FILES))) @@ -408,7 +396,7 @@ $(foreach FILE,$(PLUGIN_FILES),\ $(eval $(basename $(notdir $(FILE)))_TEST_FILE ?= $(wildcard $(basename $(FILE))-test.*)) \ $(eval all-$(lastword $(call split,/,$(dir $(FILE)))): $(basename $(notdir $(FILE))))) include $(PLUGIN_FILES) -PKGS := $(sort $(PKGS) $(PLUGIN_PKGS)) +PKGS := $(sort $(MXE_CONF_PKGS) $(PLUGIN_PKGS)) # create target sets for PKG_TARGET_RULE loop to avoid creating empty rules # and having to explicitly disable $(BUILD) for most packages @@ -593,7 +581,7 @@ build-only-$(1)_$(3): $$(if $(value $(call LOOKUP_PKG_RULE,$(1),FILE,$(3))),\ $$(call PREPARE_PKG_SOURCE,$(1),$(2))) - $$(call $(call LOOKUP_PKG_RULE,$(1),BUILD,$(3)),$(2)/$($(1)_SUBDIR),$(TOP_DIR)/src/$(1)-test) + $$(call $(call LOOKUP_PKG_RULE,$(1),BUILD,$(3)),$(2)/$($(1)_SUBDIR)) @echo @find '$(2)' -name 'config.log' -print -exec cat {} \; @echo @@ -656,7 +644,7 @@ show-deps-%: $(newline)$(newline)$* downstream dependents:$(newline)\ $(call WALK_DOWNSTREAM,$*))\ @echo,\ - $(error Package $* not found in docs/index.html)) + $(error Package $* not found)) # show upstream dependencies and downstream dependents separately # suitable for usage in shell with: `make show-downstream-deps-foo` @@ -666,14 +654,14 @@ show-downstream-deps-%: $(call SET_CLEAR,PKGS_VISITED)\ $(info $(call WALK_DOWNSTREAM,$*))\ @echo -n,\ - $(error Package $* not found in docs/index.html)) + $(error Package $* not found)) show-upstream-deps-%: $(if $(call set_is_member,$*,$(PKGS)),\ $(call SET_CLEAR,PKGS_VISITED)\ $(info $(call WALK_UPSTREAM,$*))\ @echo -n,\ - $(error Package $* not found in docs/index.html)) + $(error Package $* not found)) # print first level pkg deps for use in build-pkg.lua .PHONY: print-deps-for-build-pkg @@ -731,13 +719,13 @@ update: update-package-%: $(if $(call set_is_member,$*,$(PKGS)), \ $(and $($*_UPDATE),$(call UPDATE,$*,$(shell $($*_UPDATE)))), \ - $(error Package $* not found in docs/index.html)) + $(error Package $* not found)) update-checksum-%: $(if $(call set_is_member,$*,$(PKGS)), \ $(call DOWNLOAD_PKG_ARCHIVE,$*) && \ $(SED) -i 's/^\([^ ]*_CHECKSUM *:=\).*/\1 '"`$(call PKG_CHECKSUM,$*)`"'/' '$($*_MAKEFILE)', \ - $(error Package $* not found in docs/index.html)) + $(error Package $* not found)) .PHONY: cleanup-style define CLEANUP_STYLE diff --git a/patch.mk b/patch.mk index d73fc0a7..c036784d 100644 --- a/patch.mk +++ b/patch.mk @@ -63,14 +63,14 @@ init-git-%: download-only-% $(if $(wildcard $(call GIT_DIR,$*)), \ $(error $(call GIT_DIR,$*) already exists), \ $(call INIT_GIT,$*)), \ - $(error Package $* not found in docs/index.html)) + $(error Package $* not found)) import-patch-%: $(if $(call set_is_member,$*,$(PKGS)), \ $(if $(wildcard $(call GIT_DIR,$*)), \ $(call IMPORT_PATCH,$*,$(call PATCH_BY_NAME,$*,$(PATCH_NAME))), \ $(error $(call GIT_DIR,$*) does not exist)), \ - $(error Package $* not found in docs/index.html)) + $(error Package $* not found)) import-all-patches-%: $(if $(call set_is_member,$*,$(PKGS)), \ @@ -78,11 +78,11 @@ import-all-patches-%: $(foreach PKG_PATCH,$(call PKG_PATCHES,$*), \ $(call IMPORT_PATCH,$*,$(PKG_PATCH))), \ $(error $(call GIT_DIR,$*) does not exist)), \ - $(error Package $* not found in docs/index.html)) + $(error Package $* not found)) export-patch-%: $(if $(call set_is_member,$*,$(PKGS)), \ $(if $(wildcard $(call GIT_DIR,$*)), \ $(call EXPORT_PATCH,$*,$(PATCH_NAME)), \ $(error $(call GIT_DIR,$*) does not exist)), \ - $(error Package $* not found in docs/index.html)) + $(error Package $* not found)) From 74163f17940921a2ae0ebc95f4b0916cc5bd7f06 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 18 Dec 2016 06:43:56 +0100 Subject: [PATCH 1110/1463] add _WEBSITE and _DESCR fields to core packages See https://github.com/mxe/mxe/issues/1422 Automation (Python 2 code): https://gist.github.com/9f5c315e5d0cf113d41dc454b7a0eb41 --- src/a52dec.mk | 2 ++ src/agg.mk | 2 ++ src/alure.mk | 1 + src/apr-util.mk | 2 ++ src/apr.mk | 2 ++ src/armadillo.mk | 2 ++ src/aspell.mk | 2 ++ src/assimp.mk | 2 ++ src/atk.mk | 2 ++ src/atkmm.mk | 2 ++ src/aubio.mk | 1 + src/bfd.mk | 2 ++ src/binutils.mk | 2 ++ src/blas.mk | 1 + src/boost.mk | 2 ++ src/box2d.mk | 2 ++ src/bullet.mk | 2 ++ src/bzip2.mk | 1 + src/cairo.mk | 1 + src/cairomm.mk | 1 + src/cblas.mk | 1 + src/ccfits.mk | 2 ++ src/cegui.mk | 2 ++ src/cfitsio.mk | 1 + src/cgal.mk | 1 + src/check.mk | 1 + src/chipmunk.mk | 2 ++ src/chromaprint.mk | 2 ++ src/cimg.mk | 2 ++ src/cloog.mk | 2 ++ src/cmake.mk | 1 + src/cminpack.mk | 1 + src/coda.mk | 2 ++ src/coin.mk | 2 ++ src/cpp-netlib.mk | 2 ++ src/cppunit.mk | 2 ++ src/cryptopp.mk | 2 ++ src/crystalhd.mk | 2 ++ src/cunit.mk | 1 + src/curl.mk | 2 ++ src/db.mk | 2 ++ src/dbus.mk | 1 + src/dcmtk.mk | 2 ++ src/devil.mk | 2 ++ src/djvulibre.mk | 2 ++ src/dlfcn-win32.mk | 2 ++ src/eigen.mk | 1 + src/exiv2.mk | 2 ++ src/expat.mk | 2 ++ src/faad2.mk | 1 + src/fdk-aac.mk | 2 ++ src/ffmpeg.mk | 1 + src/fftw.mk | 1 + src/file.mk | 1 + src/flac.mk | 2 ++ src/flann.mk | 2 ++ src/fltk.mk | 2 ++ src/fontconfig.mk | 1 + src/freeglut.mk | 1 + src/freeimage.mk | 2 ++ src/freetds.mk | 2 ++ src/freetype-bootstrap.mk | 2 ++ src/freetype.mk | 1 + src/fribidi.mk | 2 ++ src/ftgl.mk | 1 + src/gc.mk | 1 + src/gcc.mk | 2 ++ src/gd.mk | 2 ++ src/gdal.mk | 2 ++ src/gdb.mk | 1 + src/gdk-pixbuf.mk | 2 ++ src/gendef.mk | 1 + src/geoip-database.mk | 2 ++ src/geos.mk | 2 ++ src/gettext.mk | 1 + src/ghostscript.mk | 1 + src/giflib.mk | 1 + src/glew.mk | 2 ++ src/glfw2.mk | 2 ++ src/glfw3.mk | 2 ++ src/glib.mk | 2 ++ src/glibmm.mk | 2 ++ src/glm.mk | 2 ++ src/glpk.mk | 2 ++ src/gmp.mk | 2 ++ src/gnutls.mk | 2 ++ src/googlemock.mk | 2 ++ src/googletest.mk | 2 ++ src/graphicsmagick.mk | 2 ++ src/gsl.mk | 2 ++ src/gsoap.mk | 2 ++ src/gst-plugins-bad.mk | 1 + src/gst-plugins-base.mk | 1 + src/gst-plugins-good.mk | 1 + src/gst-plugins-ugly.mk | 1 + src/gstreamer.mk | 1 + src/gta.mk | 1 + src/gtk2.mk | 2 ++ src/gtk3.mk | 2 ++ src/gtkglarea.mk | 2 ++ src/gtkglext.mk | 2 ++ src/gtkglextmm.mk | 2 ++ src/gtkimageview.mk | 2 ++ src/gtkmm2.mk | 2 ++ src/gtkmm3.mk | 2 ++ src/gtksourceview.mk | 2 ++ src/gtksourceviewmm2.mk | 2 ++ src/guile.mk | 2 ++ src/harfbuzz.mk | 2 ++ src/hdf-eos2.mk | 2 ++ src/hdf-eos5.mk | 2 ++ src/hdf4.mk | 2 ++ src/hdf5.mk | 2 ++ src/hunspell.mk | 2 ++ src/hyperscan.mk | 2 ++ src/icu4c.mk | 2 ++ src/id3lib.mk | 1 + src/ilmbase.mk | 2 ++ src/imagemagick.mk | 2 ++ src/isl.mk | 2 ++ src/itk.mk | 2 ++ src/jack.mk | 2 ++ src/jansson.mk | 2 ++ src/jasper.mk | 2 ++ src/jpeg.mk | 1 + src/json-c.mk | 1 + src/json-glib.mk | 2 ++ src/json_spirit.mk | 1 + src/jsoncpp.mk | 1 + src/lame.mk | 1 + src/lapack.mk | 1 + src/lcms.mk | 1 + src/lcms1.mk | 1 + src/lensfun.mk | 1 + src/levmar.mk | 1 + src/libaacs.mk | 1 + src/libarchive.mk | 2 ++ src/libass.mk | 1 + src/libbluray.mk | 1 + src/libbs2b.mk | 2 ++ src/libcaca.mk | 1 + src/libcddb.mk | 2 ++ src/libcdio-paranoia.mk | 2 ++ src/libcdio.mk | 2 ++ src/libcomm14cux.mk | 1 + src/libcroco.mk | 2 ++ src/libdnet.mk | 1 + src/libdvbpsi.mk | 1 + src/libdvdcss.mk | 1 + src/libdvdetect.mk | 2 ++ src/libdvdnav.mk | 1 + src/libdvdread.mk | 1 + src/libechonest.mk | 1 + src/libepoxy.mk | 1 + src/libevent.mk | 1 + src/libf2c.mk | 1 + src/libffi.mk | 1 + src/libftdi.mk | 2 ++ src/libftdi1.mk | 2 ++ src/libgcrypt.mk | 1 + src/libgda.mk | 1 + src/libgdamm.mk | 1 + src/libgee.mk | 1 + src/libgeotiff.mk | 2 ++ src/libgit2.mk | 1 + src/libglade.mk | 2 ++ src/libgnurx.mk | 1 + src/libgpg_error.mk | 2 ++ src/libgsasl.mk | 2 ++ src/libgsf.mk | 1 + src/libharu.mk | 1 + src/libiberty.mk | 1 + src/libical.mk | 1 + src/libiconv.mk | 1 + src/libid3tag.mk | 1 + src/libidn.mk | 2 ++ src/libieee1284.mk | 1 + src/libircclient.mk | 1 + src/libjpeg-turbo.mk | 1 + src/liblaxjson.mk | 1 + src/liblo.mk | 1 + src/liblqr-1.mk | 1 + src/liblsmash.mk | 2 ++ src/libltdl.mk | 2 ++ src/libmad.mk | 1 + src/libmicrohttpd.mk | 2 ++ src/libmikmod.mk | 2 ++ src/libmng.mk | 1 + src/libmodplug.mk | 1 + src/libmpcdec.mk | 1 + src/libmysqlclient.mk | 1 + src/libnice.mk | 1 + src/libntlm.mk | 2 ++ src/liboauth.mk | 1 + src/libodbc++.mk | 1 + src/liboil.mk | 1 + src/libpano13.mk | 1 + src/libpaper.mk | 1 + src/libplist.mk | 1 + src/libpng.mk | 1 + src/librosco.mk | 1 + src/librsvg.mk | 1 + src/librtmp.mk | 1 + src/libsamplerate.mk | 1 + src/libshout.mk | 1 + src/libsigc++.mk | 1 + src/libsndfile.mk | 1 + src/libsodium.mk | 1 + src/libsoup.mk | 1 + src/libspectre.mk | 1 + src/libssh2.mk | 1 + src/libsvm.mk | 1 + src/libtool.mk | 2 ++ src/libtorrent-rasterbar.mk | 1 + src/libunistring.mk | 1 + src/libusb.mk | 2 ++ src/libusb1.mk | 2 ++ src/libuv.mk | 1 + src/libvpx.mk | 2 ++ src/libwebp.mk | 1 + src/libwebsockets.mk | 1 + src/libxml++.mk | 2 ++ src/libxml2.mk | 1 + src/libxslt.mk | 1 + src/libzip.mk | 1 + src/llvm.mk | 1 + src/log4cxx.mk | 1 + src/lua.mk | 2 ++ src/luabind.mk | 2 ++ src/luajit.mk | 2 ++ src/lzma.mk | 2 ++ src/lzo.mk | 1 + src/matio.mk | 1 + src/mdbtools.mk | 1 + src/mingw-w64.mk | 2 ++ src/miniupnpc.mk | 1 + src/minizip.mk | 1 + src/mman-win32.mk | 2 ++ src/mpc.mk | 2 ++ src/mpfr.mk | 1 + src/mpg123.mk | 1 + src/muparser.mk | 2 ++ src/muparserx.mk | 2 ++ src/mxml.mk | 2 ++ src/ncurses.mk | 2 ++ src/neon.mk | 2 ++ src/netcdf.mk | 2 ++ src/netpbm.mk | 2 ++ src/nettle.mk | 1 + src/nlopt.mk | 2 ++ src/nsis.mk | 2 ++ src/ocaml-cairo.mk | 2 ++ src/ocaml-camlimages.mk | 2 ++ src/ocaml-core.mk | 2 ++ src/ocaml-findlib.mk | 2 ++ src/ocaml-flexdll.mk | 2 ++ src/ocaml-lablgl.mk | 2 ++ src/ocaml-lablgtk2.mk | 2 ++ src/ocaml-native.mk | 2 ++ src/ocaml-xml-light.mk | 2 ++ src/oce.mk | 2 ++ src/ogg.mk | 2 ++ src/old.mk | 1 + src/openal.mk | 1 + src/openblas.mk | 2 ++ src/opencore-amr.mk | 1 + src/opencsg.mk | 1 + src/opencv.mk | 2 ++ src/openexr.mk | 2 ++ src/openjpeg.mk | 2 ++ src/openmp-validation.mk | 2 ++ src/openscenegraph.mk | 2 ++ src/openssl.mk | 1 + src/openthreads.mk | 2 ++ src/opus.mk | 1 + src/opusfile.mk | 1 + src/ossim.mk | 2 ++ src/pango.mk | 2 ++ src/pangomm.mk | 2 ++ src/pcl.mk | 2 ++ src/pcre.mk | 2 ++ src/pdcurses.mk | 2 ++ src/pdflib_lite.mk | 2 ++ src/pfstools.mk | 1 + src/physfs.mk | 1 + src/picomodel.mk | 1 + src/pire.mk | 2 ++ src/pixman.mk | 1 + src/pkgconf.mk | 1 + src/plib.mk | 2 ++ src/plibc.mk | 2 ++ src/plotmm.mk | 2 ++ src/plotutils.mk | 1 + src/poco.mk | 2 ++ src/polarssl.mk | 2 ++ src/poppler.mk | 1 + src/popt.mk | 1 + src/portablexdr.mk | 2 ++ src/portaudio.mk | 1 + src/portmidi.mk | 1 + src/postgresql.mk | 2 ++ src/primesieve.mk | 2 ++ src/proj.mk | 1 + src/protobuf.mk | 1 + src/pthreads.mk | 2 ++ src/qdbm.mk | 2 ++ src/qhttpengine.mk | 1 + src/qjson.mk | 2 ++ src/qscintilla2.mk | 2 ++ src/qt.mk | 2 ++ src/qt3d.mk | 2 ++ src/qt5.mk | 2 ++ src/qtactiveqt.mk | 2 ++ src/qtbase.mk | 2 ++ src/qtcanvas3d.mk | 2 ++ src/qtcharts.mk | 2 ++ src/qtconnectivity.mk | 2 ++ src/qtdatavis3d.mk | 2 ++ src/qtdeclarative-render2d.mk | 2 ++ src/qtdeclarative.mk | 2 ++ src/qtgamepad.mk | 2 ++ src/qtgraphicaleffects.mk | 2 ++ src/qtimageformats.mk | 2 ++ src/qtlocation.mk | 2 ++ src/qtmultimedia.mk | 2 ++ src/qtofficeopenxml.mk | 2 ++ src/qtpurchasing.mk | 2 ++ src/qtquickcontrols.mk | 2 ++ src/qtquickcontrols2.mk | 2 ++ src/qtscript.mk | 2 ++ src/qtscxml.mk | 2 ++ src/qtsensors.mk | 2 ++ src/qtserialbus.mk | 2 ++ src/qtserialport.mk | 2 ++ src/qtserialport_qt4.mk | 2 ++ src/qtservice.mk | 2 ++ src/qtsparkle_qt4.mk | 2 ++ src/qtsvg.mk | 2 ++ src/qtsystems.mk | 2 ++ src/qttools.mk | 2 ++ src/qttranslations.mk | 2 ++ src/qtvirtualkeyboard.mk | 2 ++ src/qtwebchannel.mk | 2 ++ src/qtwebkit.mk | 2 ++ src/qtwebsockets.mk | 2 ++ src/qtwebview.mk | 2 ++ src/qtwinextras.mk | 2 ++ src/qtxlsxwriter.mk | 2 ++ src/qtxmlpatterns.mk | 2 ++ src/qwt.mk | 2 ++ src/qwt_qt4.mk | 2 ++ src/qwtplot3d.mk | 2 ++ src/ragel.mk | 2 ++ src/readline.mk | 2 ++ src/rubberband.mk | 2 ++ src/rucksack.mk | 1 + src/sdl.mk | 2 ++ src/sdl2.mk | 2 ++ src/sdl2_gfx.mk | 2 ++ src/sdl2_image.mk | 2 ++ src/sdl2_mixer.mk | 2 ++ src/sdl2_net.mk | 1 + src/sdl2_ttf.mk | 2 ++ src/sdl_gfx.mk | 2 ++ src/sdl_image.mk | 2 ++ src/sdl_mixer.mk | 2 ++ src/sdl_net.mk | 2 ++ src/sdl_pango.mk | 2 ++ src/sdl_rwhttp.mk | 2 ++ src/sdl_sound.mk | 2 ++ src/sdl_ttf.mk | 2 ++ src/sfml.mk | 2 ++ src/smpeg.mk | 1 + src/smpeg2.mk | 2 ++ src/sox.mk | 2 ++ src/sparsehash.mk | 1 + src/speex.mk | 2 ++ src/speexdsp.mk | 2 ++ src/sqlite.mk | 2 ++ src/subversion.mk | 1 + src/suitesparse.mk | 2 ++ src/t4k_common.mk | 1 + src/taglib.mk | 2 ++ src/tclap.mk | 1 + src/teem.mk | 2 ++ src/termcap.mk | 2 ++ src/theora.mk | 2 ++ src/tiff.mk | 2 ++ src/tinyxml.mk | 1 + src/tinyxml2.mk | 1 + src/tre.mk | 2 ++ src/twolame.mk | 2 ++ src/ucl.mk | 2 ++ src/unrtf.mk | 2 ++ src/upx.mk | 2 ++ src/vamp-plugin-sdk.mk | 2 ++ src/vcdimager.mk | 1 + src/vidstab.mk | 2 ++ src/vigra.mk | 1 + src/vmime.mk | 2 ++ src/vo-aacenc.mk | 2 ++ src/vo-amrwbenc.mk | 2 ++ src/vorbis.mk | 2 ++ src/vtk.mk | 1 + src/vtk6.mk | 2 ++ src/waf.mk | 2 ++ src/wavpack.mk | 2 ++ src/wget.mk | 1 + src/widl.mk | 2 ++ src/winpcap.mk | 2 ++ src/wt.mk | 2 ++ src/wxwidgets.mk | 2 ++ src/x264.mk | 1 + src/xapian-core.mk | 2 ++ src/xerces.mk | 2 ++ src/xmlrpc-c.mk | 1 + src/xmlwrapp.mk | 1 + src/xorg-macros.mk | 2 ++ src/xvidcore.mk | 1 + src/xxhash.mk | 2 ++ src/xz.mk | 2 ++ src/yaml-cpp.mk | 2 ++ src/yasm.mk | 2 ++ src/zlib.mk | 1 + src/zziplib.mk | 2 ++ 425 files changed, 690 insertions(+) diff --git a/src/a52dec.mk b/src/a52dec.mk index 030eb2b0..23e0e1ff 100644 --- a/src/a52dec.mk +++ b/src/a52dec.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := a52dec +$(PKG)_WEBSITE := http://liba52.sourceforge.net/ +$(PKG)_DESCR := a52dec (aka. liba52) $(PKG)_IGNORE := $(PKG)_VERSION := 0.7.4 $(PKG)_CHECKSUM := a21d724ab3b3933330194353687df82c475b5dfb997513eef4c25de6c865ec33 diff --git a/src/agg.mk b/src/agg.mk index 5e642810..6a4c368d 100644 --- a/src/agg.mk +++ b/src/agg.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := agg +$(PKG)_WEBSITE := http://agg.sourceforge.net/ +$(PKG)_DESCR := Anti-Grain Geometry $(PKG)_IGNORE := $(PKG)_VERSION := 2.5 $(PKG)_CHECKSUM := ab1edc54cc32ba51a62ff120d501eecd55fceeedf869b9354e7e13812289911f diff --git a/src/alure.mk b/src/alure.mk index 185cf3e2..b00f8da1 100644 --- a/src/alure.mk +++ b/src/alure.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := alure +$(PKG)_WEBSITE := http://kcat.strangesoft.net/alure.html $(PKG)_IGNORE := $(PKG)_VERSION := 1.2 $(PKG)_CHECKSUM := 465e6adae68927be3a023903764662d64404e40c4c152d160e3a8838b1d70f71 diff --git a/src/apr-util.mk b/src/apr-util.mk index 507bedeb..a5ff3506 100644 --- a/src/apr-util.mk +++ b/src/apr-util.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := apr-util +$(PKG)_WEBSITE := http://apr.apache.org/ +$(PKG)_DESCR := APR-util $(PKG)_IGNORE := $(PKG)_VERSION := 1.5.4 $(PKG)_CHECKSUM := 976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19 diff --git a/src/apr.mk b/src/apr.mk index b4527c1f..d2d845b9 100644 --- a/src/apr.mk +++ b/src/apr.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := apr +$(PKG)_WEBSITE := http://apr.apache.org/ +$(PKG)_DESCR := APR $(PKG)_IGNORE := $(PKG)_VERSION := 1.5.2 $(PKG)_CHECKSUM := 1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb diff --git a/src/armadillo.mk b/src/armadillo.mk index 68f2e2bc..cd6ac1d1 100644 --- a/src/armadillo.mk +++ b/src/armadillo.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := armadillo +$(PKG)_WEBSITE := http://arma.sourceforge.net/ +$(PKG)_DESCR := Armadillo C++ linear algebra library $(PKG)_IGNORE := $(PKG)_VERSION := 6.400.3 $(PKG)_CHECKSUM := 019ce442a1bcad4c5da0bc01ee35333c9a0783ec6a58237ae1e774da68cd4f2f diff --git a/src/aspell.mk b/src/aspell.mk index 560a326b..2aa68809 100644 --- a/src/aspell.mk +++ b/src/aspell.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := aspell +$(PKG)_WEBSITE := http://aspell.net/ +$(PKG)_DESCR := Aspell $(PKG)_IGNORE := $(PKG)_VERSION := 0.60.6.1 $(PKG)_CHECKSUM := f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df6e1 diff --git a/src/assimp.mk b/src/assimp.mk index 5cf3c6c4..6f286e8e 100644 --- a/src/assimp.mk +++ b/src/assimp.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := assimp +$(PKG)_WEBSITE := http://assimp.sourceforge.net/ +$(PKG)_DESCR := Assimp Open Asset Import Library $(PKG)_IGNORE := $(PKG)_VERSION := 3.2 $(PKG)_CHECKSUM := 187f825c563e84b1b17527a4da0351aa3d575dfd696a9d204ae4bb19ee7df94a diff --git a/src/atk.mk b/src/atk.mk index 99bb6431..ded38787 100644 --- a/src/atk.mk +++ b/src/atk.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := atk +$(PKG)_WEBSITE := http://www.gtk.org/ +$(PKG)_DESCR := ATK $(PKG)_IGNORE := $(PKG)_VERSION := 2.16.0 $(PKG)_CHECKSUM := 095f986060a6a0b22eb15eef84ae9f14a1cf8082488faa6886d94c37438ae562 diff --git a/src/atkmm.mk b/src/atkmm.mk index b551d478..409f4bea 100644 --- a/src/atkmm.mk +++ b/src/atkmm.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := atkmm +$(PKG)_WEBSITE := http://www.gtkmm.org/ +$(PKG)_DESCR := ATKmm $(PKG)_IGNORE := $(PKG)_VERSION := 2.22.7 $(PKG)_CHECKSUM := bfbf846b409b4c5eb3a52fa32a13d86936021969406b3dcafd4dd05abd70f91b diff --git a/src/aubio.mk b/src/aubio.mk index d5c11042..3850f0d6 100644 --- a/src/aubio.mk +++ b/src/aubio.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := aubio +$(PKG)_WEBSITE := http://www.aubio.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 0.4.2 $(PKG)_CHECKSUM := 1cc58e0fed2b9468305b198ad06b889f228b797a082c2ede716dc30fcb4f8f1f diff --git a/src/bfd.mk b/src/bfd.mk index cf1bf75b..8d64bcaf 100644 --- a/src/bfd.mk +++ b/src/bfd.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := bfd +$(PKG)_WEBSITE := https://www.gnu.org/software/binutils/ +$(PKG)_DESCR := Binary File Descriptor library $(PKG)_IGNORE = $(binutils_IGNORE) $(PKG)_VERSION = $(binutils_VERSION) $(PKG)_CHECKSUM = $(binutils_CHECKSUM) diff --git a/src/binutils.mk b/src/binutils.mk index b049bc0f..ed021387 100644 --- a/src/binutils.mk +++ b/src/binutils.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := binutils +$(PKG)_WEBSITE := https://www.gnu.org/software/binutils/ +$(PKG)_DESCR := GNU Binutils # see http://lists.nongnu.org/archive/html/mingw-cross-env-list/2016-01/msg00013.html # 2.26 causes incorrect dlls to be built with sjlj exceptions $(PKG)_IGNORE := 2.26 diff --git a/src/blas.mk b/src/blas.mk index e8bc4980..20332b80 100644 --- a/src/blas.mk +++ b/src/blas.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := blas +$(PKG)_WEBSITE := http://www.netlib.org/blas/ $(PKG)_IGNORE := $(PKG)_VERSION := 3.5.0 $(PKG)_CHECKSUM := ef7d775d380f255d1902bce374ff7c8a594846454fcaeae552292168af1aca24 diff --git a/src/boost.mk b/src/boost.mk index 71e38fa6..2a05987f 100644 --- a/src/boost.mk +++ b/src/boost.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := boost +$(PKG)_WEBSITE := http://www.boost.org/ +$(PKG)_DESCR := Boost C++ Library $(PKG)_IGNORE := $(PKG)_VERSION := 1.60.0 $(PKG)_CHECKSUM := 686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b diff --git a/src/box2d.mk b/src/box2d.mk index 007837dc..317aff5a 100644 --- a/src/box2d.mk +++ b/src/box2d.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := box2d +$(PKG)_WEBSITE := http://www.box2d.org/ +$(PKG)_DESCR := Box2D $(PKG)_IGNORE := $(PKG)_VERSION := 2.3.1 $(PKG)_CHECKSUM := 75d62738b13d2836cd56647581b6e574d4005a6e077ddefa5d727d445d649752 diff --git a/src/bullet.mk b/src/bullet.mk index 1a82fd58..205683a9 100644 --- a/src/bullet.mk +++ b/src/bullet.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := bullet +$(PKG)_WEBSITE := http://bulletphysics.org/ +$(PKG)_DESCR := Bullet physics, version 2 $(PKG)_IGNORE := $(PKG)_VERSION := 2.82-r2704 $(PKG)_CHECKSUM := 67e4c9eb76f7adf99501d726d8ad5e9b525dfd0843fbce9ca73aaca4ba9eced2 diff --git a/src/bzip2.mk b/src/bzip2.mk index ff6217ac..d8ab1f76 100644 --- a/src/bzip2.mk +++ b/src/bzip2.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := bzip2 +$(PKG)_WEBSITE := http://www.bzip.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.0.6 $(PKG)_CHECKSUM := a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd diff --git a/src/cairo.mk b/src/cairo.mk index 7e112d8e..0bfc1597 100644 --- a/src/cairo.mk +++ b/src/cairo.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := cairo +$(PKG)_WEBSITE := http://cairographics.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.14.6 $(PKG)_CHECKSUM := 613cb38447b76a93ff7235e17acd55a78b52ea84a9df128c3f2257f8eaa7b252 diff --git a/src/cairomm.mk b/src/cairomm.mk index f74b773e..7a0022d6 100644 --- a/src/cairomm.mk +++ b/src/cairomm.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := cairomm +$(PKG)_WEBSITE := http://cairographics.org/cairomm/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.11.2 $(PKG)_CHECKSUM := ccf677098c1e08e189add0bd146f78498109f202575491a82f1815b6bc28008d diff --git a/src/cblas.mk b/src/cblas.mk index bcdd9acc..209cb653 100644 --- a/src/cblas.mk +++ b/src/cblas.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := cblas +$(PKG)_WEBSITE := http://www.netlib.org/blas/ $(PKG)_IGNORE := $(PKG)_VERSION := 1 $(PKG)_CHECKSUM := 0f6354fd67fabd909baf57ced2ef84e962db58fae126e4f41b21dd4fec60a2a3 diff --git a/src/ccfits.mk b/src/ccfits.mk index 1a44d2d8..b55c0110 100755 --- a/src/ccfits.mk +++ b/src/ccfits.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := ccfits +$(PKG)_WEBSITE := http://heasarc.gsfc.nasa.gov/fitsio/ccfits +$(PKG)_DESCR := CCfits $(PKG)_IGNORE := $(PKG)_VERSION := 2.4 $(PKG)_CHECKSUM := ba6c5012b260adf7633f92581279ea582e331343d8c973981aa7de07242bd7f8 diff --git a/src/cegui.mk b/src/cegui.mk index 7b259f3d..a47f0db7 100644 --- a/src/cegui.mk +++ b/src/cegui.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := cegui +$(PKG)_WEBSITE := http://cegui.org.uk/ +$(PKG)_DESCR := Crazy Eddie’s GUI System (CEGUI) $(PKG)_IGNORE := $(PKG)_VERSION := 9726a2b505fb $(PKG)_CHECKSUM := 14b3da7f1f89693192cd9afbf2126f4519508245ed156de893828e31ce676e9e diff --git a/src/cfitsio.mk b/src/cfitsio.mk index f0951e23..def4886b 100644 --- a/src/cfitsio.mk +++ b/src/cfitsio.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := cfitsio +$(PKG)_WEBSITE := http://heasarc.gsfc.nasa.gov/fitsio/ $(PKG)_IGNORE := $(PKG)_VERSION := 3370 $(PKG)_CHECKSUM := 092897c6dae4dfe42d91d35a738e45e8236aa3d8f9b3ffc7f0e6545b8319c63a diff --git a/src/cgal.mk b/src/cgal.mk index 84a407c7..1433a6e8 100644 --- a/src/cgal.mk +++ b/src/cgal.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := cgal +$(PKG)_WEBSITE := http://www.cgal.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 4.6.3 $(PKG)_CHECKSUM := e338027b8767c0a7a6e4fd8679182d1b83b5b1a0da0a1fe4546e7c0ca094fc21 diff --git a/src/check.mk b/src/check.mk index 7447e975..3d1102bb 100644 --- a/src/check.mk +++ b/src/check.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := check +$(PKG)_WEBSITE := http://check.sourceforge.net/ $(PKG)_IGNORE := $(PKG)_VERSION := 0.10.0 $(PKG)_CHECKSUM := f5f50766aa6f8fe5a2df752666ca01a950add45079aa06416b83765b1cf71052 diff --git a/src/chipmunk.mk b/src/chipmunk.mk index a3d57d04..13af91fb 100644 --- a/src/chipmunk.mk +++ b/src/chipmunk.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := chipmunk +$(PKG)_WEBSITE := https://chipmunk-physics.net/ +$(PKG)_DESCR := Chipmunk Physics $(PKG)_IGNORE := $(PKG)_VERSION := 6.2.2 $(PKG)_CHECKSUM := c51f0e3a30770f6b940de3228bee40a871aaf7611a1b5ec546a7d2b9e1041f97 diff --git a/src/chromaprint.mk b/src/chromaprint.mk index 39ccde7f..6950de97 100644 --- a/src/chromaprint.mk +++ b/src/chromaprint.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := chromaprint +$(PKG)_WEBSITE := http://acoustid.org/chromaprint +$(PKG)_DESCR := Chromaprint $(PKG)_IGNORE := $(PKG)_VERSION := 1.1 $(PKG)_CHECKSUM := 6b14d7ea4964581b73bd3f8038c8857c01e446421c1ae99cbbf64de26b47cd12 diff --git a/src/cimg.mk b/src/cimg.mk index 4e7abf76..4f7c7d87 100644 --- a/src/cimg.mk +++ b/src/cimg.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := cimg +$(PKG)_WEBSITE := http://cimg.eu/ +$(PKG)_DESCR := CImg Library $(PKG)_IGNORE := $(PKG)_VERSION := 1.6.3 $(PKG)_CHECKSUM := c2a3c62d05d1e322afa6afae086cf96df82a3a13b839e9bf1cedcb014d921ce7 diff --git a/src/cloog.mk b/src/cloog.mk index 251f1fc5..0e3d98ce 100644 --- a/src/cloog.mk +++ b/src/cloog.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := cloog +$(PKG)_WEBSITE := http://www.cloog.org/ +$(PKG)_DESCR := CLooG Code Generator $(PKG)_IGNORE := $(PKG)_VERSION := 0.18.1 $(PKG)_CHECKSUM := 02500a4edd14875f94fe84cbeda4290425cb0c1c2474c6f75d75a303d64b4196 diff --git a/src/cmake.mk b/src/cmake.mk index c4074a24..fa63a38b 100644 --- a/src/cmake.mk +++ b/src/cmake.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := cmake +$(PKG)_WEBSITE := http://www.cmake.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 3.5.2 $(PKG)_CHECKSUM := 92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a diff --git a/src/cminpack.mk b/src/cminpack.mk index 3f0d401b..6095950a 100644 --- a/src/cminpack.mk +++ b/src/cminpack.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := cminpack +$(PKG)_WEBSITE := http://devernay.free.fr/hacks/cminpack/cminpack.html $(PKG)_IGNORE := $(PKG)_VERSION := 1.3.4 $(PKG)_CHECKSUM := 3b517bf7dca68cc9a882883db96dac0a0d37d72aba6dfb0c9c7e78e67af503ca diff --git a/src/coda.mk b/src/coda.mk index 280fbd51..5e1ddd8f 100644 --- a/src/coda.mk +++ b/src/coda.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := coda +$(PKG)_WEBSITE := https://stcorp.nl/coda/ +$(PKG)_DESCR := CODA $(PKG)_IGNORE := $(PKG)_VERSION := 2.15.1 $(PKG)_CHECKSUM := 51076ff958ec15633d741ea021761fc6d8c6492f931175c489288481e37ac810 diff --git a/src/coin.mk b/src/coin.mk index 78ebba95..618c4f68 100644 --- a/src/coin.mk +++ b/src/coin.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := coin +$(PKG)_WEBSITE := https://bitbucket.org/Coin3D/ +$(PKG)_DESCR := Coin3D $(PKG)_IGNORE := $(PKG)_VERSION := 3.1.3 $(PKG)_CHECKSUM := 583478c581317862aa03a19f14c527c3888478a06284b9a46a0155fa5886d417 diff --git a/src/cpp-netlib.mk b/src/cpp-netlib.mk index c8be3b3b..9a97d518 100644 --- a/src/cpp-netlib.mk +++ b/src/cpp-netlib.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := cpp-netlib +$(PKG)_WEBSITE := http://cpp-netlib.org/ +$(PKG)_DESCR := Boost C++ Networking Library $(PKG)_IGNORE := $(PKG)_VERSION := 0.11.2 $(PKG)_CHECKSUM := 71953379c5a6fab618cbda9ac6639d87b35cab0600a4450a7392bc08c930f2b1 diff --git a/src/cppunit.mk b/src/cppunit.mk index c885b25f..cd9524b2 100644 --- a/src/cppunit.mk +++ b/src/cppunit.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := cppunit +$(PKG)_WEBSITE := http://www.freedesktop.org/wiki/Software/cppunit/ +$(PKG)_DESCR := CppUnit $(PKG)_IGNORE := $(PKG)_VERSION := 1.13.2 $(PKG)_CHECKSUM := 3f47d246e3346f2ba4d7c9e882db3ad9ebd3fcbd2e8b732f946e0e3eeb9f429f diff --git a/src/cryptopp.mk b/src/cryptopp.mk index db9de7bc..89412905 100644 --- a/src/cryptopp.mk +++ b/src/cryptopp.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := cryptopp +$(PKG)_WEBSITE := https://www.cryptopp.com/ +$(PKG)_DESCR := Crypto++ Library $(PKG)_IGNORE := $(PKG)_VERSION := 5.6.3 $(PKG)_CHECKSUM := 9390670a14170dd0f48a6b6b06f74269ef4b056d4718a1a329f6f6069dc957c9 diff --git a/src/crystalhd.mk b/src/crystalhd.mk index ad7e31ef..7712b3a1 100644 --- a/src/crystalhd.mk +++ b/src/crystalhd.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := crystalhd +$(PKG)_WEBSITE := http://www.broadcom.com/support/crystal_hd/ +$(PKG)_DESCR := Broadcom Crystal HD Headers $(PKG)_IGNORE := $(PKG)_VERSION := 1 $(PKG)_CHECKSUM := 818d72fdbebcfc0a449d9e39153370c80325f2490798f82f1ed98c6bb60bc18c diff --git a/src/cunit.mk b/src/cunit.mk index 100c5b2b..afd833d3 100644 --- a/src/cunit.mk +++ b/src/cunit.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := cunit +$(PKG)_WEBSITE := http://cunit.sourceforge.net/ $(PKG)_IGNORE := $(PKG)_VERSION := 2.1-3 $(PKG)_CHECKSUM := f5b29137f845bb08b77ec60584fdb728b4e58f1023e6f249a464efa49a40f214 diff --git a/src/curl.mk b/src/curl.mk index 43d245dc..1d9da873 100644 --- a/src/curl.mk +++ b/src/curl.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := curl +$(PKG)_WEBSITE := http://curl.haxx.se/libcurl/ +$(PKG)_DESCR := cURL $(PKG)_IGNORE := $(PKG)_VERSION := 7.52.0 $(PKG)_CHECKSUM := c8f0114c7c72c8627d716416326593d061274b208cdf123c418c20c6dbe009c2 diff --git a/src/db.mk b/src/db.mk index 52c92672..94ddc3c9 100644 --- a/src/db.mk +++ b/src/db.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := db +$(PKG)_WEBSITE := http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html +$(PKG)_DESCR := Oracle Berkeley DB $(PKG)_IGNORE := $(PKG)_VERSION := 6.1.26 $(PKG)_CHECKSUM := dd1417af5443f326ee3998e40986c3c60e2a7cfb5bfa25177ef7cadb2afb13a6 diff --git a/src/dbus.mk b/src/dbus.mk index 6d1804ed..4e86f184 100644 --- a/src/dbus.mk +++ b/src/dbus.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := dbus +$(PKG)_WEBSITE := http://dbus.freedesktop.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.11.8 $(PKG)_CHECKSUM := fa207530d694706e33378c87e65b2b4304eb99fff71fc6d6caa6f70591b9afd5 diff --git a/src/dcmtk.mk b/src/dcmtk.mk index cf1f2624..3c68e5ca 100644 --- a/src/dcmtk.mk +++ b/src/dcmtk.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := dcmtk +$(PKG)_WEBSITE := http://dicom.offis.de/dcmtk.php.en +$(PKG)_DESCR := DCMTK $(PKG)_IGNORE := $(PKG)_VERSION := 3.6.0 $(PKG)_CHECKSUM := cfc509701122adfa359f1ee160e943c1548c7696b607dbb646c5a06f015ed33a diff --git a/src/devil.mk b/src/devil.mk index 0a96341f..205342e6 100644 --- a/src/devil.mk +++ b/src/devil.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := devil +$(PKG)_WEBSITE := http://openil.sourceforge.net/ +$(PKG)_DESCR := DevIL $(PKG)_IGNORE := $(PKG)_VERSION := 1.7.8 $(PKG)_CHECKSUM := 682ffa3fc894686156337b8ce473c954bf3f4fb0f3ecac159c73db632d28a8fd diff --git a/src/djvulibre.mk b/src/djvulibre.mk index 18352ce2..2b50d6b3 100644 --- a/src/djvulibre.mk +++ b/src/djvulibre.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := djvulibre +$(PKG)_WEBSITE := http://djvu.sourceforge.net/ +$(PKG)_DESCR := DjVuLibre $(PKG)_VERSION := 3.5.27 $(PKG)_CHECKSUM := e69668252565603875fb88500cde02bf93d12d48a3884e472696c896e81f505f $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) diff --git a/src/dlfcn-win32.mk b/src/dlfcn-win32.mk index 9dce8802..58012d8e 100644 --- a/src/dlfcn-win32.mk +++ b/src/dlfcn-win32.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := dlfcn-win32 +$(PKG)_WEBSITE := https://code.google.com/p/dlfcn-win32/ +$(PKG)_DESCR := POSIX dlfcn wrapper for Windows $(PKG)_IGNORE := $(PKG)_VERSION := e19bf07 $(PKG)_CHECKSUM := 6b31a8547547af27e5dfc092df1ea2c6ac562ce47b7ec08a0a4da4ed0b002767 diff --git a/src/eigen.mk b/src/eigen.mk index e0808bb2..c672e09b 100644 --- a/src/eigen.mk +++ b/src/eigen.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := eigen +$(PKG)_WEBSITE := http://eigen.tuxfamily.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 3.2.5 $(PKG)_CHECKSUM := 5f6e6cb88188e34185f43cb819d7dab9b48ef493774ff834e568f4805d3dc2f9 diff --git a/src/exiv2.mk b/src/exiv2.mk index 85625939..581871e2 100644 --- a/src/exiv2.mk +++ b/src/exiv2.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := exiv2 +$(PKG)_WEBSITE := http://www.exiv2.org/ +$(PKG)_DESCR := Exiv2 $(PKG)_IGNORE := $(PKG)_VERSION := 0.25 $(PKG)_CHECKSUM := c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4 diff --git a/src/expat.mk b/src/expat.mk index 3b0da149..2c9eceae 100644 --- a/src/expat.mk +++ b/src/expat.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := expat +$(PKG)_WEBSITE := http://expat.sourceforge.net/ +$(PKG)_DESCR := Expat XML Parser $(PKG)_IGNORE := $(PKG)_VERSION := 2.2.0 $(PKG)_CHECKSUM := d9e50ff2d19b3538bd2127902a89987474e1a4db8e43a66a4d1a712ab9a504ff diff --git a/src/faad2.mk b/src/faad2.mk index 113f5a0b..0ecef374 100644 --- a/src/faad2.mk +++ b/src/faad2.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := faad2 +$(PKG)_WEBSITE := http://www.audiocoding.com/ $(PKG)_IGNORE := $(PKG)_VERSION := 2.7 $(PKG)_CHECKSUM := ee26ed1e177c0cd8fa8458a481b14a0b24ca0b51468c8b4c8b676fd3ceccd330 diff --git a/src/fdk-aac.mk b/src/fdk-aac.mk index 3bee38a3..de62f910 100644 --- a/src/fdk-aac.mk +++ b/src/fdk-aac.mk @@ -4,6 +4,8 @@ # GPL 2+, but it is with LGPL 2.1+. See docs/index.html#potential-legal-issues PKG := fdk-aac +$(PKG)_WEBSITE := https://github.com/mstorsjo/fdk-aac +$(PKG)_DESCR := FDK-AAC $(PKG)_IGNORE := $(PKG)_VERSION := 0.1.4 $(PKG)_CHECKSUM := 5910fe788677ca13532e3f47b7afaa01d72334d46a2d5e1d1f080f1173ff15ab diff --git a/src/ffmpeg.mk b/src/ffmpeg.mk index f13bb5aa..657df39d 100644 --- a/src/ffmpeg.mk +++ b/src/ffmpeg.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := ffmpeg +$(PKG)_WEBSITE := http://www.ffmpeg.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 3.2.1 $(PKG)_CHECKSUM := 72abc55bea5ff5397ac82320fa5c4843a05f527d0d7912d66784c92fdfbd12fb diff --git a/src/fftw.mk b/src/fftw.mk index 6baad540..a8b10eb3 100644 --- a/src/fftw.mk +++ b/src/fftw.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := fftw +$(PKG)_WEBSITE := http://www.fftw.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 3.3.4 $(PKG)_CHECKSUM := 8f0cde90929bc05587c3368d2f15cd0530a60b8a9912a8e2979a72dbe5af0982 diff --git a/src/file.mk b/src/file.mk index 6a406774..2bb23938 100644 --- a/src/file.mk +++ b/src/file.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := file +$(PKG)_WEBSITE := http://www.darwinsys.com/file/ $(PKG)_IGNORE := $(PKG)_VERSION := 5.24 $(PKG)_CHECKSUM := 802cb3de2e49e88ef97cdcb52cd507a0f25458112752e398445cea102bc750ce diff --git a/src/flac.mk b/src/flac.mk index a240b2e0..97ccac5c 100644 --- a/src/flac.mk +++ b/src/flac.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := flac +$(PKG)_WEBSITE := http://www.xiph.org/flac/ +$(PKG)_DESCR := FLAC $(PKG)_IGNORE := $(PKG)_VERSION := 1.3.1 $(PKG)_CHECKSUM := 4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c diff --git a/src/flann.mk b/src/flann.mk index d63f0282..63d823e1 100644 --- a/src/flann.mk +++ b/src/flann.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := flann +$(PKG)_WEBSITE := http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN +$(PKG)_DESCR := FLANN $(PKG)_IGNORE := $(PKG)_VERSION := 1.8.4 $(PKG)_CHECKSUM := dfbb9321b0d687626a644c70872a2c540b16200e7f4c7bd72f91ae032f445c08 diff --git a/src/fltk.mk b/src/fltk.mk index 3b302290..f537289f 100644 --- a/src/fltk.mk +++ b/src/fltk.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := fltk +$(PKG)_WEBSITE := http://www.fltk.org/ +$(PKG)_DESCR := FLTK $(PKG)_IGNORE := $(PKG)_VERSION := 1.3.3 $(PKG)_CHECKSUM := f8398d98d7221d40e77bc7b19e761adaf2f1ef8bb0c30eceb7beb4f2273d0d97 diff --git a/src/fontconfig.mk b/src/fontconfig.mk index 4957c4f7..063751da 100644 --- a/src/fontconfig.mk +++ b/src/fontconfig.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := fontconfig +$(PKG)_WEBSITE := http://fontconfig.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 2.12.1 $(PKG)_CHECKSUM := b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3 diff --git a/src/freeglut.mk b/src/freeglut.mk index 8dd7ca58..628101f9 100644 --- a/src/freeglut.mk +++ b/src/freeglut.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := freeglut +$(PKG)_WEBSITE := http://freeglut.sourceforge.net/ $(PKG)_IGNORE := $(PKG)_VERSION := 3.0.0 $(PKG)_CHECKSUM := 2a43be8515b01ea82bcfa17d29ae0d40bd128342f0930cd1f375f1ff999f76a2 diff --git a/src/freeimage.mk b/src/freeimage.mk index 8acbb4bc..27d8f397 100644 --- a/src/freeimage.mk +++ b/src/freeimage.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := freeimage +$(PKG)_WEBSITE := http://freeimage.sourceforge.net/ +$(PKG)_DESCR := FreeImage $(PKG)_IGNORE := $(PKG)_VERSION := 3.15.4 $(PKG)_CHECKSUM := eb6361519d33131690a0e726b085a05825e5adf9fb72c752d8d39100e48dc829 diff --git a/src/freetds.mk b/src/freetds.mk index 85ba6465..2b045007 100644 --- a/src/freetds.mk +++ b/src/freetds.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := freetds +$(PKG)_WEBSITE := http://www.freetds.org/ +$(PKG)_DESCR := FreeTDS $(PKG)_IGNORE := $(PKG)_VERSION := 1.00.23 $(PKG)_CHECKSUM := 1be0cedc4ad026c28633c6587e84e35844dfa4e05e6779eae6d475572a64d36f diff --git a/src/freetype-bootstrap.mk b/src/freetype-bootstrap.mk index 7029a69d..4dd870f6 100644 --- a/src/freetype-bootstrap.mk +++ b/src/freetype-bootstrap.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := freetype-bootstrap +$(PKG)_WEBSITE := http://www.freetype.org/ +$(PKG)_DESCR := freetype (without harfbuzz) $(PKG)_IGNORE = $(freetype_IGNORE) $(PKG)_VERSION = $(freetype_VERSION) $(PKG)_CHECKSUM = $(freetype_CHECKSUM) diff --git a/src/freetype.mk b/src/freetype.mk index 417354e7..e796a9a6 100644 --- a/src/freetype.mk +++ b/src/freetype.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := freetype +$(PKG)_WEBSITE := http://www.freetype.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 2.7 $(PKG)_CHECKSUM := d6a451f5b754857d2aa3964fd4473f8bc5c64e879b24516d780fb26bec7f7d48 diff --git a/src/fribidi.mk b/src/fribidi.mk index 7d6c137f..d1b246e3 100644 --- a/src/fribidi.mk +++ b/src/fribidi.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := fribidi +$(PKG)_WEBSITE := http://fribidi.org/ +$(PKG)_DESCR := FriBidi $(PKG)_IGNORE := $(PKG)_VERSION := 0.19.6 $(PKG)_CHECKSUM := cba8b7423c817e5adf50d28ec9079d14eafcec9127b9e8c8f1960c5ad585e17d diff --git a/src/ftgl.mk b/src/ftgl.mk index 10223b0e..92056b36 100644 --- a/src/ftgl.mk +++ b/src/ftgl.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := ftgl +$(PKG)_WEBSITE := http://sourceforge.net/projects/ftgl/ $(PKG)_IGNORE := $(PKG)_VERSION := 2.1.3~rc5 $(PKG)_CHECKSUM := 521ff7bd62c459ff5372e269c223e2a6107a6a99a36afdc2ae634a973af70c59 diff --git a/src/gc.mk b/src/gc.mk index 64bd075d..3b6c6f1c 100644 --- a/src/gc.mk +++ b/src/gc.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := gc +$(PKG)_WEBSITE := http://www.hpl.hp.com/personal/Hans_Boehm/gc/ $(PKG)_IGNORE := $(PKG)_VERSION := 7.2e $(PKG)_CHECKSUM := 09315b48a82d600371207691126ad058c04677281ac318d86fa84c98c3c9af4b diff --git a/src/gcc.mk b/src/gcc.mk index 3c4d786d..d36416cc 100644 --- a/src/gcc.mk +++ b/src/gcc.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := gcc +$(PKG)_WEBSITE := http://gcc.gnu.org/ +$(PKG)_DESCR := GCC $(PKG)_IGNORE := 5% $(PKG)_VERSION := 4.9.4 $(PKG)_CHECKSUM := 6c11d292cd01b294f9f84c9a59c230d80e9e4a47e5c6355f046bb36d4f358092 diff --git a/src/gd.mk b/src/gd.mk index 17d1af54..fc07661e 100644 --- a/src/gd.mk +++ b/src/gd.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := gd +$(PKG)_WEBSITE := http://www.libgd.org/ +$(PKG)_DESCR := GD (without support for xpm) $(PKG)_IGNORE := $(PKG)_VERSION := 2.1.0 $(PKG)_CHECKSUM := fa6665dfe3d898019671293c84d77067a3d2ede50884dbcb6df899d508370e5a diff --git a/src/gdal.mk b/src/gdal.mk index 20a9bf0c..f122d0fb 100644 --- a/src/gdal.mk +++ b/src/gdal.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := gdal +$(PKG)_WEBSITE := http://www.gdal.org/ +$(PKG)_DESCR := GDAL $(PKG)_IGNORE := $(PKG)_VERSION := 2.1.2 $(PKG)_CHECKSUM := 69761c38acac8c6d3ea71304341f6982b5d66125a1a80d9088b6bfd2019125c9 diff --git a/src/gdb.mk b/src/gdb.mk index e22fc78e..f53f7823 100644 --- a/src/gdb.mk +++ b/src/gdb.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := gdb +$(PKG)_WEBSITE := https://www.gnu.org/software/gdb/ $(PKG)_VERSION := 7.12 $(PKG)_CHECKSUM := 834ff3c5948b30718343ea57b11cbc3235d7995c6a4f3a5cecec8c8114164f94 $(PKG)_SUBDIR := gdb-$($(PKG)_VERSION) diff --git a/src/gdk-pixbuf.mk b/src/gdk-pixbuf.mk index cad45ece..e79f678d 100644 --- a/src/gdk-pixbuf.mk +++ b/src/gdk-pixbuf.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := gdk-pixbuf +$(PKG)_WEBSITE := http://www.gdk-pixbuf.org/ +$(PKG)_DESCR := GDK-pixbuf $(PKG)_IGNORE := $(PKG)_VERSION := 2.32.3 $(PKG)_CHECKSUM := 2b6771f1ac72f687a8971e59810b8dc658e65e7d3086bd2e676e618fd541d031 diff --git a/src/gendef.mk b/src/gendef.mk index b9cb02ca..5937476c 100644 --- a/src/gendef.mk +++ b/src/gendef.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := gendef +$(PKG)_WEBSITE := http://sourceforge.net/p/mingw-w64/wiki2/gendef/ $(PKG)_IGNORE = $(mingw-w64_IGNORE) $(PKG)_VERSION = $(mingw-w64_VERSION) $(PKG)_CHECKSUM = $(mingw-w64_CHECKSUM) diff --git a/src/geoip-database.mk b/src/geoip-database.mk index a8371152..758cf3ba 100644 --- a/src/geoip-database.mk +++ b/src/geoip-database.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := geoip-database +$(PKG)_WEBSITE := http://www.maxmind.com +$(PKG)_DESCR := GeoIP Legacy Database $(PKG)_IGNORE := $(PKG)_VERSION := 20150317-1 $(PKG)_CHECKSUM := 45be84939fd22bef1ccaa1189f83c667fef275a16bbfb91f82b7b2068b4e3735 diff --git a/src/geos.mk b/src/geos.mk index b791bc30..b46c6c16 100644 --- a/src/geos.mk +++ b/src/geos.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := geos +$(PKG)_WEBSITE := http://trac.osgeo.org/geos/ +$(PKG)_DESCR := GEOS $(PKG)_IGNORE := $(PKG)_VERSION := 3.4.2 $(PKG)_CHECKSUM := 15e8bfdf7e29087a957b56ac543ea9a80321481cef4d4f63a7b268953ad26c53 diff --git a/src/gettext.mk b/src/gettext.mk index 4629f7ce..dce7569e 100644 --- a/src/gettext.mk +++ b/src/gettext.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := gettext +$(PKG)_WEBSITE := https://www.gnu.org/software/gettext/ $(PKG)_IGNORE := $(PKG)_VERSION := 0.19.8.1 $(PKG)_CHECKSUM := ff942af0e438ced4a8b0ea4b0b6e0d6d657157c5e2364de57baa279c1c125c43 diff --git a/src/ghostscript.mk b/src/ghostscript.mk index 46f0ac32..d2872953 100644 --- a/src/ghostscript.mk +++ b/src/ghostscript.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := ghostscript +$(PKG)_WEBSITE := http://www.ghostscript.com/ $(PKG)_IGNORE := $(PKG)_VERSION := 9.19 $(PKG)_NODOTVER := $(subst .,,$($(PKG)_VERSION)) diff --git a/src/giflib.mk b/src/giflib.mk index fa5dd9df..ba24d110 100644 --- a/src/giflib.mk +++ b/src/giflib.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := giflib +$(PKG)_WEBSITE := http://sourceforge.net/projects/libungif/ $(PKG)_IGNORE := $(PKG)_VERSION := 5.1.4 $(PKG)_CHECKSUM := df27ec3ff24671f80b29e6ab1c4971059c14ac3db95406884fc26574631ba8d5 diff --git a/src/glew.mk b/src/glew.mk index 0785d56d..55952def 100644 --- a/src/glew.mk +++ b/src/glew.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := glew +$(PKG)_WEBSITE := http://glew.sourceforge.net/ +$(PKG)_DESCR := GLEW $(PKG)_IGNORE := $(PKG)_VERSION := 1.12.0 $(PKG)_CHECKSUM := af58103f4824b443e7fa4ed3af593b8edac6f3a7be3b30911edbc7344f48e4bf diff --git a/src/glfw2.mk b/src/glfw2.mk index e4ab25fe..2284e3a6 100644 --- a/src/glfw2.mk +++ b/src/glfw2.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := glfw2 +$(PKG)_WEBSITE := http://www.glfw.org/ +$(PKG)_DESCR := GLFW 2.x $(PKG)_IGNORE := $(PKG)_VERSION := 2.7.9 $(PKG)_CHECKSUM := b7276dcadc85a07077834d1043f11ffd6a3a379647bb94361b4abc3ffca75e7d diff --git a/src/glfw3.mk b/src/glfw3.mk index 42cf7078..f5cd432c 100644 --- a/src/glfw3.mk +++ b/src/glfw3.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := glfw3 +$(PKG)_WEBSITE := http://www.glfw.org/ +$(PKG)_DESCR := GLFW 3.x $(PKG)_IGNORE := $(PKG)_VERSION := 3.1.2 $(PKG)_CHECKSUM := 6ac642087682aaf7f8397761a41a99042b2c656498217a1c63ba9706d1eef122 diff --git a/src/glib.mk b/src/glib.mk index d262ddff..89908903 100644 --- a/src/glib.mk +++ b/src/glib.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := glib +$(PKG)_WEBSITE := http://www.gtk.org/ +$(PKG)_DESCR := GLib $(PKG)_IGNORE := $(PKG)_VERSION := 2.44.1 $(PKG)_CHECKSUM := 8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07 diff --git a/src/glibmm.mk b/src/glibmm.mk index a60767ab..3140fe73 100644 --- a/src/glibmm.mk +++ b/src/glibmm.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := glibmm +$(PKG)_WEBSITE := http://www.gtkmm.org/ +$(PKG)_DESCR := GLibmm $(PKG)_IGNORE := $(PKG)_VERSION := 2.42.0 $(PKG)_CHECKSUM := 985083d97378d234da27a7243587cc0d186897a4b2d3c1286f794089be1a3397 diff --git a/src/glm.mk b/src/glm.mk index 129e07fe..e81f3f54 100644 --- a/src/glm.mk +++ b/src/glm.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := glm +$(PKG)_WEBSITE := http://glm.g-truc.net +$(PKG)_DESCR := GLM - OpenGL Mathematics $(PKG)_IGNORE := $(PKG)_VERSION := 0.9.7.6 $(PKG)_CHECKSUM := 872fdea580b69b752562adc60734d7472fd97d5724c4ead585564083deac3953 diff --git a/src/glpk.mk b/src/glpk.mk index 29a49583..b8eb2d4e 100644 --- a/src/glpk.mk +++ b/src/glpk.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := glpk +$(PKG)_WEBSITE := https://www.gnu.org/software/glpk/ +$(PKG)_DESCR := GNU Linear Programming Kit $(PKG)_IGNORE := $(PKG)_VERSION := 4.60 $(PKG)_CHECKSUM := 1356620cb0a0d33ac3411dd49d9fd40d53ece73eaec8f6b8d19a77887ff5e297 diff --git a/src/gmp.mk b/src/gmp.mk index 3203903c..8640cf8d 100644 --- a/src/gmp.mk +++ b/src/gmp.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := gmp +$(PKG)_WEBSITE := http://www.gmplib.org/ +$(PKG)_DESCR := GMP $(PKG)_IGNORE := $(PKG)_VERSION := 6.1.2 $(PKG)_CHECKSUM := 87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912 diff --git a/src/gnutls.mk b/src/gnutls.mk index 48dd32ca..ee41ddd0 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := gnutls +$(PKG)_WEBSITE := https://www.gnu.org/software/gnutls/ +$(PKG)_DESCR := GnuTLS $(PKG)_VERSION := 3.4.17 $(PKG)_CHECKSUM := 9b50e8a670d5e950425d96935c7ddd415eb6f8079615a36df425f09a3143172e $(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION) diff --git a/src/googlemock.mk b/src/googlemock.mk index 119d250d..7930c30d 100644 --- a/src/googlemock.mk +++ b/src/googlemock.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := googlemock +$(PKG)_WEBSITE := https://github.com/google/googlemock +$(PKG)_DESCR := Google Mock $(PKG)_IGNORE := $(PKG)_VERSION := 1.7.0 $(PKG)_CHECKSUM := 3f20b6acb37e5a98e8c4518165711e3e35d47deb6cdb5a4dd4566563b5efd232 diff --git a/src/googletest.mk b/src/googletest.mk index 2825c0d3..27a7ac08 100644 --- a/src/googletest.mk +++ b/src/googletest.mk @@ -2,6 +2,8 @@ # See index.html for further information. PKG := googletest +$(PKG)_WEBSITE := https://github.com/google/googletest +$(PKG)_DESCR := Google Test $(PKG)_IGNORE := $(PKG)_VERSION := 1.7.0 $(PKG)_CHECKSUM := f73a6546fdf9fce9ff93a5015e0333a8af3062a152a9ad6bcb772c96687016cc diff --git a/src/graphicsmagick.mk b/src/graphicsmagick.mk index 5cda0ecb..e63e88ad 100644 --- a/src/graphicsmagick.mk +++ b/src/graphicsmagick.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := graphicsmagick +$(PKG)_WEBSITE := http://www.graphicsmagick.org/ +$(PKG)_DESCR := GraphicsMagick $(PKG)_IGNORE := $(PKG)_VERSION := 1.3.21 $(PKG)_CHECKSUM := 9045304d991776b6a37e1b45b9b6ef152593ada0d49bc744263565617cbf3c1f diff --git a/src/gsl.mk b/src/gsl.mk index f78b368c..c43cbb6c 100644 --- a/src/gsl.mk +++ b/src/gsl.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := gsl +$(PKG)_WEBSITE := https://www.gnu.org/software/gsl/ +$(PKG)_DESCR := GSL $(PKG)_IGNORE := $(PKG)_VERSION := 1.16 $(PKG)_CHECKSUM := 73bc2f51b90d2a780e6d266d43e487b3dbd78945dd0b04b14ca5980fe28d2f53 diff --git a/src/gsoap.mk b/src/gsoap.mk index 93cf564a..435adedf 100644 --- a/src/gsoap.mk +++ b/src/gsoap.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := gsoap +$(PKG)_WEBSITE := http://gsoap2.sourceforge.net/ +$(PKG)_DESCR := gSOAP $(PKG)_IGNORE := $(PKG)_VERSION := 2.8.22 $(PKG)_CHECKSUM := 30b045af2633ac5e92ea92fdb4baad784afe6e6548b5ef2f9cad48df6a7d3e48 diff --git a/src/gst-plugins-bad.mk b/src/gst-plugins-bad.mk index 11bae6ed..9c0c2a0a 100644 --- a/src/gst-plugins-bad.mk +++ b/src/gst-plugins-bad.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := gst-plugins-bad +$(PKG)_WEBSITE := http://gstreamer.freedesktop.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.6.2 $(PKG)_CHECKSUM := 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef396fe diff --git a/src/gst-plugins-base.mk b/src/gst-plugins-base.mk index 52b8d224..8135aea5 100644 --- a/src/gst-plugins-base.mk +++ b/src/gst-plugins-base.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := gst-plugins-base +$(PKG)_WEBSITE := http://gstreamer.freedesktop.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.6.2 $(PKG)_CHECKSUM := c75dd400e451526ed71e1c4955e33d470a2581f5e71ecf84920a41c0a5c75322 diff --git a/src/gst-plugins-good.mk b/src/gst-plugins-good.mk index 1c1757fe..fe251e4a 100644 --- a/src/gst-plugins-good.mk +++ b/src/gst-plugins-good.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := gst-plugins-good +$(PKG)_WEBSITE := http://gstreamer.freedesktop.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.6.2 $(PKG)_CHECKSUM := 876e54dfce93274b98e024f353258d35fa4d49d1f9010069e676c530f6eb6a92 diff --git a/src/gst-plugins-ugly.mk b/src/gst-plugins-ugly.mk index 514c9eeb..2a33edb7 100644 --- a/src/gst-plugins-ugly.mk +++ b/src/gst-plugins-ugly.mk @@ -1,6 +1,7 @@ #This file is part of MXE. See LICENSE.md for licensing information. PKG := gst-plugins-ugly +$(PKG)_WEBSITE := http://gstreamer.freedesktop.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.6.2 $(PKG)_CHECKSUM := e7f1b6321c8667fabc0dedce3998a3c6e90ce9ce9dea7186d33dc4359f9e9845 diff --git a/src/gstreamer.mk b/src/gstreamer.mk index 7f7639cf..5790273f 100644 --- a/src/gstreamer.mk +++ b/src/gstreamer.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := gstreamer +$(PKG)_WEBSITE := http://gstreamer.freedesktop.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.6.2 $(PKG)_CHECKSUM := 5896716bd8e089dba452932a2eff2bb6f6c9d58ff64a96635d157f1ffaf8feb2 diff --git a/src/gta.mk b/src/gta.mk index 1a26ad2b..260b1a7a 100644 --- a/src/gta.mk +++ b/src/gta.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := gta +$(PKG)_WEBSITE := http://www.nongnu.org/gta/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.0.7 $(PKG)_CHECKSUM := 85763f6b1a223d89e4ac000f5048d1d5bcd39b315192bca4e123fd89c24a0db5 diff --git a/src/gtk2.mk b/src/gtk2.mk index f60be485..3f72b81e 100644 --- a/src/gtk2.mk +++ b/src/gtk2.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := gtk2 +$(PKG)_WEBSITE := http://www.gtk.org/ +$(PKG)_DESCR := GTK+ $(PKG)_IGNORE := $(PKG)_VERSION := 2.24.29 $(PKG)_CHECKSUM := 0741c59600d3d810a223866453dc2bbb18ce4723828681ba24aa6519c37631b8 diff --git a/src/gtk3.mk b/src/gtk3.mk index 50e1d0e9..ad02b8c0 100644 --- a/src/gtk3.mk +++ b/src/gtk3.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := gtk3 +$(PKG)_WEBSITE := http://www.gtk.org/ +$(PKG)_DESCR := GTK+ $(PKG)_IGNORE := $(PKG)_VERSION := 3.14.4 $(PKG)_CHECKSUM := a006c716d723dab0c623491566e3292af84c87d9198a30199051d23cfc7bef2f diff --git a/src/gtkglarea.mk b/src/gtkglarea.mk index b0f24680..3872ce68 100644 --- a/src/gtkglarea.mk +++ b/src/gtkglarea.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := gtkglarea +$(PKG)_WEBSITE := http://www.mono-project.com/GtkGLArea/ +$(PKG)_DESCR := GtkGLArea $(PKG)_IGNORE := $(PKG)_VERSION := 2.0.1 $(PKG)_CHECKSUM := dffe1cc0512d20d3840d0a1f3eff727bf2207c5c6714125155ca0cee0b177179 diff --git a/src/gtkglext.mk b/src/gtkglext.mk index 7367343d..98a6bf73 100644 --- a/src/gtkglext.mk +++ b/src/gtkglext.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := gtkglext +$(PKG)_WEBSITE := http://gtkglext.sourceforge.net/ +$(PKG)_DESCR := GtkGLExt $(PKG)_IGNORE := $(PKG)_VERSION := 1.2.0 $(PKG)_CHECKSUM := e5073f3c6b816e7fa67d359d9745a5bb5de94a628ac85f624c992925a46844f9 diff --git a/src/gtkglextmm.mk b/src/gtkglextmm.mk index feaddefd..ac88cd70 100644 --- a/src/gtkglextmm.mk +++ b/src/gtkglextmm.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := gtkglextmm +$(PKG)_WEBSITE := http://gtkglext.sourceforge.net/ +$(PKG)_DESCR := GtkGLExtmm $(PKG)_IGNORE := $(PKG)_VERSION := 1.2.0 $(PKG)_CHECKSUM := 8f499c1f95678c56cce908c10bf2c1d0f2267b87e0c480385fa4b128c75bdf7b diff --git a/src/gtkimageview.mk b/src/gtkimageview.mk index e2205bb6..c6e0d902 100644 --- a/src/gtkimageview.mk +++ b/src/gtkimageview.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := gtkimageview +$(PKG)_WEBSITE := http://trac.bjourne.webfactional.com/ +$(PKG)_DESCR := GtkImageView $(PKG)_IGNORE := $(PKG)_VERSION := 1.6.4 $(PKG)_CHECKSUM := 4c681d38d127ee3950a29bce9aa7aa8a2abe3b4d915f7a0c88e526999c1a46f2 diff --git a/src/gtkmm2.mk b/src/gtkmm2.mk index 0319c74a..b1a3d704 100644 --- a/src/gtkmm2.mk +++ b/src/gtkmm2.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := gtkmm2 +$(PKG)_WEBSITE := http://www.gtkmm.org/ +$(PKG)_DESCR := GTKMM $(PKG)_IGNORE := $(PKG)_VERSION := 2.24.4 $(PKG)_CHECKSUM := 443a2ff3fcb42a915609f1779000390c640a6d7fd19ad8816e6161053696f5ee diff --git a/src/gtkmm3.mk b/src/gtkmm3.mk index 859d2803..235e6796 100644 --- a/src/gtkmm3.mk +++ b/src/gtkmm3.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := gtkmm3 +$(PKG)_WEBSITE := http://www.gtkmm.org/ +$(PKG)_DESCR := GTKMM $(PKG)_IGNORE := $(PKG)_VERSION := 3.14.0 $(PKG)_CHECKSUM := d9f528a62c6ec226fa08287c45c7465b2dce5aae5068e9ac48d30a64a378e48b diff --git a/src/gtksourceview.mk b/src/gtksourceview.mk index 740627c6..0bac0e64 100644 --- a/src/gtksourceview.mk +++ b/src/gtksourceview.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := gtksourceview +$(PKG)_WEBSITE := http://projects.gnome.org/gtksourceview/ +$(PKG)_DESCR := GTKSourceView $(PKG)_IGNORE := $(PKG)_VERSION := 2.10.5 $(PKG)_CHECKSUM := c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e diff --git a/src/gtksourceviewmm2.mk b/src/gtksourceviewmm2.mk index 27005457..9f31fa3c 100644 --- a/src/gtksourceviewmm2.mk +++ b/src/gtksourceviewmm2.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := gtksourceviewmm2 +$(PKG)_WEBSITE := http://projects.gnome.org/gtksourceviewmm/ +$(PKG)_DESCR := GtkSourceViewmm $(PKG)_IGNORE := $(PKG)_VERSION := 2.10.3 $(PKG)_CHECKSUM := 0000df1b582d7be2e412020c5d748f21c0e6e5074c6b2ca8529985e70479375b diff --git a/src/guile.mk b/src/guile.mk index 86c8b953..50cb2fe7 100644 --- a/src/guile.mk +++ b/src/guile.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := guile +$(PKG)_WEBSITE := https://www.gnu.org/software/guile/ +$(PKG)_DESCR := GNU Guile $(PKG)_IGNORE := 2% $(PKG)_VERSION := 1.8.8 $(PKG)_CHECKSUM := c3471fed2e72e5b04ad133bbaaf16369e8360283679bcf19800bc1b381024050 diff --git a/src/harfbuzz.mk b/src/harfbuzz.mk index 025b2253..9b2e74f9 100644 --- a/src/harfbuzz.mk +++ b/src/harfbuzz.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := harfbuzz +$(PKG)_WEBSITE := http://harfbuzz.sourceforge.net/ +$(PKG)_DESCR := HarfBuzz $(PKG)_IGNORE := $(PKG)_VERSION := 1.3.4 $(PKG)_CHECKSUM := 718aa6fcadef1a6548315b8cfe42cc27e926256302c337f42df3a443843f6a2b diff --git a/src/hdf-eos2.mk b/src/hdf-eos2.mk index f450b425..7ead9bcc 100644 --- a/src/hdf-eos2.mk +++ b/src/hdf-eos2.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := hdf-eos2 +$(PKG)_WEBSITE := https://hdfeos.org/software/library.php +$(PKG)_DESCR := HDF-EOS2 $(PKG)_IGNORE := $(PKG)_VERSION := 19v1.00 $(PKG)_CHECKSUM := 3fffa081466e85d2b9436d984bc44fe97bbb33ad9d8b7055a322095dc4672e31 diff --git a/src/hdf-eos5.mk b/src/hdf-eos5.mk index aa8954eb..44525c8f 100644 --- a/src/hdf-eos5.mk +++ b/src/hdf-eos5.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := hdf-eos5 +$(PKG)_WEBSITE := https://hdfeos.org/software/library.php +$(PKG)_DESCR := HDF-EOS5 $(PKG)_IGNORE := $(PKG)_VERSION := 1.15 $(PKG)_CHECKSUM := 119588067abf139c1c600a4519b880d04a3933049576c88acdc8ff6fc71803dd diff --git a/src/hdf4.mk b/src/hdf4.mk index f9923167..e9e40cce 100644 --- a/src/hdf4.mk +++ b/src/hdf4.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := hdf4 +$(PKG)_WEBSITE := https://www.hdfgroup.org/hdf4/ +$(PKG)_DESCR := HDF4 $(PKG)_IGNORE := $(PKG)_VERSION := 4.2.10 $(PKG)_CHECKSUM := 44e9c7f5bdd463c4a01738f44ad4f0ee9c68e3f0cb9872eca160e3fddc8b994c diff --git a/src/hdf5.mk b/src/hdf5.mk index c9adf0d0..961f649b 100644 --- a/src/hdf5.mk +++ b/src/hdf5.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := hdf5 +$(PKG)_WEBSITE := https://www.hdfgroup.org/hdf5/ +$(PKG)_DESCR := HDF5 $(PKG)_IGNORE := $(PKG)_VERSION := 1.8.12 $(PKG)_CHECKSUM := 6d080f913a226a3ce390a11d9b571b2d5866581a2aa4434c398cd371c7063639 diff --git a/src/hunspell.mk b/src/hunspell.mk index 742226bb..1ca85c46 100644 --- a/src/hunspell.mk +++ b/src/hunspell.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := hunspell +$(PKG)_WEBSITE := http://hunspell.sourceforge.net/ +$(PKG)_DESCR := Hunspell $(PKG)_IGNORE := $(PKG)_VERSION := 1.3.3 $(PKG)_CHECKSUM := a7b2c0de0e2ce17426821dc1ac8eb115029959b3ada9d80a81739fa19373246c diff --git a/src/hyperscan.mk b/src/hyperscan.mk index 87ab40ca..b4058540 100644 --- a/src/hyperscan.mk +++ b/src/hyperscan.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := hyperscan +$(PKG)_WEBSITE := https://01.org/hyperscan +$(PKG)_DESCR := Hyperscan $(PKG)_IGNORE := $(PKG)_VERSION := 4.3.2 $(PKG)_CHECKSUM := 6cd5820d6da51d6fe4ab12066d1efd9afecc1bc6fb7d6eca9c98f76fd391dbd5 diff --git a/src/icu4c.mk b/src/icu4c.mk index 407391a8..60458ea0 100644 --- a/src/icu4c.mk +++ b/src/icu4c.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := icu4c +$(PKG)_WEBSITE := http://site.icu-project.org/ +$(PKG)_DESCR := ICU4C $(PKG)_IGNORE := $(PKG)_VERSION := 56.1 $(PKG)_MAJOR := $(word 1,$(subst ., ,$($(PKG)_VERSION))) diff --git a/src/id3lib.mk b/src/id3lib.mk index 3dd7b38a..3ce64977 100644 --- a/src/id3lib.mk +++ b/src/id3lib.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := id3lib +$(PKG)_WEBSITE := http://id3lib.sourceforge.net/ $(PKG)_IGNORE := $(PKG)_VERSION := 3.8.3 $(PKG)_CHECKSUM := 2749cc3c0cd7280b299518b1ddf5a5bcfe2d1100614519b68702230e26c7d079 diff --git a/src/ilmbase.mk b/src/ilmbase.mk index 5881c22b..48addbc0 100644 --- a/src/ilmbase.mk +++ b/src/ilmbase.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := ilmbase +$(PKG)_WEBSITE := http://www.openexr.com/ +$(PKG)_DESCR := IlmBase $(PKG)_IGNORE := $(PKG)_VERSION := 2.2.0 $(PKG)_CHECKSUM := ecf815b60695555c1fbc73679e84c7c9902f4e8faa6e8000d2f905b8b86cedc7 diff --git a/src/imagemagick.mk b/src/imagemagick.mk index 06720828..1abe9832 100644 --- a/src/imagemagick.mk +++ b/src/imagemagick.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := imagemagick +$(PKG)_WEBSITE := http://www.imagemagick.org/ +$(PKG)_DESCR := ImageMagick $(PKG)_IGNORE := $(PKG)_VERSION := 6.9.0-0 $(PKG)_CHECKSUM := 12331c904c691cb128865fdc97e5f8a2654576f9b032e274b74dd7617aa1b9b6 diff --git a/src/isl.mk b/src/isl.mk index da618e23..0e59ccfe 100644 --- a/src/isl.mk +++ b/src/isl.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := isl +$(PKG)_WEBSITE := http://isl.gforge.inria.fr/ +$(PKG)_DESCR := Integer Set Library $(PKG)_IGNORE := $(PKG)_VERSION := 0.12.2 $(PKG)_CHECKSUM := f4b3dbee9712850006e44f0db2103441ab3d13b406f77996d1df19ee89d11fb4 diff --git a/src/itk.mk b/src/itk.mk index cb059c3b..4842cd94 100644 --- a/src/itk.mk +++ b/src/itk.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := itk +$(PKG)_WEBSITE := http://www.itk.org/ +$(PKG)_DESCR := Insight Segmentation and Registration Toolkit (ITK) $(PKG)_IGNORE := $(PKG)_VERSION := 4.10.1 $(PKG)_CHECKSUM := 334312cc31925fd6c2622c9cd4ed33fecbbbd5b97e03b93f34b259d08352eed7 diff --git a/src/jack.mk b/src/jack.mk index 2d599556..07102171 100644 --- a/src/jack.mk +++ b/src/jack.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := jack +$(PKG)_WEBSITE := http://jackaudio.org/ +$(PKG)_DESCR := JACK Audio Connection Kit $(PKG)_IGNORE := $(PKG)_VERSION := 1.9.10 $(PKG)_CHECKSUM := 5bc6336e6ac9799e3cb241915e2ba5d01b030589bbb2afae39579a59ef0f2f56 diff --git a/src/jansson.mk b/src/jansson.mk index 3474d1dd..4b9bcc0e 100644 --- a/src/jansson.mk +++ b/src/jansson.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := jansson +$(PKG)_WEBSITE := http://www.digip.org/jansson/ +$(PKG)_DESCR := Jansson $(PKG)_IGNORE := $(PKG)_VERSION := 2.7 $(PKG)_CHECKSUM := 459f2b7cf22fb676286723f26169a17cf111fbfb6f54e3dc2ec6b6f9f4a97bdc diff --git a/src/jasper.mk b/src/jasper.mk index df10104f..9f945ac4 100644 --- a/src/jasper.mk +++ b/src/jasper.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := jasper +$(PKG)_WEBSITE := http://www.ece.uvic.ca/~mdadams/jasper/ +$(PKG)_DESCR := JasPer $(PKG)_IGNORE := $(PKG)_VERSION := 1.900.1 $(PKG)_CHECKSUM := 6b905a9c2aca2e275544212666eefc4eb44d95d0a57e4305457b407fe63f9494 diff --git a/src/jpeg.mk b/src/jpeg.mk index 014f2444..f73c3eef 100644 --- a/src/jpeg.mk +++ b/src/jpeg.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := jpeg +$(PKG)_WEBSITE := http://www.ijg.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 9b $(PKG)_CHECKSUM := 240fd398da741669bf3c90366f58452ea59041cacc741a489b99f2f6a0bad052 diff --git a/src/json-c.mk b/src/json-c.mk index b72a12a3..8413550c 100644 --- a/src/json-c.mk +++ b/src/json-c.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := json-c +$(PKG)_WEBSITE := https://github.com/json-c/json-c/wiki $(PKG)_IGNORE := $(PKG)_VERSION := 0.12 $(PKG)_CHECKSUM := 6fd6d2311d610b279e1bcdd5c6d4f699700159d3e0786de8306af7b4bc94fb35 diff --git a/src/json-glib.mk b/src/json-glib.mk index 78dccf3b..deeb104a 100644 --- a/src/json-glib.mk +++ b/src/json-glib.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := json-glib +$(PKG)_WEBSITE := https://wiki.gnome.org/action/show/Projects/JsonGlib +$(PKG)_DESCR := JSON-Glib $(PKG)_IGNORE := $(PKG)_VERSION := 1.0.4 $(PKG)_CHECKSUM := 80f3593cb6bd13f1465828e46a9f740e2e9bd3cd2257889442b3e62bd6de05cd diff --git a/src/json_spirit.mk b/src/json_spirit.mk index 2bc94507..923701e9 100644 --- a/src/json_spirit.mk +++ b/src/json_spirit.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := json_spirit +$(PKG)_WEBSITE := https://www.codeproject.com/Articles/20027/JSON-Spirit-A-C-JSON-Parser-Generator-Implemented $(PKG)_IGNORE := $(PKG)_VERSION := 4.08 $(PKG)_CHECKSUM := 082798e46b3ee4c2b9613c212308f770cd9988c7a08b8ae3c345bf64fdad125f diff --git a/src/jsoncpp.mk b/src/jsoncpp.mk index 65a99b3a..100993d8 100644 --- a/src/jsoncpp.mk +++ b/src/jsoncpp.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := jsoncpp +$(PKG)_WEBSITE := https://github.com/open-source-parsers/jsoncpp $(PKG)_IGNORE := $(PKG)_VERSION := 1.6.5 $(PKG)_CHECKSUM := a2b121eaff56ec88cfd034d17685821a908d0d87bc319329b04f91a6552c1ac2 diff --git a/src/lame.mk b/src/lame.mk index e1631e54..0434b218 100644 --- a/src/lame.mk +++ b/src/lame.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := lame +$(PKG)_WEBSITE := http://lame.sourceforge.net/ $(PKG)_IGNORE := $(PKG)_VERSION := 3.99.5 $(PKG)_CHECKSUM := 24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff diff --git a/src/lapack.mk b/src/lapack.mk index 7397b065..c2aad449 100644 --- a/src/lapack.mk +++ b/src/lapack.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := lapack +$(PKG)_WEBSITE := http://www.netlib.org/lapack/ $(PKG)_VERSION := 3.6.0 $(PKG)_CHECKSUM := a9a0082c918fe14e377bbd570057616768dca76cbdc713457d8199aaa233ffc3 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) diff --git a/src/lcms.mk b/src/lcms.mk index 94f66c06..20f773f7 100644 --- a/src/lcms.mk +++ b/src/lcms.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := lcms +$(PKG)_WEBSITE := http://www.littlecms.com/ $(PKG)_IGNORE := $(PKG)_VERSION := 2.7 $(PKG)_CHECKSUM := 4524234ae7de185e6b6da5d31d6875085b2198bc63b1211f7dde6e2d197d6a53 diff --git a/src/lcms1.mk b/src/lcms1.mk index 0ddad74e..655c12e9 100644 --- a/src/lcms1.mk +++ b/src/lcms1.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := lcms1 +$(PKG)_WEBSITE := http://www.littlecms.com/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.19 $(PKG)_CHECKSUM := 80ae32cb9f568af4dc7ee4d3c05a4c31fc513fc3e31730fed0ce7378237273a9 diff --git a/src/lensfun.mk b/src/lensfun.mk index f0640ea2..bf945b1c 100644 --- a/src/lensfun.mk +++ b/src/lensfun.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := lensfun +$(PKG)_WEBSITE := http://lensfun.sourceforge.net/ $(PKG)_IGNORE := $(PKG)_VERSION := 0.3.0 $(PKG)_CHECKSUM := c2c3c03873cb549d49d42f118fcb0ffa95d1e45b9ff395e19facb63bf699bec1 diff --git a/src/levmar.mk b/src/levmar.mk index 135dc2bf..f51ec7e2 100644 --- a/src/levmar.mk +++ b/src/levmar.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := levmar +$(PKG)_WEBSITE := http://www.ics.forth.gr/~lourakis/levmar $(PKG)_IGNORE := $(PKG)_VERSION := 2.6 $(PKG)_CHECKSUM := 3bf4ef1ea4475ded5315e8d8fc992a725f2e7940a74ca3b0f9029d9e6e94bad7 diff --git a/src/libaacs.mk b/src/libaacs.mk index e1f25d2b..96a57cce 100644 --- a/src/libaacs.mk +++ b/src/libaacs.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libaacs +$(PKG)_WEBSITE := http://www.videolan.org/developers/libaacs.html $(PKG)_IGNORE := $(PKG)_VERSION := 0.8.1 $(PKG)_CHECKSUM := 95c344a02c47c9753c50a5386fdfb8313f9e4e95949a5c523a452f0bcb01bbe8 diff --git a/src/libarchive.mk b/src/libarchive.mk index fa5914f4..f4f8dac4 100644 --- a/src/libarchive.mk +++ b/src/libarchive.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libarchive +$(PKG)_WEBSITE := http://www.libarchive.org/ +$(PKG)_DESCR := Libarchive $(PKG)_IGNORE := $(PKG)_VERSION := 3.1.2 $(PKG)_CHECKSUM := eb87eacd8fe49e8d90c8fdc189813023ccc319c5e752b01fb6ad0cc7b2c53d5e diff --git a/src/libass.mk b/src/libass.mk index 14653f3f..fcab079b 100644 --- a/src/libass.mk +++ b/src/libass.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libass +$(PKG)_WEBSITE := http://code.google.com/p/libass/ $(PKG)_IGNORE := # remove autoreconf step after 0.13.1 # https://github.com/libass/libass/issues/209 diff --git a/src/libbluray.mk b/src/libbluray.mk index a355afab..6350351b 100644 --- a/src/libbluray.mk +++ b/src/libbluray.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libbluray +$(PKG)_WEBSITE := http://www.videolan.org/developers/libbluray.html $(PKG)_IGNORE := $(PKG)_VERSION := 0.9.2 $(PKG)_CHECKSUM := efc994f42d2bce6af2ce69d05ba89dbbd88bcec7aca065de094fb3a7880ce7ea diff --git a/src/libbs2b.mk b/src/libbs2b.mk index 2b00b4ea..2829356f 100644 --- a/src/libbs2b.mk +++ b/src/libbs2b.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libbs2b +$(PKG)_WEBSITE := http://bs2b.sourceforge.net/ +$(PKG)_DESCR := Bauer Stereophonic-to-Binaural library $(PKG)_IGNORE := $(PKG)_VERSION := 3.1.0 $(PKG)_CHECKSUM := 4799974becdeeedf0db00115bc63f60ea3fe4b25f1dfdb6903505839a720e46f diff --git a/src/libcaca.mk b/src/libcaca.mk index d852fc7a..b280a479 100644 --- a/src/libcaca.mk +++ b/src/libcaca.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libcaca +$(PKG)_WEBSITE := http://caca.zoy.org/wiki/libcaca $(PKG)_IGNORE := $(PKG)_VERSION := 0.99.beta19 $(PKG)_CHECKSUM := 128b467c4ed03264c187405172a4e83049342cc8cc2f655f53a2d0ee9d3772f4 diff --git a/src/libcddb.mk b/src/libcddb.mk index 2446d49f..4521249a 100644 --- a/src/libcddb.mk +++ b/src/libcddb.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libcddb +$(PKG)_WEBSITE := https://sourceforge.net/projects/libcddb/ +$(PKG)_DESCR := Access data on a CDDB $(PKG)_IGNORE := $(PKG)_VERSION := 1.3.2 $(PKG)_CHECKSUM := 35ce0ee1741ea38def304ddfe84a958901413aa829698357f0bee5bb8f0a223b diff --git a/src/libcdio-paranoia.mk b/src/libcdio-paranoia.mk index ef6bf1ac..c4ac64e9 100644 --- a/src/libcdio-paranoia.mk +++ b/src/libcdio-paranoia.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libcdio-paranoia +$(PKG)_WEBSITE := https://www.gnu.org/software/libcdio/ +$(PKG)_DESCR := Libcdio-paranoia $(PKG)_IGNORE := $(PKG)_VERSION := 10.2+0.93+1 $(PKG)_CHECKSUM := ec1d9b1d5a28cc042f2cb33a7cc0a2b5ce5525f102bc4c15db1fac322559a493 diff --git a/src/libcdio.mk b/src/libcdio.mk index b8fee79d..805ddb08 100644 --- a/src/libcdio.mk +++ b/src/libcdio.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libcdio +$(PKG)_WEBSITE := https://www.gnu.org/software/libcdio/ +$(PKG)_DESCR := Libcdio $(PKG)_IGNORE := $(PKG)_VERSION := 0.93 $(PKG)_CHECKSUM := f8276629226c7e1e74209b66ca421d09d6aec87f72f60ae9b1d3debd0a13dda8 diff --git a/src/libcomm14cux.mk b/src/libcomm14cux.mk index 4cc6e62f..8d1f0d30 100644 --- a/src/libcomm14cux.mk +++ b/src/libcomm14cux.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libcomm14cux +$(PKG)_WEBSITE := https://github.com/colinbourassa/libcomm14cux/ $(PKG)_IGNORE := $(PKG)_VERSION := 2.1.1 $(PKG)_CHECKSUM := 4b3d0969e2226a0f3c1250c609858e487631507ed62bf6732ce82f13f0d9fcc9 diff --git a/src/libcroco.mk b/src/libcroco.mk index 92983da7..35d3ff98 100644 --- a/src/libcroco.mk +++ b/src/libcroco.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libcroco +$(PKG)_WEBSITE := http://www.freespiders.org/projects/libcroco/ +$(PKG)_DESCR := Libcroco $(PKG)_IGNORE := $(PKG)_VERSION := 0.6.2 $(PKG)_CHECKSUM := be24853f64c09b63d39e563fb0222e29bae1a33c3d9f6cbffc0bc27669371749 diff --git a/src/libdnet.mk b/src/libdnet.mk index 7c9d08bb..b4bdc6f5 100644 --- a/src/libdnet.mk +++ b/src/libdnet.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libdnet +$(PKG)_WEBSITE := http://libdnet.sourceforge.net/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.11 $(PKG)_CHECKSUM := 0eb78415c8f2564c2f1e8ad36e98473348d9c94852f796a226360c716cc7ca53 diff --git a/src/libdvbpsi.mk b/src/libdvbpsi.mk index 8c8ad8fc..e9500f52 100644 --- a/src/libdvbpsi.mk +++ b/src/libdvbpsi.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libdvbpsi +$(PKG)_WEBSITE := http://www.videolan.org/developers/libdvbpsi.html $(PKG)_IGNORE := $(PKG)_VERSION := 1.2.0 $(PKG)_CHECKSUM := 36d9b233306e48b58999e87864253b564e20932ed46a485e44ef7058f1f927e8 diff --git a/src/libdvdcss.mk b/src/libdvdcss.mk index 266766c2..47c756f7 100644 --- a/src/libdvdcss.mk +++ b/src/libdvdcss.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libdvdcss +$(PKG)_WEBSITE := http://www.videolan.org/developers/libdvdcss.html $(PKG)_IGNORE := $(PKG)_VERSION := 1.3.0 $(PKG)_CHECKSUM := 7c414acd520c4e4dd7267952f72d738ff50321a7869af4d75c65aefad44f1395 diff --git a/src/libdvdetect.mk b/src/libdvdetect.mk index 652c4a67..a3816f74 100644 --- a/src/libdvdetect.mk +++ b/src/libdvdetect.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libdvdetect +$(PKG)_WEBSITE := https://www.dvdetect.de/ +$(PKG)_DESCR := Fast database lookup for DVDs $(PKG)_IGNORE := $(PKG)_VERSION := 0.71.0 $(PKG)_CHECKSUM := b098e04660532df78836f50bc0a8044b66c6659b07a6bff6609724ad30a87192 diff --git a/src/libdvdnav.mk b/src/libdvdnav.mk index ae7f0f28..331200c7 100644 --- a/src/libdvdnav.mk +++ b/src/libdvdnav.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libdvdnav +$(PKG)_WEBSITE := https://dvdnav.mplayerhq.hu/ $(PKG)_IGNORE := $(PKG)_VERSION := 5.0.1 $(PKG)_CHECKSUM := 72b1cb8266f163d4a1481b92c7b6c53e6dc9274d2a6befb08ffc351fe7a4a2a9 diff --git a/src/libdvdread.mk b/src/libdvdread.mk index ac145617..78c1bf1e 100644 --- a/src/libdvdread.mk +++ b/src/libdvdread.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libdvdread +$(PKG)_WEBSITE := https://dvdnav.mplayerhq.hu/ $(PKG)_IGNORE := $(PKG)_VERSION := 5.0.0 $(PKG)_CHECKSUM := 66fb1a3a42aa0c56b02547f69c7eb0438c5beeaf21aee2ae2c6aa23ea8305f14 diff --git a/src/libechonest.mk b/src/libechonest.mk index f1286f2e..2aeb718e 100644 --- a/src/libechonest.mk +++ b/src/libechonest.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libechonest +$(PKG)_WEBSITE := https://github.com/lfranchi/libechonest $(PKG)_IGNORE := $(PKG)_VERSION := 2.3.1 $(PKG)_CHECKSUM := ab961ab952df30c5234b548031594d7e281e7c9f2a9d1ce91fe5421ddde85e7c diff --git a/src/libepoxy.mk b/src/libepoxy.mk index 67fe1d7b..71269490 100644 --- a/src/libepoxy.mk +++ b/src/libepoxy.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libepoxy +$(PKG)_WEBSITE := https://github.com/anholt/libepoxy $(PKG)_IGNORE := $(PKG)_VERSION := 1.3.1 $(PKG)_CHECKSUM := 6700ddedffb827b42c72cce1e0be6fba67b678b19bf256e1b5efd3ea38cc2bb4 diff --git a/src/libevent.mk b/src/libevent.mk index 055258ee..ea9f9efc 100644 --- a/src/libevent.mk +++ b/src/libevent.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libevent +$(PKG)_WEBSITE := http://libevent.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 2.0.21 $(PKG)_CHECKSUM := 872b7cdc199ead2edd9f0d1e93b4d900e67d892c014545bd3314b3ae49505eff diff --git a/src/libf2c.mk b/src/libf2c.mk index 2dea129c..cf6cc42b 100644 --- a/src/libf2c.mk +++ b/src/libf2c.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libf2c +$(PKG)_WEBSITE := http://www.netlib.org/f2c/ $(PKG)_IGNORE := $(PKG)_VERSION := 1 $(PKG)_CHECKSUM := 5dff29c58b428fa00cd36b1220e2d71b9882a658fdec1aa094fb7e6e482d6765 diff --git a/src/libffi.mk b/src/libffi.mk index 569adc75..a4c915b3 100644 --- a/src/libffi.mk +++ b/src/libffi.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libffi +$(PKG)_WEBSITE := https://sourceware.org/libffi/ $(PKG)_IGNORE := $(PKG)_VERSION := 3.2.1 $(PKG)_CHECKSUM := d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37 diff --git a/src/libftdi.mk b/src/libftdi.mk index 4040a5ea..0a13e0c0 100644 --- a/src/libftdi.mk +++ b/src/libftdi.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libftdi +$(PKG)_WEBSITE := http://www.intra2net.com/en/developer/libftdi/index.php +$(PKG)_DESCR := LibFTDI $(PKG)_IGNORE := $(PKG)_VERSION := 0.20 $(PKG)_CHECKSUM := 3176d5b5986438f33f5208e690a8bfe90941be501cc0a72118ce3d338d4b838e diff --git a/src/libftdi1.mk b/src/libftdi1.mk index f074bd72..bbf6d99c 100644 --- a/src/libftdi1.mk +++ b/src/libftdi1.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libftdi1 +$(PKG)_WEBSITE := http://www.intra2net.com/en/developer/libftdi/index.php +$(PKG)_DESCR := LibFTDI1 $(PKG)_IGNORE := $(PKG)_VERSION := 1.2 $(PKG)_CHECKSUM := a6ea795c829219015eb372b03008351cee3fb39f684bff3bf8a4620b558488d6 diff --git a/src/libgcrypt.mk b/src/libgcrypt.mk index 5c4cec05..0bf2f4b1 100644 --- a/src/libgcrypt.mk +++ b/src/libgcrypt.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libgcrypt +$(PKG)_WEBSITE := ftp://ftp.gnupg.org/gcrypt/libgcrypt/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.7.5 $(PKG)_CHECKSUM := d1fea4128beef2bb30a470af6bafabccc503ced350534fb9dd8f5a53ffbae800 diff --git a/src/libgda.mk b/src/libgda.mk index e7d432eb..38e9be9b 100644 --- a/src/libgda.mk +++ b/src/libgda.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libgda +$(PKG)_WEBSITE := http://www.gnome-db.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 4.2.13 $(PKG)_CHECKSUM := 25b75951f8f38fd58a403389566a0aae2f83b39d4225bc3acf5f2d68895ab4c3 diff --git a/src/libgdamm.mk b/src/libgdamm.mk index 79136ee0..b4b5caae 100644 --- a/src/libgdamm.mk +++ b/src/libgdamm.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libgdamm +$(PKG)_WEBSITE := https://launchpad.net/libgdamm $(PKG)_IGNORE := $(PKG)_VERSION := 4.1.3 $(PKG)_CHECKSUM := 9e7c04544fb580d8b00216ca191ab863dff73abec0e569159f4aa640f6319881 diff --git a/src/libgee.mk b/src/libgee.mk index 45bd74c7..b839d684 100644 --- a/src/libgee.mk +++ b/src/libgee.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libgee +$(PKG)_WEBSITE := http://live.gnome.org/Libgee $(PKG)_IGNORE := $(PKG)_VERSION := 0.5.0 $(PKG)_CHECKSUM := aa6a2563867d3e3d56921bd1f7a7869d24599e1b5beb70e83f55b718fdddff51 diff --git a/src/libgeotiff.mk b/src/libgeotiff.mk index d51cfd57..5da71b18 100644 --- a/src/libgeotiff.mk +++ b/src/libgeotiff.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libgeotiff +$(PKG)_WEBSITE := http://trac.osgeo.org/geotiff/ +$(PKG)_DESCR := GeoTiff $(PKG)_IGNORE := $(PKG)_VERSION := 1.4.0 $(PKG)_CHECKSUM := d0acb8d341fd6a8f2c673456e09fdb8f50f91e3166ac934719fe05b30d328329 diff --git a/src/libgit2.mk b/src/libgit2.mk index b401ce53..cad3941e 100644 --- a/src/libgit2.mk +++ b/src/libgit2.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libgit2 +$(PKG)_WEBSITE := https://libgit2.github.com/ $(PKG)_IGNORE := $(PKG)_VERSION := 0.23.2 $(PKG)_CHECKSUM := 20c0a6ee92c0e19207dac6ddc336b4ae4a1c4ddf91be0891e4b6e6ccba16df0b diff --git a/src/libglade.mk b/src/libglade.mk index c8e4da32..8c1950f0 100644 --- a/src/libglade.mk +++ b/src/libglade.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libglade +$(PKG)_WEBSITE := http://glade.gnome.org/ +$(PKG)_DESCR := glade $(PKG)_IGNORE := $(PKG)_VERSION := 2.6.4 $(PKG)_CHECKSUM := c41d189b68457976069073e48d6c14c183075d8b1d8077cb6dfb8b7c5097add3 diff --git a/src/libgnurx.mk b/src/libgnurx.mk index 18c094b4..9b29fd46 100644 --- a/src/libgnurx.mk +++ b/src/libgnurx.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libgnurx +$(PKG)_WEBSITE := http://sourceforge.net/projects/mingw/files/UserContributed/regex/ $(PKG)_IGNORE := $(PKG)_VERSION := 2.6.1 $(PKG)_CHECKSUM := ee6edc110c6b63d0469f4f05ef187564b310cc8a88b6566310a4aebd48b612c7 diff --git a/src/libgpg_error.mk b/src/libgpg_error.mk index d787fee0..8d7d66a1 100644 --- a/src/libgpg_error.mk +++ b/src/libgpg_error.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libgpg_error +$(PKG)_WEBSITE := ftp://ftp.gnupg.org/gcrypt/libgpg-error/ +$(PKG)_DESCR := libgpg-error $(PKG)_IGNORE := $(PKG)_VERSION := 1.26 $(PKG)_CHECKSUM := 4c4bcbc90116932e3acd37b37812d8653b1b189c1904985898e860af818aee69 diff --git a/src/libgsasl.mk b/src/libgsasl.mk index 7b9961d6..23a12f46 100644 --- a/src/libgsasl.mk +++ b/src/libgsasl.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libgsasl +$(PKG)_WEBSITE := https://www.gnu.org/software/gsasl/ +$(PKG)_DESCR := Libgsasl $(PKG)_IGNORE := $(PKG)_VERSION := 1.8.0 $(PKG)_CHECKSUM := 3adfb49f9c92a719dea855fd1840d698cde55d4648d332a69032ba8bea207720 diff --git a/src/libgsf.mk b/src/libgsf.mk index c0599200..a90ae45b 100644 --- a/src/libgsf.mk +++ b/src/libgsf.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libgsf +$(PKG)_WEBSITE := http://projects.gnome.org/libgsf/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.14.30 $(PKG)_CHECKSUM := cb48c3480be4a691963548e664308f497d93c9d7bc12cf6a68d5ebae930a5b70 diff --git a/src/libharu.mk b/src/libharu.mk index 9bacd408..a4052404 100644 --- a/src/libharu.mk +++ b/src/libharu.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libharu +$(PKG)_WEBSITE := http://libharu.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 2.2.1 $(PKG)_CHECKSUM := 45fd57044042c0e290ad0f11fc19eeb31b50c4b9edadf9d89dd5a7d9ae4865a7 diff --git a/src/libiberty.mk b/src/libiberty.mk index 5a16c436..ff032383 100644 --- a/src/libiberty.mk +++ b/src/libiberty.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libiberty +$(PKG)_WEBSITE := http://gcc.gnu.org/onlinedocs/libiberty/ $(PKG)_IGNORE = $(binutils_IGNORE) $(PKG)_VERSION = $(binutils_VERSION) $(PKG)_CHECKSUM = $(binutils_CHECKSUM) diff --git a/src/libical.mk b/src/libical.mk index 78f630f1..6a8925e4 100644 --- a/src/libical.mk +++ b/src/libical.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libical +$(PKG)_WEBSITE := http://freeassociation.sourceforge.net/ $(PKG)_VERSION := 2.0.0 $(PKG)_CHECKSUM := 654c11f759c19237be39f6ad401d917e5a05f36f1736385ed958e60cf21456da $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) diff --git a/src/libiconv.mk b/src/libiconv.mk index 35b218e9..f026c8b1 100644 --- a/src/libiconv.mk +++ b/src/libiconv.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libiconv +$(PKG)_WEBSITE := https://www.gnu.org/software/libiconv/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.14 $(PKG)_CHECKSUM := 72b24ded17d687193c3366d0ebe7cde1e6b18f0df8c55438ac95be39e8a30613 diff --git a/src/libid3tag.mk b/src/libid3tag.mk index 23a82bb9..442d0325 100644 --- a/src/libid3tag.mk +++ b/src/libid3tag.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libid3tag +$(PKG)_WEBSITE := http://sourceforge.net/projects/mad/files/libid3tag/ $(PKG)_IGNORE := $(PKG)_VERSION := 0.15.1b $(PKG)_CHECKSUM := 63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151 diff --git a/src/libidn.mk b/src/libidn.mk index 34996b6e..a40c68d0 100644 --- a/src/libidn.mk +++ b/src/libidn.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libidn +$(PKG)_WEBSITE := https://www.gnu.org/software/libidn/ +$(PKG)_DESCR := Libidn $(PKG)_IGNORE := $(PKG)_VERSION := 1.33 $(PKG)_CHECKSUM := 44a7aab635bb721ceef6beecc4d49dfd19478325e1b47f3196f7d2acc4930e19 diff --git a/src/libieee1284.mk b/src/libieee1284.mk index b8a77bf7..b4e5aa1d 100644 --- a/src/libieee1284.mk +++ b/src/libieee1284.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libieee1284 +$(PKG)_WEBSITE := http://cyberelk.net/tim/software/libieee1284/ $(PKG)_IGNORE := $(PKG)_VERSION := 0.2.11 $(PKG)_CHECKSUM := 7730de107782e5d2b071bdcb5b06a44da74856f00ef4a9be85d1ba4806a38f1a diff --git a/src/libircclient.mk b/src/libircclient.mk index e9b159f0..23e98618 100644 --- a/src/libircclient.mk +++ b/src/libircclient.mk @@ -3,6 +3,7 @@ # Note that IPv6 support is partly broken and therefore disabled. PKG := libircclient +$(PKG)_WEBSITE := http://sourceforge.net/projects/libircclient/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.8 $(PKG)_CHECKSUM := 2cf8523ac683588f2785b08159a2df3e4d15939ee655c0024aa86334149de8f6 diff --git a/src/libjpeg-turbo.mk b/src/libjpeg-turbo.mk index cdda6184..ca0ddcc1 100644 --- a/src/libjpeg-turbo.mk +++ b/src/libjpeg-turbo.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libjpeg-turbo +$(PKG)_WEBSITE := http://libjpeg-turbo.virtualgl.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.5.1 $(PKG)_CHECKSUM := 41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c diff --git a/src/liblaxjson.mk b/src/liblaxjson.mk index 5823caee..8baa591b 100644 --- a/src/liblaxjson.mk +++ b/src/liblaxjson.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := liblaxjson +$(PKG)_WEBSITE := https://github.com/andrewrk/liblaxjson $(PKG)_IGNORE := $(PKG)_VERSION := 1.0.5 $(PKG)_CHECKSUM := ffc495b5837e703b13af3f5a5790365dc3a6794f12f0fa93fb8593b162b0b762 diff --git a/src/liblo.mk b/src/liblo.mk index 8e0548dc..bc9f96ed 100644 --- a/src/liblo.mk +++ b/src/liblo.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := liblo +$(PKG)_WEBSITE := http://liblo.sourceforge.net/ $(PKG)_IGNORE := $(PKG)_VERSION := 0.28 $(PKG)_CHECKSUM := da94a9b67b93625354dd89ff7fe31e5297fc9400b6eaf7378c82ee1caf7db909 diff --git a/src/liblqr-1.mk b/src/liblqr-1.mk index 1836ba7a..b91d78e1 100644 --- a/src/liblqr-1.mk +++ b/src/liblqr-1.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := liblqr-1 +$(PKG)_WEBSITE := http://liblqr.wikidot.com/ $(PKG)_IGNORE := $(PKG)_VERSION := 0.4.2 $(PKG)_CHECKSUM := 173a822efd207d72cda7d7f4e951c5000f31b10209366ff7f0f5972f7f9ff137 diff --git a/src/liblsmash.mk b/src/liblsmash.mk index 3ad797d8..a1918415 100644 --- a/src/liblsmash.mk +++ b/src/liblsmash.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := liblsmash +$(PKG)_WEBSITE := https://l-smash.github.io/l-smash/ +$(PKG)_DESCR := L-SMASH $(PKG)_IGNORE := $(PKG)_VERSION := 2.9.1 $(PKG)_CHECKSUM := 17f24fc8bffba753f8c628f1732fc3581b80362341274747ef6fb96af1cac45c diff --git a/src/libltdl.mk b/src/libltdl.mk index f2b02e2e..60cec664 100644 --- a/src/libltdl.mk +++ b/src/libltdl.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libltdl +$(PKG)_WEBSITE := http://www.gnu.org/software/libtool/manual/html_node/Using-libltdl.html#Using-libltdl +$(PKG)_DESCR := GNU Libtool Library (libltdl) $(PKG)_IGNORE = $(libtool_IGNORE) $(PKG)_VERSION = $(libtool_VERSION) $(PKG)_CHECKSUM = $(libtool_CHECKSUM) diff --git a/src/libmad.mk b/src/libmad.mk index 57dd185c..58724300 100644 --- a/src/libmad.mk +++ b/src/libmad.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libmad +$(PKG)_WEBSITE := http://www.underbit.com/products/mad/ $(PKG)_IGNORE := $(PKG)_VERSION := 0.15.1b $(PKG)_CHECKSUM := bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690 diff --git a/src/libmicrohttpd.mk b/src/libmicrohttpd.mk index 1ddc1e17..cf50b982 100644 --- a/src/libmicrohttpd.mk +++ b/src/libmicrohttpd.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libmicrohttpd +$(PKG)_WEBSITE := http://www.gnu.org/software/libmicrohttpd/ +$(PKG)_DESCR := GNU Libmicrohttpd $(PKG)_IGNORE := $(PKG)_VERSION := 0.9.38 $(PKG)_CHECKSUM := 8df2b4dd863c98799a4775a530d905363fbc02fec850af9094da890b28b9e721 diff --git a/src/libmikmod.mk b/src/libmikmod.mk index 9493a027..12d472e9 100644 --- a/src/libmikmod.mk +++ b/src/libmikmod.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libmikmod +$(PKG)_WEBSITE := http://mikmod.raphnet.net/ +$(PKG)_DESCR := libMikMod $(PKG)_IGNORE := $(PKG)_VERSION := 3.3.7 $(PKG)_CHECKSUM := 4cf41040a9af99cb960580210ba900c0a519f73ab97b503c780e82428b9bd9a2 diff --git a/src/libmng.mk b/src/libmng.mk index c11ff5d2..aca4f1fb 100644 --- a/src/libmng.mk +++ b/src/libmng.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libmng +$(PKG)_WEBSITE := http://www.libmng.com/ $(PKG)_IGNORE := $(PKG)_VERSION := 2.0.3 $(PKG)_CHECKSUM := 4a462fdd48d4bc82c1d7a21106c8a18b62f8cc0042454323058e6da0dbb57dd3 diff --git a/src/libmodplug.mk b/src/libmodplug.mk index 0a24119c..f56843e2 100644 --- a/src/libmodplug.mk +++ b/src/libmodplug.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libmodplug +$(PKG)_WEBSITE := http://modplug-xmms.sourceforge.net/ $(PKG)_IGNORE := $(PKG)_VERSION := 0.8.8.4 $(PKG)_CHECKSUM := 5c5ee13dddbed144be26276e5f102da17ff5b1c992f3100389983082da2264f7 diff --git a/src/libmpcdec.mk b/src/libmpcdec.mk index 085e5a7a..e0153893 100644 --- a/src/libmpcdec.mk +++ b/src/libmpcdec.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libmpcdec +$(PKG)_WEBSITE := http://www.musepack.net/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.2.6 $(PKG)_CHECKSUM := 4bd54929a80850754f27b568d7891e1e3e1b8d2f208d371f27d1fda09e6f12a8 diff --git a/src/libmysqlclient.mk b/src/libmysqlclient.mk index 332ef1a3..dd322bef 100644 --- a/src/libmysqlclient.mk +++ b/src/libmysqlclient.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libmysqlclient +$(PKG)_WEBSITE := https://dev.mysql.com/downloads/connector/c/ $(PKG)_IGNORE := $(PKG)_VERSION := 6.1.6 $(PKG)_CHECKSUM := 2222433012c415871958b61bc4f3683e1ebe77e3389f698b267058c12533ea78 diff --git a/src/libnice.mk b/src/libnice.mk index 6cd53c3a..6fcdec66 100644 --- a/src/libnice.mk +++ b/src/libnice.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libnice +$(PKG)_WEBSITE := https://nice.freedesktop.org/wiki/ $(PKG)_IGNORE := $(PKG)_VERSION := 0.1.13 $(PKG)_CHECKSUM := 61112d9f3be933a827c8365f20551563953af6718057928f51f487bfe88419e1 diff --git a/src/libntlm.mk b/src/libntlm.mk index 656a9e3a..7ad0262e 100644 --- a/src/libntlm.mk +++ b/src/libntlm.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libntlm +$(PKG)_WEBSITE := http://www.nongnu.org/libntlm/ +$(PKG)_DESCR := Libntlm $(PKG)_IGNORE := $(PKG)_VERSION := 1.4 $(PKG)_CHECKSUM := 8415d75e31d3135dc7062787eaf4119b984d50f86f0d004b964cdc18a3182589 diff --git a/src/liboauth.mk b/src/liboauth.mk index e34d1e83..1efe0271 100644 --- a/src/liboauth.mk +++ b/src/liboauth.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := liboauth +$(PKG)_WEBSITE := http://liboauth.sourceforge.net/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.0.3 $(PKG)_CHECKSUM := 0df60157b052f0e774ade8a8bac59d6e8d4b464058cc55f9208d72e41156811f diff --git a/src/libodbc++.mk b/src/libodbc++.mk index e3366141..2c5c9fc4 100644 --- a/src/libodbc++.mk +++ b/src/libodbc++.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libodbc++ +$(PKG)_WEBSITE := http://libodbcxx.sourceforge.net/ $(PKG)_IGNORE := $(PKG)_VERSION := 0.2.5 $(PKG)_CHECKSUM := ba3030a27b34e4aafbececa2ddbbf42a38815e9534f34c051620540531b5e23e diff --git a/src/liboil.mk b/src/liboil.mk index b76bf782..b8bffc26 100644 --- a/src/liboil.mk +++ b/src/liboil.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := liboil +$(PKG)_WEBSITE := http://liboil.freedesktop.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 0.3.17 $(PKG)_CHECKSUM := 105f02079b0b50034c759db34b473ecb5704ffa20a5486b60a8b7698128bfc69 diff --git a/src/libpano13.mk b/src/libpano13.mk index 37f783e9..665d37d3 100644 --- a/src/libpano13.mk +++ b/src/libpano13.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libpano13 +$(PKG)_WEBSITE := http://panotools.sourceforge.net/ $(PKG)_IGNORE := $(PKG)_VERSION := 2.9.18 $(PKG)_CHECKSUM := de5d4e43f15c3430e95c0faa1c50c9503516e1b570d0ec0522f610a578caa172 diff --git a/src/libpaper.mk b/src/libpaper.mk index 00b9610d..2ac38910 100644 --- a/src/libpaper.mk +++ b/src/libpaper.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libpaper +$(PKG)_WEBSITE := http://packages.debian.org/unstable/libpaper1 $(PKG)_IGNORE := $(PKG)_VERSION := 1.1.24+nmu4 $(PKG)_CHECKSUM := 2491fce3f590d922d2d3070555df4425921b89c76a18e1c62e36336d6657526a diff --git a/src/libplist.mk b/src/libplist.mk index 920e1b41..c2f1b7da 100644 --- a/src/libplist.mk +++ b/src/libplist.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libplist +$(PKG)_WEBSITE := https://github.com/libimobiledevice/libplist $(PKG)_IGNORE := $(PKG)_VERSION := 1.12 $(PKG)_CHECKSUM := b8e860ef2e01154e79242438252b2a7ed185df351f02c167147a8a602a0aa63e diff --git a/src/libpng.mk b/src/libpng.mk index bab3c54b..4ceb2d8c 100644 --- a/src/libpng.mk +++ b/src/libpng.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libpng +$(PKG)_WEBSITE := http://www.libpng.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.6.26 $(PKG)_CHECKSUM := 266743a326986c3dbcee9d89b640595f6b16a293fd02b37d8c91348d317b73f9 diff --git a/src/librosco.mk b/src/librosco.mk index 4a03c653..9d8e901f 100644 --- a/src/librosco.mk +++ b/src/librosco.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := librosco +$(PKG)_WEBSITE := https://github.com/colinbourassa/librosco/ $(PKG)_IGNORE := $(PKG)_VERSION := 0.1.11 $(PKG)_CHECKSUM := 48bb2d07c2575f39bdb6cf022889f20bd855eb9100bb19d4e2536a771198e3a4 diff --git a/src/librsvg.mk b/src/librsvg.mk index a40fea64..57b57510 100644 --- a/src/librsvg.mk +++ b/src/librsvg.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := librsvg +$(PKG)_WEBSITE := http://librsvg.sourceforge.net/ $(PKG)_IGNORE := $(PKG)_VERSION := 2.40.5 $(PKG)_CHECKSUM := d14d7b3e25023ce34302022fd7c9b3a468629c94dff6c177874629686bfc71a7 diff --git a/src/librtmp.mk b/src/librtmp.mk index d63ebe8e..3064a2f9 100644 --- a/src/librtmp.mk +++ b/src/librtmp.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := librtmp +$(PKG)_WEBSITE := http://rtmpdump.mplayerhq.hu/ $(PKG)_IGNORE := $(PKG)_VERSION := a107cef $(PKG)_CHECKSUM := aea53f2a2c6596c93eeb288d97266e89a97b31795b678daccedc31d70dad28c4 diff --git a/src/libsamplerate.mk b/src/libsamplerate.mk index 64d7b69c..ac4d062f 100644 --- a/src/libsamplerate.mk +++ b/src/libsamplerate.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libsamplerate +$(PKG)_WEBSITE := http://www.mega-nerd.com/SRC/ $(PKG)_IGNORE := $(PKG)_VERSION := 0.1.8 $(PKG)_CHECKSUM := 93b54bdf46d5e6d2354b7034395fe329c222a966790de34520702bb9642f1c06 diff --git a/src/libshout.mk b/src/libshout.mk index 63e6edf9..117a94a4 100644 --- a/src/libshout.mk +++ b/src/libshout.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libshout +$(PKG)_WEBSITE := http://www.icecast.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 2.4.1 $(PKG)_CHECKSUM := f3acb8dec26f2dbf6df778888e0e429a4ce9378a9d461b02a7ccbf2991bbf24d diff --git a/src/libsigc++.mk b/src/libsigc++.mk index 3ebcab53..bad65269 100644 --- a/src/libsigc++.mk +++ b/src/libsigc++.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libsigc++ +$(PKG)_WEBSITE := http://libsigc.sourceforge.net/ $(PKG)_IGNORE := $(PKG)_VERSION := 2.4.0 $(PKG)_CHECKSUM := 7593d5fa9187bbad7c6868dce375ce3079a805f3f1e74236143bceb15a37cd30 diff --git a/src/libsndfile.mk b/src/libsndfile.mk index 811cb094..e34b2bb0 100644 --- a/src/libsndfile.mk +++ b/src/libsndfile.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libsndfile +$(PKG)_WEBSITE := http://www.mega-nerd.com/libsndfile/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.0.27 $(PKG)_CHECKSUM := a391952f27f4a92ceb2b4c06493ac107896ed6c76be9a613a4731f076d30fac0 diff --git a/src/libsodium.mk b/src/libsodium.mk index daec4b92..cce277ed 100644 --- a/src/libsodium.mk +++ b/src/libsodium.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libsodium +$(PKG)_WEBSITE := https://download.libsodium.org/doc/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.0.6 $(PKG)_CHECKSUM := 940d03ea7d2caa7940e24564bf6d9f66d6edd1df1e0111ff8e3655f3b864fb59 diff --git a/src/libsoup.mk b/src/libsoup.mk index 235c237b..0e1248c5 100644 --- a/src/libsoup.mk +++ b/src/libsoup.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libsoup +$(PKG)_WEBSITE := https://github.com/GNOME/libsoup $(PKG)_IGNORE := libsoup-pre% $(PKG)_VERSION := 2.54.0.1 $(PKG)_APIVER := 2.4 diff --git a/src/libspectre.mk b/src/libspectre.mk index 78949343..e712481e 100644 --- a/src/libspectre.mk +++ b/src/libspectre.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libspectre +$(PKG)_WEBSITE := https://libspectre.freedesktop.org $(PKG)_IGNORE := $(PKG)_VERSION := 0.2.8 $(PKG)_CHECKSUM := 65256af389823bbc4ee4d25bfd1cc19023ffc29ae9f9677f2d200fa6e98bc7a8 diff --git a/src/libssh2.mk b/src/libssh2.mk index 5efcf87e..e4919d33 100644 --- a/src/libssh2.mk +++ b/src/libssh2.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libssh2 +$(PKG)_WEBSITE := http://www.libssh2.org $(PKG)_IGNORE := $(PKG)_VERSION := 1.8.0 $(PKG)_CHECKSUM := 39f34e2f6835f4b992cafe8625073a88e5a28ba78f83e8099610a7b3af4676d4 diff --git a/src/libsvm.mk b/src/libsvm.mk index 0647a5d7..a135026e 100644 --- a/src/libsvm.mk +++ b/src/libsvm.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libsvm +$(PKG)_WEBSITE := http://www.csie.ntu.edu.tw/~cjlin/libsvm $(PKG)_IGNORE := $(PKG)_VERSION := 3.20 $(PKG)_CHECKSUM := 0f122480bef44dec4df6dae056f468c208e4e08c00771ec1b6dae2707fd945be diff --git a/src/libtool.mk b/src/libtool.mk index 11b28df9..77be7031 100644 --- a/src/libtool.mk +++ b/src/libtool.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libtool +$(PKG)_WEBSITE := https://www.gnu.org/software/libtool/ +$(PKG)_DESCR := GNU Libtool $(PKG)_IGNORE := $(PKG)_VERSION := 2.4.4 $(PKG)_CHECKSUM := 159d4e20c201f929e3562536d3ae6b5e605403fa4bb4e72ef197a4e162c3fedf diff --git a/src/libtorrent-rasterbar.mk b/src/libtorrent-rasterbar.mk index 5130adfb..39188574 100644 --- a/src/libtorrent-rasterbar.mk +++ b/src/libtorrent-rasterbar.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libtorrent-rasterbar +$(PKG)_WEBSITE := http://www.rasterbar.com/products/libtorrent/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.1.0 $(PKG)_CHECKSUM := 2713df7da4aec5263ac11b6626ea966f368a5a8081103fd8f2f2ed97b5cd731d diff --git a/src/libunistring.mk b/src/libunistring.mk index 91bef72e..41f9c17c 100644 --- a/src/libunistring.mk +++ b/src/libunistring.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libunistring +$(PKG)_WEBSITE := https://www.gnu.org/software/libunistring/ $(PKG)_IGNORE := $(PKG)_VERSION := 0.9.4 $(PKG)_CHECKSUM := f5246d63286a42902dc096d6d44541fbe4204b6c02d6d5d28b457c9882ddd8a6 diff --git a/src/libusb.mk b/src/libusb.mk index c47b12b6..2adda006 100644 --- a/src/libusb.mk +++ b/src/libusb.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libusb +$(PKG)_WEBSITE := http://libusb-win32.sourceforge.net/ +$(PKG)_DESCR := LibUsb $(PKG)_IGNORE := $(PKG)_VERSION := 1.2.6.0 $(PKG)_CHECKSUM := f3faf094c9b3415ede42eeb5032feda2e71945f13f0ca3da58ca10dcb439bfee diff --git a/src/libusb1.mk b/src/libusb1.mk index 89869e04..d1dfc22d 100644 --- a/src/libusb1.mk +++ b/src/libusb1.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libusb1 +$(PKG)_WEBSITE := http://libusb.org/ +$(PKG)_DESCR := LibUsb-1.0 $(PKG)_IGNORE := $(PKG)_VERSION := 1.0.19 $(PKG)_CHECKSUM := 6c502c816002f90d4f76050a6429c3a7e0d84204222cbff2dce95dd773ba6840 diff --git a/src/libuv.mk b/src/libuv.mk index bf632dbd..b15e8965 100644 --- a/src/libuv.mk +++ b/src/libuv.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libuv +$(PKG)_WEBSITE := http://libuv.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.9.1 $(PKG)_CHECKSUM := e83953782c916d7822ef0b94e8115ce5756fab5300cca173f0de5f5b0e0ae928 diff --git a/src/libvpx.mk b/src/libvpx.mk index d89e1796..57184ca3 100644 --- a/src/libvpx.mk +++ b/src/libvpx.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libvpx +$(PKG)_WEBSITE := http://code.google.com/p/webm/ +$(PKG)_DESCR := vpx $(PKG)_IGNORE := $(PKG)_VERSION := 1.5.0 $(PKG)_CHECKSUM := 306d67908625675f8e188d37a81fbfafdf5068b09d9aa52702b6fbe601c76797 diff --git a/src/libwebp.mk b/src/libwebp.mk index 05670482..6a784e9f 100644 --- a/src/libwebp.mk +++ b/src/libwebp.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libwebp +$(PKG)_WEBSITE := https://developers.google.com/speed/webp/ $(PKG)_IGNORE := $(PKG)_VERSION := 0.4.4 $(PKG)_CHECKSUM := c65d34edb57338e331ba4d622227a2b3179444cfca17d02c34f1ead63f603e86 diff --git a/src/libwebsockets.mk b/src/libwebsockets.mk index ed79d09f..4b2056c0 100644 --- a/src/libwebsockets.mk +++ b/src/libwebsockets.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libwebsockets +$(PKG)_WEBSITE := http://libwebsockets.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.4-chrome43-firefox-36 $(PKG)_CHECKSUM := e11492477e582ef0b1a6ea2f18d81a9619b449170a3a5c43f32a9468461a9798 diff --git a/src/libxml++.mk b/src/libxml++.mk index b86bbfb0..95b647f0 100644 --- a/src/libxml++.mk +++ b/src/libxml++.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libxml++ +$(PKG)_WEBSITE := http://libxmlplusplus.sourceforge.net/ +$(PKG)_DESCR := libxml2 $(PKG)_IGNORE := $(PKG)_VERSION := 2.37.2 $(PKG)_CHECKSUM := bb3e10a2148e90fc61098499a0923b4de786b1dd86466d7ec6255e154baa773b diff --git a/src/libxml2.mk b/src/libxml2.mk index 85152d1e..95508df7 100644 --- a/src/libxml2.mk +++ b/src/libxml2.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libxml2 +$(PKG)_WEBSITE := http://www.xmlsoft.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 2.9.4 $(PKG)_CHECKSUM := ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c diff --git a/src/libxslt.mk b/src/libxslt.mk index 9a918169..6dc709fc 100644 --- a/src/libxslt.mk +++ b/src/libxslt.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libxslt +$(PKG)_WEBSITE := http://xmlsoft.org/XSLT/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.1.29 $(PKG)_CHECKSUM := b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce diff --git a/src/libzip.mk b/src/libzip.mk index e9dae3fb..92e72fa0 100644 --- a/src/libzip.mk +++ b/src/libzip.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libzip +$(PKG)_WEBSITE := http://www.nih.at/libzip/ $(PKG)_IGNORE := $(PKG)_VERSION := 0.11.2 $(PKG)_CHECKSUM := 7cfbbc2c540e154b933b6e9ec781e2671086bd8114eb744ae1a1ade34d2bb6bb diff --git a/src/llvm.mk b/src/llvm.mk index 4db8a504..ef84e1e3 100644 --- a/src/llvm.mk +++ b/src/llvm.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := llvm +$(PKG)_WEBSITE := http://llvm.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 3.4 $(PKG)_CHECKSUM := 25a5612d692c48481b9b397e2b55f4870e447966d66c96d655241702d44a2628 diff --git a/src/log4cxx.mk b/src/log4cxx.mk index 3f49c725..906f2170 100644 --- a/src/log4cxx.mk +++ b/src/log4cxx.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := log4cxx +$(PKG)_WEBSITE := http://logging.apache.org/log4cxx/ $(PKG)_IGNORE := $(PKG)_VERSION := 0.10.0 $(PKG)_CHECKSUM := 0de0396220a9566a580166e66b39674cb40efd2176f52ad2c65486c99c920c8c diff --git a/src/lua.mk b/src/lua.mk index 0e010d75..bbf92d86 100644 --- a/src/lua.mk +++ b/src/lua.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := lua +$(PKG)_WEBSITE := http://www.lua.org/ +$(PKG)_DESCR := Lua $(PKG)_IGNORE := $(PKG)_VERSION := 5.3.3 # Shared version and luarocks subdir diff --git a/src/luabind.mk b/src/luabind.mk index b38f24c4..ba75bdfb 100644 --- a/src/luabind.mk +++ b/src/luabind.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := luabind +$(PKG)_WEBSITE := http://www.rasterbar.com/products/luabind.html +$(PKG)_DESCR := Luabind $(PKG)_IGNORE := $(PKG)_VERSION := 0.9.1 $(PKG)_CHECKSUM := 80de5e04918678dd8e6dac3b22a34b3247f74bf744c719bae21faaa49649aaae diff --git a/src/luajit.mk b/src/luajit.mk index f710e24f..b84cfa80 100644 --- a/src/luajit.mk +++ b/src/luajit.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := luajit +$(PKG)_WEBSITE := http://luajit.org/luajit.html +$(PKG)_DESCR := LuaJIT $(PKG)_IGNORE := $(PKG)_VERSION := 2.0.4 $(PKG)_ABIVER := 5.1 diff --git a/src/lzma.mk b/src/lzma.mk index be2427bc..edb8bdb1 100644 --- a/src/lzma.mk +++ b/src/lzma.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := lzma +$(PKG)_WEBSITE := http://www.7-zip.org/sdk.html +$(PKG)_DESCR := LZMA SDK $(PKG)_IGNORE := $(PKG)_VERSION := 920 $(PKG)_CHECKSUM := 8ac221acdca8b6f6dd110120763af42b3707363752fc04e63c7bbff76774a445 diff --git a/src/lzo.mk b/src/lzo.mk index adbe8aa8..da9848e1 100644 --- a/src/lzo.mk +++ b/src/lzo.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := lzo +$(PKG)_WEBSITE := http://www.oberhumer.com/opensource/lzo/ $(PKG)_IGNORE := $(PKG)_VERSION := 2.09 $(PKG)_CHECKSUM := f294a7ced313063c057c504257f437c8335c41bfeed23531ee4e6a2b87bcb34c diff --git a/src/matio.mk b/src/matio.mk index ec856d12..89760570 100644 --- a/src/matio.mk +++ b/src/matio.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := matio +$(PKG)_WEBSITE := http://sourceforge.net/projects/matio/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.5.2 $(PKG)_CHECKSUM := db02d0fb3373c3d766a606309b17e64a5d8da55610e921a9f1a0ec171e911d45 diff --git a/src/mdbtools.mk b/src/mdbtools.mk index 7f13d806..a1a66b1e 100644 --- a/src/mdbtools.mk +++ b/src/mdbtools.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := mdbtools +$(PKG)_WEBSITE := http://sourceforge.net/projects/mdbtools/ $(PKG)_IGNORE := $(PKG)_VERSION := 0.7.1 $(PKG)_CHECKSUM := 4eac1bce55066a38d9ea6c52a8e8ecc101b79afe75118ecc16852990472c4721 diff --git a/src/mingw-w64.mk b/src/mingw-w64.mk index 27f8ec02..abcfc399 100644 --- a/src/mingw-w64.mk +++ b/src/mingw-w64.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := mingw-w64 +$(PKG)_WEBSITE := http://mingw-w64.sourceforge.net/ +$(PKG)_DESCR := MinGW-w64 Runtime $(PKG)_IGNORE := $(PKG)_VERSION := 4.0.6 $(PKG)_CHECKSUM := 0c407394b0d8635553f4fbca674cdfe446aac223e90b4010603d863e4bdd015c diff --git a/src/miniupnpc.mk b/src/miniupnpc.mk index 81832b44..12dbc340 100644 --- a/src/miniupnpc.mk +++ b/src/miniupnpc.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := miniupnpc +$(PKG)_WEBSITE := http://miniupnp.free.fr/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.9 $(PKG)_CHECKSUM := 2923e453e880bb949e3d4da9f83dd3cb6f08946d35de0b864d0339cf70934464 diff --git a/src/minizip.mk b/src/minizip.mk index 7529058c..17096075 100644 --- a/src/minizip.mk +++ b/src/minizip.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := minizip +$(PKG)_WEBSITE := http://www.winimage.com/zLibDll/minizip.html $(PKG)_IGNORE := $(PKG)_VERSION := 0b46a2b $(PKG)_CHECKSUM := 2ecc8da9bcc3b3c42de915567dfceb6fcb4a70a2b2704f59c6447b54da811a65 diff --git a/src/mman-win32.mk b/src/mman-win32.mk index 2e653a53..de872ee0 100644 --- a/src/mman-win32.mk +++ b/src/mman-win32.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := mman-win32 +$(PKG)_WEBSITE := https://code.google.com/p/mman-win32/ +$(PKG)_DESCR := MMA-Win32 $(PKG)_IGNORE := $(PKG)_VERSION := b7ec370 $(PKG)_CHECKSUM := 6f94db28ddf30711c7b227e97c5142f72f77aca2c5cc034a7d012db242cc2f7b diff --git a/src/mpc.mk b/src/mpc.mk index ac68b910..e881abc5 100644 --- a/src/mpc.mk +++ b/src/mpc.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := mpc +$(PKG)_WEBSITE := http://www.multiprecision.org/ +$(PKG)_DESCR := GNU MPC $(PKG)_IGNORE := $(PKG)_VERSION := 1.0.2 $(PKG)_CHECKSUM := b561f54d8a479cee3bc891ee52735f18ff86712ba30f036f8b8537bae380c488 diff --git a/src/mpfr.mk b/src/mpfr.mk index 818b2345..e6b6b90a 100644 --- a/src/mpfr.mk +++ b/src/mpfr.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := mpfr +$(PKG)_WEBSITE := http://www.mpfr.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 3.1.5 $(PKG)_CHECKSUM := 015fde82b3979fbe5f83501986d328331ba8ddf008c1ff3da3c238f49ca062bc diff --git a/src/mpg123.mk b/src/mpg123.mk index ba9b16f5..7c228b21 100644 --- a/src/mpg123.mk +++ b/src/mpg123.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := mpg123 +$(PKG)_WEBSITE := http://www.mpg123.de/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.22.4 $(PKG)_CHECKSUM := 5069e02e50138600f10cc5f7674e44e9bf6f1930af81d0e1d2f869b3c0ee40d2 diff --git a/src/muparser.mk b/src/muparser.mk index 232ba770..da66579d 100644 --- a/src/muparser.mk +++ b/src/muparser.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := muparser +$(PKG)_WEBSITE := http://muparser.beltoforion.de/ +$(PKG)_DESCR := muParser $(PKG)_IGNORE := $(PKG)_VERSION := 2.2.5 $(PKG)_CHECKSUM := 0666ef55da72c3e356ca85b6a0084d56b05dd740c3c21d26d372085aa2c6e708 diff --git a/src/muparserx.mk b/src/muparserx.mk index 4cc9b1f5..9594c6f0 100644 --- a/src/muparserx.mk +++ b/src/muparserx.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := muparserx +$(PKG)_WEBSITE := http://muparserx.beltoforion.de/ +$(PKG)_DESCR := muParserX $(PKG)_IGNORE := $(PKG)_VERSION := 4.0.4 $(PKG)_CHECKSUM := d7ebcab8cb1de88e6dcba21651db8f6055b3e904c45afc387b06b5f4218dda40 diff --git a/src/mxml.mk b/src/mxml.mk index 6889684f..52350d2c 100644 --- a/src/mxml.mk +++ b/src/mxml.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := mxml +$(PKG)_WEBSITE := http://www.msweet.org/projects.php?Z3 +$(PKG)_DESCR := Mini-XML $(PKG)_IGNORE := $(PKG)_VERSION := 2.9 $(PKG)_CHECKSUM := cded54653c584b24c4a78a7fa1b3b4377d49ac4f451ddf170ebbc8161d85ff92 diff --git a/src/ncurses.mk b/src/ncurses.mk index 58749c8e..c598f9a3 100644 --- a/src/ncurses.mk +++ b/src/ncurses.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := ncurses +$(PKG)_WEBSITE := https://www.gnu.org/software/ncurses/ +$(PKG)_DESCR := Ncurses $(PKG)_IGNORE := $(PKG)_VERSION := e14300b $(PKG)_CHECKSUM := 3564ffa540cc069854607a0fb10d258c12769f8f6ee752f66038ba95a5e5f650 diff --git a/src/neon.mk b/src/neon.mk index 05e03bf2..9a3c37ae 100644 --- a/src/neon.mk +++ b/src/neon.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := neon +$(PKG)_WEBSITE := http://webdav.org/neon/ +$(PKG)_DESCR := HTTP and WebDAV client library (libneon) $(PKG)_IGNORE := $(PKG)_VERSION := 0.30.2 $(PKG)_CHECKSUM := db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca diff --git a/src/netcdf.mk b/src/netcdf.mk index 98f705ea..875181a2 100644 --- a/src/netcdf.mk +++ b/src/netcdf.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := netcdf +$(PKG)_WEBSITE := http://www.unidata.ucar.edu/software/netcdf/ +$(PKG)_DESCR := NetCDF $(PKG)_IGNORE := $(PKG)_VERSION := 4.3.0 $(PKG)_CHECKSUM := e796413d27da6b053e07a18f567a1d0c23d2a317cef905faa2a05fe4f725fc63 diff --git a/src/netpbm.mk b/src/netpbm.mk index 5a717a6b..831f9437 100644 --- a/src/netpbm.mk +++ b/src/netpbm.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := netpbm +$(PKG)_WEBSITE := http://netpbm.sourceforge.net/ +$(PKG)_DESCR := Netpbm $(PKG)_IGNORE := $(PKG)_VERSION := 10.35.96 $(PKG)_CHECKSUM := e652f3642e930156afaffb4c28e135efe026b41cd64be20e245b0c8124819eee diff --git a/src/nettle.mk b/src/nettle.mk index d05c0bf3..8367b432 100644 --- a/src/nettle.mk +++ b/src/nettle.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := nettle +$(PKG)_WEBSITE := http://www.lysator.liu.se/~nisse/nettle/ $(PKG)_IGNORE := $(PKG)_VERSION := 3.3 $(PKG)_CHECKSUM := 46942627d5d0ca11720fec18d81fc38f7ef837ea4197c1f630e71ce0d470b11e diff --git a/src/nlopt.mk b/src/nlopt.mk index 1d8dba29..e0216984 100644 --- a/src/nlopt.mk +++ b/src/nlopt.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := nlopt +$(PKG)_WEBSITE := http://ab-initio.mit.edu/wiki/index.php/NLopt +$(PKG)_DESCR := NLopt $(PKG)_IGNORE := $(PKG)_VERSION := 2.4.2 $(PKG)_CHECKSUM := 8099633de9d71cbc06cd435da993eb424bbcdbded8f803cdaa9fb8c6e09c8e89 diff --git a/src/nsis.mk b/src/nsis.mk index f6e19ffc..cf14015b 100644 --- a/src/nsis.mk +++ b/src/nsis.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := nsis +$(PKG)_WEBSITE := http://nsis.sourceforge.net/ +$(PKG)_DESCR := NSIS $(PKG)_IGNORE := $(PKG)_VERSION := 3.01 $(PKG)_CHECKSUM := 604c011593be484e65b2141c50a018f1b28ab28c994268e4ecd377773f3ffba1 diff --git a/src/ocaml-cairo.mk b/src/ocaml-cairo.mk index 751f29a6..4920ab61 100644 --- a/src/ocaml-cairo.mk +++ b/src/ocaml-cairo.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := ocaml-cairo +$(PKG)_WEBSITE := http://cairographics.org/cairo-ocaml/ +$(PKG)_DESCR := cairo-ocaml $(PKG)_IGNORE := $(PKG)_VERSION := 1.2.0 $(PKG)_CHECKSUM := 4beae96acfc13dbb8b0a798a0664380429c6a94357e7dc5747d76599deabdfc7 diff --git a/src/ocaml-camlimages.mk b/src/ocaml-camlimages.mk index e5e49719..3d74ec4b 100644 --- a/src/ocaml-camlimages.mk +++ b/src/ocaml-camlimages.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := ocaml-camlimages +$(PKG)_WEBSITE := http://gallium.inria.fr/camlimages +$(PKG)_DESCR := camlimages $(PKG)_IGNORE := $(PKG)_VERSION := 4.0.1 $(PKG)_CHECKSUM := b40237c1505487049799a7af296eb3996b3fa08eab94415546f46d61355747c4 diff --git a/src/ocaml-core.mk b/src/ocaml-core.mk index 6741c4d7..2d4e38b8 100644 --- a/src/ocaml-core.mk +++ b/src/ocaml-core.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := ocaml-core +$(PKG)_WEBSITE := http://caml.inria.fr/ +$(PKG)_DESCR := ocaml $(PKG)_IGNORE = $(ocaml-native_IGNORE) $(PKG)_VERSION = $(ocaml-native_VERSION) $(PKG)_CHECKSUM = $(ocaml-native_CHECKSUM) diff --git a/src/ocaml-findlib.mk b/src/ocaml-findlib.mk index 67876a91..4f41a32d 100644 --- a/src/ocaml-findlib.mk +++ b/src/ocaml-findlib.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := ocaml-findlib +$(PKG)_WEBSITE := http://download.camlcity.org/ +$(PKG)_DESCR := findlib $(PKG)_IGNORE := $(PKG)_VERSION := 1.4 $(PKG)_CHECKSUM := 6e4065e5d79d31176ec213ff94599c4eae17c3904c2896e845d0379a99f1bdf8 diff --git a/src/ocaml-flexdll.mk b/src/ocaml-flexdll.mk index df668a52..76bf18f5 100644 --- a/src/ocaml-flexdll.mk +++ b/src/ocaml-flexdll.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := ocaml-flexdll +$(PKG)_WEBSITE := http://alain.frisch.fr/ +$(PKG)_DESCR := flexdll $(PKG)_IGNORE := $(PKG)_VERSION := 0.31 $(PKG)_CHECKSUM := f01d90a8b89a82a6021f3d96a2977a54cb858c561f062a43e5dd451618119e2c diff --git a/src/ocaml-lablgl.mk b/src/ocaml-lablgl.mk index 17c0d8e4..93e5e359 100644 --- a/src/ocaml-lablgl.mk +++ b/src/ocaml-lablgl.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := ocaml-lablgl +$(PKG)_WEBSITE := http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html +$(PKG)_DESCR := lablgl $(PKG)_IGNORE := $(PKG)_VERSION := 1.05 $(PKG)_CHECKSUM := d8ff03e35b970d2b23a942f9e6ed65da5a6c123986bd0ecf5424a6205af34b61 diff --git a/src/ocaml-lablgtk2.mk b/src/ocaml-lablgtk2.mk index de158f56..38bcc33e 100644 --- a/src/ocaml-lablgtk2.mk +++ b/src/ocaml-lablgtk2.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := ocaml-lablgtk2 +$(PKG)_WEBSITE := http://forge.ocamlcore.org/ +$(PKG)_DESCR := lablgtk2 $(PKG)_IGNORE := $(PKG)_VERSION := 2.16.0 $(PKG)_CHECKSUM := a0ea9752eb257dadcfc2914408fff339d4c34357802f02c63329dd41b777de2f diff --git a/src/ocaml-native.mk b/src/ocaml-native.mk index 1243a361..b2993dbd 100644 --- a/src/ocaml-native.mk +++ b/src/ocaml-native.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := ocaml-native +$(PKG)_WEBSITE := http://caml.inria.fr/ +$(PKG)_DESCR := ocaml $(PKG)_IGNORE := $(PKG)_VERSION := 4.00.1 $(PKG)_CHECKSUM := b48d5c7d3bf4a0cd6125f8fdfc1f654dd65586087399dc9f14716d7b9535e87a diff --git a/src/ocaml-xml-light.mk b/src/ocaml-xml-light.mk index 25935bb7..1c453695 100644 --- a/src/ocaml-xml-light.mk +++ b/src/ocaml-xml-light.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := ocaml-xml-light +$(PKG)_WEBSITE := http://tech.motion-twin.com/xmllight.html +$(PKG)_DESCR := xml-light $(PKG)_IGNORE := $(PKG)_VERSION := 2.2 $(PKG)_CHECKSUM := fdb205e8b3a25922e46fca52aea449b9a2de4000c5442487e7e74d79f1e2274a diff --git a/src/oce.mk b/src/oce.mk index a822c259..d3a73573 100644 --- a/src/oce.mk +++ b/src/oce.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := oce +$(PKG)_WEBSITE := https://github.com/tpaviot/oce +$(PKG)_DESCR := Open CASCADE Community Edition $(PKG)_IGNORE := $(PKG)_VERSION := 0.17.2 $(PKG)_CHECKSUM := 8d9995360cd531cbd4a7aa4ca5ed969f08ec7c7a37755e2f3d4ef832c1b2f56e diff --git a/src/ogg.mk b/src/ogg.mk index a9b1bdc3..7d6a8111 100644 --- a/src/ogg.mk +++ b/src/ogg.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := ogg +$(PKG)_WEBSITE := http://www.xiph.org/ogg/ +$(PKG)_DESCR := OGG $(PKG)_IGNORE := $(PKG)_VERSION := 1.3.2 $(PKG)_CHECKSUM := e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 diff --git a/src/old.mk b/src/old.mk index 3ac20394..87cbf656 100644 --- a/src/old.mk +++ b/src/old.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := old +$(PKG)_WEBSITE := http://blitiri.com.ar/p/old/ $(PKG)_IGNORE := $(PKG)_VERSION := 0.17 $(PKG)_CHECKSUM := d24b0d28bbce308b68d62815df8edc2806af0b7b86129f9e8078bd9381dc5eb5 diff --git a/src/openal.mk b/src/openal.mk index 04c9ee57..f77e7876 100644 --- a/src/openal.mk +++ b/src/openal.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := openal +$(PKG)_WEBSITE := http://kcat.strangesoft.net/openal.html $(PKG)_IGNORE := $(PKG)_VERSION := 1.16.0 $(PKG)_CHECKSUM := 2f3dcd313fe26391284fbf8596863723f99c65d6c6846dccb48e79cadaf40d5f diff --git a/src/openblas.mk b/src/openblas.mk index d1cc2ef9..ba076bc3 100644 --- a/src/openblas.mk +++ b/src/openblas.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := openblas +$(PKG)_WEBSITE := http://www.openblas.net/ +$(PKG)_DESCR := OpenBLAS $(PKG)_IGNORE := $(PKG)_VERSION := 0.2.15 $(PKG)_CHECKSUM := 73c40ace5978282224e5e122a41c8388c5a19e65a6f2329c2b7c0b61bacc9044 diff --git a/src/opencore-amr.mk b/src/opencore-amr.mk index f61df451..4aa1d3cd 100644 --- a/src/opencore-amr.mk +++ b/src/opencore-amr.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := opencore-amr +$(PKG)_WEBSITE := http://opencore-amr.sourceforge.net/ $(PKG)_IGNORE := $(PKG)_VERSION := 0.1.3 $(PKG)_CHECKSUM := 106bf811c1f36444d7671d8fd2589f8b2e0cca58a2c764da62ffc4a070595385 diff --git a/src/opencsg.mk b/src/opencsg.mk index 3f0b4fba..deb67d1e 100644 --- a/src/opencsg.mk +++ b/src/opencsg.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := opencsg +$(PKG)_WEBSITE := http://www.opencsg.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.4.1 $(PKG)_CHECKSUM := 48182c8233e6f89cd6752679bde44ef6cc9eda4c06f4db845ec7de2cae2bb07a diff --git a/src/opencv.mk b/src/opencv.mk index 47e6c69b..60aa4c95 100644 --- a/src/opencv.mk +++ b/src/opencv.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := opencv +$(PKG)_WEBSITE := http://opencv.org/ +$(PKG)_DESCR := OpenCV $(PKG)_IGNORE := $(PKG)_VERSION := 2.4.10 $(PKG)_CHECKSUM := 1bf4cb87283797fd91669d4f90b622a677a903c20b4a577b7958a2164f7596c6 diff --git a/src/openexr.mk b/src/openexr.mk index cfae36c5..ed561cdc 100644 --- a/src/openexr.mk +++ b/src/openexr.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := openexr +$(PKG)_WEBSITE := http://www.openexr.com/ +$(PKG)_DESCR := OpenEXR $(PKG)_IGNORE := $(PKG)_VERSION := 2.2.0 $(PKG)_CHECKSUM := 36a012f6c43213f840ce29a8b182700f6cf6b214bea0d5735594136b44914231 diff --git a/src/openjpeg.mk b/src/openjpeg.mk index 804b4811..a6b9d4b9 100644 --- a/src/openjpeg.mk +++ b/src/openjpeg.mk @@ -2,6 +2,8 @@ #Author: Julien Michel PKG := openjpeg +$(PKG)_WEBSITE := http://www.openjpeg.org/ +$(PKG)_DESCR := OpenJPEG $(PKG)_IGNORE := $(PKG)_VERSION := 2.1.0 $(PKG)_CHECKSUM := 1232bb814fd88d8ed314c94f0bfebb03de8559583a33abbe8c64ef3fc0a8ff03 diff --git a/src/openmp-validation.mk b/src/openmp-validation.mk index 0b152a58..dee650c3 100644 --- a/src/openmp-validation.mk +++ b/src/openmp-validation.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := openmp-validation +$(PKG)_WEBSITE := http://web.cs.uh.edu/~openuh/ +$(PKG)_DESCR := OpenMP Validation Suite $(PKG)_IGNORE := $(PKG)_VERSION := 3.1 $(PKG)_CHECKSUM := 9dbfe3cf49ab6187def83c85b57e133e11fbb667aa111f0fd70775166254dbff diff --git a/src/openscenegraph.mk b/src/openscenegraph.mk index 92615bd7..09ae6388 100644 --- a/src/openscenegraph.mk +++ b/src/openscenegraph.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := openscenegraph +$(PKG)_WEBSITE := http://www.openscenegraph.org/ +$(PKG)_DESCR := OpenSceneGraph $(PKG)_IGNORE := $(PKG)_VERSION := 3.4.0 $(PKG)_CHECKSUM := 5c727d84755da276adf8c4a4a3a8ba9c9570fc4b4969f06f1d2e9f89b1e3040e diff --git a/src/openssl.mk b/src/openssl.mk index d979f056..af2db8b8 100644 --- a/src/openssl.mk +++ b/src/openssl.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := openssl +$(PKG)_WEBSITE := https://www.openssl.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.0.2j $(PKG)_CHECKSUM := e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431 diff --git a/src/openthreads.mk b/src/openthreads.mk index 35bae228..81bc0042 100644 --- a/src/openthreads.mk +++ b/src/openthreads.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := openthreads +$(PKG)_WEBSITE := http://www.openscenegraph.org/ +$(PKG)_DESCR := OpenThreads $(PKG)_IGNORE = $(openscenegraph_IGNORE) $(PKG)_VERSION = $(openscenegraph_VERSION) $(PKG)_CHECKSUM = $(openscenegraph_CHECKSUM) diff --git a/src/opus.mk b/src/opus.mk index 8582390a..49eac5c2 100644 --- a/src/opus.mk +++ b/src/opus.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := opus +$(PKG)_WEBSITE := http://opus-codec.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.1.1 $(PKG)_CHECKSUM := 9b84ff56bd7720d5554103c557664efac2b8b18acc4bbcc234cb881ab9a3371e diff --git a/src/opusfile.mk b/src/opusfile.mk index aabdcd9d..b3c8d8da 100644 --- a/src/opusfile.mk +++ b/src/opusfile.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := opusfile +$(PKG)_WEBSITE := http://opus-codec.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 0.6 $(PKG)_CHECKSUM := 2428717b356e139f18ed2fdb5ad990b5654a238907a0058200b39c46a7d03ea6 diff --git a/src/ossim.mk b/src/ossim.mk index d2c70d45..c9f19fd1 100644 --- a/src/ossim.mk +++ b/src/ossim.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := ossim +$(PKG)_WEBSITE := http://trac.osgeo.org/ossim +$(PKG)_DESCR := OSSIM $(PKG)_IGNORE := $(PKG)_VERSION := 1.8.20 $(PKG)_CHECKSUM := d7981d0d7e84bdbc26d5bda9e5b80c583d806164e4d6e5fab276c9255a2b407c diff --git a/src/pango.mk b/src/pango.mk index 8e4442e4..c582c1ec 100644 --- a/src/pango.mk +++ b/src/pango.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := pango +$(PKG)_WEBSITE := http://www.pango.org/ +$(PKG)_DESCR := Pango $(PKG)_IGNORE := $(PKG)_VERSION := 1.37.4 $(PKG)_CHECKSUM := ae2446f1c23c81d78e935054a37530336818c214f54bed2351bdd4ad0acebcbe diff --git a/src/pangomm.mk b/src/pangomm.mk index 682bde46..ae5fbe06 100644 --- a/src/pangomm.mk +++ b/src/pangomm.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := pangomm +$(PKG)_WEBSITE := http://www.pango.org/ +$(PKG)_DESCR := Pangomm $(PKG)_IGNORE := $(PKG)_VERSION := 2.34.0 $(PKG)_CHECKSUM := 0e82bbff62f626692a00f3772d8b17169a1842b8cc54d5f2ddb1fec2cede9e41 diff --git a/src/pcl.mk b/src/pcl.mk index c3dc1072..c883f0a8 100644 --- a/src/pcl.mk +++ b/src/pcl.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := pcl +$(PKG)_WEBSITE := http://www.pointclouds.org/ +$(PKG)_DESCR := PCL (Point Cloud Library) $(PKG)_IGNORE := $(PKG)_VERSION := 1.8.0 $(PKG)_CHECKSUM := 9e54b0c1b59a67a386b9b0f4acb2d764272ff9a0377b825c4ed5eedf46ebfcf4 diff --git a/src/pcre.mk b/src/pcre.mk index 71590860..d1eeab7b 100644 --- a/src/pcre.mk +++ b/src/pcre.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := pcre +$(PKG)_WEBSITE := http://www.pcre.org/ +$(PKG)_DESCR := PCRE $(PKG)_IGNORE := $(PKG)_VERSION := 8.39 $(PKG)_CHECKSUM := b858099f82483031ee02092711689e7245586ada49e534a06e678b8ea9549e8b diff --git a/src/pdcurses.mk b/src/pdcurses.mk index 4ded08de..a67c8b0a 100644 --- a/src/pdcurses.mk +++ b/src/pdcurses.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := pdcurses +$(PKG)_WEBSITE := http://pdcurses.sourceforge.net/ +$(PKG)_DESCR := PDcurses $(PKG)_IGNORE := $(PKG)_VERSION := 3.4 $(PKG)_CHECKSUM := 46ad8fd439e71d44819ea884d775ccbf653b9f8b1f7a418a0cce3a510aa2e64b diff --git a/src/pdflib_lite.mk b/src/pdflib_lite.mk index fd71c23c..fba2e467 100644 --- a/src/pdflib_lite.mk +++ b/src/pdflib_lite.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := pdflib_lite +$(PKG)_WEBSITE := http://www.pdflib.com/download/free-software/pdflib-lite-7/ +$(PKG)_DESCR := PDFlib Lite $(PKG)_IGNORE := $(PKG)_VERSION := 7.0.5p3 $(PKG)_CHECKSUM := e5fb30678165d28b2bf066f78d5f5787e73a2a28d4902b63e3e07ce1678616c9 diff --git a/src/pfstools.mk b/src/pfstools.mk index d9d82c0c..76fafa31 100644 --- a/src/pfstools.mk +++ b/src/pfstools.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := pfstools +$(PKG)_WEBSITE := http://pfstools.sourceforge.net/ $(PKG)_IGNORE := $(PKG)_VERSION := 2.0.4 $(PKG)_CHECKSUM := 4a6c1880193d3d1924d98b8dc2d2fe25827e7b2508823dc38f535653a4fd9942 diff --git a/src/physfs.mk b/src/physfs.mk index c45030b3..9fc4e311 100644 --- a/src/physfs.mk +++ b/src/physfs.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := physfs +$(PKG)_WEBSITE := http://icculus.org/physfs/ $(PKG)_IGNORE := $(PKG)_VERSION := 2.0.3 $(PKG)_CHECKSUM := ca862097c0fb451f2cacd286194d071289342c107b6fe69079c079883ff66b69 diff --git a/src/picomodel.mk b/src/picomodel.mk index 12dc6d39..cc8a307e 100644 --- a/src/picomodel.mk +++ b/src/picomodel.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := picomodel +$(PKG)_WEBSITE := http://code.google.com/p/picomodel/ $(PKG)_IGNORE := $(PKG)_VERSION := 1142ad8 $(PKG)_CHECKSUM := e9dd8b78278a454602a81eb388603142a15f2124f549f478d4edc93149eb6dd0 diff --git a/src/pire.mk b/src/pire.mk index de338f24..2238c497 100644 --- a/src/pire.mk +++ b/src/pire.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := pire +$(PKG)_WEBSITE := https://github.com/yandex/pire +$(PKG)_DESCR := PIRE $(PKG)_IGNORE := $(PKG)_VERSION := 0.0.5 $(PKG)_CHECKSUM := 85a9bd66fff568554826e4aff9b188ed6124e3ea0530cc561723b36aea2a58e3 diff --git a/src/pixman.mk b/src/pixman.mk index 800e59bf..89a2041d 100644 --- a/src/pixman.mk +++ b/src/pixman.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := pixman +$(PKG)_WEBSITE := http://cairographics.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 0.33.6 $(PKG)_CHECKSUM := 4e1e72c0ed31d10944f304976e87e6c87b441c853713eeecf115e22c23d4b17d diff --git a/src/pkgconf.mk b/src/pkgconf.mk index 4b75207c..11a30306 100644 --- a/src/pkgconf.mk +++ b/src/pkgconf.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := pkgconf +$(PKG)_WEBSITE := https://github.com/pkgconf/pkgconf $(PKG)_IGNORE := $(PKG)_VERSION := da179fd $(PKG)_CHECKSUM := 91b2e5d7ce06583d5920c373b61d7d6554cd085cbd61ed176c7ff7ff3032523d diff --git a/src/plib.mk b/src/plib.mk index 10058cd4..2943bfc3 100644 --- a/src/plib.mk +++ b/src/plib.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := plib +$(PKG)_WEBSITE := http://plib.sourceforge.net/ +$(PKG)_DESCR := Plib $(PKG)_IGNORE := $(PKG)_VERSION := 1.8.5-rc1 $(PKG)_CHECKSUM := d421a3c84517b4bfc8c6402887c74984ec57c12bc85f2dc2729de3ec4cdcdbe4 diff --git a/src/plibc.mk b/src/plibc.mk index c2608e2d..9cdb62c0 100644 --- a/src/plibc.mk +++ b/src/plibc.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := plibc +$(PKG)_WEBSITE := http://plibc.sourceforge.net/ +$(PKG)_DESCR := Plibc $(PKG)_IGNORE := % $(PKG)_VERSION := cd7ed09 $(PKG)_CHECKSUM := 1e939804e173b8f789e1403964211835b8006253d0a541d55256b540639b0629 diff --git a/src/plotmm.mk b/src/plotmm.mk index 2a4bac48..a9c306ff 100644 --- a/src/plotmm.mk +++ b/src/plotmm.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := plotmm +$(PKG)_WEBSITE := http://plotmm.sourceforge.net/ +$(PKG)_DESCR := PlotMM $(PKG)_IGNORE := $(PKG)_VERSION := 0.1.2 $(PKG)_CHECKSUM := 896bb729eb9cad5f3188d72304789dd7a86fdae66020ac0632fe3bc66abe9653 diff --git a/src/plotutils.mk b/src/plotutils.mk index 50c66054..5af493c9 100644 --- a/src/plotutils.mk +++ b/src/plotutils.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := plotutils +$(PKG)_WEBSITE := https://www.gnu.org/software/plotutils/ $(PKG)_IGNORE := $(PKG)_VERSION := 2.6 $(PKG)_CHECKSUM := 4f4222820f97ca08c7ea707e4c53e5a3556af4d8f1ab51e0da6ff1627ff433ab diff --git a/src/poco.mk b/src/poco.mk index 73787748..a04da527 100644 --- a/src/poco.mk +++ b/src/poco.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := poco +$(PKG)_WEBSITE := http://pocoproject.org/ +$(PKG)_DESCR := POCO C++ Libraries $(PKG)_IGNORE := $(PKG)_VERSION := 1.4.7p1 $(PKG)_CHECKSUM := 7037cc465744bf2fa73aca9cea14d1207f040de5ea8073dc266b06a73b3db8df diff --git a/src/polarssl.mk b/src/polarssl.mk index 364513fb..4218c9ea 100644 --- a/src/polarssl.mk +++ b/src/polarssl.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := polarssl +$(PKG)_WEBSITE := https://polarssl.org/ +$(PKG)_DESCR := Polar SSL Library $(PKG)_IGNORE := $(PKG)_VERSION := 1.3.9 $(PKG)_CHECKSUM := d3605afc28ed4b7d1d9e3142d72e42855e4a23c07c951bbb0299556b02d36755 diff --git a/src/poppler.mk b/src/poppler.mk index b7b3f821..70e70a88 100644 --- a/src/poppler.mk +++ b/src/poppler.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := poppler +$(PKG)_WEBSITE := http://poppler.freedesktop.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 0.30.0 $(PKG)_CHECKSUM := b616ee869d0b1f8a7a2c71cf346f55c1bff624cce4badebe17f506ec8ce7ddf5 diff --git a/src/popt.mk b/src/popt.mk index bdd93df2..01676ad5 100644 --- a/src/popt.mk +++ b/src/popt.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := popt +$(PKG)_WEBSITE := http://freshmeat.net/projects/popt/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.16 $(PKG)_CHECKSUM := e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8 diff --git a/src/portablexdr.mk b/src/portablexdr.mk index 8da04942..178e5206 100644 --- a/src/portablexdr.mk +++ b/src/portablexdr.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := portablexdr +$(PKG)_WEBSITE := http://people.redhat.com/~rjones/portablexdr/ +$(PKG)_DESCR := PortableXDR $(PKG)_IGNORE := $(PKG)_VERSION := 4.9.1 $(PKG)_CHECKSUM := 5cf4bdd153cf4d44eaf10b725f451d0cfadc070b4b9a9ccfb64094b8f78de72c diff --git a/src/portaudio.mk b/src/portaudio.mk index 16821544..6cf6d55d 100644 --- a/src/portaudio.mk +++ b/src/portaudio.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := portaudio +$(PKG)_WEBSITE := http://www.portaudio.com/ $(PKG)_IGNORE := $(PKG)_VERSION := 190600_20161030 $(PKG)_CHECKSUM := f5a21d7dcd6ee84397446fa1fa1a0675bb2e8a4a6dceb4305a8404698d8d1513 diff --git a/src/portmidi.mk b/src/portmidi.mk index 406651f1..7a1635a8 100644 --- a/src/portmidi.mk +++ b/src/portmidi.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := portmidi +$(PKG)_WEBSITE := http://portmedia.sourceforge.net/portmidi/ $(PKG)_IGNORE := $(PKG)_VERSION := 217 $(PKG)_CHECKSUM := 08e9a892bd80bdb1115213fb72dc29a7bf2ff108b378180586aa65f3cfd42e0f diff --git a/src/postgresql.mk b/src/postgresql.mk index e41db5ac..e0ad874c 100644 --- a/src/postgresql.mk +++ b/src/postgresql.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := postgresql +$(PKG)_WEBSITE := http://www.postgresql.org/ +$(PKG)_DESCR := PostgreSQL $(PKG)_IGNORE := $(PKG)_VERSION := 9.2.4 $(PKG)_CHECKSUM := d97dd918a88a4449225998f46aafa85216a3f89163a3411830d6890507ffae93 diff --git a/src/primesieve.mk b/src/primesieve.mk index 463c0dc2..6deda58d 100644 --- a/src/primesieve.mk +++ b/src/primesieve.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := primesieve +$(PKG)_WEBSITE := http://primesieve.org/ +$(PKG)_DESCR := Primesieve $(PKG)_IGNORE := $(PKG)_VERSION := 5.5.0 $(PKG)_CHECKSUM := f0f818902967ce7c911c330c578a52ec62dbbd9b12a68b8d3a3bc79b601e52b0 diff --git a/src/proj.mk b/src/proj.mk index a24972c1..ce22cefa 100644 --- a/src/proj.mk +++ b/src/proj.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := proj +$(PKG)_WEBSITE := http://trac.osgeo.org/proj/ $(PKG)_IGNORE := $(PKG)_VERSION := 4.9.3 $(PKG)_CHECKSUM := 6984542fea333488de5c82eea58d699e4aff4b359200a9971537cd7e047185f7 diff --git a/src/protobuf.mk b/src/protobuf.mk index 8fba8db2..0b97e6cd 100644 --- a/src/protobuf.mk +++ b/src/protobuf.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := protobuf +$(PKG)_WEBSITE := https://github.com/google/protobuf $(PKG)_IGNORE := $(PKG)_VERSION := 3.1.0 $(PKG)_CHECKSUM := 0a0ae63cbffc274efb573bdde9a253e3f32e458c41261df51c5dbc5ad541e8f7 diff --git a/src/pthreads.mk b/src/pthreads.mk index 690c26d2..297ea761 100644 --- a/src/pthreads.mk +++ b/src/pthreads.mk @@ -4,6 +4,8 @@ # but the pre-requisite package and test are the same. PKG := pthreads +$(PKG)_WEBSITE := https://en.wikipedia.org/wiki/POSIX_Threads +$(PKG)_DESCR := POSIX Threads $(PKG)_VERSION := POSIX 1003.1-2001 $(PKG)_DEPS := gcc diff --git a/src/qdbm.mk b/src/qdbm.mk index b6f51e00..8a11e7f2 100644 --- a/src/qdbm.mk +++ b/src/qdbm.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qdbm +$(PKG)_WEBSITE := http://fallabs.com/qdbm/ +$(PKG)_DESCR := QDBM $(PKG)_IGNORE := $(PKG)_VERSION := 1.8.78 $(PKG)_CHECKSUM := b466fe730d751e4bfc5900d1f37b0fb955f2826ac456e70012785e012cdcb73e diff --git a/src/qhttpengine.mk b/src/qhttpengine.mk index 62d07238..eeed40ac 100644 --- a/src/qhttpengine.mk +++ b/src/qhttpengine.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qhttpengine +$(PKG)_WEBSITE := https://github.com/nitroshare/qhttpengine $(PKG)_IGNORE := $(PKG)_VERSION := 0.1.0 $(PKG)_CHECKSUM := 6df0e2f303eb5fb80995e0322903c2991b398a0b89fb483dae7c24bdefa1eaf1 diff --git a/src/qjson.mk b/src/qjson.mk index 2edefdf6..64822ff9 100644 --- a/src/qjson.mk +++ b/src/qjson.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qjson +$(PKG)_WEBSITE := http://qjson.sourceforge.net/ +$(PKG)_DESCR := QJson $(PKG)_IGNORE := $(PKG)_VERSION := 0.8.1 $(PKG)_CHECKSUM := cd4db5b956247c4991a9c3e95512da257cd2a6bd011357e363d02300afc814d9 diff --git a/src/qscintilla2.mk b/src/qscintilla2.mk index 012a405d..d8022f18 100644 --- a/src/qscintilla2.mk +++ b/src/qscintilla2.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qscintilla2 +$(PKG)_WEBSITE := http://www.riverbankcomputing.com/software/qscintilla/intro +$(PKG)_DESCR := QScintilla2 $(PKG)_IGNORE := $(PKG)_VERSION := 2.8.4 $(PKG)_CHECKSUM := 9b7b2d7440cc39736bbe937b853506b3bd218af3b79095d4f710cccb0fabe80f diff --git a/src/qt.mk b/src/qt.mk index d250eb19..c0e64901 100644 --- a/src/qt.mk +++ b/src/qt.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qt +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION := 4.8.7 $(PKG)_CHECKSUM := e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 diff --git a/src/qt3d.mk b/src/qt3d.mk index 8d69cc8d..1f8b3e72 100644 --- a/src/qt3d.mk +++ b/src/qt3d.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qt3d +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_CHECKSUM := 1d74cf431777b8086d771ab0d4d2c01f9c28eb14cc2d73d7f838a665d1f707ea diff --git a/src/qt5.mk b/src/qt5.mk index 3735b215..deef4577 100644 --- a/src/qt5.mk +++ b/src/qt5.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qt5 +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_DEPS := $(patsubst $(TOP_DIR)/src/%.mk,%,\ $(shell grep -l 'qtbase_VERSION' \ diff --git a/src/qtactiveqt.mk b/src/qtactiveqt.mk index 09f76f02..b30b04b5 100644 --- a/src/qtactiveqt.mk +++ b/src/qtactiveqt.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtactiveqt +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_CHECKSUM := 0c09920de273fa12e40f6486a4715267e2fe54991303b6ddfdac69fe9a24a1d5 diff --git a/src/qtbase.mk b/src/qtbase.mk index c3cceea0..21a43255 100644 --- a/src/qtbase.mk +++ b/src/qtbase.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtbase +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION := 5.7.1 $(PKG)_CHECKSUM := edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e diff --git a/src/qtcanvas3d.mk b/src/qtcanvas3d.mk index 5efc8bcd..cd3f7226 100644 --- a/src/qtcanvas3d.mk +++ b/src/qtcanvas3d.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtcanvas3d +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_CHECKSUM := a887083817b77710f6b5401cec4713a03147ed16fa5cf5fb8de4495807bebdb4 diff --git a/src/qtcharts.mk b/src/qtcharts.mk index f726c08d..a7308691 100644 --- a/src/qtcharts.mk +++ b/src/qtcharts.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtcharts +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_CHECKSUM := 85feee6992cdef1ab42947a83cbf806a29224d704ee5dc97ee5038c75b633fe3 diff --git a/src/qtconnectivity.mk b/src/qtconnectivity.mk index 2c12ad0b..62b828c4 100644 --- a/src/qtconnectivity.mk +++ b/src/qtconnectivity.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtconnectivity +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_CHECKSUM := b3e8b9068304dc5605a8fdf0695102032fd1a216f2c2d4d53a7e4d4dda3ab966 diff --git a/src/qtdatavis3d.mk b/src/qtdatavis3d.mk index f1bbb776..af8e5d5e 100644 --- a/src/qtdatavis3d.mk +++ b/src/qtdatavis3d.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtdatavis3d +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_CHECKSUM := 1bff85dcdeed98ad8f0e191f77e7c0e9d57af719c51791044b9c15e939b800f8 diff --git a/src/qtdeclarative-render2d.mk b/src/qtdeclarative-render2d.mk index b80b65b2..3aaa7a62 100644 --- a/src/qtdeclarative-render2d.mk +++ b/src/qtdeclarative-render2d.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtdeclarative-render2d +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_CHECKSUM := 831913488bb887993ae8701e5966f53875667a774c0230fc5dc39d6077828c7f diff --git a/src/qtdeclarative.mk b/src/qtdeclarative.mk index cfb3c890..22fa8da6 100644 --- a/src/qtdeclarative.mk +++ b/src/qtdeclarative.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtdeclarative +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_CHECKSUM := fd13dd3059d20694a857ed30ee56a2ade908c0cb93246f9804a65f7a2d775d56 diff --git a/src/qtgamepad.mk b/src/qtgamepad.mk index 13f2fa74..d5d32cae 100644 --- a/src/qtgamepad.mk +++ b/src/qtgamepad.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtgamepad +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_CHECKSUM := bb2b2165e3bcbf37a7e03c3e1cac4fe9771b087dad7ab9566ba5f7f4f4929182 diff --git a/src/qtgraphicaleffects.mk b/src/qtgraphicaleffects.mk index d55edc6a..94ec1a7d 100644 --- a/src/qtgraphicaleffects.mk +++ b/src/qtgraphicaleffects.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtgraphicaleffects +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_CHECKSUM := 2c68fabe599fa2f318562dc22003df6797e91d00761dbf1f337cdc7fbacd4dc8 diff --git a/src/qtimageformats.mk b/src/qtimageformats.mk index c48ed9b7..4e1f86b6 100644 --- a/src/qtimageformats.mk +++ b/src/qtimageformats.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtimageformats +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_CHECKSUM := 4f97a2a2b269f8a45576256ad9f452320c9c9de6d9c7cc1751fdeac36b0f77f4 diff --git a/src/qtlocation.mk b/src/qtlocation.mk index 75164b0f..40e85ccb 100644 --- a/src/qtlocation.mk +++ b/src/qtlocation.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtlocation +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_CHECKSUM := f9e9e64e757008c2341504a1916a219ee0cf2b1b42bfa72156e62dfe9dfbf39f diff --git a/src/qtmultimedia.mk b/src/qtmultimedia.mk index 216481d1..5f22d903 100644 --- a/src/qtmultimedia.mk +++ b/src/qtmultimedia.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtmultimedia +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_CHECKSUM := a52b177fbf02600a0c8bd995ce7c2041c673bc1332c02b60e0e95bb9ebab7def diff --git a/src/qtofficeopenxml.mk b/src/qtofficeopenxml.mk index 48f2b62a..16445a3f 100644 --- a/src/qtofficeopenxml.mk +++ b/src/qtofficeopenxml.mk @@ -1,5 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtofficeopenxml +$(PKG)_WEBSITE := https://github.com/dbzhang800/QtOfficeOpenXml/ +$(PKG)_DESCR := QtOfficeOpenXml $(PKG)_IGNORE := $(PKG)_VERSION := 02dda4a46f92a843eaba5f5a021952860eadfe01 $(PKG)_CHECKSUM := 50f989b2af404e8a9a20b46b3ca4955093ad295cb61f0cfb42fa06480d1fbad2 diff --git a/src/qtpurchasing.mk b/src/qtpurchasing.mk index 9e26523b..61d75c9a 100644 --- a/src/qtpurchasing.mk +++ b/src/qtpurchasing.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtpurchasing +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_CHECKSUM := f694757929cefa31643daab4bde1fbda8d76c79eda0ee6094e1d86efd4cb7b42 diff --git a/src/qtquickcontrols.mk b/src/qtquickcontrols.mk index 4b64432e..9bf8f09b 100644 --- a/src/qtquickcontrols.mk +++ b/src/qtquickcontrols.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtquickcontrols +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_CHECKSUM := 6feb1a736bf93af98c40d04cde6b36c113e4cdf84ccb9b306ca92ef9b1779e9d diff --git a/src/qtquickcontrols2.mk b/src/qtquickcontrols2.mk index 588ae356..94b1db4e 100644 --- a/src/qtquickcontrols2.mk +++ b/src/qtquickcontrols2.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtquickcontrols2 +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_CHECKSUM := f2e8acd0badbf604f28258b063c94ba71e28147c53c435ae9eb484497cf3e7ec diff --git a/src/qtscript.mk b/src/qtscript.mk index 1c314f8c..b531777a 100644 --- a/src/qtscript.mk +++ b/src/qtscript.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtscript +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_CHECKSUM := 5bf91a1c53020d91d454d4bb0f930ada98c5fc008fda78f2d7171152920da426 diff --git a/src/qtscxml.mk b/src/qtscxml.mk index e89fb62f..0aa92dcb 100644 --- a/src/qtscxml.mk +++ b/src/qtscxml.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtscxml +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_CHECKSUM := 9dad4ab220a715b6a63df1d4a196bfa963a1ce7e6e57e7b36462c5dab09db38c diff --git a/src/qtsensors.mk b/src/qtsensors.mk index f720f182..bcad3cfb 100644 --- a/src/qtsensors.mk +++ b/src/qtsensors.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtsensors +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_CHECKSUM := ccb3942edb5e615e9a43c147d87a09f19690eafbc56be0cdf4f73b7e510f3b10 diff --git a/src/qtserialbus.mk b/src/qtserialbus.mk index 52d7a382..5f39a2b4 100644 --- a/src/qtserialbus.mk +++ b/src/qtserialbus.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtserialbus +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_CHECKSUM := 727edbe0f29659119cfcfbc9ce7c7063af319ec441bc9a5156ebda28e820b157 diff --git a/src/qtserialport.mk b/src/qtserialport.mk index 2327fb29..d065450f 100644 --- a/src/qtserialport.mk +++ b/src/qtserialport.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtserialport +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_CHECKSUM := 76d5e19bd392b72602ba3bfe3c0d03c10962674604cf814efa2c910f98cf5a26 diff --git a/src/qtserialport_qt4.mk b/src/qtserialport_qt4.mk index f74aa690..5e9f1d44 100644 --- a/src/qtserialport_qt4.mk +++ b/src/qtserialport_qt4.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtserialport_qt4 +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION := 5c3b6cc770 $(PKG)_CHECKSUM := d49c1cd4bb47706561f52c07d6075bb9931700d3bcae656ef3b6d3db3eb014ab diff --git a/src/qtservice.mk b/src/qtservice.mk index c5764d69..902e1859 100644 --- a/src/qtservice.mk +++ b/src/qtservice.mk @@ -1,5 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtservice +$(PKG)_WEBSITE := https://qt.gitorious.org/qt-solutions/ +$(PKG)_DESCR := Qt Solutions $(PKG)_IGNORE := $(PKG)_VERSION := ad9bc46 $(PKG)_CHECKSUM := c708cb14637811b5d9060e33e4afe904a9d1c9f39a9befdc3a570f219825075b diff --git a/src/qtsparkle_qt4.mk b/src/qtsparkle_qt4.mk index 1e4dc7db..d0b86d9c 100644 --- a/src/qtsparkle_qt4.mk +++ b/src/qtsparkle_qt4.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtsparkle_qt4 +$(PKG)_WEBSITE := https://github.com/davidsansome/qtsparkle +$(PKG)_DESCR := qtsparkle $(PKG)_IGNORE := $(PKG)_VERSION := 8882e6ef86cdb79db7932307309d005411fd0c20 $(PKG)_CHECKSUM := 86f6f010356e05e6efb956b5643ce587ffbbae45e8e7dc1b25b4b1dcf865b5f3 diff --git a/src/qtsvg.mk b/src/qtsvg.mk index 94b10365..ee713b18 100644 --- a/src/qtsvg.mk +++ b/src/qtsvg.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtsvg +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_CHECKSUM := b0f017db8cf18e655e8a6635bc4ddbdbad6f8ef839857451b78942630a4c3947 diff --git a/src/qtsystems.mk b/src/qtsystems.mk index 7c75bd0f..73e6a25d 100644 --- a/src/qtsystems.mk +++ b/src/qtsystems.mk @@ -1,5 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtsystems +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION := 4e3a7ed $(PKG)_CHECKSUM := 710d2b80f9125fb03fdb67dd6f3c4dd51396981e812fd4a3ea99b1b1290853e5 diff --git a/src/qttools.mk b/src/qttools.mk index b956a1e5..2b4c1104 100644 --- a/src/qttools.mk +++ b/src/qttools.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qttools +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_CHECKSUM := 64197022686c3d8b11a8639f102e2caf03cc325a30e7a32ba66881648ac2dfac diff --git a/src/qttranslations.mk b/src/qttranslations.mk index 8b7d7f26..b38ca759 100644 --- a/src/qttranslations.mk +++ b/src/qttranslations.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qttranslations +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_CHECKSUM := 16ecdb09532724e80fa6202e5604d80877923b652b771b6020cea36bee0258e7 diff --git a/src/qtvirtualkeyboard.mk b/src/qtvirtualkeyboard.mk index 97e05e2c..e89ff62b 100644 --- a/src/qtvirtualkeyboard.mk +++ b/src/qtvirtualkeyboard.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtvirtualkeyboard +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_CHECKSUM := b28b8b937ed15d794c5ebc93e9556d08a0c9761a434864ebf2b454554e652add diff --git a/src/qtwebchannel.mk b/src/qtwebchannel.mk index e6620296..a391dfb4 100644 --- a/src/qtwebchannel.mk +++ b/src/qtwebchannel.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtwebchannel +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_CHECKSUM := 63ab3ac76ff993009cfa978162a764e05b763cacb70d1a862893f8de4492319b diff --git a/src/qtwebkit.mk b/src/qtwebkit.mk index 8256ba97..5d6da1a8 100644 --- a/src/qtwebkit.mk +++ b/src/qtwebkit.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtwebkit +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_CHECKSUM := a46cf7c89339645f94a5777e8ae5baccf75c5fc87ab52c9dafc25da3327b5f03 diff --git a/src/qtwebsockets.mk b/src/qtwebsockets.mk index 9ceef620..d418a719 100644 --- a/src/qtwebsockets.mk +++ b/src/qtwebsockets.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtwebsockets +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_CHECKSUM := 5c2a75b68e7f2e98530659b33bb08edee83013832dbf99cc5b40afc8a90652d1 diff --git a/src/qtwebview.mk b/src/qtwebview.mk index d2550bc8..43d04bd8 100644 --- a/src/qtwebview.mk +++ b/src/qtwebview.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtwebview +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_CHECKSUM := b3bcf9693e0205263f5d227f2204cf12c3a3d1e200b3114723511ee3bdf2159f diff --git a/src/qtwinextras.mk b/src/qtwinextras.mk index dd21a636..1b46b1ec 100644 --- a/src/qtwinextras.mk +++ b/src/qtwinextras.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtwinextras +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_CHECKSUM := 241463a49fef3543b47a2874bd373ddf5a88321de169730db09ae333018ef3cc diff --git a/src/qtxlsxwriter.mk b/src/qtxlsxwriter.mk index beb712a9..6ae46b19 100644 --- a/src/qtxlsxwriter.mk +++ b/src/qtxlsxwriter.mk @@ -1,5 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtxlsxwriter +$(PKG)_WEBSITE := https://github.com/dbzhang800/QtXlsxWriter/ +$(PKG)_DESCR := QtXlsxWriter $(PKG)_IGNORE := $(PKG)_VERSION := 37ef9dae209f989ed07f3aec37d5fbd1c821335c $(PKG)_CHECKSUM := e1cf5ecb51e048ee4531362b08ff844147a63d0fb2ba568ce29c8ff2b037a42f diff --git a/src/qtxmlpatterns.mk b/src/qtxmlpatterns.mk index a3f187dc..028e8b84 100644 --- a/src/qtxmlpatterns.mk +++ b/src/qtxmlpatterns.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qtxmlpatterns +$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_DESCR := Qt $(PKG)_IGNORE := $(PKG)_VERSION = $(qtbase_VERSION) $(PKG)_CHECKSUM := a805938c2ab1379d7dc83dcec606edd7950b5155c073b9eb53c53e62deb5f8e5 diff --git a/src/qwt.mk b/src/qwt.mk index 14aac24f..139521d3 100644 --- a/src/qwt.mk +++ b/src/qwt.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qwt +$(PKG)_WEBSITE := http://qwt.sourceforge.net/ +$(PKG)_DESCR := Qwt $(PKG)_VERSION := 6.1.3 $(PKG)_CHECKSUM := 027c32c0473a682c1db5b9cb02ebed5e39a4fbb0afd2306e23b1113c30006042 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) diff --git a/src/qwt_qt4.mk b/src/qwt_qt4.mk index c99cc10a..e7386203 100644 --- a/src/qwt_qt4.mk +++ b/src/qwt_qt4.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qwt_qt4 +$(PKG)_WEBSITE := http://qwt.sourceforge.net/ +$(PKG)_DESCR := Qwt-qt4 $(PKG)_VERSION = $(qwt_VERSION) $(PKG)_CHECKSUM = $(qwt_CHECKSUM) $(PKG)_SUBDIR = $(qwt_SUBDIR) diff --git a/src/qwtplot3d.mk b/src/qwtplot3d.mk index ef116da3..6357ec73 100644 --- a/src/qwtplot3d.mk +++ b/src/qwtplot3d.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qwtplot3d +$(PKG)_WEBSITE := http://qwtplot3d.sourceforge.net/ +$(PKG)_DESCR := QwtPlot3D $(PKG)_IGNORE := $(PKG)_VERSION := 0.2.7 $(PKG)_CHECKSUM := 1208336b15e82e7a9d22cbc743e46f27e2fad716094a9c133138f259fa299a42 diff --git a/src/ragel.mk b/src/ragel.mk index 2c146a50..e3f6103f 100644 --- a/src/ragel.mk +++ b/src/ragel.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := ragel +$(PKG)_WEBSITE := https://www.colm.net/open-source/ragel/ +$(PKG)_DESCR := Ragel $(PKG)_IGNORE := 7% $(PKG)_VERSION := 6.9 $(PKG)_CHECKSUM := 6e07be0fab5ca1d9c2d9e177718a018fc666141f594a5d6e7025658620cf660a diff --git a/src/readline.mk b/src/readline.mk index d3108da8..16b22cc6 100644 --- a/src/readline.mk +++ b/src/readline.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := readline +$(PKG)_WEBSITE := http://tiswww.case.edu/php/chet/readline/rltop.html +$(PKG)_DESCR := Readline $(PKG)_IGNORE := $(PKG)_VERSION := 6.3 $(PKG)_CHECKSUM := 56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43 diff --git a/src/rubberband.mk b/src/rubberband.mk index 0b3e70fe..f4c8c3ab 100644 --- a/src/rubberband.mk +++ b/src/rubberband.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := rubberband +$(PKG)_WEBSITE := http://breakfastquay.com/rubberband/ +$(PKG)_DESCR := Rubberband $(PKG)_IGNORE := $(PKG)_VERSION := 1.8.1 $(PKG)_CHECKSUM := ff0c63b0b5ce41f937a8a3bc560f27918c5fe0b90c6bc1cb70829b86ada82b75 diff --git a/src/rucksack.mk b/src/rucksack.mk index f5d6643c..9e190e1a 100644 --- a/src/rucksack.mk +++ b/src/rucksack.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := rucksack +$(PKG)_WEBSITE := https://github.com/andrewrk/rucksack $(PKG)_IGNORE := $(PKG)_VERSION := 3.1.0 $(PKG)_CHECKSUM := dcdaab57b06fdeb9be63ed0f2c2de78d0b1e79f7a896bb1e76561216a4458e3b diff --git a/src/sdl.mk b/src/sdl.mk index e2a34ca9..d47f6447 100644 --- a/src/sdl.mk +++ b/src/sdl.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := sdl +$(PKG)_WEBSITE := http://www.libsdl.org/ +$(PKG)_DESCR := SDL $(PKG)_IGNORE := $(PKG)_VERSION := 1.2.15 $(PKG)_CHECKSUM := d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00 diff --git a/src/sdl2.mk b/src/sdl2.mk index 92a63cca..6e48051a 100644 --- a/src/sdl2.mk +++ b/src/sdl2.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := sdl2 +$(PKG)_WEBSITE := http://www.libsdl.org/ +$(PKG)_DESCR := SDL2 $(PKG)_IGNORE := $(PKG)_VERSION := 2.0.5 $(PKG)_CHECKSUM := 442038cf55965969f2ff06d976031813de643af9c9edc9e331bd761c242e8785 diff --git a/src/sdl2_gfx.mk b/src/sdl2_gfx.mk index fb8925cd..ecf99bf6 100644 --- a/src/sdl2_gfx.mk +++ b/src/sdl2_gfx.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := sdl2_gfx +$(PKG)_WEBSITE := http://www.ferzkopp.net/joomla/content/view/19/14/ +$(PKG)_DESCR := SDL2_gfx $(PKG)_IGNORE := $(PKG)_VERSION := 1.0.1 $(PKG)_CHECKSUM := d69bcbceb811b4e5712fbad3ede737166327f44b727f1388c32581dbbe8c599a diff --git a/src/sdl2_image.mk b/src/sdl2_image.mk index 0872ba07..7def5a7a 100644 --- a/src/sdl2_image.mk +++ b/src/sdl2_image.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := sdl2_image +$(PKG)_WEBSITE := http://www.libsdl.org/ +$(PKG)_DESCR := SDL2_image $(PKG)_IGNORE := $(PKG)_VERSION := 2.0.0 $(PKG)_CHECKSUM := b29815c73b17633baca9f07113e8ac476ae66412dec0d29a5045825c27a47234 diff --git a/src/sdl2_mixer.mk b/src/sdl2_mixer.mk index 6532dddc..71e519e9 100644 --- a/src/sdl2_mixer.mk +++ b/src/sdl2_mixer.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := sdl2_mixer +$(PKG)_WEBSITE := http://www.libsdl.org/ +$(PKG)_DESCR := SDL2_mixer $(PKG)_IGNORE := $(PKG)_VERSION := 2.0.0 $(PKG)_CHECKSUM := a8ce0e161793791adeff258ca6214267fdd41b3c073d2581cd5265c8646f725b diff --git a/src/sdl2_net.mk b/src/sdl2_net.mk index c08b3141..d7ade53c 100644 --- a/src/sdl2_net.mk +++ b/src/sdl2_net.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := sdl2_net +$(PKG)_WEBSITE := http://www.libsdl.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 2.0.0 $(PKG)_CHECKSUM := d715be30783cc99e541626da52079e308060b21d4f7b95f0224b1d06c1faacab diff --git a/src/sdl2_ttf.mk b/src/sdl2_ttf.mk index 09d93532..1b21d614 100644 --- a/src/sdl2_ttf.mk +++ b/src/sdl2_ttf.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := sdl2_ttf +$(PKG)_WEBSITE := http://www.libsdl.org/ +$(PKG)_DESCR := SDL2_ttf $(PKG)_IGNORE := $(PKG)_VERSION := 2.0.12 $(PKG)_CHECKSUM := 8728605443ea1cca5cad501dc34dc0cb15135d1e575551da6d151d213d356f6e diff --git a/src/sdl_gfx.mk b/src/sdl_gfx.mk index 82437b12..4012f146 100644 --- a/src/sdl_gfx.mk +++ b/src/sdl_gfx.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := sdl_gfx +$(PKG)_WEBSITE := http://www.ferzkopp.net/joomla/content/view/19/14/ +$(PKG)_DESCR := SDL_gfx $(PKG)_IGNORE := $(PKG)_VERSION := 2.0.25 $(PKG)_CHECKSUM := 556eedc06b6cf29eb495b6d27f2dcc51bf909ad82389ba2fa7bdc4dec89059c0 diff --git a/src/sdl_image.mk b/src/sdl_image.mk index d435dd67..92edeb1b 100644 --- a/src/sdl_image.mk +++ b/src/sdl_image.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := sdl_image +$(PKG)_WEBSITE := http://www.libsdl.org/projects/SDL_image/ +$(PKG)_DESCR := SDL_image $(PKG)_IGNORE := $(PKG)_VERSION := 1.2.12 $(PKG)_CHECKSUM := 0b90722984561004de84847744d566809dbb9daf732a9e503b91a1b5a84e5699 diff --git a/src/sdl_mixer.mk b/src/sdl_mixer.mk index ca6c07d7..67a1b131 100644 --- a/src/sdl_mixer.mk +++ b/src/sdl_mixer.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := sdl_mixer +$(PKG)_WEBSITE := http://www.libsdl.org/projects/SDL_mixer/ +$(PKG)_DESCR := SDL_mixer $(PKG)_IGNORE := $(PKG)_VERSION := 1.2.12 $(PKG)_CHECKSUM := 1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a diff --git a/src/sdl_net.mk b/src/sdl_net.mk index 026ca19d..2dc23cf3 100644 --- a/src/sdl_net.mk +++ b/src/sdl_net.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := sdl_net +$(PKG)_WEBSITE := http://www.libsdl.org/projects/SDL_net/ +$(PKG)_DESCR := SDL_net $(PKG)_IGNORE := $(PKG)_VERSION := 1.2.8 $(PKG)_CHECKSUM := 5f4a7a8bb884f793c278ac3f3713be41980c5eedccecff0260411347714facb4 diff --git a/src/sdl_pango.mk b/src/sdl_pango.mk index 6a1e6af7..1e836621 100644 --- a/src/sdl_pango.mk +++ b/src/sdl_pango.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := sdl_pango +$(PKG)_WEBSITE := http://sdlpango.sourceforge.net/ +$(PKG)_DESCR := SDL_Pango $(PKG)_IGNORE := $(PKG)_VERSION := 0.1.2 $(PKG)_CHECKSUM := 7f75d3b97acf707c696ea126424906204ebfa07660162de925173cdd0257eba4 diff --git a/src/sdl_rwhttp.mk b/src/sdl_rwhttp.mk index 40e6e701..75d08086 100644 --- a/src/sdl_rwhttp.mk +++ b/src/sdl_rwhttp.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := sdl_rwhttp +$(PKG)_WEBSITE := http://github.com/mgerhardy/SDL_rwhttp/ +$(PKG)_DESCR := SDL_rwhttp $(PKG)_IGNORE := $(PKG)_VERSION := 0.2.0 $(PKG)_CHECKSUM := 9341f427901b5d24d07fd74c8a9124b3c363669142cdf0b3675ac72afe793ea1 diff --git a/src/sdl_sound.mk b/src/sdl_sound.mk index 42ccdabb..add6c60e 100644 --- a/src/sdl_sound.mk +++ b/src/sdl_sound.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := sdl_sound +$(PKG)_WEBSITE := http://icculus.org/SDL_sound/ +$(PKG)_DESCR := SDL_sound $(PKG)_IGNORE := $(PKG)_VERSION := 1.0.3 $(PKG)_CHECKSUM := 3999fd0bbb485289a52be14b2f68b571cb84e380cc43387eadf778f64c79e6df diff --git a/src/sdl_ttf.mk b/src/sdl_ttf.mk index 5914986b..efd363ad 100644 --- a/src/sdl_ttf.mk +++ b/src/sdl_ttf.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := sdl_ttf +$(PKG)_WEBSITE := http://www.libsdl.org/projects/SDL_ttf/ +$(PKG)_DESCR := SDL_ttf $(PKG)_IGNORE := 2% $(PKG)_VERSION := 2.0.11 $(PKG)_CHECKSUM := 724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7 diff --git a/src/sfml.mk b/src/sfml.mk index 5c75e5bd..866fdf23 100644 --- a/src/sfml.mk +++ b/src/sfml.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := sfml +$(PKG)_WEBSITE := http://www.sfml-dev.org/ +$(PKG)_DESCR := SFML $(PKG)_IGNORE := $(PKG)_VERSION := 2.3.2 $(PKG)_CHECKSUM := 03fe79943c48222037f1126a581b12c95a4dd53168881907964695c5ec3dc395 diff --git a/src/smpeg.mk b/src/smpeg.mk index 6618d808..ec459298 100644 --- a/src/smpeg.mk +++ b/src/smpeg.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := smpeg +$(PKG)_WEBSITE := http://icculus.org/smpeg/ $(PKG)_IGNORE := $(PKG)_VERSION := 0.4.5+cvs20030824 $(PKG)_CHECKSUM := 1276ea797dd9fde8a12dd3f33f180153922544c28ca9fc7b477c018876be1916 diff --git a/src/smpeg2.mk b/src/smpeg2.mk index fd2d02f2..357821f7 100644 --- a/src/smpeg2.mk +++ b/src/smpeg2.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := smpeg2 +$(PKG)_WEBSITE := http://icculus.org/smpeg/ +$(PKG)_DESCR := smpeg $(PKG)_IGNORE := $(PKG)_VERSION := 2.0.0 $(PKG)_CHECKSUM := 979a65b211744a44fa641a9b6e4d64e64a12ff703ae776bafe3c4c4cd85494b3 diff --git a/src/sox.mk b/src/sox.mk index 8ca08baa..eb9c604e 100644 --- a/src/sox.mk +++ b/src/sox.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := sox +$(PKG)_WEBSITE := http://sox.sourceforge.net/ +$(PKG)_DESCR := SoX $(PKG)_IGNORE := $(PKG)_VERSION := 14.4.2 $(PKG)_CHECKSUM := b45f598643ffbd8e363ff24d61166ccec4836fea6d3888881b8df53e3bb55f6c diff --git a/src/sparsehash.mk b/src/sparsehash.mk index e39085de..85273d13 100644 --- a/src/sparsehash.mk +++ b/src/sparsehash.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := sparsehash +$(PKG)_WEBSITE := https://github.com/sparsehash/sparsehash $(PKG)_IGNORE := $(PKG)_VERSION := 2.0.3 $(PKG)_CHECKSUM := 05e986a5c7327796dad742182b2d10805a8d4f511ad090da0490f146c1ff7a8c diff --git a/src/speex.mk b/src/speex.mk index 81c9592d..2d8ad30b 100644 --- a/src/speex.mk +++ b/src/speex.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := speex +$(PKG)_WEBSITE := http://www.speex.org/ +$(PKG)_DESCR := Speex $(PKG)_IGNORE := $(PKG)_VERSION := 1.2rc2 $(PKG)_CHECKSUM := caa27c7247ff15c8521c2ae0ea21987c9e9710a8f2d3448e8b79da9806bce891 diff --git a/src/speexdsp.mk b/src/speexdsp.mk index d3b36ce3..c1b201fd 100644 --- a/src/speexdsp.mk +++ b/src/speexdsp.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := speexdsp +$(PKG)_WEBSITE := http://www.speex.org/ +$(PKG)_DESCR := SpeexDSP $(PKG)_IGNORE := $(PKG)_VERSION := 1.2rc3 $(PKG)_CHECKSUM := 4ae688600039f5d224bdf2e222d2fbde65608447e4c2f681585e4dca6df692f1 diff --git a/src/sqlite.mk b/src/sqlite.mk index a2c01061..e725b988 100644 --- a/src/sqlite.mk +++ b/src/sqlite.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := sqlite +$(PKG)_WEBSITE := http://www.sqlite.org/ +$(PKG)_DESCR := SQLite $(PKG)_IGNORE := $(PKG)_VERSION := 3150200 $(PKG)_CHECKSUM := 07b35063b9386865b78226cdaca9a299d938a87aaa8fdc4d73edb0cef30f3149 diff --git a/src/subversion.mk b/src/subversion.mk index 3e7d57cd..1ba08ee5 100644 --- a/src/subversion.mk +++ b/src/subversion.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := subversion +$(PKG)_WEBSITE := http://subversion.apache.org $(PKG)_IGNORE := $(PKG)_VERSION := 1.9.4 $(PKG)_CHECKSUM := 1267f9e2ab983f260623bee841e6c9cc458bf4bf776238ed5f100983f79e9299 diff --git a/src/suitesparse.mk b/src/suitesparse.mk index 57eea1b5..5c89eb7e 100644 --- a/src/suitesparse.mk +++ b/src/suitesparse.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := suitesparse +$(PKG)_WEBSITE := http://www.cise.ufl.edu/research/sparse/SuiteSparse/ +$(PKG)_DESCR := SuiteSparse $(PKG)_VERSION := 4.2.1 $(PKG)_CHECKSUM := e8023850bc30742e20a3623fabda02421cb5774b980e3e7c9c6d9e7e864946bd $(PKG)_SUBDIR := SuiteSparse diff --git a/src/t4k_common.mk b/src/t4k_common.mk index 6238647b..5517c4ce 100644 --- a/src/t4k_common.mk +++ b/src/t4k_common.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := t4k_common +$(PKG)_WEBSITE := http://tux4kids.alioth.debian.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 0.1.1 $(PKG)_CHECKSUM := 42c155816dae2c5dad560faa50edaa1ca84536530283d37859c4b91e82675110 diff --git a/src/taglib.mk b/src/taglib.mk index d7b9c9fe..314143e4 100644 --- a/src/taglib.mk +++ b/src/taglib.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := taglib +$(PKG)_WEBSITE := http://developer.kde.org/~wheeler/taglib.html +$(PKG)_DESCR := TagLib $(PKG)_IGNORE := $(PKG)_VERSION := 1.10 $(PKG)_CHECKSUM := 24c32d50042cb0ddf162eb263f8ac75c5a158e12bf32ed534c1d5c71ee369baa diff --git a/src/tclap.mk b/src/tclap.mk index 961fed92..79a6b1fc 100644 --- a/src/tclap.mk +++ b/src/tclap.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := tclap +$(PKG)_WEBSITE := http://tclap.sourceforge.net/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.2.1 $(PKG)_CHECKSUM := 9f9f0fe3719e8a89d79b6ca30cf2d16620fba3db5b9610f9b51dd2cd033deebb diff --git a/src/teem.mk b/src/teem.mk index 825b8cb5..ef8eaa94 100644 --- a/src/teem.mk +++ b/src/teem.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := teem +$(PKG)_WEBSITE := http://teem.sourceforge.net/ +$(PKG)_DESCR := Teem $(PKG)_IGNORE := $(PKG)_VERSION := 1.11.0 $(PKG)_CHECKSUM := a01386021dfa802b3e7b4defced2f3c8235860d500c1fa2f347483775d4c8def diff --git a/src/termcap.mk b/src/termcap.mk index e2c3c848..b00d4419 100644 --- a/src/termcap.mk +++ b/src/termcap.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := termcap +$(PKG)_WEBSITE := https://www.gnu.org/software/termutils/ +$(PKG)_DESCR := Termcap $(PKG)_IGNORE := $(PKG)_VERSION := 1.3.1 $(PKG)_CHECKSUM := 91a0e22e5387ca4467b5bcb18edf1c51b930262fd466d5fda396dd9d26719100 diff --git a/src/theora.mk b/src/theora.mk index b8dc56bf..2df6b486 100644 --- a/src/theora.mk +++ b/src/theora.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := theora +$(PKG)_WEBSITE := http://theora.org/ +$(PKG)_DESCR := Theora $(PKG)_IGNORE := $(PKG)_VERSION := 1.1.1 $(PKG)_CHECKSUM := 40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b diff --git a/src/tiff.mk b/src/tiff.mk index f612ea8c..46068ee5 100644 --- a/src/tiff.mk +++ b/src/tiff.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := tiff +$(PKG)_WEBSITE := http://www.remotesensing.org/libtiff/ +$(PKG)_DESCR := LibTIFF $(PKG)_IGNORE := $(PKG)_VERSION := 4.0.7 $(PKG)_CHECKSUM := 9f43a2cfb9589e5cecaa66e16bf87f814c945f22df7ba600d63aac4632c4f019 diff --git a/src/tinyxml.mk b/src/tinyxml.mk index 8ab04d90..3a7ef230 100644 --- a/src/tinyxml.mk +++ b/src/tinyxml.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := tinyxml +$(PKG)_WEBSITE := http://sourceforge.net/projects/tinyxml/ $(PKG)_IGNORE := $(PKG)_VERSION := 2.6.2 $(PKG)_CHECKSUM := 15bdfdcec58a7da30adc87ac2b078e4417dbe5392f3afb719f9ba6d062645593 diff --git a/src/tinyxml2.mk b/src/tinyxml2.mk index 4a7b7b86..c313d076 100644 --- a/src/tinyxml2.mk +++ b/src/tinyxml2.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := tinyxml2 +$(PKG)_WEBSITE := http://grinninglizard.com/tinyxml2/ $(PKG)_IGNORE := $(PKG)_VERSION := 4.0.1 $(PKG)_CHECKSUM := 14b38ef25cc136d71339ceeafb4856bb638d486614103453eccd323849267f20 diff --git a/src/tre.mk b/src/tre.mk index 7d337d32..6a646102 100644 --- a/src/tre.mk +++ b/src/tre.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := tre +$(PKG)_WEBSITE := http://laurikari.net/tre/ +$(PKG)_DESCR := TRE $(PKG)_IGNORE := $(PKG)_VERSION := 0.8.0 $(PKG)_CHECKSUM := be8670a55198bc57485a6a8ae4b497d7db98ea25f90968585b7eb07d94c6a7dd diff --git a/src/twolame.mk b/src/twolame.mk index 190305a8..98fd8238 100644 --- a/src/twolame.mk +++ b/src/twolame.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := twolame +$(PKG)_WEBSITE := http://www.twolame.org/ +$(PKG)_DESCR := TwoLAME $(PKG)_IGNORE := $(PKG)_VERSION := 0.3.13 $(PKG)_CHECKSUM := 98f332f48951f47f23f70fd0379463aff7d7fb26f07e1e24e42ddef22cc6112a diff --git a/src/ucl.mk b/src/ucl.mk index 568901ea..b421d764 100644 --- a/src/ucl.mk +++ b/src/ucl.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := ucl +$(PKG)_WEBSITE := http://www.oberhumer.com/opensource/ucl/ +$(PKG)_DESCR := UCL $(PKG)_IGNORE := $(PKG)_VERSION := 1.03 $(PKG)_CHECKSUM := b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348 diff --git a/src/unrtf.mk b/src/unrtf.mk index 849f712b..508cbfd4 100644 --- a/src/unrtf.mk +++ b/src/unrtf.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := unrtf +$(PKG)_WEBSITE := https://www.gnu.org/software/unrtf/ +$(PKG)_DESCR := unRTF $(PKG)_VERSION := 0.21.9 $(PKG)_CHECKSUM := 22a37826f96d754e335fb69f8036c068c00dd01ee9edd9461a36df0085fb8ddd $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) diff --git a/src/upx.mk b/src/upx.mk index eeeea903..2b1b1f31 100644 --- a/src/upx.mk +++ b/src/upx.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := upx +$(PKG)_WEBSITE := http://upx.sourceforge.net/ +$(PKG)_DESCR := UPX $(PKG)_IGNORE := $(PKG)_VERSION := 3.91 $(PKG)_CHECKSUM := 527ce757429841f51675352b1f9f6fc8ad97b18002080d7bf8672c466d8c6a3c diff --git a/src/vamp-plugin-sdk.mk b/src/vamp-plugin-sdk.mk index bd549b7e..f44e4dc6 100644 --- a/src/vamp-plugin-sdk.mk +++ b/src/vamp-plugin-sdk.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := vamp-plugin-sdk +$(PKG)_WEBSITE := http://vamp-plugins.org/ +$(PKG)_DESCR := Vamp Plugins SDK $(PKG)_IGNORE := $(PKG)_VERSION := 2.5 $(PKG)_CHECKSUM := 7b719f9e4575624b30b335c64c00469d3745aef4bca177f66faf3204f073139d diff --git a/src/vcdimager.mk b/src/vcdimager.mk index 3517e94f..abb87e04 100644 --- a/src/vcdimager.mk +++ b/src/vcdimager.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := vcdimager +$(PKG)_WEBSITE := https://www.gnu.org/software/vcdimager/ $(PKG)_IGNORE := $(PKG)_VERSION := 0.7.24 $(PKG)_CHECKSUM := 075d7a67353ff3004745da781435698b6bc4a053838d0d4a3ce0516d7d974694 diff --git a/src/vidstab.mk b/src/vidstab.mk index f07ca74c..bb84c33c 100644 --- a/src/vidstab.mk +++ b/src/vidstab.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := vidstab +$(PKG)_WEBSITE := http://public.hronopik.de/vid.stab/features.php?lang=en +$(PKG)_DESCR := vid.stab video stablizer $(PKG)_IGNORE := $(PKG)_VERSION := 0.98b $(PKG)_CHECKSUM := 530f0bf7479ec89d9326af3a286a15d7d6a90fcafbb641e3b8bdb8d05637d025 diff --git a/src/vigra.mk b/src/vigra.mk index f41c726e..7615dafc 100644 --- a/src/vigra.mk +++ b/src/vigra.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := vigra +$(PKG)_WEBSITE := http://hci.iwr.uni-heidelberg.de/vigra $(PKG)_IGNORE := $(PKG)_VERSION := 1.9.0 $(PKG)_CHECKSUM := dc041f7ccf838d4321e9bcf522fece1758768dd7a3f8350d1e83e2b8e6daf1e6 diff --git a/src/vmime.mk b/src/vmime.mk index a0584082..af35d88b 100644 --- a/src/vmime.mk +++ b/src/vmime.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := vmime +$(PKG)_WEBSITE := http://www.vmime.org/ +$(PKG)_DESCR := VMime $(PKG)_IGNORE := $(PKG)_VERSION := b1b3f30 $(PKG)_CHECKSUM := 1d3608df15af109c748aeb36f47c4932311c8636f14fc57d10807cb04d7ec8a4 diff --git a/src/vo-aacenc.mk b/src/vo-aacenc.mk index 4ae4d2ca..4f516c9e 100644 --- a/src/vo-aacenc.mk +++ b/src/vo-aacenc.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := vo-aacenc +$(PKG)_WEBSITE := https://github.com/mstorsjo/vo-aacenc +$(PKG)_DESCR := VO-AACENC $(PKG)_IGNORE := $(PKG)_VERSION := 0.1.3 $(PKG)_CHECKSUM := e51a7477a359f18df7c4f82d195dab4e14e7414cbd48cf79cc195fc446850f36 diff --git a/src/vo-amrwbenc.mk b/src/vo-amrwbenc.mk index c2b73860..bb19884a 100644 --- a/src/vo-amrwbenc.mk +++ b/src/vo-amrwbenc.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := vo-amrwbenc +$(PKG)_WEBSITE := https://github.com/mstorsjo/vo-amrwbenc +$(PKG)_DESCR := VO-AMRWBENC $(PKG)_IGNORE := $(PKG)_VERSION := 0.1.3 $(PKG)_CHECKSUM := 5652b391e0f0e296417b841b02987d3fd33e6c0af342c69542cbb016a71d9d4e diff --git a/src/vorbis.mk b/src/vorbis.mk index 9da54560..1dbd4fb1 100644 --- a/src/vorbis.mk +++ b/src/vorbis.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := vorbis +$(PKG)_WEBSITE := http://www.vorbis.com/ +$(PKG)_DESCR := Vorbis $(PKG)_IGNORE := $(PKG)_VERSION := 1.3.5 $(PKG)_CHECKSUM := 6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce diff --git a/src/vtk.mk b/src/vtk.mk index aeb0e4c7..e73dfbcd 100644 --- a/src/vtk.mk +++ b/src/vtk.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := vtk +$(PKG)_WEBSITE := http://www.vtk.org/ $(PKG)_IGNORE := 5.10% $(PKG)_VERSION := 5.8.0 $(PKG)_CHECKSUM := 83ee74b83403590342c079a52b06eef7ab862417f941d5f4558aea25c6bbc2d5 diff --git a/src/vtk6.mk b/src/vtk6.mk index 23d93ec4..05fec106 100644 --- a/src/vtk6.mk +++ b/src/vtk6.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := vtk6 +$(PKG)_WEBSITE := http://www.vtk.org/ +$(PKG)_DESCR := VTK6 $(PKG)_IGNORE := $(PKG)_VERSION := 6.3.0 $(PKG)_CHECKSUM := 92a493354c5fa66bea73b5fc014154af5d9f3f6cee8d20a826f4cd5d4b0e8a5e diff --git a/src/waf.mk b/src/waf.mk index 243f8561..a0c12102 100644 --- a/src/waf.mk +++ b/src/waf.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := waf +$(PKG)_WEBSITE := https://waf.io/ +$(PKG)_DESCR := Waf: the meta build system $(PKG)_IGNORE := $(PKG)_VERSION := 1.8.17 $(PKG)_CHECKSUM := 63c53b03dd23afde1008dced06a011dad581d24392818c8069a40af99f6ac2b6 diff --git a/src/wavpack.mk b/src/wavpack.mk index 2361fccf..65ae68d2 100644 --- a/src/wavpack.mk +++ b/src/wavpack.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := wavpack +$(PKG)_WEBSITE := http://www.wavpack.com/ +$(PKG)_DESCR := WavPack $(PKG)_IGNORE := $(PKG)_VERSION := 4.75.2 $(PKG)_CHECKSUM := 7d31b34166c33c3109b45c6e4579b472fd05e3ee8ec6d728352961c5cdd1d6b0 diff --git a/src/wget.mk b/src/wget.mk index 4be4f11b..be30effd 100644 --- a/src/wget.mk +++ b/src/wget.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := wget +$(PKG)_WEBSITE := https://www.gnu.org/software/wget/ $(PKG)_VERSION := 1.18 $(PKG)_CHECKSUM := b5b55b75726c04c06fe253daec9329a6f1a3c0c1878e3ea76ebfebc139ea9cc1 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) diff --git a/src/widl.mk b/src/widl.mk index d589a3c3..1e8d8f70 100644 --- a/src/widl.mk +++ b/src/widl.mk @@ -4,6 +4,8 @@ # avoid downloading Wine's entire tree. PKG := widl +$(PKG)_WEBSITE := https://www.winehq.org/docs/widl/ +$(PKG)_DESCR := Wine IDL Compiler $(PKG)_IGNORE = $(mingw-w64_IGNORE) $(PKG)_VERSION = $(mingw-w64_VERSION) $(PKG)_CHECKSUM = $(mingw-w64_CHECKSUM) diff --git a/src/winpcap.mk b/src/winpcap.mk index b0079bb0..010fcbde 100644 --- a/src/winpcap.mk +++ b/src/winpcap.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := winpcap +$(PKG)_WEBSITE := http://www.winpcap.org/ +$(PKG)_DESCR := WinPcap $(PKG)_IGNORE := $(PKG)_VERSION := 4_1_3 $(PKG)_CHECKSUM := 346a93f6b375ac4c1add5c8c7178498f1feed4172fb33383474a91b48ec6633a diff --git a/src/wt.mk b/src/wt.mk index 0032f814..bdab1cc0 100644 --- a/src/wt.mk +++ b/src/wt.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := wt +$(PKG)_WEBSITE := http://www.webtoolkit.eu +$(PKG)_DESCR := Wt $(PKG)_IGNORE := $(PKG)_VERSION := 3.3.6 $(PKG)_CHECKSUM := 8f82576076deb1d72cfb8ff42cf7ffb3553a45da32123b2a3cf36e66040678ab diff --git a/src/wxwidgets.mk b/src/wxwidgets.mk index 90e7b43a..521e776f 100644 --- a/src/wxwidgets.mk +++ b/src/wxwidgets.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := wxwidgets +$(PKG)_WEBSITE := http://www.wxwidgets.org/ +$(PKG)_DESCR := wxWidgets $(PKG)_IGNORE := $(PKG)_VERSION := 3.0.2 $(PKG)_CHECKSUM := 346879dc554f3ab8d6da2704f651ecb504a22e9d31c17ef5449b129ed711585d diff --git a/src/x264.mk b/src/x264.mk index fda6f0cd..ed299a78 100644 --- a/src/x264.mk +++ b/src/x264.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := x264 +$(PKG)_WEBSITE := http://www.videolan.org/developers/x264.html $(PKG)_IGNORE := $(PKG)_VERSION := 20161130-2245 $(PKG)_CHECKSUM := 0825e14945bc373107f9a00e66d45d5389bb86368efd834b92c52cddb2ded1d8 diff --git a/src/xapian-core.mk b/src/xapian-core.mk index 578b58a5..eb6a2125 100644 --- a/src/xapian-core.mk +++ b/src/xapian-core.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := xapian-core +$(PKG)_WEBSITE := http://xapian.org/ +$(PKG)_DESCR := Xapian-Core $(PKG)_IGNORE := $(PKG)_VERSION := 1.2.21 $(PKG)_CHECKSUM := 63f48758fbd13fa8456dd4cf9bf3ec35a096e4290f14a51ac7df23f78c162d3f diff --git a/src/xerces.mk b/src/xerces.mk index bc6bcca7..6d3260cf 100644 --- a/src/xerces.mk +++ b/src/xerces.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := xerces +$(PKG)_WEBSITE := http://xerces.apache.org/xerces-c/ +$(PKG)_DESCR := Xerces-C++ $(PKG)_IGNORE := $(PKG)_VERSION := 3.1.4 $(PKG)_CHECKSUM := c98eedac4cf8a73b09366ad349cb3ef30640e7a3089d360d40a3dde93f66ecf6 diff --git a/src/xmlrpc-c.mk b/src/xmlrpc-c.mk index 123ff287..f5ddca1e 100644 --- a/src/xmlrpc-c.mk +++ b/src/xmlrpc-c.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := xmlrpc-c +$(PKG)_WEBSITE := http://xmlrpc-c.sourceforge.net/ $(PKG)_IGNORE := $(PKG)_VERSION := d4364f4 $(PKG)_CHECKSUM := fbd79d86020a87ed61dfdf00f78873c0fd925f477a8705f415b9fee0d6d64b19 diff --git a/src/xmlwrapp.mk b/src/xmlwrapp.mk index 7fc0d684..b10b4aa8 100644 --- a/src/xmlwrapp.mk +++ b/src/xmlwrapp.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := xmlwrapp +$(PKG)_WEBSITE := http://sourceforge.net/projects/xmlwrapp/ $(PKG)_IGNORE := $(PKG)_VERSION := 0.7.0 $(PKG)_CHECKSUM := 2d46234058270d878e7674f4ff9005a4ebd4e991162de9d1215d33d99fde37aa diff --git a/src/xorg-macros.mk b/src/xorg-macros.mk index ec66336c..cbff4882 100644 --- a/src/xorg-macros.mk +++ b/src/xorg-macros.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := xorg-macros +$(PKG)_WEBSITE := http://cgit.freedesktop.org/xorg/util/macros/ +$(PKG)_DESCR := X.org utility macros $(PKG)_IGNORE := $(PKG)_VERSION := 1.19.0 $(PKG)_CHECKSUM := 2835b11829ee634e19fa56517b4cfc52ef39acea0cd82e15f68096e27cbed0ba diff --git a/src/xvidcore.mk b/src/xvidcore.mk index 825cfbc8..4129cf7a 100644 --- a/src/xvidcore.mk +++ b/src/xvidcore.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := xvidcore +$(PKG)_WEBSITE := http://www.xvid.org/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.3.4 $(PKG)_CHECKSUM := 4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f diff --git a/src/xxhash.mk b/src/xxhash.mk index c5677bfa..41748130 100644 --- a/src/xxhash.mk +++ b/src/xxhash.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := xxhash +$(PKG)_WEBSITE := http://cyan4973.github.io/xxHash/ +$(PKG)_DESCR := xxHash $(PKG)_IGNORE := $(PKG)_VERSION := 0.6.1 $(PKG)_CHECKSUM := a940123baa6c71b75b6c02836bae2155cd2f74f7682e1a1d6f7b889f7bc9e7f8 diff --git a/src/xz.mk b/src/xz.mk index 8d159c37..7b759315 100644 --- a/src/xz.mk +++ b/src/xz.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := xz +$(PKG)_WEBSITE := http://tukaani.org/xz/ +$(PKG)_DESCR := XZ $(PKG)_IGNORE := $(PKG)_VERSION := 5.2.2 $(PKG)_CHECKSUM := 73df4d5d34f0468bd57d09f2d8af363e95ed6cc3a4a86129d2f2c366259902a2 diff --git a/src/yaml-cpp.mk b/src/yaml-cpp.mk index 545998f5..aaffe469 100644 --- a/src/yaml-cpp.mk +++ b/src/yaml-cpp.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := yaml-cpp +$(PKG)_WEBSITE := https://github.com/jbeder/yaml-cpp +$(PKG)_DESCR := A YAML parser and emitter for C++ $(PKG)_IGNORE := $(PKG)_VERSION := 0.5.3 $(PKG)_CHECKSUM := ac50a27a201d16dc69a881b80ad39a7be66c4d755eda1f76c3a68781b922af8f diff --git a/src/yasm.mk b/src/yasm.mk index e4f361ab..45af8334 100644 --- a/src/yasm.mk +++ b/src/yasm.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := yasm +$(PKG)_WEBSITE := http://yasm.tortall.net// +$(PKG)_DESCR := Yasm $(PKG)_VERSION := 1.3.0 $(PKG)_CHECKSUM := 3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) diff --git a/src/zlib.mk b/src/zlib.mk index 0dde4fd7..64016956 100644 --- a/src/zlib.mk +++ b/src/zlib.mk @@ -1,6 +1,7 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := zlib +$(PKG)_WEBSITE := http://zlib.net/ $(PKG)_IGNORE := $(PKG)_VERSION := 1.2.8 $(PKG)_CHECKSUM := 831df043236df8e9a7667b9e3bb37e1fcb1220a0f163b6de2626774b9590d057 diff --git a/src/zziplib.mk b/src/zziplib.mk index 2cdf5165..55ba644f 100644 --- a/src/zziplib.mk +++ b/src/zziplib.mk @@ -1,6 +1,8 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := zziplib +$(PKG)_WEBSITE := http://zziplib.sourceforge.net/ +$(PKG)_DESCR := ZZIPlib $(PKG)_IGNORE := $(PKG)_VERSION := 0.13.62 $(PKG)_CHECKSUM := a1b8033f1a1fd6385f4820b01ee32d8eca818409235d22caf5119e0078c7525b From 23c5e209d48e46f791b16e10ec0be7178d750ed2 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 18 Dec 2016 21:51:32 +0100 Subject: [PATCH 1111/1463] add descriptions and websites to packages.json See https://github.com/mxe/mxe/issues/1422 --- .travis.yml | 2 +- Makefile | 4 +- docs/index.html | 2 +- docs/packages.json | 852 ++++++++++++++++++++++----------------------- 4 files changed, 431 insertions(+), 429 deletions(-) diff --git a/.travis.yml b/.travis.yml index aa8b2157..04e8192b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: c sudo: false script: - - make docs/build-matrix.html docs/packages.json + - make docs/build-matrix.html docs/packages.json OS_SHORT_NAME=disable-native-plugins - if [ "$GH_TOKEN" != "" ]; then ./tools/travis-push.sh; fi - make download -j 6 -k MXE_PLUGIN_DIRS="$(./tools/plugins-with-additional-packages.sh)" diff --git a/Makefile b/Makefile index 25cb9d67..526e1189 100644 --- a/Makefile +++ b/Makefile @@ -857,7 +857,9 @@ docs/packages.json: $(foreach 1,$(PKGS),$(PKG_MAKEFILES)) @echo '{' > $@ @{$(foreach PKG,$(PKGS), \ echo ' "$(PKG)": \ - "$($(PKG)_VERSION)",';)} >> $@ + {"version": "$($(PKG)_VERSION)", \ + "website": "$($(PKG)_WEBSITE)", \ + "description": "$($(PKG)_DESCR)"},';)} >> $@ @echo ' "": null' >> $@ @echo '}' >> $@ diff --git a/docs/index.html b/docs/index.html index 67ba60ea..f15751cf 100644 --- a/docs/index.html +++ b/docs/index.html @@ -2841,7 +2841,7 @@ local-pkg-list: $(LOCAL_PKG_LIST) function showVersions(packageElements, resolvedVersions) { for (package in packageElements) { var element = packageElements[package]; - var version = resolvedVersions[package]; + var version = resolvedVersions[package].version; var shorten = version.length > 12; if (shorten) { version = version.substring(0, 12); diff --git a/docs/packages.json b/docs/packages.json index ccaabab7..220c37eb 100644 --- a/docs/packages.json +++ b/docs/packages.json @@ -1,429 +1,429 @@ { - "a52dec": "0.7.4", - "agg": "2.5", - "alure": "1.2", - "apr": "1.5.2", - "apr-util": "1.5.4", - "armadillo": "6.400.3", - "aspell": "0.60.6.1", - "assimp": "3.2", - "atk": "2.16.0", - "atkmm": "2.22.7", - "aubio": "0.4.2", - "bfd": "2.25.1", - "binutils": "2.25.1", - "blas": "3.5.0", - "boost": "1.60.0", - "box2d": "2.3.1", - "bullet": "2.82-r2704", - "bzip2": "1.0.6", - "cairo": "1.14.6", - "cairomm": "1.11.2", - "cblas": "1", - "ccfits": "2.4", - "cegui": "9726a2b505fb", - "cfitsio": "3370", - "cgal": "4.6.3", - "check": "0.10.0", - "chipmunk": "6.2.2", - "chromaprint": "1.1", - "cimg": "1.6.3", - "cloog": "0.18.1", - "cmake": "3.5.2", - "cminpack": "1.3.4", - "coda": "2.15.1", - "coin": "3.1.3", - "cpp-netlib": "0.11.2", - "cppunit": "1.13.2", - "cryptopp": "5.6.3", - "crystalhd": "1", - "cunit": "2.1-3", - "curl": "7.52.0", - "db": "6.1.26", - "dbus": "1.11.8", - "dcmtk": "3.6.0", - "devil": "1.7.8", - "djvulibre": "3.5.27", - "dlfcn-win32": "e19bf07", - "eigen": "3.2.5", - "exiv2": "0.25", - "expat": "2.2.0", - "faad2": "2.7", - "fdk-aac": "0.1.4", - "ffmpeg": "3.2.1", - "fftw": "3.3.4", - "file": "5.24", - "flac": "1.3.1", - "flann": "1.8.4", - "fltk": "1.3.3", - "fontconfig": "2.12.1", - "freeglut": "3.0.0", - "freeimage": "3.15.4", - "freetds": "1.00.23", - "freetype": "2.7", - "freetype-bootstrap": "2.7", - "fribidi": "0.19.6", - "ftgl": "2.1.3~rc5", - "gc": "7.2e", - "gcc": "4.9.4", - "gd": "2.1.0", - "gdal": "2.1.2", - "gdb": "7.12", - "gdk-pixbuf": "2.32.3", - "gendef": "4.0.6", - "geoip-database": "20150317-1", - "geos": "3.4.2", - "gettext": "0.19.8.1", - "ghostscript": "9.19", - "giflib": "5.1.4", - "glew": "1.12.0", - "glfw2": "2.7.9", - "glfw3": "3.1.2", - "glib": "2.44.1", - "glibmm": "2.42.0", - "glm": "0.9.7.6", - "glpk": "4.60", - "gmp": "6.1.2", - "gnutls": "3.4.17", - "googlemock": "1.7.0", - "googletest": "1.7.0", - "graphicsmagick": "1.3.21", - "gsl": "1.16", - "gsoap": "2.8.22", - "gst-plugins-bad": "1.6.2", - "gst-plugins-base": "1.6.2", - "gst-plugins-good": "1.6.2", - "gst-plugins-ugly": "1.6.2", - "gstreamer": "1.6.2", - "gta": "1.0.7", - "gtk2": "2.24.29", - "gtk3": "3.14.4", - "gtkglarea": "2.0.1", - "gtkglext": "1.2.0", - "gtkglextmm": "1.2.0", - "gtkimageview": "1.6.4", - "gtkmm2": "2.24.4", - "gtkmm3": "3.14.0", - "gtksourceview": "2.10.5", - "gtksourceviewmm2": "2.10.3", - "guile": "1.8.8", - "harfbuzz": "1.3.4", - "hdf-eos2": "19v1.00", - "hdf-eos5": "1.15", - "hdf4": "4.2.10", - "hdf5": "1.8.12", - "hunspell": "1.3.3", - "hyperscan": "4.3.2", - "icu4c": "56.1", - "id3lib": "3.8.3", - "ilmbase": "2.2.0", - "imagemagick": "6.9.0-0", - "isl": "0.12.2", - "itk": "4.10.1", - "jack": "1.9.10", - "jansson": "2.7", - "jasper": "1.900.1", - "jpeg": "9b", - "json-c": "0.12", - "json-glib": "1.0.4", - "json_spirit": "4.08", - "jsoncpp": "1.6.5", - "lame": "3.99.5", - "lapack": "3.6.0", - "lcms": "2.7", - "lcms1": "1.19", - "lensfun": "0.3.0", - "levmar": "2.6", - "libaacs": "0.8.1", - "libarchive": "3.1.2", - "libass": "0.13.1", - "libbluray": "0.9.2", - "libbs2b": "3.1.0", - "libcaca": "0.99.beta19", - "libcddb": "1.3.2", - "libcdio": "0.93", - "libcdio-paranoia": "10.2+0.93+1", - "libcomm14cux": "2.1.1", - "libcroco": "0.6.2", - "libdnet": "1.11", - "libdvbpsi": "1.2.0", - "libdvdcss": "1.3.0", - "libdvdetect": "0.71.0", - "libdvdnav": "5.0.1", - "libdvdread": "5.0.0", - "libechonest": "2.3.1", - "libepoxy": "1.3.1", - "libevent": "2.0.21", - "libf2c": "1", - "libffi": "3.2.1", - "libftdi": "0.20", - "libftdi1": "1.2", - "libgcrypt": "1.7.5", - "libgda": "4.2.13", - "libgdamm": "4.1.3", - "libgee": "0.5.0", - "libgeotiff": "1.4.0", - "libgit2": "0.23.2", - "libglade": "2.6.4", - "libgnurx": "2.6.1", - "libgpg_error": "1.26", - "libgsasl": "1.8.0", - "libgsf": "1.14.30", - "libharu": "2.2.1", - "libiberty": "2.25.1", - "libical": "2.0.0", - "libiconv": "1.14", - "libid3tag": "0.15.1b", - "libidn": "1.33", - "libieee1284": "0.2.11", - "libircclient": "1.8", - "libjpeg-turbo": "1.5.1", - "liblaxjson": "1.0.5", - "liblo": "0.28", - "liblqr-1": "0.4.2", - "liblsmash": "2.9.1", - "libltdl": "2.4.4", - "libmad": "0.15.1b", - "libmicrohttpd": "0.9.38", - "libmikmod": "3.3.7", - "libmng": "2.0.3", - "libmodplug": "0.8.8.4", - "libmpcdec": "1.2.6", - "libmysqlclient": "6.1.6", - "libnice": "0.1.13", - "libntlm": "1.4", - "liboauth": "1.0.3", - "libodbc++": "0.2.5", - "liboil": "0.3.17", - "libpano13": "2.9.18", - "libpaper": "1.1.24+nmu4", - "libplist": "1.12", - "libpng": "1.6.26", - "librosco": "0.1.11", - "librsvg": "2.40.5", - "librtmp": "a107cef", - "libsamplerate": "0.1.8", - "libshout": "2.4.1", - "libsigc++": "2.4.0", - "libsndfile": "1.0.27", - "libsodium": "1.0.6", - "libsoup": "2.54.0.1", - "libspectre": "0.2.8", - "libssh2": "1.8.0", - "libsvm": "3.20", - "libtool": "2.4.4", - "libtorrent-rasterbar": "1.1.0", - "libunistring": "0.9.4", - "libusb": "1.2.6.0", - "libusb1": "1.0.19", - "libuv": "1.9.1", - "libvpx": "1.5.0", - "libwebp": "0.4.4", - "libwebsockets": "1.4-chrome43-firefox-36", - "libxml++": "2.37.2", - "libxml2": "2.9.4", - "libxslt": "1.1.29", - "libzip": "0.11.2", - "llvm": "3.4", - "log4cxx": "0.10.0", - "lua": "5.3.3", - "luabind": "0.9.1", - "luajit": "2.0.4", - "lzma": "920", - "lzo": "2.09", - "matio": "1.5.2", - "mdbtools": "0.7.1", - "mingw-w64": "4.0.6", - "miniupnpc": "1.9", - "minizip": "0b46a2b", - "mman-win32": "b7ec370", - "mpc": "1.0.2", - "mpfr": "3.1.5", - "mpg123": "1.22.4", - "muparser": "2.2.5", - "muparserx": "4.0.4", - "mxe-conf": "1", - "mxml": "2.9", - "ncurses": "e14300b", - "neon": "0.30.2", - "netcdf": "4.3.0", - "netpbm": "10.35.96", - "nettle": "3.3", - "nlopt": "2.4.2", - "nsis": "3.01", - "ocaml-cairo": "1.2.0", - "ocaml-camlimages": "4.0.1", - "ocaml-core": "4.00.1", - "ocaml-findlib": "1.4", - "ocaml-flexdll": "0.31", - "ocaml-lablgl": "1.05", - "ocaml-lablgtk2": "2.16.0", - "ocaml-native": "4.00.1", - "ocaml-xml-light": "2.2", - "oce": "0.17.2", - "ogg": "1.3.2", - "old": "0.17", - "openal": "1.16.0", - "openblas": "0.2.15", - "opencore-amr": "0.1.3", - "opencsg": "1.4.1", - "opencv": "2.4.10", - "openexr": "2.2.0", - "openjpeg": "2.1.0", - "openmp-validation": "3.1", - "openscenegraph": "3.4.0", - "openssl": "1.0.2j", - "openthreads": "3.4.0", - "opus": "1.1.1", - "opusfile": "0.6", - "ossim": "1.8.20", - "pango": "1.37.4", - "pangomm": "2.34.0", - "pcl": "1.8.0", - "pcre": "8.39", - "pdcurses": "3.4", - "pdflib_lite": "7.0.5p3", - "pfstools": "2.0.4", - "physfs": "2.0.3", - "picomodel": "1142ad8", - "pire": "0.0.5", - "pixman": "0.33.6", - "pkgconf": "da179fd", - "plib": "1.8.5-rc1", - "plibc": "cd7ed09", - "plotmm": "0.1.2", - "plotutils": "2.6", - "poco": "1.4.7p1", - "polarssl": "1.3.9", - "poppler": "0.30.0", - "popt": "1.16", - "portablexdr": "4.9.1", - "portaudio": "190600_20161030", - "portmidi": "217", - "postgresql": "9.2.4", - "primesieve": "5.5.0", - "proj": "4.9.3", - "protobuf": "3.1.0", - "pthreads": "POSIX 1003.1-2001", - "qdbm": "1.8.78", - "qhttpengine": "0.1.0", - "qjson": "0.8.1", - "qscintilla2": "2.8.4", - "qt": "4.8.7", - "qt3d": "5.7.1", - "qt5": "5.7.1", - "qtactiveqt": "5.7.1", - "qtbase": "5.7.1", - "qtcanvas3d": "5.7.1", - "qtcharts": "5.7.1", - "qtconnectivity": "5.7.1", - "qtdatavis3d": "5.7.1", - "qtdeclarative": "5.7.1", - "qtdeclarative-render2d": "5.7.1", - "qtgamepad": "5.7.1", - "qtgraphicaleffects": "5.7.1", - "qtimageformats": "5.7.1", - "qtlocation": "5.7.1", - "qtmultimedia": "5.7.1", - "qtofficeopenxml": "02dda4a46f92a843eaba5f5a021952860eadfe01", - "qtpurchasing": "5.7.1", - "qtquickcontrols": "5.7.1", - "qtquickcontrols2": "5.7.1", - "qtscript": "5.7.1", - "qtscxml": "5.7.1", - "qtsensors": "5.7.1", - "qtserialbus": "5.7.1", - "qtserialport": "5.7.1", - "qtserialport_qt4": "5c3b6cc770", - "qtservice": "ad9bc46", - "qtsparkle_qt4": "8882e6ef86cdb79db7932307309d005411fd0c20", - "qtsvg": "5.7.1", - "qtsystems": "4e3a7ed", - "qttools": "5.7.1", - "qttranslations": "5.7.1", - "qtvirtualkeyboard": "5.7.1", - "qtwebchannel": "5.7.1", - "qtwebkit": "5.7.1", - "qtwebsockets": "5.7.1", - "qtwebview": "5.7.1", - "qtwinextras": "5.7.1", - "qtxlsxwriter": "37ef9dae209f989ed07f3aec37d5fbd1c821335c", - "qtxmlpatterns": "5.7.1", - "qwt": "6.1.3", - "qwt_qt4": "6.1.3", - "qwtplot3d": "0.2.7", - "ragel": "6.9", - "readline": "6.3", - "rubberband": "1.8.1", - "rucksack": "3.1.0", - "sdl": "1.2.15", - "sdl2": "2.0.5", - "sdl2_gfx": "1.0.1", - "sdl2_image": "2.0.0", - "sdl2_mixer": "2.0.0", - "sdl2_net": "2.0.0", - "sdl2_ttf": "2.0.12", - "sdl_gfx": "2.0.25", - "sdl_image": "1.2.12", - "sdl_mixer": "1.2.12", - "sdl_net": "1.2.8", - "sdl_pango": "0.1.2", - "sdl_rwhttp": "0.2.0", - "sdl_sound": "1.0.3", - "sdl_ttf": "2.0.11", - "sfml": "2.3.2", - "smpeg": "0.4.5+cvs20030824", - "smpeg2": "2.0.0", - "sox": "14.4.2", - "sparsehash": "2.0.3", - "speex": "1.2rc2", - "speexdsp": "1.2rc3", - "sqlite": "3150200", - "subversion": "1.9.4", - "suitesparse": "4.2.1", - "t4k_common": "0.1.1", - "taglib": "1.10", - "tclap": "1.2.1", - "teem": "1.11.0", - "termcap": "1.3.1", - "theora": "1.1.1", - "tiff": "4.0.7", - "tinyxml": "2.6.2", - "tinyxml2": "4.0.1", - "tre": "0.8.0", - "twolame": "0.3.13", - "ucl": "1.03", - "unrtf": "0.21.9", - "upx": "3.91", - "vamp-plugin-sdk": "2.5", - "vcdimager": "0.7.24", - "vidstab": "0.98b", - "vigra": "1.9.0", - "vmime": "b1b3f30", - "vo-aacenc": "0.1.3", - "vo-amrwbenc": "0.1.3", - "vorbis": "1.3.5", - "vtk": "5.8.0", - "vtk6": "6.3.0", - "waf": "1.8.17", - "wavpack": "4.75.2", - "wget": "1.18", - "widl": "4.0.6", - "winpcap": "4_1_3", - "wt": "3.3.6", - "wxwidgets": "3.0.2", - "x264": "20161130-2245", - "xapian-core": "1.2.21", - "xerces": "3.1.4", - "xmlrpc-c": "d4364f4", - "xmlwrapp": "0.7.0", - "xorg-macros": "1.19.0", - "xvidcore": "1.3.4", - "xxhash": "0.6.1", - "xz": "5.2.2", - "yaml-cpp": "0.5.3", - "yasm": "1.3.0", - "zlib": "1.2.8", - "zziplib": "0.13.62", + "a52dec": {"version": "0.7.4", "website": "http://liba52.sourceforge.net/", "description": "a52dec (aka. liba52)"}, + "agg": {"version": "2.5", "website": "http://agg.sourceforge.net/", "description": "Anti-Grain Geometry"}, + "alure": {"version": "1.2", "website": "http://kcat.strangesoft.net/alure.html", "description": ""}, + "apr": {"version": "1.5.2", "website": "http://apr.apache.org/", "description": "APR"}, + "apr-util": {"version": "1.5.4", "website": "http://apr.apache.org/", "description": "APR-util"}, + "armadillo": {"version": "6.400.3", "website": "http://arma.sourceforge.net/", "description": "Armadillo C++ linear algebra library"}, + "aspell": {"version": "0.60.6.1", "website": "http://aspell.net/", "description": "Aspell"}, + "assimp": {"version": "3.2", "website": "http://assimp.sourceforge.net/", "description": "Assimp Open Asset Import Library"}, + "atk": {"version": "2.16.0", "website": "http://www.gtk.org/", "description": "ATK"}, + "atkmm": {"version": "2.22.7", "website": "http://www.gtkmm.org/", "description": "ATKmm"}, + "aubio": {"version": "0.4.2", "website": "http://www.aubio.org/", "description": ""}, + "bfd": {"version": "2.25.1", "website": "https://www.gnu.org/software/binutils/", "description": "Binary File Descriptor library"}, + "binutils": {"version": "2.25.1", "website": "https://www.gnu.org/software/binutils/", "description": "GNU Binutils"}, + "blas": {"version": "3.5.0", "website": "http://www.netlib.org/blas/", "description": ""}, + "boost": {"version": "1.60.0", "website": "http://www.boost.org/", "description": "Boost C++ Library"}, + "box2d": {"version": "2.3.1", "website": "http://www.box2d.org/", "description": "Box2D"}, + "bullet": {"version": "2.82-r2704", "website": "http://bulletphysics.org/", "description": "Bullet physics, version 2"}, + "bzip2": {"version": "1.0.6", "website": "http://www.bzip.org/", "description": ""}, + "cairo": {"version": "1.14.6", "website": "http://cairographics.org/", "description": ""}, + "cairomm": {"version": "1.11.2", "website": "http://cairographics.org/cairomm/", "description": ""}, + "cblas": {"version": "1", "website": "http://www.netlib.org/blas/", "description": ""}, + "ccfits": {"version": "2.4", "website": "http://heasarc.gsfc.nasa.gov/fitsio/ccfits", "description": "CCfits"}, + "cegui": {"version": "9726a2b505fb", "website": "http://cegui.org.uk/", "description": "Crazy Eddie’s GUI System (CEGUI)"}, + "cfitsio": {"version": "3370", "website": "http://heasarc.gsfc.nasa.gov/fitsio/", "description": ""}, + "cgal": {"version": "4.6.3", "website": "http://www.cgal.org/", "description": ""}, + "check": {"version": "0.10.0", "website": "http://check.sourceforge.net/", "description": ""}, + "chipmunk": {"version": "6.2.2", "website": "https://chipmunk-physics.net/", "description": "Chipmunk Physics"}, + "chromaprint": {"version": "1.1", "website": "http://acoustid.org/chromaprint", "description": "Chromaprint"}, + "cimg": {"version": "1.6.3", "website": "http://cimg.eu/", "description": "CImg Library"}, + "cloog": {"version": "0.18.1", "website": "http://www.cloog.org/", "description": "CLooG Code Generator"}, + "cmake": {"version": "3.5.2", "website": "http://www.cmake.org/", "description": ""}, + "cminpack": {"version": "1.3.4", "website": "http://devernay.free.fr/hacks/cminpack/cminpack.html", "description": ""}, + "coda": {"version": "2.15.1", "website": "https://stcorp.nl/coda/", "description": "CODA"}, + "coin": {"version": "3.1.3", "website": "https://bitbucket.org/Coin3D/", "description": "Coin3D"}, + "cpp-netlib": {"version": "0.11.2", "website": "http://cpp-netlib.org/", "description": "Boost C++ Networking Library"}, + "cppunit": {"version": "1.13.2", "website": "http://www.freedesktop.org/wiki/Software/cppunit/", "description": "CppUnit"}, + "cryptopp": {"version": "5.6.3", "website": "https://www.cryptopp.com/", "description": "Crypto++ Library"}, + "crystalhd": {"version": "1", "website": "http://www.broadcom.com/support/crystal_hd/", "description": "Broadcom Crystal HD Headers"}, + "cunit": {"version": "2.1-3", "website": "http://cunit.sourceforge.net/", "description": ""}, + "curl": {"version": "7.52.0", "website": "http://curl.haxx.se/libcurl/", "description": "cURL"}, + "db": {"version": "6.1.26", "website": "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html", "description": "Oracle Berkeley DB"}, + "dbus": {"version": "1.11.8", "website": "http://dbus.freedesktop.org/", "description": ""}, + "dcmtk": {"version": "3.6.0", "website": "http://dicom.offis.de/dcmtk.php.en", "description": "DCMTK"}, + "devil": {"version": "1.7.8", "website": "http://openil.sourceforge.net/", "description": "DevIL"}, + "djvulibre": {"version": "3.5.27", "website": "http://djvu.sourceforge.net/", "description": "DjVuLibre"}, + "dlfcn-win32": {"version": "e19bf07", "website": "https://code.google.com/p/dlfcn-win32/", "description": "POSIX dlfcn wrapper for Windows"}, + "eigen": {"version": "3.2.5", "website": "http://eigen.tuxfamily.org/", "description": ""}, + "exiv2": {"version": "0.25", "website": "http://www.exiv2.org/", "description": "Exiv2"}, + "expat": {"version": "2.2.0", "website": "http://expat.sourceforge.net/", "description": "Expat XML Parser"}, + "faad2": {"version": "2.7", "website": "http://www.audiocoding.com/", "description": ""}, + "fdk-aac": {"version": "0.1.4", "website": "https://github.com/mstorsjo/fdk-aac", "description": "FDK-AAC"}, + "ffmpeg": {"version": "3.2.1", "website": "http://www.ffmpeg.org/", "description": ""}, + "fftw": {"version": "3.3.4", "website": "http://www.fftw.org/", "description": ""}, + "file": {"version": "5.24", "website": "http://www.darwinsys.com/file/", "description": ""}, + "flac": {"version": "1.3.1", "website": "http://www.xiph.org/flac/", "description": "FLAC"}, + "flann": {"version": "1.8.4", "website": "http://www.cs.ubc.ca/~mariusm/index.php/FLANN/FLANN", "description": "FLANN"}, + "fltk": {"version": "1.3.3", "website": "http://www.fltk.org/", "description": "FLTK"}, + "fontconfig": {"version": "2.12.1", "website": "http://fontconfig.org/", "description": ""}, + "freeglut": {"version": "3.0.0", "website": "http://freeglut.sourceforge.net/", "description": ""}, + "freeimage": {"version": "3.15.4", "website": "http://freeimage.sourceforge.net/", "description": "FreeImage"}, + "freetds": {"version": "1.00.23", "website": "http://www.freetds.org/", "description": "FreeTDS"}, + "freetype": {"version": "2.7", "website": "http://www.freetype.org/", "description": ""}, + "freetype-bootstrap": {"version": "2.7", "website": "http://www.freetype.org/", "description": "freetype (without harfbuzz)"}, + "fribidi": {"version": "0.19.6", "website": "http://fribidi.org/", "description": "FriBidi"}, + "ftgl": {"version": "2.1.3~rc5", "website": "http://sourceforge.net/projects/ftgl/", "description": ""}, + "gc": {"version": "7.2e", "website": "http://www.hpl.hp.com/personal/Hans_Boehm/gc/", "description": ""}, + "gcc": {"version": "4.9.4", "website": "http://gcc.gnu.org/", "description": "GCC"}, + "gd": {"version": "2.1.0", "website": "http://www.libgd.org/", "description": "GD (without support for xpm)"}, + "gdal": {"version": "2.1.2", "website": "http://www.gdal.org/", "description": "GDAL"}, + "gdb": {"version": "7.12", "website": "https://www.gnu.org/software/gdb/", "description": ""}, + "gdk-pixbuf": {"version": "2.32.3", "website": "http://www.gdk-pixbuf.org/", "description": "GDK-pixbuf"}, + "gendef": {"version": "4.0.6", "website": "http://sourceforge.net/p/mingw-w64/wiki2/gendef/", "description": ""}, + "geoip-database": {"version": "20150317-1", "website": "http://www.maxmind.com", "description": "GeoIP Legacy Database"}, + "geos": {"version": "3.4.2", "website": "http://trac.osgeo.org/geos/", "description": "GEOS"}, + "gettext": {"version": "0.19.8.1", "website": "https://www.gnu.org/software/gettext/", "description": ""}, + "ghostscript": {"version": "9.19", "website": "http://www.ghostscript.com/", "description": ""}, + "giflib": {"version": "5.1.4", "website": "http://sourceforge.net/projects/libungif/", "description": ""}, + "glew": {"version": "1.12.0", "website": "http://glew.sourceforge.net/", "description": "GLEW"}, + "glfw2": {"version": "2.7.9", "website": "http://www.glfw.org/", "description": "GLFW 2.x"}, + "glfw3": {"version": "3.1.2", "website": "http://www.glfw.org/", "description": "GLFW 3.x"}, + "glib": {"version": "2.44.1", "website": "http://www.gtk.org/", "description": "GLib"}, + "glibmm": {"version": "2.42.0", "website": "http://www.gtkmm.org/", "description": "GLibmm"}, + "glm": {"version": "0.9.7.6", "website": "http://glm.g-truc.net", "description": "GLM - OpenGL Mathematics"}, + "glpk": {"version": "4.60", "website": "https://www.gnu.org/software/glpk/", "description": "GNU Linear Programming Kit"}, + "gmp": {"version": "6.1.2", "website": "http://www.gmplib.org/", "description": "GMP"}, + "gnutls": {"version": "3.4.17", "website": "https://www.gnu.org/software/gnutls/", "description": "GnuTLS"}, + "googlemock": {"version": "1.7.0", "website": "https://github.com/google/googlemock", "description": "Google Mock"}, + "googletest": {"version": "1.7.0", "website": "https://github.com/google/googletest", "description": "Google Test"}, + "graphicsmagick": {"version": "1.3.21", "website": "http://www.graphicsmagick.org/", "description": "GraphicsMagick"}, + "gsl": {"version": "1.16", "website": "https://www.gnu.org/software/gsl/", "description": "GSL"}, + "gsoap": {"version": "2.8.22", "website": "http://gsoap2.sourceforge.net/", "description": "gSOAP"}, + "gst-plugins-bad": {"version": "1.6.2", "website": "http://gstreamer.freedesktop.org/", "description": ""}, + "gst-plugins-base": {"version": "1.6.2", "website": "http://gstreamer.freedesktop.org/", "description": ""}, + "gst-plugins-good": {"version": "1.6.2", "website": "http://gstreamer.freedesktop.org/", "description": ""}, + "gst-plugins-ugly": {"version": "1.6.2", "website": "http://gstreamer.freedesktop.org/", "description": ""}, + "gstreamer": {"version": "1.6.2", "website": "http://gstreamer.freedesktop.org/", "description": ""}, + "gta": {"version": "1.0.7", "website": "http://www.nongnu.org/gta/", "description": ""}, + "gtk2": {"version": "2.24.29", "website": "http://www.gtk.org/", "description": "GTK+"}, + "gtk3": {"version": "3.14.4", "website": "http://www.gtk.org/", "description": "GTK+"}, + "gtkglarea": {"version": "2.0.1", "website": "http://www.mono-project.com/GtkGLArea/", "description": "GtkGLArea"}, + "gtkglext": {"version": "1.2.0", "website": "http://gtkglext.sourceforge.net/", "description": "GtkGLExt"}, + "gtkglextmm": {"version": "1.2.0", "website": "http://gtkglext.sourceforge.net/", "description": "GtkGLExtmm"}, + "gtkimageview": {"version": "1.6.4", "website": "http://trac.bjourne.webfactional.com/", "description": "GtkImageView"}, + "gtkmm2": {"version": "2.24.4", "website": "http://www.gtkmm.org/", "description": "GTKMM"}, + "gtkmm3": {"version": "3.14.0", "website": "http://www.gtkmm.org/", "description": "GTKMM"}, + "gtksourceview": {"version": "2.10.5", "website": "http://projects.gnome.org/gtksourceview/", "description": "GTKSourceView"}, + "gtksourceviewmm2": {"version": "2.10.3", "website": "http://projects.gnome.org/gtksourceviewmm/", "description": "GtkSourceViewmm"}, + "guile": {"version": "1.8.8", "website": "https://www.gnu.org/software/guile/", "description": "GNU Guile"}, + "harfbuzz": {"version": "1.3.4", "website": "http://harfbuzz.sourceforge.net/", "description": "HarfBuzz"}, + "hdf-eos2": {"version": "19v1.00", "website": "https://hdfeos.org/software/library.php", "description": "HDF-EOS2"}, + "hdf-eos5": {"version": "1.15", "website": "https://hdfeos.org/software/library.php", "description": "HDF-EOS5"}, + "hdf4": {"version": "4.2.10", "website": "https://www.hdfgroup.org/hdf4/", "description": "HDF4"}, + "hdf5": {"version": "1.8.12", "website": "https://www.hdfgroup.org/hdf5/", "description": "HDF5"}, + "hunspell": {"version": "1.3.3", "website": "http://hunspell.sourceforge.net/", "description": "Hunspell"}, + "hyperscan": {"version": "4.3.2", "website": "https://01.org/hyperscan", "description": "Hyperscan"}, + "icu4c": {"version": "56.1", "website": "http://site.icu-project.org/", "description": "ICU4C"}, + "id3lib": {"version": "3.8.3", "website": "http://id3lib.sourceforge.net/", "description": ""}, + "ilmbase": {"version": "2.2.0", "website": "http://www.openexr.com/", "description": "IlmBase"}, + "imagemagick": {"version": "6.9.0-0", "website": "http://www.imagemagick.org/", "description": "ImageMagick"}, + "isl": {"version": "0.12.2", "website": "http://isl.gforge.inria.fr/", "description": "Integer Set Library"}, + "itk": {"version": "4.10.1", "website": "http://www.itk.org/", "description": "Insight Segmentation and Registration Toolkit (ITK)"}, + "jack": {"version": "1.9.10", "website": "http://jackaudio.org/", "description": "JACK Audio Connection Kit"}, + "jansson": {"version": "2.7", "website": "http://www.digip.org/jansson/", "description": "Jansson"}, + "jasper": {"version": "1.900.1", "website": "http://www.ece.uvic.ca/~mdadams/jasper/", "description": "JasPer"}, + "jpeg": {"version": "9b", "website": "http://www.ijg.org/", "description": ""}, + "json-c": {"version": "0.12", "website": "https://github.com/json-c/json-c/wiki", "description": ""}, + "json-glib": {"version": "1.0.4", "website": "https://wiki.gnome.org/action/show/Projects/JsonGlib", "description": "JSON-Glib"}, + "json_spirit": {"version": "4.08", "website": "https://www.codeproject.com/Articles/20027/JSON-Spirit-A-C-JSON-Parser-Generator-Implemented", "description": ""}, + "jsoncpp": {"version": "1.6.5", "website": "https://github.com/open-source-parsers/jsoncpp", "description": ""}, + "lame": {"version": "3.99.5", "website": "http://lame.sourceforge.net/", "description": ""}, + "lapack": {"version": "3.6.0", "website": "http://www.netlib.org/lapack/", "description": ""}, + "lcms": {"version": "2.7", "website": "http://www.littlecms.com/", "description": ""}, + "lcms1": {"version": "1.19", "website": "http://www.littlecms.com/", "description": ""}, + "lensfun": {"version": "0.3.0", "website": "http://lensfun.sourceforge.net/", "description": ""}, + "levmar": {"version": "2.6", "website": "http://www.ics.forth.gr/~lourakis/levmar", "description": ""}, + "libaacs": {"version": "0.8.1", "website": "http://www.videolan.org/developers/libaacs.html", "description": ""}, + "libarchive": {"version": "3.1.2", "website": "http://www.libarchive.org/", "description": "Libarchive"}, + "libass": {"version": "0.13.1", "website": "http://code.google.com/p/libass/", "description": ""}, + "libbluray": {"version": "0.9.2", "website": "http://www.videolan.org/developers/libbluray.html", "description": ""}, + "libbs2b": {"version": "3.1.0", "website": "http://bs2b.sourceforge.net/", "description": "Bauer Stereophonic-to-Binaural library"}, + "libcaca": {"version": "0.99.beta19", "website": "http://caca.zoy.org/wiki/libcaca", "description": ""}, + "libcddb": {"version": "1.3.2", "website": "https://sourceforge.net/projects/libcddb/", "description": "Access data on a CDDB"}, + "libcdio": {"version": "0.93", "website": "https://www.gnu.org/software/libcdio/", "description": "Libcdio"}, + "libcdio-paranoia": {"version": "10.2+0.93+1", "website": "https://www.gnu.org/software/libcdio/", "description": "Libcdio-paranoia"}, + "libcomm14cux": {"version": "2.1.1", "website": "https://github.com/colinbourassa/libcomm14cux/", "description": ""}, + "libcroco": {"version": "0.6.2", "website": "http://www.freespiders.org/projects/libcroco/", "description": "Libcroco"}, + "libdnet": {"version": "1.11", "website": "http://libdnet.sourceforge.net/", "description": ""}, + "libdvbpsi": {"version": "1.2.0", "website": "http://www.videolan.org/developers/libdvbpsi.html", "description": ""}, + "libdvdcss": {"version": "1.3.0", "website": "http://www.videolan.org/developers/libdvdcss.html", "description": ""}, + "libdvdetect": {"version": "0.71.0", "website": "https://www.dvdetect.de/", "description": "Fast database lookup for DVDs"}, + "libdvdnav": {"version": "5.0.1", "website": "https://dvdnav.mplayerhq.hu/", "description": ""}, + "libdvdread": {"version": "5.0.0", "website": "https://dvdnav.mplayerhq.hu/", "description": ""}, + "libechonest": {"version": "2.3.1", "website": "https://github.com/lfranchi/libechonest", "description": ""}, + "libepoxy": {"version": "1.3.1", "website": "https://github.com/anholt/libepoxy", "description": ""}, + "libevent": {"version": "2.0.21", "website": "http://libevent.org/", "description": ""}, + "libf2c": {"version": "1", "website": "http://www.netlib.org/f2c/", "description": ""}, + "libffi": {"version": "3.2.1", "website": "https://sourceware.org/libffi/", "description": ""}, + "libftdi": {"version": "0.20", "website": "http://www.intra2net.com/en/developer/libftdi/index.php", "description": "LibFTDI"}, + "libftdi1": {"version": "1.2", "website": "http://www.intra2net.com/en/developer/libftdi/index.php", "description": "LibFTDI1"}, + "libgcrypt": {"version": "1.7.5", "website": "ftp://ftp.gnupg.org/gcrypt/libgcrypt/", "description": ""}, + "libgda": {"version": "4.2.13", "website": "http://www.gnome-db.org/", "description": ""}, + "libgdamm": {"version": "4.1.3", "website": "https://launchpad.net/libgdamm", "description": ""}, + "libgee": {"version": "0.5.0", "website": "http://live.gnome.org/Libgee", "description": ""}, + "libgeotiff": {"version": "1.4.0", "website": "http://trac.osgeo.org/geotiff/", "description": "GeoTiff"}, + "libgit2": {"version": "0.23.2", "website": "https://libgit2.github.com/", "description": ""}, + "libglade": {"version": "2.6.4", "website": "http://glade.gnome.org/", "description": "glade"}, + "libgnurx": {"version": "2.6.1", "website": "http://sourceforge.net/projects/mingw/files/UserContributed/regex/", "description": ""}, + "libgpg_error": {"version": "1.26", "website": "ftp://ftp.gnupg.org/gcrypt/libgpg-error/", "description": "libgpg-error"}, + "libgsasl": {"version": "1.8.0", "website": "https://www.gnu.org/software/gsasl/", "description": "Libgsasl"}, + "libgsf": {"version": "1.14.30", "website": "http://projects.gnome.org/libgsf/", "description": ""}, + "libharu": {"version": "2.2.1", "website": "http://libharu.org/", "description": ""}, + "libiberty": {"version": "2.25.1", "website": "http://gcc.gnu.org/onlinedocs/libiberty/", "description": ""}, + "libical": {"version": "2.0.0", "website": "http://freeassociation.sourceforge.net/", "description": ""}, + "libiconv": {"version": "1.14", "website": "https://www.gnu.org/software/libiconv/", "description": ""}, + "libid3tag": {"version": "0.15.1b", "website": "http://sourceforge.net/projects/mad/files/libid3tag/", "description": ""}, + "libidn": {"version": "1.33", "website": "https://www.gnu.org/software/libidn/", "description": "Libidn"}, + "libieee1284": {"version": "0.2.11", "website": "http://cyberelk.net/tim/software/libieee1284/", "description": ""}, + "libircclient": {"version": "1.8", "website": "http://sourceforge.net/projects/libircclient/", "description": ""}, + "libjpeg-turbo": {"version": "1.5.1", "website": "http://libjpeg-turbo.virtualgl.org/", "description": ""}, + "liblaxjson": {"version": "1.0.5", "website": "https://github.com/andrewrk/liblaxjson", "description": ""}, + "liblo": {"version": "0.28", "website": "http://liblo.sourceforge.net/", "description": ""}, + "liblqr-1": {"version": "0.4.2", "website": "http://liblqr.wikidot.com/", "description": ""}, + "liblsmash": {"version": "2.9.1", "website": "https://l-smash.github.io/l-smash/", "description": "L-SMASH"}, + "libltdl": {"version": "2.4.4", "website": "http://www.gnu.org/software/libtool/manual/html_node/Using-libltdl.html", "description": "GNU Libtool Library (libltdl)"}, + "libmad": {"version": "0.15.1b", "website": "http://www.underbit.com/products/mad/", "description": ""}, + "libmicrohttpd": {"version": "0.9.38", "website": "http://www.gnu.org/software/libmicrohttpd/", "description": "GNU Libmicrohttpd"}, + "libmikmod": {"version": "3.3.7", "website": "http://mikmod.raphnet.net/", "description": "libMikMod"}, + "libmng": {"version": "2.0.3", "website": "http://www.libmng.com/", "description": ""}, + "libmodplug": {"version": "0.8.8.4", "website": "http://modplug-xmms.sourceforge.net/", "description": ""}, + "libmpcdec": {"version": "1.2.6", "website": "http://www.musepack.net/", "description": ""}, + "libmysqlclient": {"version": "6.1.6", "website": "https://dev.mysql.com/downloads/connector/c/", "description": ""}, + "libnice": {"version": "0.1.13", "website": "https://nice.freedesktop.org/wiki/", "description": ""}, + "libntlm": {"version": "1.4", "website": "http://www.nongnu.org/libntlm/", "description": "Libntlm"}, + "liboauth": {"version": "1.0.3", "website": "http://liboauth.sourceforge.net/", "description": ""}, + "libodbc++": {"version": "0.2.5", "website": "http://libodbcxx.sourceforge.net/", "description": ""}, + "liboil": {"version": "0.3.17", "website": "http://liboil.freedesktop.org/", "description": ""}, + "libpano13": {"version": "2.9.18", "website": "http://panotools.sourceforge.net/", "description": ""}, + "libpaper": {"version": "1.1.24+nmu4", "website": "http://packages.debian.org/unstable/libpaper1", "description": ""}, + "libplist": {"version": "1.12", "website": "https://github.com/libimobiledevice/libplist", "description": ""}, + "libpng": {"version": "1.6.26", "website": "http://www.libpng.org/", "description": ""}, + "librosco": {"version": "0.1.11", "website": "https://github.com/colinbourassa/librosco/", "description": ""}, + "librsvg": {"version": "2.40.5", "website": "http://librsvg.sourceforge.net/", "description": ""}, + "librtmp": {"version": "a107cef", "website": "http://rtmpdump.mplayerhq.hu/", "description": ""}, + "libsamplerate": {"version": "0.1.8", "website": "http://www.mega-nerd.com/SRC/", "description": ""}, + "libshout": {"version": "2.4.1", "website": "http://www.icecast.org/", "description": ""}, + "libsigc++": {"version": "2.4.0", "website": "http://libsigc.sourceforge.net/", "description": ""}, + "libsndfile": {"version": "1.0.27", "website": "http://www.mega-nerd.com/libsndfile/", "description": ""}, + "libsodium": {"version": "1.0.6", "website": "https://download.libsodium.org/doc/", "description": ""}, + "libsoup": {"version": "2.54.0.1", "website": "https://github.com/GNOME/libsoup", "description": ""}, + "libspectre": {"version": "0.2.8", "website": "https://libspectre.freedesktop.org", "description": ""}, + "libssh2": {"version": "1.8.0", "website": "http://www.libssh2.org", "description": ""}, + "libsvm": {"version": "3.20", "website": "http://www.csie.ntu.edu.tw/~cjlin/libsvm", "description": ""}, + "libtool": {"version": "2.4.4", "website": "https://www.gnu.org/software/libtool/", "description": "GNU Libtool"}, + "libtorrent-rasterbar": {"version": "1.1.0", "website": "http://www.rasterbar.com/products/libtorrent/", "description": ""}, + "libunistring": {"version": "0.9.4", "website": "https://www.gnu.org/software/libunistring/", "description": ""}, + "libusb": {"version": "1.2.6.0", "website": "http://libusb-win32.sourceforge.net/", "description": "LibUsb"}, + "libusb1": {"version": "1.0.19", "website": "http://libusb.org/", "description": "LibUsb-1.0"}, + "libuv": {"version": "1.9.1", "website": "http://libuv.org/", "description": ""}, + "libvpx": {"version": "1.5.0", "website": "http://code.google.com/p/webm/", "description": "vpx"}, + "libwebp": {"version": "0.4.4", "website": "https://developers.google.com/speed/webp/", "description": ""}, + "libwebsockets": {"version": "1.4-chrome43-firefox-36", "website": "http://libwebsockets.org/", "description": ""}, + "libxml++": {"version": "2.37.2", "website": "http://libxmlplusplus.sourceforge.net/", "description": "libxml2"}, + "libxml2": {"version": "2.9.4", "website": "http://www.xmlsoft.org/", "description": ""}, + "libxslt": {"version": "1.1.29", "website": "http://xmlsoft.org/XSLT/", "description": ""}, + "libzip": {"version": "0.11.2", "website": "http://www.nih.at/libzip/", "description": ""}, + "llvm": {"version": "3.4", "website": "http://llvm.org/", "description": ""}, + "log4cxx": {"version": "0.10.0", "website": "http://logging.apache.org/log4cxx/", "description": ""}, + "lua": {"version": "5.3.3", "website": "http://www.lua.org/", "description": "Lua"}, + "luabind": {"version": "0.9.1", "website": "http://www.rasterbar.com/products/luabind.html", "description": "Luabind"}, + "luajit": {"version": "2.0.4", "website": "http://luajit.org/luajit.html", "description": "LuaJIT"}, + "lzma": {"version": "920", "website": "http://www.7-zip.org/sdk.html", "description": "LZMA SDK"}, + "lzo": {"version": "2.09", "website": "http://www.oberhumer.com/opensource/lzo/", "description": ""}, + "matio": {"version": "1.5.2", "website": "http://sourceforge.net/projects/matio/", "description": ""}, + "mdbtools": {"version": "0.7.1", "website": "http://sourceforge.net/projects/mdbtools/", "description": ""}, + "mingw-w64": {"version": "4.0.6", "website": "http://mingw-w64.sourceforge.net/", "description": "MinGW-w64 Runtime"}, + "miniupnpc": {"version": "1.9", "website": "http://miniupnp.free.fr/", "description": ""}, + "minizip": {"version": "0b46a2b", "website": "http://www.winimage.com/zLibDll/minizip.html", "description": ""}, + "mman-win32": {"version": "b7ec370", "website": "https://code.google.com/p/mman-win32/", "description": "MMA-Win32"}, + "mpc": {"version": "1.0.2", "website": "http://www.multiprecision.org/", "description": "GNU MPC"}, + "mpfr": {"version": "3.1.5", "website": "http://www.mpfr.org/", "description": ""}, + "mpg123": {"version": "1.22.4", "website": "http://www.mpg123.de/", "description": ""}, + "muparser": {"version": "2.2.5", "website": "http://muparser.beltoforion.de/", "description": "muParser"}, + "muparserx": {"version": "4.0.4", "website": "http://muparserx.beltoforion.de/", "description": "muParserX"}, + "mxe-conf": {"version": "1", "website": "", "description": ""}, + "mxml": {"version": "2.9", "website": "http://www.msweet.org/projects.php?Z3", "description": "Mini-XML"}, + "ncurses": {"version": "e14300b", "website": "https://www.gnu.org/software/ncurses/", "description": "Ncurses"}, + "neon": {"version": "0.30.2", "website": "http://webdav.org/neon/", "description": "HTTP and WebDAV client library (libneon)"}, + "netcdf": {"version": "4.3.0", "website": "http://www.unidata.ucar.edu/software/netcdf/", "description": "NetCDF"}, + "netpbm": {"version": "10.35.96", "website": "http://netpbm.sourceforge.net/", "description": "Netpbm"}, + "nettle": {"version": "3.3", "website": "http://www.lysator.liu.se/~nisse/nettle/", "description": ""}, + "nlopt": {"version": "2.4.2", "website": "http://ab-initio.mit.edu/wiki/index.php/NLopt", "description": "NLopt"}, + "nsis": {"version": "3.01", "website": "http://nsis.sourceforge.net/", "description": "NSIS"}, + "ocaml-cairo": {"version": "1.2.0", "website": "http://cairographics.org/cairo-ocaml/", "description": "cairo-ocaml"}, + "ocaml-camlimages": {"version": "4.0.1", "website": "http://gallium.inria.fr/camlimages", "description": "camlimages"}, + "ocaml-core": {"version": "4.00.1", "website": "http://caml.inria.fr/", "description": "ocaml"}, + "ocaml-findlib": {"version": "1.4", "website": "http://download.camlcity.org/", "description": "findlib"}, + "ocaml-flexdll": {"version": "0.31", "website": "http://alain.frisch.fr/", "description": "flexdll"}, + "ocaml-lablgl": {"version": "1.05", "website": "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html", "description": "lablgl"}, + "ocaml-lablgtk2": {"version": "2.16.0", "website": "http://forge.ocamlcore.org/", "description": "lablgtk2"}, + "ocaml-native": {"version": "4.00.1", "website": "http://caml.inria.fr/", "description": "ocaml"}, + "ocaml-xml-light": {"version": "2.2", "website": "http://tech.motion-twin.com/xmllight.html", "description": "xml-light"}, + "oce": {"version": "0.17.2", "website": "https://github.com/tpaviot/oce", "description": "Open CASCADE Community Edition"}, + "ogg": {"version": "1.3.2", "website": "http://www.xiph.org/ogg/", "description": "OGG"}, + "old": {"version": "0.17", "website": "http://blitiri.com.ar/p/old/", "description": ""}, + "openal": {"version": "1.16.0", "website": "http://kcat.strangesoft.net/openal.html", "description": ""}, + "openblas": {"version": "0.2.15", "website": "http://www.openblas.net/", "description": "OpenBLAS"}, + "opencore-amr": {"version": "0.1.3", "website": "http://opencore-amr.sourceforge.net/", "description": ""}, + "opencsg": {"version": "1.4.1", "website": "http://www.opencsg.org/", "description": ""}, + "opencv": {"version": "2.4.10", "website": "http://opencv.org/", "description": "OpenCV"}, + "openexr": {"version": "2.2.0", "website": "http://www.openexr.com/", "description": "OpenEXR"}, + "openjpeg": {"version": "2.1.0", "website": "http://www.openjpeg.org/", "description": "OpenJPEG"}, + "openmp-validation": {"version": "3.1", "website": "http://web.cs.uh.edu/~openuh/", "description": "OpenMP Validation Suite"}, + "openscenegraph": {"version": "3.4.0", "website": "http://www.openscenegraph.org/", "description": "OpenSceneGraph"}, + "openssl": {"version": "1.0.2j", "website": "https://www.openssl.org/", "description": ""}, + "openthreads": {"version": "3.4.0", "website": "http://www.openscenegraph.org/", "description": "OpenThreads"}, + "opus": {"version": "1.1.1", "website": "http://opus-codec.org/", "description": ""}, + "opusfile": {"version": "0.6", "website": "http://opus-codec.org/", "description": ""}, + "ossim": {"version": "1.8.20", "website": "http://trac.osgeo.org/ossim", "description": "OSSIM"}, + "pango": {"version": "1.37.4", "website": "http://www.pango.org/", "description": "Pango"}, + "pangomm": {"version": "2.34.0", "website": "http://www.pango.org/", "description": "Pangomm"}, + "pcl": {"version": "1.8.0", "website": "http://www.pointclouds.org/", "description": "PCL (Point Cloud Library)"}, + "pcre": {"version": "8.39", "website": "http://www.pcre.org/", "description": "PCRE"}, + "pdcurses": {"version": "3.4", "website": "http://pdcurses.sourceforge.net/", "description": "PDcurses"}, + "pdflib_lite": {"version": "7.0.5p3", "website": "http://www.pdflib.com/download/free-software/pdflib-lite-7/", "description": "PDFlib Lite"}, + "pfstools": {"version": "2.0.4", "website": "http://pfstools.sourceforge.net/", "description": ""}, + "physfs": {"version": "2.0.3", "website": "http://icculus.org/physfs/", "description": ""}, + "picomodel": {"version": "1142ad8", "website": "http://code.google.com/p/picomodel/", "description": ""}, + "pire": {"version": "0.0.5", "website": "https://github.com/yandex/pire", "description": "PIRE"}, + "pixman": {"version": "0.33.6", "website": "http://cairographics.org/", "description": ""}, + "pkgconf": {"version": "da179fd", "website": "https://github.com/pkgconf/pkgconf", "description": ""}, + "plib": {"version": "1.8.5-rc1", "website": "http://plib.sourceforge.net/", "description": "Plib"}, + "plibc": {"version": "cd7ed09", "website": "http://plibc.sourceforge.net/", "description": "Plibc"}, + "plotmm": {"version": "0.1.2", "website": "http://plotmm.sourceforge.net/", "description": "PlotMM"}, + "plotutils": {"version": "2.6", "website": "https://www.gnu.org/software/plotutils/", "description": ""}, + "poco": {"version": "1.4.7p1", "website": "http://pocoproject.org/", "description": "POCO C++ Libraries"}, + "polarssl": {"version": "1.3.9", "website": "https://polarssl.org/", "description": "Polar SSL Library"}, + "poppler": {"version": "0.30.0", "website": "http://poppler.freedesktop.org/", "description": ""}, + "popt": {"version": "1.16", "website": "http://freshmeat.net/projects/popt/", "description": ""}, + "portablexdr": {"version": "4.9.1", "website": "http://people.redhat.com/~rjones/portablexdr/", "description": "PortableXDR"}, + "portaudio": {"version": "190600_20161030", "website": "http://www.portaudio.com/", "description": ""}, + "portmidi": {"version": "217", "website": "http://portmedia.sourceforge.net/portmidi/", "description": ""}, + "postgresql": {"version": "9.2.4", "website": "http://www.postgresql.org/", "description": "PostgreSQL"}, + "primesieve": {"version": "5.5.0", "website": "http://primesieve.org/", "description": "Primesieve"}, + "proj": {"version": "4.9.3", "website": "http://trac.osgeo.org/proj/", "description": ""}, + "protobuf": {"version": "3.1.0", "website": "https://github.com/google/protobuf", "description": ""}, + "pthreads": {"version": "POSIX 1003.1-2001", "website": "https://en.wikipedia.org/wiki/POSIX_Threads", "description": "POSIX Threads"}, + "qdbm": {"version": "1.8.78", "website": "http://fallabs.com/qdbm/", "description": "QDBM"}, + "qhttpengine": {"version": "0.1.0", "website": "https://github.com/nitroshare/qhttpengine", "description": ""}, + "qjson": {"version": "0.8.1", "website": "http://qjson.sourceforge.net/", "description": "QJson"}, + "qscintilla2": {"version": "2.8.4", "website": "http://www.riverbankcomputing.com/software/qscintilla/intro", "description": "QScintilla2"}, + "qt": {"version": "4.8.7", "website": "http://qt-project.org/", "description": "Qt"}, + "qt3d": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qt5": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qtactiveqt": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qtbase": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qtcanvas3d": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qtcharts": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qtconnectivity": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qtdatavis3d": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qtdeclarative": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qtdeclarative-render2d": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qtgamepad": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qtgraphicaleffects": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qtimageformats": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qtlocation": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qtmultimedia": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qtofficeopenxml": {"version": "02dda4a46f92a843eaba5f5a021952860eadfe01", "website": "https://github.com/dbzhang800/QtOfficeOpenXml/", "description": "QtOfficeOpenXml"}, + "qtpurchasing": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qtquickcontrols": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qtquickcontrols2": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qtscript": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qtscxml": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qtsensors": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qtserialbus": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qtserialport": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qtserialport_qt4": {"version": "5c3b6cc770", "website": "http://qt-project.org/", "description": "Qt"}, + "qtservice": {"version": "ad9bc46", "website": "https://qt.gitorious.org/qt-solutions/", "description": "Qt Solutions"}, + "qtsparkle_qt4": {"version": "8882e6ef86cdb79db7932307309d005411fd0c20", "website": "https://github.com/davidsansome/qtsparkle", "description": "qtsparkle"}, + "qtsvg": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qtsystems": {"version": "4e3a7ed", "website": "http://qt-project.org/", "description": "Qt"}, + "qttools": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qttranslations": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qtvirtualkeyboard": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qtwebchannel": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qtwebkit": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qtwebsockets": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qtwebview": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qtwinextras": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qtxlsxwriter": {"version": "37ef9dae209f989ed07f3aec37d5fbd1c821335c", "website": "https://github.com/dbzhang800/QtXlsxWriter/", "description": "QtXlsxWriter"}, + "qtxmlpatterns": {"version": "5.7.1", "website": "http://qt-project.org/", "description": "Qt"}, + "qwt": {"version": "6.1.3", "website": "http://qwt.sourceforge.net/", "description": "Qwt"}, + "qwt_qt4": {"version": "6.1.3", "website": "http://qwt.sourceforge.net/", "description": "Qwt-qt4"}, + "qwtplot3d": {"version": "0.2.7", "website": "http://qwtplot3d.sourceforge.net/", "description": "QwtPlot3D"}, + "ragel": {"version": "6.9", "website": "https://www.colm.net/open-source/ragel/", "description": "Ragel"}, + "readline": {"version": "6.3", "website": "http://tiswww.case.edu/php/chet/readline/rltop.html", "description": "Readline"}, + "rubberband": {"version": "1.8.1", "website": "http://breakfastquay.com/rubberband/", "description": "Rubberband"}, + "rucksack": {"version": "3.1.0", "website": "https://github.com/andrewrk/rucksack", "description": ""}, + "sdl": {"version": "1.2.15", "website": "http://www.libsdl.org/", "description": "SDL"}, + "sdl2": {"version": "2.0.5", "website": "http://www.libsdl.org/", "description": "SDL2"}, + "sdl2_gfx": {"version": "1.0.1", "website": "http://www.ferzkopp.net/joomla/content/view/19/14/", "description": "SDL2_gfx"}, + "sdl2_image": {"version": "2.0.0", "website": "http://www.libsdl.org/", "description": "SDL2_image"}, + "sdl2_mixer": {"version": "2.0.0", "website": "http://www.libsdl.org/", "description": "SDL2_mixer"}, + "sdl2_net": {"version": "2.0.0", "website": "http://www.libsdl.org/", "description": ""}, + "sdl2_ttf": {"version": "2.0.12", "website": "http://www.libsdl.org/", "description": "SDL2_ttf"}, + "sdl_gfx": {"version": "2.0.25", "website": "http://www.ferzkopp.net/joomla/content/view/19/14/", "description": "SDL_gfx"}, + "sdl_image": {"version": "1.2.12", "website": "http://www.libsdl.org/projects/SDL_image/", "description": "SDL_image"}, + "sdl_mixer": {"version": "1.2.12", "website": "http://www.libsdl.org/projects/SDL_mixer/", "description": "SDL_mixer"}, + "sdl_net": {"version": "1.2.8", "website": "http://www.libsdl.org/projects/SDL_net/", "description": "SDL_net"}, + "sdl_pango": {"version": "0.1.2", "website": "http://sdlpango.sourceforge.net/", "description": "SDL_Pango"}, + "sdl_rwhttp": {"version": "0.2.0", "website": "http://github.com/mgerhardy/SDL_rwhttp/", "description": "SDL_rwhttp"}, + "sdl_sound": {"version": "1.0.3", "website": "http://icculus.org/SDL_sound/", "description": "SDL_sound"}, + "sdl_ttf": {"version": "2.0.11", "website": "http://www.libsdl.org/projects/SDL_ttf/", "description": "SDL_ttf"}, + "sfml": {"version": "2.3.2", "website": "http://www.sfml-dev.org/", "description": "SFML"}, + "smpeg": {"version": "0.4.5+cvs20030824", "website": "http://icculus.org/smpeg/", "description": ""}, + "smpeg2": {"version": "2.0.0", "website": "http://icculus.org/smpeg/", "description": "smpeg"}, + "sox": {"version": "14.4.2", "website": "http://sox.sourceforge.net/", "description": "SoX"}, + "sparsehash": {"version": "2.0.3", "website": "https://github.com/sparsehash/sparsehash", "description": ""}, + "speex": {"version": "1.2rc2", "website": "http://www.speex.org/", "description": "Speex"}, + "speexdsp": {"version": "1.2rc3", "website": "http://www.speex.org/", "description": "SpeexDSP"}, + "sqlite": {"version": "3150200", "website": "http://www.sqlite.org/", "description": "SQLite"}, + "subversion": {"version": "1.9.4", "website": "http://subversion.apache.org", "description": ""}, + "suitesparse": {"version": "4.2.1", "website": "http://www.cise.ufl.edu/research/sparse/SuiteSparse/", "description": "SuiteSparse"}, + "t4k_common": {"version": "0.1.1", "website": "http://tux4kids.alioth.debian.org/", "description": ""}, + "taglib": {"version": "1.10", "website": "http://developer.kde.org/~wheeler/taglib.html", "description": "TagLib"}, + "tclap": {"version": "1.2.1", "website": "http://tclap.sourceforge.net/", "description": ""}, + "teem": {"version": "1.11.0", "website": "http://teem.sourceforge.net/", "description": "Teem"}, + "termcap": {"version": "1.3.1", "website": "https://www.gnu.org/software/termutils/", "description": "Termcap"}, + "theora": {"version": "1.1.1", "website": "http://theora.org/", "description": "Theora"}, + "tiff": {"version": "4.0.7", "website": "http://www.remotesensing.org/libtiff/", "description": "LibTIFF"}, + "tinyxml": {"version": "2.6.2", "website": "http://sourceforge.net/projects/tinyxml/", "description": ""}, + "tinyxml2": {"version": "4.0.1", "website": "http://grinninglizard.com/tinyxml2/", "description": ""}, + "tre": {"version": "0.8.0", "website": "http://laurikari.net/tre/", "description": "TRE"}, + "twolame": {"version": "0.3.13", "website": "http://www.twolame.org/", "description": "TwoLAME"}, + "ucl": {"version": "1.03", "website": "http://www.oberhumer.com/opensource/ucl/", "description": "UCL"}, + "unrtf": {"version": "0.21.9", "website": "https://www.gnu.org/software/unrtf/", "description": "unRTF"}, + "upx": {"version": "3.91", "website": "http://upx.sourceforge.net/", "description": "UPX"}, + "vamp-plugin-sdk": {"version": "2.5", "website": "http://vamp-plugins.org/", "description": "Vamp Plugins SDK"}, + "vcdimager": {"version": "0.7.24", "website": "https://www.gnu.org/software/vcdimager/", "description": ""}, + "vidstab": {"version": "0.98b", "website": "http://public.hronopik.de/vid.stab/features.php?lang=en", "description": "vid.stab video stablizer"}, + "vigra": {"version": "1.9.0", "website": "http://hci.iwr.uni-heidelberg.de/vigra", "description": ""}, + "vmime": {"version": "b1b3f30", "website": "http://www.vmime.org/", "description": "VMime"}, + "vo-aacenc": {"version": "0.1.3", "website": "https://github.com/mstorsjo/vo-aacenc", "description": "VO-AACENC"}, + "vo-amrwbenc": {"version": "0.1.3", "website": "https://github.com/mstorsjo/vo-amrwbenc", "description": "VO-AMRWBENC"}, + "vorbis": {"version": "1.3.5", "website": "http://www.vorbis.com/", "description": "Vorbis"}, + "vtk": {"version": "5.8.0", "website": "http://www.vtk.org/", "description": ""}, + "vtk6": {"version": "6.3.0", "website": "http://www.vtk.org/", "description": "VTK6"}, + "waf": {"version": "1.8.17", "website": "https://waf.io/", "description": "Waf: the meta build system"}, + "wavpack": {"version": "4.75.2", "website": "http://www.wavpack.com/", "description": "WavPack"}, + "wget": {"version": "1.18", "website": "https://www.gnu.org/software/wget/", "description": ""}, + "widl": {"version": "4.0.6", "website": "https://www.winehq.org/docs/widl/", "description": "Wine IDL Compiler"}, + "winpcap": {"version": "4_1_3", "website": "http://www.winpcap.org/", "description": "WinPcap"}, + "wt": {"version": "3.3.6", "website": "http://www.webtoolkit.eu", "description": "Wt"}, + "wxwidgets": {"version": "3.0.2", "website": "http://www.wxwidgets.org/", "description": "wxWidgets"}, + "x264": {"version": "20161130-2245", "website": "http://www.videolan.org/developers/x264.html", "description": ""}, + "xapian-core": {"version": "1.2.21", "website": "http://xapian.org/", "description": "Xapian-Core"}, + "xerces": {"version": "3.1.4", "website": "http://xerces.apache.org/xerces-c/", "description": "Xerces-C++"}, + "xmlrpc-c": {"version": "d4364f4", "website": "http://xmlrpc-c.sourceforge.net/", "description": ""}, + "xmlwrapp": {"version": "0.7.0", "website": "http://sourceforge.net/projects/xmlwrapp/", "description": ""}, + "xorg-macros": {"version": "1.19.0", "website": "http://cgit.freedesktop.org/xorg/util/macros/", "description": "X.org utility macros"}, + "xvidcore": {"version": "1.3.4", "website": "http://www.xvid.org/", "description": ""}, + "xxhash": {"version": "0.6.1", "website": "http://cyan4973.github.io/xxHash/", "description": "xxHash"}, + "xz": {"version": "5.2.2", "website": "http://tukaani.org/xz/", "description": "XZ"}, + "yaml-cpp": {"version": "0.5.3", "website": "https://github.com/jbeder/yaml-cpp", "description": "A YAML parser and emitter for C++"}, + "yasm": {"version": "1.3.0", "website": "http://yasm.tortall.net//", "description": "Yasm"}, + "zlib": {"version": "1.2.8", "website": "http://zlib.net/", "description": ""}, + "zziplib": {"version": "0.13.62", "website": "http://zziplib.sourceforge.net/", "description": "ZZIPlib"}, "": null } From 63f905458ef922d6fedabc7abe507f0464d71d2c Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 18 Dec 2016 22:03:35 +0100 Subject: [PATCH 1112/1463] index.html: load packages table from JSON See https://github.com/mxe/mxe/issues/1422 --- docs/index.html | 1756 +---------------------------------------------- 1 file changed, 32 insertions(+), 1724 deletions(-) diff --git a/docs/index.html b/docs/index.html index f15751cf..f7a826cc 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1111,1737 +1111,37 @@ local-pkg-list: $(LOCAL_PKG_LIST)

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
    a52deca52dec (aka. liba52)
    aggAnti-Grain Geometry
    alurealure
    aprAPR
    apr-utilAPR-util
    armadilloArmadillo C++ linear algebra library
    aspellAspell
    assimpAssimp Open Asset Import Library
    atkATK
    atkmmATKmm
    aubioaubio
    bfdBinary File Descriptor library
    binutilsGNU Binutils
    blasblas
    boostBoost C++ Library
    box2dBox2D
    bulletBullet physics, version 2
    bzip2bzip2
    cairocairo
    cairommcairomm
    cblascblas
    ccfitsCCfits
    ceguiCrazy Eddie’s GUI System (CEGUI)
    cfitsiocfitsio
    cgalcgal
    checkcheck
    chipmunkChipmunk Physics
    chromaprintChromaprint
    cimgCImg Library
    cloogCLooG Code Generator
    cmakecmake
    cminpackcminpack
    codaCODA
    coinCoin3D
    cpp-netlibBoost C++ Networking Library
    cppunitCppUnit
    cryptoppCrypto++ Library
    crystalhdBroadcom Crystal HD Headers
    cunitcunit
    curlcURL
    dbOracle Berkeley DB
    dbusdbus
    dcmtkDCMTK
    devilDevIL
    djvulibreDjVuLibre
    dlfcn-win32POSIX dlfcn wrapper for Windows
    eigeneigen
    exiv2Exiv2
    expatExpat XML Parser
    faad2faad2
    fdk-aacFDK-AAC
    ffmpegffmpeg
    fftwfftw
    filefile
    flacFLAC
    flannFLANN
    fltkFLTK
    fontconfigfontconfig
    freeglutfreeglut
    freeimageFreeImage
    freetdsFreeTDS
    freetypefreetype
    freetype-bootstrapfreetype (without harfbuzz)
    fribidiFriBidi
    ftglftgl
    gcgc
    gccGCC
    gdGD (without support for xpm)
    gdalGDAL
    gdbgdb
    gdk-pixbufGDK-pixbuf
    gendefgendef
    geoip-databaseGeoIP Legacy Database
    geosGEOS
    gettextgettext
    ghostscriptghostscript
    giflibgiflib
    glewGLEW
    glfw2GLFW 2.x
    glfw3GLFW 3.x
    glibGLib
    glibmmGLibmm
    glmGLM - OpenGL Mathematics
    glpkGNU Linear Programming Kit
    gmpGMP
    gnutlsGnuTLS
    googlemockGoogle Mock
    googletestGoogle Test
    graphicsmagickGraphicsMagick
    gslGSL
    gsoapgSOAP
    gst-plugins-badgst-plugins-bad
    gst-plugins-basegst-plugins-base
    gst-plugins-goodgst-plugins-good
    gst-plugins-uglygst-plugins-ugly
    gstreamergstreamer
    gtagta
    gtk2GTK+
    gtk3GTK+
    gtkglareaGtkGLArea
    gtkglextGtkGLExt
    gtkglextmmGtkGLExtmm
    gtkimageviewGtkImageView
    gtkmm2GTKMM
    gtkmm3GTKMM
    gtksourceviewGTKSourceView
    gtksourceviewmm2GtkSourceViewmm
    guileGNU Guile
    harfbuzzHarfBuzz
    hdf-eos2HDF-EOS2
    hdf-eos5HDF-EOS5
    hdf4HDF4
    hdf5HDF5
    hunspellHunspell
    hyperscanHyperscan
    icu4cICU4C
    id3libid3lib
    ilmbaseIlmBase
    imagemagickImageMagick
    islInteger Set Library
    itkInsight Segmentation and Registration Toolkit (ITK)
    jackJACK Audio Connection Kit
    janssonJansson
    jasperJasPer
    jpegjpeg
    json-cjson-c
    json-glibJSON-Glib
    json_spiritjson_spirit
    jsoncppjsoncpp
    lamelame
    lapacklapack
    lcmslcms
    lcms1lcms1
    lensfunlensfun
    levmarlevmar
    libaacslibaacs
    libarchiveLibarchive
    libasslibass
    libbluraylibbluray
    libbs2bBauer Stereophonic-to-Binaural library
    libcacalibcaca
    libcddbAccess data on a CDDB
    libcdioLibcdio
    libcdio-paranoiaLibcdio-paranoia
    libcomm14cuxlibcomm14cux
    libcrocoLibcroco
    libdnetlibdnet
    libdvbpsilibdvbpsi
    libdvdcsslibdvdcss
    libdvdetectFast database lookup for DVDs
    libdvdnavlibdvdnav
    libdvdreadlibdvdread
    libechonestlibechonest
    libepoxylibepoxy
    libeventlibevent
    libf2clibf2c
    libffilibffi
    libftdiLibFTDI
    libftdi1LibFTDI1
    libgcryptlibgcrypt
    libgdalibgda
    libgdammlibgdamm
    libgeelibgee
    libgeotiffGeoTiff
    libgit2libgit2
    libgladeglade
    libgnurxlibgnurx
    libgpg_errorlibgpg-error
    libgsaslLibgsasl
    libgsflibgsf
    libharulibharu
    libibertylibiberty
    libicallibical
    libiconvlibiconv
    libid3taglibid3tag
    libidnLibidn
    libieee1284libieee1284
    libircclientlibircclient
    libjpeg-turbolibjpeg-turbo
    liblaxjsonliblaxjson
    libloliblo
    liblqr-1liblqr-1
    liblsmashL-SMASH
    libltdlGNU Libtool Library (libltdl)
    libmadlibmad
    libmicrohttpdGNU Libmicrohttpd
    libmikmodlibMikMod
    libmnglibmng
    libmodpluglibmodplug
    libmpcdeclibmpcdec
    libmysqlclientlibmysqlclient
    libnicelibnice
    libntlmLibntlm
    liboauthliboauth
    libodbc++libodbc++
    liboilliboil
    libpano13libpano13
    libpaperlibpaper
    libplistlibplist
    libpnglibpng
    libroscolibrosco
    librsvglibrsvg
    librtmplibrtmp
    libsampleratelibsamplerate
    libshoutlibshout
    libsigc++libsigc++
    libsndfilelibsndfile
    libsodiumlibsodium
    libsouplibsoup
    libspectrelibspectre
    libssh2libssh2
    libsvmlibsvm
    libtoolGNU Libtool
    libtorrent-rasterbarlibtorrent-rasterbar
    libunistringlibunistring
    libusbLibUsb
    libusb1LibUsb-1.0
    libuvlibuv
    libvpxvpx
    libwebplibwebp
    libwebsocketslibwebsockets
    libxml++libxml2
    libxml2libxml2
    libxsltlibxslt
    libziplibzip
    llvmllvm
    log4cxxlog4cxx
    luaLua
    luabindLuabind
    luajitLuaJIT
    lzmaLZMA SDK
    lzolzo
    matiomatio
    mdbtoolsmdbtools
    mingw-w64MinGW-w64 Runtime
    miniupnpcminiupnpc
    minizipminizip
    mman-win32MMA-Win32
    mpcGNU MPC
    mpfrmpfr
    mpg123mpg123
    muparsermuParser
    muparserxmuParserX
    mxmlMini-XML
    ncursesNcurses
    neonHTTP and WebDAV client library (libneon)
    netcdfNetCDF
    netpbmNetpbm
    nettlenettle
    nloptNLopt
    nsisNSIS
    ocaml-cairocairo-ocaml
    ocaml-camlimagescamlimages
    ocaml-coreocaml
    ocaml-findlibfindlib
    ocaml-flexdllflexdll
    ocaml-lablgllablgl
    ocaml-lablgtk2lablgtk2
    ocaml-nativeocaml
    ocaml-xml-lightxml-light
    oceOpen CASCADE Community Edition
    oggOGG
    oldold
    openalopenal
    openblasOpenBLAS
    opencore-amropencore-amr
    opencsgopencsg
    opencvOpenCV
    openexrOpenEXR
    openjpegOpenJPEG
    openmp-validationOpenMP Validation Suite
    openscenegraphOpenSceneGraph
    opensslopenssl
    openthreadsOpenThreads
    opusopus
    opusfileopusfile
    ossimOSSIM
    pangoPango
    pangommPangomm
    pclPCL (Point Cloud Library)
    pcrePCRE
    pdcursesPDcurses
    pdflib_litePDFlib Lite
    pfstoolspfstools
    physfsphysfs
    picomodelpicomodel
    pirePIRE
    pixmanpixman
    pkgconfpkgconf
    plibPlib
    plibcPlibc
    plotmmPlotMM
    plotutilsplotutils
    pocoPOCO C++ Libraries
    polarsslPolar SSL Library
    popplerpoppler
    poptpopt
    portablexdrPortableXDR
    portaudioportaudio
    portmidiportmidi
    postgresqlPostgreSQL
    primesievePrimesieve
    projproj
    protobufprotobuf
    pthreadsPOSIX Threads
    qdbmQDBM
    qhttpengineqhttpengine
    qjsonQJson
    qscintilla2QScintilla2
    qtQt
    qt3dQt
    qt5Qt
    qtactiveqtQt
    qtbaseQt
    qtcanvas3dQt
    qtchartsQt
    qtconnectivityQt
    qtdatavis3dQt
    qtdeclarativeQt
    qtdeclarative-render2dQt
    qtgamepadQt
    qtgraphicaleffectsQt
    qtimageformatsQt
    qtlocationQt
    qtmultimediaQt
    qtofficeopenxmlQtOfficeOpenXml
    qtpurchasingQt
    qtquickcontrolsQt
    qtquickcontrols2Qt
    qtscriptQt
    qtscxmlQt
    qtsensorsQt
    qtserialbusQt
    qtserialportQt
    qtserialport_qt4Qt
    qtserviceQt Solutions
    qtsparkle_qt4qtsparkle
    qtsvgQt
    qtsystemsQt
    qttoolsQt
    qttranslationsQt
    qtvirtualkeyboardQt
    qtwebchannelQt
    qtwebkitQt
    qtwebsocketsQt
    qtwebviewQt
    qtwinextrasQt
    qtxlsxwriterQtXlsxWriter
    qtxmlpatternsQt
    qwtQwt
    qwt_qt4Qwt-qt4
    qwtplot3dQwtPlot3D
    ragelRagel
    readlineReadline
    rubberbandRubberband
    rucksackrucksack
    sdlSDL
    sdl2SDL2
    sdl2_gfxSDL2_gfx
    sdl2_imageSDL2_image
    sdl2_mixerSDL2_mixer
    sdl2_netsdl2_net
    sdl2_ttfSDL2_ttf
    sdl_gfxSDL_gfx
    sdl_imageSDL_image
    sdl_mixerSDL_mixer
    sdl_netSDL_net
    sdl_pangoSDL_Pango
    sdl_rwhttpSDL_rwhttp
    sdl_soundSDL_sound
    sdl_ttfSDL_ttf
    sfmlSFML
    smpegsmpeg
    smpeg2smpeg
    soxSoX
    sparsehashsparsehash
    speexSpeex
    speexdspSpeexDSP
    sqliteSQLite
    subversionsubversion
    suitesparseSuiteSparse
    t4k_commont4k_common
    taglibTagLib
    tclaptclap
    teemTeem
    termcapTermcap
    theoraTheora
    tiffLibTIFF
    tinyxmltinyxml
    tinyxml2tinyxml2
    treTRE
    twolameTwoLAME
    uclUCL
    unrtfunRTF
    upxUPX
    vamp-plugin-sdkVamp Plugins SDK
    vcdimagervcdimager
    vidstabvid.stab video stablizer
    vigravigra
    vmimeVMime
    vo-aacencVO-AACENC
    vo-amrwbencVO-AMRWBENC
    vorbisVorbis
    vtkvtk
    vtk6VTK6
    wafWaf: the meta build system
    wavpackWavPack
    wgetwget
    widlWine IDL Compiler
    winpcapWinPcap
    wtWt
    wxwidgetswxWidgets
    x264x264
    xapian-coreXapian-Core
    xercesXerces-C++
    xmlrpc-cxmlrpc-c
    xmlwrappxmlwrapp
    xorg-macrosX.org utility macros
    xvidcorexvidcore
    xxhashxxHash
    xzXZ
    yaml-cppA YAML parser and emitter for C++
    yasmYasm
    zlibzlib
    zziplibZZIPlibLoading package list...
    -
    From cf8930dde0620d7d198830558cb7ef7cacc9e482 Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Sun, 18 Dec 2016 22:13:44 +0100 Subject: [PATCH 1113/1463] skeleton.py: put website and description to .mk ... instead of index.html See https://github.com/mxe/mxe/issues/1422 --- tools/skeleton.py | 50 ++--------------------------------------------- 1 file changed, 2 insertions(+), 48 deletions(-) diff --git a/tools/skeleton.py b/tools/skeleton.py index 1e630bfb..441243c6 100755 --- a/tools/skeleton.py +++ b/tools/skeleton.py @@ -22,6 +22,8 @@ MK_TEMPLATE = r''' # This file is part of MXE. See LICENSE.md for licensing information. PKG := %(name)s +$(PKG)_WEBSITE := %(website)s +$(PKG)_DESCR := %(description)s $(PKG)_IGNORE := $(PKG)_VERSION := %(version)s $(PKG)_CHECKSUM := %(checksum)s @@ -126,53 +128,6 @@ def make_build(options, builder): commands_template = BUILDERS[builder].lstrip() + PC_AND_TEST.rstrip() return commands_template % options -def update_index_html(name, description, website): - # read HTML and find a list of packages - with open('docs/index.html', 'rb') as f: - index_html = f.read() - if not isinstance(index_html, str): - # Python 3 - index_html = index_html.decode() - sep1 = ' ' - sep2 = '
    ' - (prefix, other) = index_html.split(sep1, 1) - (packages_html, suffix) = other.split(sep2, 1) - # find existing packages - pkg_re = r''' - - (?P.*) - (?P.*) - - '''.strip() - packages = [ - { - 'name': match.group('name'), - 'description': match.group('description'), - 'website': match.group('website'), - } - for match in re.finditer(pkg_re, packages_html) - ] - packages.append({ - 'name': name, - 'description': description, - 'website': website, - }) - packages.sort(key=lambda package: package['name']) - pkg_template = r''' - - %(name)s - %(description)s - - '''.rstrip() - packages_html = ''.join(pkg_template % package for package in packages) - packages_html += '\n' - # build and write HTML - index_html = prefix + sep1 + packages_html + sep2 + suffix - (_, tmp_index_html) = tempfile.mkstemp() - with open(tmp_index_html, 'wt') as f: - f.write(index_html) - shutil.move(tmp_index_html, 'docs/index.html') - def make_skeleton( name, description, @@ -217,7 +172,6 @@ def make_skeleton( } options['build'] = make_build(options, builder) mk.write(MK_TEMPLATE.lstrip() % options) - update_index_html(name, description, website) def main(): parser = argparse.ArgumentParser( From c098cd5f6c79b96fed2eb118a184df5d713c8a0a Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 20 Dec 2016 09:16:21 +0100 Subject: [PATCH 1114/1463] index.html: update "Creating Packages" --- docs/index.html | 53 ++++++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/docs/index.html b/docs/index.html index f7a826cc..e6f6161e 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1266,6 +1266,30 @@ local-pkg-list: $(LOCAL_PKG_LIST) 

    $(PKG)_DEPS     := gcc ...
    +

    + Specify official name and website of a package. + If the official name coincides with the package name, + you can omit $(PKG)_DESCR. +

    + 
    +PKG             := libdvdetect
+$(PKG)_WEBSITE  := https://www.dvdetect.de/
+$(PKG)_DESCR    := Fast database lookup for DVDs
    + +

    + Always look for the SSL version of URLs, that is, + prefer https:// URLs over http:// URLs. +

    +
    • + +
  • +

    + Write your $(PKG)_BUILD. + If your library has a ./configure script, + enable/disable all dependency libraries explicitly + via "--enable-*" and "--disable-*" options. +

    +

    Things not to do:

    @@ -1287,35 +1311,6 @@ local-pkg-list: $(LOCAL_PKG_LIST)
    • - - -
  • -

    - Add your package to the list of packages. -

    -

    - Each package gets its own table row element with table cells - specifying your package name, official name and website: -

    - 
    -<tr>
-    <td class="package">gettext</td>
-    <td class="website"><a href="https://www.gnu.org/software/gettext/">gettext</a></td>
-</tr>
    -

    - Always look for the SSL version of a website, that is, - prefer https:// URLs over http:// URLs. -

    -
    • - -
  • -

    - Write your $(PKG)_BUILD. - If your library has a ./configure script, - enable/disable all dependency libraries explicitly - via "--enable-*" and "--disable-*" options. -

    -

    Useful Makefile variables provided by MXE:

    From ef22fd584316d645787fe0929717dc2ae81119fd Mon Sep 17 00:00:00 2001 From: Boris Nagaev Date: Tue, 20 Dec 2016 09:28:18 +0100 Subject: [PATCH 1115/1463] index.html: load packages.json synchronously If it loads asynchronously, then all content after the table of packages, e.g. #creating-packages moves down, making it impossible to make a reference to this content. --- docs/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.html b/docs/index.html index e6f6161e..2ece06b5 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1117,7 +1117,7 @@ local-pkg-list: $(LOCAL_PKG_LIST)