diff --git a/mingw-w64-SDL/PKGBUILD b/mingw-w64-SDL/PKGBUILD index ef0c4e3be8..fa47ccb968 100644 --- a/mingw-w64-SDL/PKGBUILD +++ b/mingw-w64-SDL/PKGBUILD @@ -3,7 +3,7 @@ _realname=SDL pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.2.15 -pkgrel=5 +pkgrel=6 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (mingw-w64)" arch=('any') url="http://libsdl.org" @@ -15,18 +15,20 @@ source=("$url/release/SDL-$pkgver.tar.gz") md5sums=('9d96df8417572a2afb781a7c4c811a85') build() { + [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}" mkdir -p "${srcdir}/build-${MINGW_CHOST}" cd "${srcdir}/build-${MINGW_CHOST}" - "${srcdir}"/SDL-${pkgver}/configure \ + ../SDL-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --disable-assembly + make } package() { cd "${srcdir}/build-${MINGW_CHOST}" - make DESTDIR="$pkgdir" install + make DESTDIR="${pkgdir}" install sed -e "s|-mwindows||g" -i ${pkgdir}${MINGW_PREFIX}/lib/pkgconfig/sdl.pc } diff --git a/mingw-w64-boost/PKGBUILD b/mingw-w64-boost/PKGBUILD index fdfb1c100e..644d76d7cc 100644 --- a/mingw-w64-boost/PKGBUILD +++ b/mingw-w64-boost/PKGBUILD @@ -4,7 +4,7 @@ _realname=boost pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.57.0 _boostver=${pkgver//./_} -pkgrel=2 +pkgrel=3 pkgdesc="Free peer-reviewed portable C++ source libraries (mingw-w64)" arch=('any') url="http://www.boost.org/" @@ -22,46 +22,126 @@ source=(http://downloads.sourceforge.net/sourceforge/boost/boost_${_boostver}.ta boost-1.50.0-fix-non-utf8-files.patch boost-1.50.0-pool.patch boost-1.54.0-bootstrap.patch - boost-1.57.0-Add-missing-include-to-signals2-trackable.hpp.patch + boost-1.54.0-locale-unused_typedef.patch + boost-1.54.0-pool-max_chunks_shadow.patch + boost-1.54.0-python-unused_typedef.patch + boost-1.55.0-python-test-PyImport_AppendInittab.patch boost-1.56-mingw-context.patch + boost-1.57.0-build-optflags.patch + boost-1.57.0-move-is_class.patch + boost-1.57.0-mpl-print.patch + boost-1.57.0-pool-test_linking.patch + boost-1.57.0-python-abi_letters.patch + boost-1.57.0-python-libpython_dep.patch + boost-1.57.0-signals2-weak_ptr.patch + boost-1.57.0-spirit-unused_typedef.patch + boost-1.57.0-uuid-comparison.patch + boost-include-intrin-h-on-mingw-w64.patch using-mingw-w64-python.patch - ) + msys2-mingw-folders-bootstrap.patch) md5sums=('1be49befbdd9a5ce9def2983ba3e7b76' 'dff8166486150121bf89d7050c7e5c49' 'ef427ef3a47f8fdeeb6b4ae3246aa84f' - 'a69f826fd911dcf34189aaaacf16853f' + '957b9ec07e4197b87a0f1073e565d955' '45dbfa0c971c8625c5cb985e6ed71b5d' - '26a97a0abc51efb7e87853d4d1030d48' + '18963bb39f778b0f0ed7894a5b48845d' + 'aac88d8444c25db38e6fc9f6e549ea4b' + '4e652869f58b4ce601715b9fb2c2b9ee' + 'a08837900284c677cf1cff21636ecbe7' '2c65a8915b70b9de25ac37a73a74d84d' - 'c2aac61b370b321552b5240b9ee7248e') + '2f7eaf049a7ab916008806beaf3eea0b' + '65a7e8edffbed332162253d31301fa29' + 'e6631765436f87e90c16778a25d2129c' + 'c28bcd8eeafd494021ebcd80456a687a' + 'a128f4a4e371bdde469f055c7a045db7' + 'ff8ee6c27cc2f4d912f1c028d4f2d91d' + '254c27857ee0574da377aa5ac107101c' + 'd8fb4b4bb69e225ff076513dfd756db9' + '92f66bba767a61bb553a13a794270f28' + '1f0904cea88ca36e6b927432c85676a3' + 'c2aac61b370b321552b5240b9ee7248e' + '29ffd4b1636e31678fa8e1afa77305eb') prepare() { cd "${srcdir}/boost_${_boostver}" - - patch -p1 -i ${srcdir}/boost-1.50.0-fix-non-utf8-files.patch - patch -p1 -i ${srcdir}/boost-1.48.0-add-bjam-man-page.patch - patch -p1 -i ${srcdir}/boost-1.50.0-pool.patch - patch -p1 -i ${srcdir}/boost-1.56-mingw-context.patch + patch -p1 -i ${srcdir}/boost-1.54.0-bootstrap.patch - patch -p1 -i ${srcdir}/boost-1.57.0-Add-missing-include-to-signals2-trackable.hpp.patch + + # https://svn.boost.org/trac/boost/ticket/6150 + patch -p1 -i ${srcdir}/boost-1.50.0-fix-non-utf8-files.patch + + # Add a manual page for bjam, based on the on-line documentation: + # http://www.boost.org/boost-build2/doc/html/bbv2/overview.html + patch -p1 -i ${srcdir}/boost-1.48.0-add-bjam-man-page.patch + + # https://bugzilla.redhat.com/show_bug.cgi?id=828856 + # https://bugzilla.redhat.com/show_bug.cgi?id=828857 + # https://svn.boost.org/trac/boost/ticket/6701 + patch -p1 -i ${srcdir}/boost-1.50.0-pool.patch + + # https://svn.boost.org/trac/boost/ticket/5637 + patch -p1 -i ${srcdir}/boost-1.57.0-mpl-print.patch + + # https://svn.boost.org/trac/boost/ticket/8870 + patch -p1 -i ${srcdir}/boost-1.57.0-spirit-unused_typedef.patch + + # https://svn.boost.org/trac/boost/ticket/8878 + patch -p1 -i ${srcdir}/boost-1.54.0-locale-unused_typedef.patch + + # https://svn.boost.org/trac/boost/ticket/8888 + patch -p1 -i ${srcdir}/boost-1.54.0-python-unused_typedef.patch + + # https://svn.boost.org/trac/boost/ticket/9038 + patch -p1 -i ${srcdir}/boost-1.57.0-pool-test_linking.patch + + # This was already fixed upstream, so no tracking bug. + patch -p1 -i ${srcdir}/boost-1.54.0-pool-max_chunks_shadow.patch + + # https://bugzilla.redhat.com/show_bug.cgi?id=1102667 + patch -p1 -i ${srcdir}/boost-1.57.0-python-libpython_dep.patch + patch -p1 -i ${srcdir}/boost-1.57.0-python-abi_letters.patch + patch -p1 -i ${srcdir}/boost-1.55.0-python-test-PyImport_AppendInittab.patch + + # https://svn.boost.org/trac/boost/ticket/10100 + # https://github.com/boostorg/signals2/pull/8 + patch -p1 -i ${srcdir}/boost-1.57.0-signals2-weak_ptr.patch + + # https://bugzilla.redhat.com/show_bug.cgi?id=1190039 + patch -p1 -i ${srcdir}/boost-1.57.0-build-optflags.patch + + # https://svn.boost.org/trac/boost/ticket/10510 + patch -p1 -i ${srcdir}/boost-1.57.0-uuid-comparison.patch + + # https://bugzilla.redhat.com/show_bug.cgi?id=1192002 + # https://svn.boost.org/trac/boost/ticket/11044 + patch -p1 -i ${srcdir}/boost-1.57.0-move-is_class.patch + + # https://svn.boost.org/trac/boost/ticket/7262 + patch -p1 -i ${srcdir}/boost-1.56-mingw-context.patch + + # Fix FTBFS on recent mingw-w64 and also use intrinsics based + # versions of the Interlocked symbols which are better optimized + patch -p1 -i ${srcdir}/boost-include-intrin-h-on-mingw-w64.patch # Use out own build Python patch -p1 -i ${srcdir}/using-mingw-w64-python.patch - - pushd ${MINGW_PREFIX} > /dev/null - export PREFIX_DEPS=`pwd -W` - popd > /dev/null - - echo "using python : 2.7 : ${PREFIX_DEPS}/bin/python2.exe : ${PREFIX_DEPS}/include/python2.7 ;" >> ./tools/build/src/user-config.jam - echo "using python : 3.4 : ${PREFIX_DEPS}/bin/python3.exe : ${PREFIX_DEPS}/include/python3.4m : ${PREFIX_DEPS}/lib/python3.4/config-3.4m ;" >> ./tools/build/src/user-config.jam - - mkdir -p "${srcdir}/boost-${MINGW_CHOST}" - lndir "${srcdir}/boost_${_boostver}" "${srcdir}/boost-${MINGW_CHOST}" + + patch -p1 -i ${srcdir}/msys2-mingw-folders-bootstrap.patch } build() { - cd "${srcdir}/boost-${MINGW_CHOST}" - ./bootstrap.sh --with-icu=${MINGW_PREFIX} --with-python=${MINGW_PREFIX} + local PREFIX_DEPS=$(cygpath -am ${MINGW_PREFIX}) + + mkdir -p "${srcdir}/build-${MINGW_CHOST}" + lndir "${srcdir}/boost_${_boostver}" "${srcdir}/build-${MINGW_CHOST}" + + cd "${srcdir}/build-${MINGW_CHOST}" + + echo "using python : 2.7 : ${PREFIX_DEPS}/bin/python2.exe : ${PREFIX_DEPS}/include/python2.7 ;" >> ./tools/build/src/user-config.jam + echo "using python : 3.4 : ${PREFIX_DEPS}/bin/python3.exe : ${PREFIX_DEPS}/include/python3.4m : ${PREFIX_DEPS}/lib/python3.4/config-3.4m ;" >> ./tools/build/src/user-config.jam + #echo "using gcc : : ${PREFIX_DEPS}/bin/g++.exe : ${PREFIX_DEPS}/bin/windres.exe ;" >> ./tools/build/src/user-config.jam + + ./bootstrap.sh --with-icu=${MINGW_PREFIX} --with-python=${MINGW_PREFIX} --with-toolset=gcc case ${CARCH} in i686) @@ -80,13 +160,17 @@ build() { ./b2 \ toolset=gcc \ - variant=$variant \ + link=shared,static \ + address-model=${_model} \ + pch=off \ + runtime-link=shared \ threading=multi \ threadapi=win32 \ - link=shared,static \ - runtime-link=shared \ + variant=${variant} \ --debug-configuration \ --prefix=${pkgdir}${MINGW_PREFIX} \ + --layout=tagged \ + --without-mpi \ -sHAVE_ICU=1 \ -sICU_PATH=${MINGW_PREFIX} \ -sICU_LINK="-L${MINGW_PREFIX}/lib -licuuc -licuin -licudt" \ @@ -100,15 +184,11 @@ build() { -sZLIB_BINARY=z \ -sZLIB_INCLUDE=${MINGW_PREFIX}/include \ -sZLIB_LIBPATH=${MINGW_PREFIX}/zlib \ - pch=off \ - -d2 \ - address-model=${_model} \ - --layout=tagged \ - --without-mpi + -d2 } package() { - cd "${srcdir}/boost-${MINGW_CHOST}" + cd "${srcdir}/build-${MINGW_CHOST}" case ${CARCH} in i686) local _model=32 @@ -126,7 +206,7 @@ package() { ./b2 \ toolset=gcc \ - variant=$variant \ + variant=${variant} \ threading=multi \ threadapi=win32 \ link=shared,static \ diff --git a/mingw-w64-boost/boost-1.50.0-pool.patch b/mingw-w64-boost/boost-1.50.0-pool.patch index 15ce400767..a5a9caad97 100644 --- a/mingw-w64-boost/boost-1.50.0-pool.patch +++ b/mingw-w64-boost/boost-1.50.0-pool.patch @@ -1,4 +1,4 @@ -Index: boost/pool/pool.hpp +Index: a/boost/pool/pool.hpp =================================================================== --- a/boost/pool/pool.hpp (revision 78317) +++ b/boost/pool/pool.hpp (revision 78326) @@ -88,7 +88,7 @@ Index: boost/pool/pool.hpp + set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size)); // insert it into the list, -Index: libs/pool/test/test_bug_6701.cpp +Index: a/libs/pool/test/test_bug_6701.cpp =================================================================== --- a/libs/pool/test/test_bug_6701.cpp (revision 78326) +++ b/libs/pool/test/test_bug_6701.cpp (revision 78326) diff --git a/mingw-w64-boost/boost-1.54.0-locale-unused_typedef.patch b/mingw-w64-boost/boost-1.54.0-locale-unused_typedef.patch new file mode 100644 index 0000000000..b7c91284d9 --- /dev/null +++ b/mingw-w64-boost/boost-1.54.0-locale-unused_typedef.patch @@ -0,0 +1,11 @@ +diff -urp boost_1_54_0-orig/boost/locale/boundary/segment.hpp boost_1_54_0/boost/locale/boundary/segment.hpp +--- boost_1_54_0-orig/boost/locale/boundary/segment.hpp 2013-07-23 00:47:27.020787174 +0200 ++++ boost_1_54_0/boost/locale/boundary/segment.hpp 2013-07-23 00:50:40.382959016 +0200 +@@ -27,7 +27,6 @@ namespace boundary { + int compare_text(LeftIterator l_begin,LeftIterator l_end,RightIterator r_begin,RightIterator r_end) + { + typedef LeftIterator left_iterator; +- typedef RightIterator right_iterator; + typedef typename std::iterator_traits::value_type char_type; + typedef std::char_traits traits; + while(l_begin!=l_end && r_begin!=r_end) { diff --git a/mingw-w64-boost/boost-1.54.0-pool-max_chunks_shadow.patch b/mingw-w64-boost/boost-1.54.0-pool-max_chunks_shadow.patch new file mode 100644 index 0000000000..1a85fceb82 --- /dev/null +++ b/mingw-w64-boost/boost-1.54.0-pool-max_chunks_shadow.patch @@ -0,0 +1,14 @@ +diff -up ./boost/pool/pool.hpp~ ./boost/pool/pool.hpp +--- ./boost/pool/pool.hpp~ 2013-08-21 17:49:56.023296922 +0200 ++++ ./boost/pool/pool.hpp 2013-08-22 11:38:01.133912638 +0200 +@@ -361,9 +361,7 @@ class pool: protected simple_segregated_ + { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool. + size_type partition_size = alloc_size(); + size_type POD_size = math::static_lcm::value + sizeof(size_type); +- size_type max_chunks = (std::numeric_limits::max() - POD_size) / alloc_size(); +- +- return max_chunks; ++ return (std::numeric_limits::max() - POD_size) / alloc_size(); + } + + static void * & nextof(void * const ptr) diff --git a/mingw-w64-boost/boost-1.54.0-python-unused_typedef.patch b/mingw-w64-boost/boost-1.54.0-python-unused_typedef.patch new file mode 100644 index 0000000000..8adf8ed208 --- /dev/null +++ b/mingw-w64-boost/boost-1.54.0-python-unused_typedef.patch @@ -0,0 +1,15 @@ +diff -up boost_1_53_0/boost/python/to_python_value.hpp\~ boost_1_53_0/boost/python/to_python_value.hpp +--- boost_1_53_0/boost/python/to_python_value.hpp~ 2007-12-16 11:12:07.000000000 +0100 ++++ boost_1_53_0/boost/python/to_python_value.hpp 2013-07-23 16:19:02.518904596 +0200 +@@ -147,8 +147,8 @@ namespace detail + template + inline PyObject* registry_to_python_value::operator()(argument_type x) const + { +- typedef converter::registered r; + # if BOOST_WORKAROUND(__GNUC__, < 3) ++ typedef converter::registered r; + // suppresses an ICE, somehow + (void)r::converters; + # endif + +Diff finished. Tue Jul 23 16:19:05 2013 diff --git a/mingw-w64-boost/boost-1.55.0-python-test-PyImport_AppendInittab.patch b/mingw-w64-boost/boost-1.55.0-python-test-PyImport_AppendInittab.patch new file mode 100644 index 0000000000..1d2ee5c382 --- /dev/null +++ b/mingw-w64-boost/boost-1.55.0-python-test-PyImport_AppendInittab.patch @@ -0,0 +1,98 @@ +diff -up boost_1_55_0/libs/python/test/exec.cpp\~ boost_1_55_0/libs/python/test/exec.cpp +--- boost_1_55_0/libs/python/test/exec.cpp~ 2010-07-05 00:38:38.000000000 +0200 ++++ boost_1_55_0/libs/python/test/exec.cpp 2015-01-09 21:31:12.903218280 +0100 +@@ -56,6 +56,20 @@ void eval_test() + BOOST_TEST(value == "ABCDEFG"); + } + ++struct PyCtx ++{ ++ PyCtx() { ++ Py_Initialize(); ++ } ++ ++ ~PyCtx() { ++ // N.B. certain problems may arise when Py_Finalize is called when ++ // using Boost.Python. However in this test suite it all seems to ++ // work fine. ++ Py_Finalize(); ++ } ++}; ++ + void exec_test() + { + // Register the module with the interpreter +@@ -68,6 +82,8 @@ void exec_test() + ) == -1) + throw std::runtime_error("Failed to add embedded_hello to the interpreter's " + "builtin modules"); ++ ++ PyCtx ctx; + // Retrieve the main module + python::object main = python::import("__main__"); + +@@ -148,41 +164,43 @@ void check_pyerr(bool pyerr_expected=fal + } + } + ++template ++bool ++run_and_handle_exception(Cb cb, bool pyerr_expected = false) ++{ ++ PyCtx ctx; ++ if (python::handle_exception(cb)) { ++ check_pyerr(pyerr_expected); ++ return true; ++ } else { ++ return false; ++ } ++} ++ + int main(int argc, char **argv) + { + BOOST_TEST(argc == 2 || argc == 3); + std::string script = argv[1]; +- // Initialize the interpreter +- Py_Initialize(); + +- if (python::handle_exception(eval_test)) { +- check_pyerr(); +- } +- else if(python::handle_exception(exec_test)) { +- check_pyerr(); +- } +- else if (python::handle_exception(boost::bind(exec_file_test, script))) { ++ // N.B. exec_test mustn't be called through run_and_handle_exception ++ // as it needs to handles the python context by itself. ++ if (run_and_handle_exception(eval_test) ++ || python::handle_exception(exec_test)) + check_pyerr(); +- } +- +- if (python::handle_exception(exec_test_error)) +- { +- check_pyerr(/*pyerr_expected*/ true); +- } + else +- { ++ run_and_handle_exception(boost::bind(exec_file_test, script)); ++ ++ if (!run_and_handle_exception(exec_test_error, true)) + BOOST_ERROR("Python exception expected, but not seen."); +- } + + if (argc > 2) { ++ PyCtx ctx; + // The main purpose is to test compilation. Since this test generates + // a file and I (rwgk) am uncertain about the side-effects, run it only + // if explicitly requested. + exercise_embedding_html(); + } + +- // Boost.Python doesn't support Py_Finalize yet. +- // Py_Finalize(); + return boost::report_errors(); + } + + +Diff finished. Fri Jan 9 21:31:13 2015 diff --git a/mingw-w64-boost/boost-1.57.0-Add-missing-include-to-signals2-trackable.hpp.patch b/mingw-w64-boost/boost-1.57.0-Add-missing-include-to-signals2-trackable.hpp.patch deleted file mode 100644 index 7ecd749eb2..0000000000 --- a/mingw-w64-boost/boost-1.57.0-Add-missing-include-to-signals2-trackable.hpp.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 06ccdfee76fe487a141b95848d1c866890f15d88 Mon Sep 17 00:00:00 2001 -From: Evangelos Foutras -Date: Thu, 6 Nov 2014 09:19:26 +0200 -Subject: [PATCH] Add missing include to signals2/trackable.hpp - -boost::weak_ptr started being used in commit a0bf2d1 (Disconnect slots -associated with signals2::trackable immediately) but the matching header -wasn't included. - -https://svn.boost.org/trac/boost/ticket/10100#comment:7 ---- - boost/signals2/trackable.hpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/boost/signals2/trackable.hpp b/boost/signals2/trackable.hpp -index dba001d..64e8489 100644 ---- a/boost/signals2/trackable.hpp -+++ b/boost/signals2/trackable.hpp -@@ -18,6 +18,7 @@ - - #include - #include -+#include - - namespace boost { - namespace signals2 { --- -2.1.3 - diff --git a/mingw-w64-boost/boost-1.57.0-build-optflags.patch b/mingw-w64-boost/boost-1.57.0-build-optflags.patch new file mode 100644 index 0000000000..d0b925fbbc --- /dev/null +++ b/mingw-w64-boost/boost-1.57.0-build-optflags.patch @@ -0,0 +1,48 @@ +diff -up ./tools/build/src/tools/gcc.jam~ ./tools/build/src/tools/gcc.jam +--- ./tools/build/src/tools/gcc.jam~ 2015-02-09 15:01:04.850331626 +0100 ++++ ./tools/build/src/tools/gcc.jam 2015-02-09 15:44:29.122307134 +0100 +@@ -366,17 +366,17 @@ generators.override gcc.compile.c++.pch + toolset.flags gcc.compile PCH_FILE on : ; + + # Declare flags and action for compilation. +-toolset.flags gcc.compile OPTIONS off : -O0 ; +-toolset.flags gcc.compile OPTIONS speed : -O3 ; +-toolset.flags gcc.compile OPTIONS space : -Os ; ++toolset.flags gcc.compile OPTIONS off : ; ++toolset.flags gcc.compile OPTIONS speed : ; ++toolset.flags gcc.compile OPTIONS space : ; + +-toolset.flags gcc.compile OPTIONS off : -fno-inline ; +-toolset.flags gcc.compile OPTIONS on : -Wno-inline ; +-toolset.flags gcc.compile OPTIONS full : -finline-functions -Wno-inline ; ++toolset.flags gcc.compile OPTIONS off : ; ++toolset.flags gcc.compile OPTIONS on : ; ++toolset.flags gcc.compile OPTIONS full : ; + +-toolset.flags gcc.compile OPTIONS off : -w ; +-toolset.flags gcc.compile OPTIONS on : -Wall ; +-toolset.flags gcc.compile OPTIONS all : -Wall -pedantic ; ++toolset.flags gcc.compile OPTIONS off : ; ++toolset.flags gcc.compile OPTIONS on : ; ++toolset.flags gcc.compile OPTIONS all : ; + toolset.flags gcc.compile OPTIONS on : -Werror ; + + toolset.flags gcc.compile OPTIONS on : -g ; +@@ -603,7 +603,7 @@ rule compile.fortran ( targets * : sourc + + actions compile.c++ bind PCH_FILE + { +- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" -c -o "$(<:W)" "$(>:W)" ++ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" -c -o "$(<:W)" "$(>:W)" + } + + actions compile.c bind PCH_FILE +@@ -613,7 +613,7 @@ actions compile.c bind PCH_FILE + + actions compile.c++.preprocess bind PCH_FILE + { +- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" "$(>:W)" -E >"$(<:W)" ++ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" "$(>:W)" -E >"$(<:W)" + } + + actions compile.c.preprocess bind PCH_FILE diff --git a/mingw-w64-boost/boost-1.57.0-move-is_class.patch b/mingw-w64-boost/boost-1.57.0-move-is_class.patch new file mode 100644 index 0000000000..e37af32794 --- /dev/null +++ b/mingw-w64-boost/boost-1.57.0-move-is_class.patch @@ -0,0 +1,20 @@ +diff -up a/move/core.hpp b/move/core.hpp +--- a/boost/move/core.hpp~ 2015-02-09 17:33:35.000000000 +0100 ++++ b/boost/move/core.hpp 2015-02-13 13:54:52.012130813 +0100 +@@ -43,6 +43,7 @@ + #if defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_MOVE_DOXYGEN_INVOKED) + + #include ++ #include + + //Move emulation rv breaks standard aliasing rules so add workarounds for some compilers + #if defined(__GNUC__) && (__GNUC__ >= 4) && \ +@@ -65,7 +66,7 @@ + template + class rv + : public ::boost::move_detail::if_c +- < ::boost::move_detail::is_class_or_union::value ++ < ::boost::is_class::value + , T + , ::boost::move_detail::nat + >::type diff --git a/mingw-w64-boost/boost-1.57.0-mpl-print.patch b/mingw-w64-boost/boost-1.57.0-mpl-print.patch new file mode 100644 index 0000000000..561cef19eb --- /dev/null +++ b/mingw-w64-boost/boost-1.57.0-mpl-print.patch @@ -0,0 +1,31 @@ +diff -up boost_1_57_0/boost/mpl/print.hpp\~ boost_1_57_0/boost/mpl/print.hpp +--- boost_1_57_0/boost/mpl/print.hpp~ 2014-07-09 23:12:31.000000000 +0200 ++++ boost_1_57_0/boost/mpl/print.hpp 2015-01-20 12:44:59.621400948 +0100 +@@ -52,16 +52,15 @@ struct print + enum { n = sizeof(T) + -1 }; + #elif defined(__MWERKS__) + void f(int); +-#else +- enum { +- n = +-# if defined(__EDG_VERSION__) +- aux::dependent_unsigned::value > -1 +-# else +- sizeof(T) > -1 +-# endif +- }; +-#endif ++#elif defined(__EDG_VERSION__) ++ enum { n = aux::dependent_unsigned::value > -1 }; ++#elif defined(BOOST_GCC) ++ enum { n1 }; ++ enum { n2 }; ++ enum { n = n1 != n2 }; ++#else ++ enum { n = sizeof(T) > -1 }; ++#endif + }; + + #if defined(BOOST_MSVC) + +Diff finished. Tue Jan 20 12:45:03 2015 diff --git a/mingw-w64-boost/boost-1.57.0-pool-test_linking.patch b/mingw-w64-boost/boost-1.57.0-pool-test_linking.patch new file mode 100644 index 0000000000..57e6206bba --- /dev/null +++ b/mingw-w64-boost/boost-1.57.0-pool-test_linking.patch @@ -0,0 +1,33 @@ +diff -up boost_1_57_0/libs/pool/test/Jamfile.v2\~ boost_1_57_0/libs/pool/test/Jamfile.v2 +--- boost_1_57_0/libs/pool/test/Jamfile.v2~ 2014-07-10 06:36:10.000000000 +0200 ++++ boost_1_57_0/libs/pool/test/Jamfile.v2 2015-01-20 13:59:10.818700586 +0100 +@@ -28,17 +28,17 @@ explicit valgrind_config_check ; + local use-valgrind = [ check-target-builds valgrind_config_check "valgrind" : "valgrind --error-exitcode=1" : no ] ; + + test-suite pool : +- [ run test_simple_seg_storage.cpp ] +- [ run test_pool_alloc.cpp ] +- [ run pool_msvc_compiler_bug_test.cpp ] +- [ run test_msvc_mem_leak_detect.cpp ] +- [ run test_bug_3349.cpp ] +- [ run test_bug_4960.cpp ] +- [ run test_bug_1252.cpp ] +- [ run test_bug_2696.cpp ] +- [ run test_bug_5526.cpp ] ++ [ run test_simple_seg_storage.cpp : : : /boost/system//boost_system ] ++ [ run test_pool_alloc.cpp : : : /boost/system//boost_system ] ++ [ run pool_msvc_compiler_bug_test.cpp : : : /boost/system//boost_system ] ++ [ run test_msvc_mem_leak_detect.cpp : : : /boost/system//boost_system ] ++ [ run test_bug_3349.cpp : : : /boost/system//boost_system ] ++ [ run test_bug_4960.cpp : : : /boost/system//boost_system ] ++ [ run test_bug_1252.cpp : : : /boost/system//boost_system ] ++ [ run test_bug_2696.cpp : : : /boost/system//boost_system ] ++ [ run test_bug_5526.cpp : : : /boost/system//boost_system ] + [ run test_threading.cpp : : : multi /boost/thread//boost_thread gcc:-Wno-attributes gcc:-Wno-missing-field-initializers ] +- [ run ../example/time_pool_alloc.cpp ] ++ [ run ../example/time_pool_alloc.cpp : : : /boost/system//boost_system ] + [ compile test_poisoned_macros.cpp ] + + # + +Diff finished. Tue Jan 20 13:59:16 2015 diff --git a/mingw-w64-boost/boost-1.57.0-python-abi_letters.patch b/mingw-w64-boost/boost-1.57.0-python-abi_letters.patch new file mode 100644 index 0000000000..7df3ee7047 --- /dev/null +++ b/mingw-w64-boost/boost-1.57.0-python-abi_letters.patch @@ -0,0 +1,62 @@ +--- boost_1_57_0/tools/build/src/tools/python.jam 2013-05-21 06:14:18.000000000 +0200 ++++ boost_1_55_0/tools/build/src/tools/python.jam 2014-05-29 19:09:12.115413877 +0200 +@@ -94,7 +94,7 @@ feature.feature pythonpath : : free opti + # using python : 2.3 : /usr/local/bin/python ; + # + rule init ( version ? : cmd-or-prefix ? : includes * : libraries ? +- : condition * : extension-suffix ? ) ++ : condition * : extension-suffix ? : abi-letters ? ) + { + project.push-current $(.project) ; + +@@ -107,7 +107,7 @@ rule init ( version ? : cmd-or-prefix ? + } + } + +- configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) ; ++ configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) : $(abi-letters) ; + + project.pop-current ; + } +@@ -653,7 +653,7 @@ local rule system-library-dependencies ( + + # Declare a target to represent Python's library. + # +-local rule declare-libpython-target ( version ? : requirements * ) ++local rule declare-libpython-target ( version ? : requirements * : abi-letters ? ) + { + # Compute the representation of Python version in the name of Python's + # library file. +@@ -677,13 +677,13 @@ local rule declare-libpython-target ( ve + } + + # Declare it. +- lib python.lib : : python$(lib-version) $(requirements) ; ++ lib python.lib : : python$(lib-version)$(abi-letters) $(requirements) ; + } + + + # Implementation of init. + local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? : +- condition * : extension-suffix ? ) ++ condition * : extension-suffix ? : abi-letters ? ) + { + local prefix ; + local exec-prefix ; +@@ -699,6 +699,7 @@ local rule configure ( version ? : cmd-o + extension-suffix ?= _d ; + } + extension-suffix ?= "" ; ++ abi-letters ?= "" ; + + # Normalize and dissect any version number. + local major-minor ; +@@ -922,7 +923,7 @@ local rule configure ( version ? : cmd-o + } + else + { +- declare-libpython-target $(version) : $(target-requirements) ; ++ declare-libpython-target $(version) : $(target-requirements) : $(abi-letters) ; + + # This is an evil hack. On, Windows, when Python is embedded, nothing + # seems to set up sys.path to include Python's standard library diff --git a/mingw-w64-boost/boost-1.57.0-python-libpython_dep.patch b/mingw-w64-boost/boost-1.57.0-python-libpython_dep.patch new file mode 100644 index 0000000000..57bfc26774 --- /dev/null +++ b/mingw-w64-boost/boost-1.57.0-python-libpython_dep.patch @@ -0,0 +1,13 @@ +Index: boost_1_57_0/tools/build/src/tools/python.jam +=================================================================== +--- boost_1_57_0/tools/build/src/tools/python.jam (revision 50406) ++++ boost_1_57_0/tools/build/src/tools/python.jam (working copy) +@@ -994,7 +994,7 @@ + else + { + alias python_for_extensions +- : ++ : python + : $(target-requirements) + : + : $(usage-requirements) diff --git a/mingw-w64-boost/boost-1.57.0-signals2-weak_ptr.patch b/mingw-w64-boost/boost-1.57.0-signals2-weak_ptr.patch new file mode 100644 index 0000000000..b0ce430a8f --- /dev/null +++ b/mingw-w64-boost/boost-1.57.0-signals2-weak_ptr.patch @@ -0,0 +1,24 @@ +From fd0d8042e2bb2fb5a4d88bcfc700c1cb9d7aa1bb Mon Sep 17 00:00:00 2001 +From: Frank Mori Hess +Date: Thu, 6 Nov 2014 23:32:20 -0500 +Subject: [PATCH] Fix for missing include from Evangelos Foutras. + +--- + boost/signals2/trackable.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/boost/signals2/trackable.hpp b/boost/signals2/trackable.hpp +index dba001d..64e8489 100644 +--- a/boost/signals2/trackable.hpp ++++ b/boost/signals2/trackable.hpp +@@ -18,6 +18,7 @@ + + #include + #include ++#include + + namespace boost { + namespace signals2 { +-- +2.1.0 + diff --git a/mingw-w64-boost/boost-1.57.0-spirit-unused_typedef.patch b/mingw-w64-boost/boost-1.57.0-spirit-unused_typedef.patch new file mode 100644 index 0000000000..282962987c --- /dev/null +++ b/mingw-w64-boost/boost-1.57.0-spirit-unused_typedef.patch @@ -0,0 +1,19 @@ +diff -up boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp\~ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp +--- boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp~ 2014-10-13 12:21:40.000000000 +0200 ++++ boost_1_57_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp 2015-01-20 13:25:50.069710766 +0100 +@@ -282,12 +282,12 @@ struct grammar_definition + #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE) + typedef impl::grammar_helper_base helper_base_t; + typedef grammar_helper_list helper_list_t; +- typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; + + helper_list_t& helpers = + grammartract_helper_list::do_(self); + + # if defined(BOOST_INTEL_CXX_VERSION) ++ typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; + for (iterator_t i = helpers.rbegin(); i != helpers.rend(); ++i) + (*i)->undefine(self); + # else + +Diff finished. Tue Jan 20 13:25:53 2015 diff --git a/mingw-w64-boost/boost-1.57.0-uuid-comparison.patch b/mingw-w64-boost/boost-1.57.0-uuid-comparison.patch new file mode 100644 index 0000000000..739d795b36 --- /dev/null +++ b/mingw-w64-boost/boost-1.57.0-uuid-comparison.patch @@ -0,0 +1,22 @@ +From fc32eea4ac9e514a7d210306cd9fa3a017dfe02c Mon Sep 17 00:00:00 2001 +From: VemundH +Date: Tue, 30 Sep 2014 21:53:45 +0200 +Subject: [PATCH] remove incorrect casts + +--- + boost/uuid/detail/uuid_x86.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/boost/uuid/detail/uuid_x86.hpp b/boost/uuid/detail/uuid_x86.hpp +index 1a329b0..5a2cdec 100644 +--- a/boost/uuid/detail/uuid_x86.hpp ++++ b/boost/uuid/detail/uuid_x86.hpp +@@ -100,7 +100,7 @@ inline bool operator< (uuid const& lhs, uuid const& rhs) BOOST_NOEXCEPT + cmp = (cmp - 1u) ^ cmp; + rcmp = (rcmp - 1u) ^ rcmp; + +- return static_cast< uint16_t >(cmp) < static_cast< uint16_t >(rcmp); ++ return cmp < rcmp; + } + + } // namespace uuids diff --git a/mingw-w64-boost/boost-include-intrin-h-on-mingw-w64.patch b/mingw-w64-boost/boost-include-intrin-h-on-mingw-w64.patch new file mode 100644 index 0000000000..acc3bd49d1 --- /dev/null +++ b/mingw-w64-boost/boost-include-intrin-h-on-mingw-w64.patch @@ -0,0 +1,14 @@ +--- a/boost/detail/interlocked.hpp.interlocked 2012-12-11 15:42:26.000000000 +0100 ++++ b/boost/detail/interlocked.hpp 2013-07-21 15:22:56.082346444 +0200 +@@ -92,9 +92,9 @@ + # define BOOST_INTERLOCKED_EXCHANGE_POINTER(dest,exchange) \ + ((void*)BOOST_INTERLOCKED_EXCHANGE((long*)(dest),(long)(exchange))) + +-#elif defined( BOOST_MSVC ) || defined( BOOST_INTEL_WIN ) ++#elif defined( BOOST_MSVC ) || defined( BOOST_INTEL_WIN ) || defined( __MINGW64_VERSION_MAJOR ) + +-#if defined( BOOST_MSVC ) && BOOST_MSVC >= 1400 ++#if ( defined( BOOST_MSVC ) && BOOST_MSVC >= 1400 ) || defined( __MINGW64_VERSION_MAJOR ) + + #include + diff --git a/mingw-w64-boost/msys2-mingw-folders-bootstrap.patch b/mingw-w64-boost/msys2-mingw-folders-bootstrap.patch new file mode 100644 index 0000000000..e94744573b --- /dev/null +++ b/mingw-w64-boost/msys2-mingw-folders-bootstrap.patch @@ -0,0 +1,29 @@ +--- a/tools/build/src/engine/build.sh 2015-07-07 09:46:25.813659600 +0300 ++++ b/tools/build/src/engine/build.sh 2015-07-07 09:47:50.111229000 +0300 +@@ -58,13 +58,26 @@ + test `uname` = $* + fi + } ++ ++test_msystem () ++{ ++ if [ -n $MSYSTEM ]; then ++ test "$MSYSTEM" = "$*" ++ fi ++} + + # Try and guess the toolset to bootstrap the build with... + Guess_Toolset () + { + if test -r /mingw/bin/gcc ; then + BOOST_JAM_TOOLSET=mingw + BOOST_JAM_TOOLSET_ROOT=/mingw/ ++ elif test_msystem MINGW32 ; then ++ BOOST_JAM_TOOLSET=mingw ++ BOOST_JAM_TOOLSET_ROOT=/mingw32/ ++ elif test_msystem MINGW64 ; then ++ BOOST_JAM_TOOLSET=mingw ++ BOOST_JAM_TOOLSET_ROOT=/mingw64/ + elif test_uname Darwin ; then BOOST_JAM_TOOLSET=darwin + elif test_uname IRIX ; then BOOST_JAM_TOOLSET=mipspro + elif test_uname IRIX64 ; then BOOST_JAM_TOOLSET=mipspro diff --git a/mingw-w64-celt/PKGBUILD b/mingw-w64-celt/PKGBUILD index 49a69bf1d1..d8f7af6891 100644 --- a/mingw-w64-celt/PKGBUILD +++ b/mingw-w64-celt/PKGBUILD @@ -3,7 +3,7 @@ _realname=celt pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=0.11.3 -pkgrel=2 +pkgrel=3 pkgdesc="Low-latency audio communication codec (mingw-w64)" arch=('any') url="http://www.celt-codec.org/" @@ -11,21 +11,23 @@ license=("BSD") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") depends=("${MINGW_PACKAGE_PREFIX}-libogg") options=('strip' 'staticlibs') -source=(http://downloads.us.xiph.org/releases/${_realname}/${_realname}-$pkgver.tar.gz) +source=(http://downloads.us.xiph.org/releases/${_realname}/${_realname}-${pkgver}.tar.gz) md5sums=('5511732a426cc42bf986ca79b5cdd02f') build() { export lt_cv_deplibs_check_method='pass_all' + [[ -d"${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" mkdir -p "${srcdir}/build-${MINGW_CHOST}" cd "${srcdir}/build-${MINGW_CHOST}" - ../${_realname}-${pkgver}/configure \ + ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ --enable-custom-modes \ - --disable-static + --enable-shared \ + --enable-static make } diff --git a/mingw-w64-enca/PKGBUILD b/mingw-w64-enca/PKGBUILD index d52ccfc301..26335195a3 100644 --- a/mingw-w64-enca/PKGBUILD +++ b/mingw-w64-enca/PKGBUILD @@ -3,7 +3,7 @@ _realname=enca pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=1.16 -pkgrel=1 +pkgrel=2 pkgdesc="Charset analyser and converter (mingw-w64)" arch=('any') url="http://cihar.com/software/enca/" @@ -27,9 +27,10 @@ prepare() { } build() { + [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST} - ${srcdir}/enca-${pkgver}/configure \ + ../enca-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ @@ -37,6 +38,7 @@ build() { --mandir=${MINGW_PREFIX}/share/man \ --with-librecode=${MINGW_PREFIX} \ --enable-external + make } diff --git a/mingw-w64-flac/PKGBUILD b/mingw-w64-flac/PKGBUILD index 84744ac32b..55786b23b2 100644 --- a/mingw-w64-flac/PKGBUILD +++ b/mingw-w64-flac/PKGBUILD @@ -1,10 +1,9 @@ # Maintainer: Alexey Pavlov _realname=flac - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="Free Lossless Audio Codec (mingw-w64)" arch=('any') url="http://flac.sourceforge.net/" @@ -16,14 +15,20 @@ options=('strip' 'staticlibs') source=("http://downloads.xiph.org/releases/flac/flac-${pkgver}.tar.xz") md5sums=('b9922c9a0378c88d3e901b234f852698') -build() { - cd "$srcdir/${_realname}-${pkgver}" +prepare() { + cd "${srcdir}/${_realname}-${pkgver}" #Required as AM_CONFIG_HEADER is deprecated and causes autotools to error out. #sed -i "s/\/AC_CONFIG_HEADERS/g" configure.in touch config.rpath #./autogen.sh - ./configure \ +} + +build() { + [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}" + mkdir -p "${srcdir}/build-${MINGW_CHOST}" + cd "${srcdir}/build-${MINGW_CHOST}" + ../${_realname}-${pkgver}/configure \ --enable-shared \ --enable-static\ --disable-xmms-plugin \ @@ -37,6 +42,6 @@ build() { } package() { - cd "$srcdir/${_realname}-${pkgver}" - make DESTDIR="$pkgdir" install + cd "${srcdir}/build-${MINGW_CHOST}" + make DESTDIR="${pkgdir}" install } diff --git a/mingw-w64-fluidsynth/PKGBUILD b/mingw-w64-fluidsynth/PKGBUILD index 1f37a1201c..955f913bcd 100644 --- a/mingw-w64-fluidsynth/PKGBUILD +++ b/mingw-w64-fluidsynth/PKGBUILD @@ -1,25 +1,22 @@ # Maintainer: Alexey Pavlov _realname=fluidsynth - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.1.6 -pkgrel=2 +pkgrel=3 pkgdesc="A real-time software synthesizer based on the SoundFont 2 specifications (mingw-w64)" arch=('any') url="http://www.fluidsynth.org/" license=('LGPL') depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" - "${MINGW_PACKAGE_PREFIX}-glib2" - "${MINGW_PACKAGE_PREFIX}-libsndfile" - "${MINGW_PACKAGE_PREFIX}-portaudio" - ) + "${MINGW_PACKAGE_PREFIX}-glib2" + "${MINGW_PACKAGE_PREFIX}-libsndfile" + "${MINGW_PACKAGE_PREFIX}-portaudio") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" - "${MINGW_PACKAGE_PREFIX}-nasm" - "${MINGW_PACKAGE_PREFIX}-libtool" - patch automake-wrapper autoconf) + "${MINGW_PACKAGE_PREFIX}-nasm" + "${MINGW_PACKAGE_PREFIX}-libtool") options=('strip' 'staticlibs') -source=("http://downloads.sourceforge.net/${_realname}/${_realname}-$pkgver.tar.gz" +source=("http://downloads.sourceforge.net/${_realname}/${_realname}-${pkgver}.tar.gz" 0001-10-ftbfs-bug-690006.all.patch 0002-1001-revert_abi_break_114.all.patch 0003-include-blddir.all.patch @@ -31,7 +28,7 @@ md5sums=('ae5aca6de824b4173667cbd3a310b263' '18f50014be62facdd4b10f305b886e88') prepare() { - cd "$srcdir/${_realname}-${pkgver}" + cd "${srcdir}/${_realname}-${pkgver}" patch -p1 -i ${srcdir}/0001-10-ftbfs-bug-690006.all.patch patch -p1 -i ${srcdir}/0002-1001-revert_abi_break_114.all.patch patch -p1 -i ${srcdir}/0003-include-blddir.all.patch @@ -41,10 +38,11 @@ prepare() { } build() { - cd "$srcdir/${_realname}-${pkgver}" - export lt_cv_deplibs_check_method='pass_all' - ./configure \ + [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}" + mkdir -p "${srcdir}/build-${MINGW_CHOST}" + cd "${srcdir}/build-${MINGW_CHOST}" + ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ @@ -53,10 +51,11 @@ build() { --enable-shared \ --enable-static \ STRIP=true CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LDFLAGS="$LDFLAGS" PTHREAD_LIBS=-lpthread + make } package() { - cd "$srcdir/${_realname}-${pkgver}" - make DESTDIR="$pkgdir" install + cd "${srcdir}/build-${MINGW_CHOST}" + make DESTDIR="${pkgdir}" install } diff --git a/mingw-w64-fribidi/PKGBUILD b/mingw-w64-fribidi/PKGBUILD index 078555487d..d6b8dfbbde 100644 --- a/mingw-w64-fribidi/PKGBUILD +++ b/mingw-w64-fribidi/PKGBUILD @@ -1,10 +1,9 @@ # Maintainer: Alexey Pavlov _realname=fribidi - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=0.19.6 -pkgrel=3 +pkgrel=4 pkgdesc="A Free Implementation of the Unicode Bidirectional Algorithm (mingw-w64)" arch=('any') license=('LGPL') @@ -26,16 +25,15 @@ prepare() { } build() { + [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST} - ${srcdir}/${_realname}-${pkgver}/configure \ + ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --enable-static \ --with-glib - #touch ${srcdir}/${_realname}-${pkgver}/doc/c2man.stamp - #touch ${srcdir}/${_realname}-${pkgver}/doc/*.3 make } diff --git a/mingw-w64-glew/PKGBUILD b/mingw-w64-glew/PKGBUILD index f4bd214f75..cb59a8e628 100644 --- a/mingw-w64-glew/PKGBUILD +++ b/mingw-w64-glew/PKGBUILD @@ -3,10 +3,10 @@ _realname=glew pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.12.0 -pkgrel=2 +pkgrel=3 arch=('any') pkgdesc="GLEW, The OpenGL Extension Wrangler Library (mingw-w64)" -depends=('') +depends=() makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "xz") license=('Modified BSD/MIT/GPL') url="http://glew.sourceforge.net/" diff --git a/mingw-w64-gsm/PKGBUILD b/mingw-w64-gsm/PKGBUILD index c0bb2c4161..2c4a3ddcb2 100644 --- a/mingw-w64-gsm/PKGBUILD +++ b/mingw-w64-gsm/PKGBUILD @@ -1,20 +1,19 @@ # Maintainer: Alexey Pavlov _realname=gsm - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.0.13 -pkgrel=2 +pkgrel=3 pkgdesc="Shared libraries for GSM 06.10 lossy speech compression (mingw-w64)" arch=('any') url="http://www.quut.com/gsm/" license=("custom") -makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config" "yasm") +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config" "${MINGW_PACKAGE_PREFIX}-yasm") options=('strip' 'staticlibs') source=("http://www.quut.com/${_realname}/${_realname}-${pkgver}.tar.gz" - 0001-adapt-makefile-to.mingw.patch - 0002-adapt-config-h-to.mingw.patch - 0003-fix-ln.mingw.patch) + 0001-adapt-makefile-to.mingw.patch + 0002-adapt-config-h-to.mingw.patch + 0003-fix-ln.mingw.patch) md5sums=('c1ba392ce61dc4aff1c29ea4e92f6df4' '7956623dd6ecf75fedbc37acb65ce451' '50841d8e3e1d3c345c719748dc8d8786' @@ -39,8 +38,7 @@ package() { # Prepare directories install -m755 -d "${pkgdir}${MINGW_PREFIX}"/{bin,lib,include,share/{licenses/${_realname},man/man{1,3}}} - make -j1 INSTALL_ROOT="${pkgdir}${MINGW_PREFIX}" \ - install + make -j1 INSTALL_ROOT="${pkgdir}${MINGW_PREFIX}" install # Install license install -m644 COPYRIGHT ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/license.txt diff --git a/mingw-w64-l-smash/PKGBUILD b/mingw-w64-l-smash/PKGBUILD index d633476318..42e1c9ba2c 100644 --- a/mingw-w64-l-smash/PKGBUILD +++ b/mingw-w64-l-smash/PKGBUILD @@ -4,7 +4,7 @@ _realname=l-smash pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgdesc="Loyal to Spec of Mpeg4 and Ad-hoc Simple Hackwork. Yet another opensource mp4 handler (mingw-w64)" pkgver=2.3.0 -pkgrel=1 +pkgrel=2 arch=('any') url="http://l-smash.github.io/l-smash/" license=('ISC') @@ -24,6 +24,7 @@ prepare() { } build() { + [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}" mkdir -p ${srcdir}/build-${MINGW_CHOST} cd ${srcdir}/build-${MINGW_CHOST} diff --git a/mingw-w64-lame/PKGBUILD b/mingw-w64-lame/PKGBUILD index 90ed85bb95..1fc8f1c063 100644 --- a/mingw-w64-lame/PKGBUILD +++ b/mingw-w64-lame/PKGBUILD @@ -3,16 +3,16 @@ _realname=lame pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=3.99.5 -pkgrel=3 +pkgrel=4 pkgdesc="A high quality MPEG Audio Layer III (MP3) encoder (mingw-w64)" arch=('any') url="http://lame.sourceforge.net/" license=("LGPL") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" - "${MINGW_PACKAGE_PREFIX}-pkg-config" - "${MINGW_PACKAGE_PREFIX}-ncurses" "${MINGW_PACKAGE_PREFIX}-mpg123" - "${MINGW_PACKAGE_PREFIX}-nasm") + "${MINGW_PACKAGE_PREFIX}-nasm" + "${MINGW_PACKAGE_PREFIX}-ncurses" + "${MINGW_PACKAGE_PREFIX}-pkg-config") depends=("${MINGW_PACKAGE_PREFIX}-libiconv") options=('strip' 'staticlibs') source=("http://downloads.sourceforge.net/${_realname}/${_realname}-${pkgver}.tar.gz" @@ -40,6 +40,7 @@ prepare() { } build() { + [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}" mkdir -p "${srcdir}/build-${MINGW_CHOST}" cd "${srcdir}/build-${MINGW_CHOST}" ../${_realname}-${pkgver}/configure \ diff --git a/mingw-w64-libass/PKGBUILD b/mingw-w64-libass/PKGBUILD index 39ee32f510..7f52183639 100644 --- a/mingw-w64-libass/PKGBUILD +++ b/mingw-w64-libass/PKGBUILD @@ -2,7 +2,7 @@ _realname=libass pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=0.12.2 +pkgver=0.12.3 pkgrel=1 pkgdesc="A portable library for SSA/ASS subtitles rendering (mingw-w64)" arch=('any') @@ -11,14 +11,14 @@ license=('ISC') makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-yasm" "${MINGW_PACKAGE_PREFIX}-pkg-config") -depends=("${MINGW_PACKAGE_PREFIX}-fribidi" - "${MINGW_PACKAGE_PREFIX}-fontconfig" - "${MINGW_PACKAGE_PREFIX}-freetype" - "${MINGW_PACKAGE_PREFIX}-harfbuzz" - "${MINGW_PACKAGE_PREFIX}-enca") +depends=("${MINGW_PACKAGE_PREFIX}-enca" + "${MINGW_PACKAGE_PREFIX}-fribidi" + "${MINGW_PACKAGE_PREFIX}-fontconfig" + "${MINGW_PACKAGE_PREFIX}-freetype" + "${MINGW_PACKAGE_PREFIX}-harfbuzz") options=('strip' 'staticlibs') source=("${_realname}-${pkgver}.tar.gz"::https://github.com/libass/${_realname}/archive/${pkgver}.tar.gz) -md5sums=('62d0868532eab9fcb5933ff4cc161b12') +md5sums=('1b53e739ab389335ce46fd626777ec61') prepare() { cd "${srcdir}/${_realname}-${pkgver}" @@ -26,6 +26,7 @@ prepare() { } build() { + [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" mkdir -p "${srcdir}/build-${MINGW_CHOST}" cd "${srcdir}/build-${MINGW_CHOST}" ../${_realname}-${pkgver}/configure \ diff --git a/mingw-w64-libogg/PKGBUILD b/mingw-w64-libogg/PKGBUILD index 25647307c1..8e8964566b 100644 --- a/mingw-w64-libogg/PKGBUILD +++ b/mingw-w64-libogg/PKGBUILD @@ -3,7 +3,7 @@ _realname=libogg pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.3.2 -pkgrel=1 +pkgrel=2 pkgdesc="Ogg bitstream and framing library (mingw-w64)" arch=('any') url="http://xiph.org" @@ -18,9 +18,10 @@ prepare() { } build() { + [[ -d"${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" mkdir -p ${srcdir}/build-${MINGW_CHOST} cd ${srcdir}/build-${MINGW_CHOST} - ${srcdir}/libogg-${pkgver}/configure \ + ../libogg-${pkgver}/configure \ --enable-shared \ --enable-static \ --prefix=${MINGW_PREFIX} \ @@ -32,5 +33,5 @@ build() { package() { cd ${srcdir}/build-${MINGW_CHOST} - make DESTDIR="$pkgdir" install + make DESTDIR="${pkgdir}" install } diff --git a/mingw-w64-libsndfile/PKGBUILD b/mingw-w64-libsndfile/PKGBUILD index d266a3016c..5240b3d434 100644 --- a/mingw-w64-libsndfile/PKGBUILD +++ b/mingw-w64-libsndfile/PKGBUILD @@ -1,22 +1,21 @@ # Maintainer: Alexey Pavlov _realname=libsndfile - pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=1.0.25 -pkgrel=2 +pkgrel=3 pkgdesc="A C library for reading and writing files containing sampled sound (mingw-w64)" arch=('any') url="http://www.mega-nerd.com/libsndfile" license=('LGPL') makedepends=("${MINGW_PACKAGE_PREFIX}-gcc") -depends=("${MINGW_PACKAGE_PREFIX}-flac" "${MINGW_PACKAGE_PREFIX}-libvorbis") +depends=("${MINGW_PACKAGE_PREFIX}-flac" "${MINGW_PACKAGE_PREFIX}-libvorbis" "${MINGW_PACKAGE_PREFIX}-speex") options=('staticlibs' 'strip') source=(http://www.mega-nerd.com/libsndfile/files/${_realname}-${pkgver}.tar.gz - 0001-more-elegant-and-foolproof-autogen-fallback.all.patch - 0002-conditional-truncate.mingw.patch - 0003-fix-source-searches.mingw.patch - 0004-fix-linking-external-libs.patch) + 0001-more-elegant-and-foolproof-autogen-fallback.all.patch + 0002-conditional-truncate.mingw.patch + 0003-fix-source-searches.mingw.patch + 0004-fix-linking-external-libs.patch) md5sums=('e2b7bb637e01022c7d20f95f9c3990a2' '9b4254acf1cfc17a1e94af29f7260d30' 'c9ac8330da543496b0b5cb6ae081a7b6' @@ -36,18 +35,20 @@ prepare() { } build() { + [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}" mkdir -p ${srcdir}/build-${MINGW_CHOST} cd ${srcdir}/build-${MINGW_CHOST} ../${_realname}-${pkgver}/configure \ - --enable-shared \ - --enable-static \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --disable-sqlite \ --disable-test-coverage \ - --enable-external-libs - #--enable-experimental # speex support + --enable-external-libs \ + --enable-experimental \ + --enable-shared \ + --enable-static + make } diff --git a/mingw-w64-libvorbis/PKGBUILD b/mingw-w64-libvorbis/PKGBUILD index 1f8a97fb61..2cfe66172e 100644 --- a/mingw-w64-libvorbis/PKGBUILD +++ b/mingw-w64-libvorbis/PKGBUILD @@ -1,10 +1,9 @@ # Maintainer: Alexey Pavlov _realname=libvorbis - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.3.4 -pkgrel=1 +pkgrel=2 pkgdesc="Vorbis codec library (mingw-w64)" arch=('any') url="http://xiph.org" @@ -16,20 +15,21 @@ source=(http://downloads.xiph.org/releases/vorbis/${_realname}-${pkgver}.tar.gz) md5sums=('8851c593a52d1ef9c526d95174873852') build() { + [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}" mkdir -p "${srcdir}/build-${MINGW_CHOST}" cd "${srcdir}/build-${MINGW_CHOST}" - "${srcdir}"/${_realname}-${pkgver}/configure \ - --enable-shared \ - --enable-static \ + ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ - --target=${MINGW_CHOST} + --target=${MINGW_CHOST} \ + --enable-shared \ + --enable-static + make } package() { cd ${srcdir}/build-${MINGW_CHOST} - make DESTDIR="$pkgdir" install - rm -r ${pkgdir}${MINGW_PREFIX}/share/doc + make DESTDIR="${pkgdir}" install } diff --git a/mingw-w64-mpg123/PKGBUILD b/mingw-w64-mpg123/PKGBUILD index 8b4e85f89f..81537e9515 100644 --- a/mingw-w64-mpg123/PKGBUILD +++ b/mingw-w64-mpg123/PKGBUILD @@ -3,19 +3,19 @@ _realname=mpg123 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.22.2 -pkgrel=1 +pkgrel=2 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3 (mingw-w64)" arch=('any') url="http://sourceforge.net/projects/mpg123" license=("LGPL2.1") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" - "${MINGW_PACKAGE_PREFIX}-portaudio" - "${MINGW_PACKAGE_PREFIX}-openal" - "${MINGW_PACKAGE_PREFIX}-SDL") + "${MINGW_PACKAGE_PREFIX}-openal" + "${MINGW_PACKAGE_PREFIX}-portaudio" + "${MINGW_PACKAGE_PREFIX}-SDL") depends=("${MINGW_PACKAGE_PREFIX}-libtool" "${MINGW_PACKAGE_PREFIX}-gcc-libs") -optdepends=("${MINGW_PACKAGE_PREFIX}-portaudio" - "${MINGW_PACKAGE_PREFIX}-openal" +optdepends=("${MINGW_PACKAGE_PREFIX}-openal" + "${MINGW_PACKAGE_PREFIX}-portaudio" "${MINGW_PACKAGE_PREFIX}-SDL") options=('strip' 'staticlibs' 'libtool') source=("http://downloads.sourceforge.net/${_realname}/${_realname}-${pkgver}.tar.bz2"{,.sig} @@ -27,7 +27,7 @@ md5sums=('6f6d2178c354f39207bf97e062936110' '9ac9a255f3ab3043915ceec455ccdbec') prepare() { - cd "$srcdir/${_realname}-${pkgver}" + cd "${srcdir}/${_realname}-${pkgver}" patch -p1 -i "$srcdir"/0001-update-ac-and-silent-rules.mingw.patch patch -p1 -i "$srcdir"/0002-openal-library.patch @@ -35,11 +35,11 @@ prepare() { } build() { + export lt_cv_deplibs_check_method='pass_all' [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}" mkdir -p "${srcdir}/build-${MINGW_CHOST}" cd "${srcdir}/build-${MINGW_CHOST}" - export lt_cv_deplibs_check_method='pass_all' - "${srcdir}"/${_realname}-${pkgver}/configure \ + ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ @@ -52,7 +52,7 @@ build() { package() { cd "${srcdir}/build-${MINGW_CHOST}" - make DESTDIR="$pkgdir" install + make DESTDIR="${pkgdir}" install install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING" } diff --git a/mingw-w64-openal/PKGBUILD b/mingw-w64-openal/PKGBUILD index 2e7f0ff8ca..0f1a70d15e 100644 --- a/mingw-w64-openal/PKGBUILD +++ b/mingw-w64-openal/PKGBUILD @@ -3,28 +3,27 @@ _realname=openal pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.16.0 -pkgrel=2 +pkgrel=3 pkgdesc="OpenAL audio library for use with opengl (mingw-w64)" arch=('any') url="http://kcat.strangesoft.net/openal.html" license=('GPL2') makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" - "${MINGW_PACKAGE_PREFIX}-cmake" - "${MINGW_PACKAGE_PREFIX}-ffmpeg" - #"${MINGW_PACKAGE_PREFIX}-fluidsynth" - "${MINGW_PACKAGE_PREFIX}-portaudio") + "${MINGW_PACKAGE_PREFIX}-cmake" + "${MINGW_PACKAGE_PREFIX}-fluidsynth" + "${MINGW_PACKAGE_PREFIX}-portaudio") options=('strip' 'staticlibs') -source=(http://kcat.strangesoft.net/openal-releases/openal-soft-$pkgver.tar.bz2) +source=(http://kcat.strangesoft.net/openal-releases/openal-soft-${pkgver}.tar.bz2) md5sums=('14db4b0d12f07252070b4fe5eb5911f6') build() { export DXSDK_DIR=${MINGW_PREFIX}/${MINGW_CHOST} - mkdir -p "${srcdir}/build-shared-${MINGW_CHOST}" && cd "${srcdir}/build-shared-${MINGW_CHOST}" + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ -G"MSYS Makefiles" \ - -DCMAKE_INSTALL_PREFIX=${pkgdir}${MINGW_PREFIX} \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DALSOFT_EXAMPLES=OFF \ -DLIBTYPE=SHARED \ -DDSOUND_INCLUDE_DIR=${MINGW_PREFIX}/${MINGW_CHOST}/include \ @@ -33,9 +32,10 @@ build() { make mkdir -p "${srcdir}/build-static-${MINGW_CHOST}" && cd "${srcdir}/build-static-${MINGW_CHOST}" + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ -G"MSYS Makefiles" \ - -DCMAKE_INSTALL_PREFIX=${pkgdir}${MINGW_PREFIX} \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DALSOFT_EXAMPLES=OFF \ -DLIBTYPE=STATIC \ -DDSOUND_INCLUDE_DIR=${MINGW_PREFIX}/${MINGW_CHOST}/include \ @@ -46,14 +46,8 @@ build() { package() { cd "${srcdir}/build-static-${MINGW_CHOST}" - make install + make DESTDIR=${pkgdir} install cd "${srcdir}/build-shared-${MINGW_CHOST}" - make install - - pushd ${pkgdir}${MINGW_PREFIX} > /dev/null - export PREFIX_WIN=`pwd -W` - popd > /dev/null - sed -s "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" \ - -i ${pkgdir}${MINGW_PREFIX}/lib/pkgconfig/openal.pc + make DESTDIR=${pkgdir} install } diff --git a/mingw-w64-openblas/PKGBUILD b/mingw-w64-openblas/PKGBUILD index 2dcfb4797d..ae6665f61a 100644 --- a/mingw-w64-openblas/PKGBUILD +++ b/mingw-w64-openblas/PKGBUILD @@ -4,7 +4,7 @@ _realname=OpenBLAS pkgname="${MINGW_PACKAGE_PREFIX}-openblas" pkgver=0.2.14 -pkgrel=1 +pkgrel=2 pkgdesc="An optimized BLAS library based on GotoBLAS2 1.13 BSD, providing optimized blas, lapack, and cblas (mingw-w64)" arch=('any') url="http://xianyi.github.com/OpenBLAS/" @@ -58,14 +58,14 @@ package() { install if [ -f libopenblas.dll ]; then - cp -f libopenblas.dll "${pkgdir}$MINGW_PREFIX/bin/" + cp -f libopenblas.dll "${pkgdir}${MINGW_PREFIX}/bin/" else echo "DLL not found" >&2 exit 1 fi if [ -f libopenblas.dll.a ]; then - cp -f libopenblas.dll.a "${pkgdir}$MINGW_PREFIX/lib/" + cp -f libopenblas.dll.a "${pkgdir}${MINGW_PREFIX}/lib/" else echo "Export library not found" >&2 exit 1 @@ -74,16 +74,16 @@ package() { if [ -f libopenblasp.a ]; then rm -f "${pkgdir}$MINGW_PREFIX/lib/libopenblasp.a" rm -f "${pkgdir}$MINGW_PREFIX/lib/libopenblas.a" - cp -f libopenblasp.a "${pkgdir}$MINGW_PREFIX/lib/libopenblas.a" + cp -f libopenblasp.a "${pkgdir}${MINGW_PREFIX}/lib/libopenblas.a" else echo "Static library not found" >&2 exit 1 fi # Copy Licencse - mkdir -p ${pkgdir}${MINGW_PREFIX}/share/licenses/$_realname + mkdir -p ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname} cp -f ${srcdir}/${_realname}-${pkgver}/LICENSE \ - ${pkgdir}${MINGW_PREFIX}/share/licenses/$_realname + ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname} cp -f ${srcdir}/${_realname}-${pkgver}/lapack-netlib/LICENSE \ - ${pkgdir}${MINGW_PREFIX}/share/licenses/$_realname/LICENSE-lapack + ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE-lapack } diff --git a/mingw-w64-portaudio/PKGBUILD b/mingw-w64-portaudio/PKGBUILD index 7775d11ff5..7e2b9cc5ee 100644 --- a/mingw-w64-portaudio/PKGBUILD +++ b/mingw-w64-portaudio/PKGBUILD @@ -1,20 +1,19 @@ # Maintainer: Alexey Pavlov _realname=portaudio - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=19_20140130 -pkgrel=1 -pkgdesc="A free, cross-platform, open source, audio I/O library. (mingw-w64)" +pkgrel=2 +pkgdesc="A free, cross-platform, open source, audio I/O library (mingw-w64)" arch=('any') url="http://www.portaudio.com" license=("custom") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") options=(!libtool strip !makeflags staticlibs) -source=("http://www.portaudio.com/archives/pa_stable_v$pkgver.tgz" - mingw-w64-fix.patch - mingw-w64-cmake-allow-cxx.patch) +source=("http://www.portaudio.com/archives/pa_stable_v${pkgver}.tgz" + mingw-w64-fix.patch + mingw-w64-cmake-allow-cxx.patch) md5sums=('7f220406902af9dca009668e198cbd23' '99da198098bd39e24333d6e4ab1bef4a' '9ae34b0d0dee106c6a90dfc744bf096c') @@ -29,9 +28,10 @@ prepare() { build() { export lt_cv_deplibs_check_method='pass_all' + [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}" mkdir -p "${srcdir}/build-${MINGW_CHOST}" cd "${srcdir}/build-${MINGW_CHOST}" - ${srcdir}/${_realname}/configure \ + ../${_realname}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ @@ -41,10 +41,11 @@ build() { --with-dxdir=${MINGW_PREFIX}/${MINGW_CHOST} \ --with-winapi=wmme,directx,wdmks #wasapi, + make } package() { cd "${srcdir}/build-${MINGW_CHOST}" - make DESTDIR="$pkgdir" install + make DESTDIR="${pkgdir}" install } diff --git a/mingw-w64-python-numpy/1.0.4-fenv.patch b/mingw-w64-python-numpy/1.0.4-fenv.patch new file mode 100644 index 0000000000..d72bce7b5e --- /dev/null +++ b/mingw-w64-python-numpy/1.0.4-fenv.patch @@ -0,0 +1,18 @@ +--- numpy-1.0.4/numpy/core/include/numpy/fenv/fenv.c.orig 2007-11-07 16:05:15.000000000 -0600 ++++ numpy-1.0.4/numpy/core/include/numpy/fenv/fenv.c 2007-11-29 22:29:31.513750000 -0600 +@@ -26,6 +26,9 @@ + * $FreeBSD$ + */ + ++#ifndef NUMPY_FENV_C ++#define NUMPY_FENV_C ++ + #include + #include "fenv.h" + +@@ -36,3 +39,5 @@ + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff } + }; ++ ++#endif /* NUMPY_FENV_C */ diff --git a/mingw-w64-python-numpy/PKGBUILD b/mingw-w64-python-numpy/PKGBUILD index 3023bc693f..95dba46042 100644 --- a/mingw-w64-python-numpy/PKGBUILD +++ b/mingw-w64-python-numpy/PKGBUILD @@ -4,7 +4,7 @@ _realname=numpy pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=1.9.2 -pkgrel=1 +pkgrel=3 pkgdesc="Scientific tools for Python (mingw-w64)" arch=('any') license=('BSD') @@ -19,27 +19,30 @@ options=('staticlibs' 'strip' '!debug') source=(http://downloads.sourceforge.net/numpy/${_realname}-${pkgver}.tar.gz fix-finding-python2.patch gfortran-better-version-check.patch - fix-testsuite.patch) + fix-testsuite.patch + 1.0.4-fenv.patch) md5sums=('a1ed53432dbcd256398898d35bc8e645' '6f03968645956c24216763b6ccce609d' '58aff1fb52401458bfd6a03c9b3b5e32' - '84e65671dc50c0a0e5fa40a1dd25359d') + '59c4e9b71cc7b297099b4430bcb7ea28' + 'c0a280441fff1a8c15a11d7e567f2544') prepare() { - cd ${_realname}-$pkgver + cd ${_realname}-${pkgver} patch -Np1 -i ${srcdir}/fix-finding-python2.patch patch -Np1 -i ${srcdir}/gfortran-better-version-check.patch patch -Np1 -i ${srcdir}/fix-testsuite.patch + patch -Np1 -i ${srcdir}/1.0.4-fenv.patch cd .. - cp -a numpy-$pkgver numpy-py2-$pkgver-${CARCH} - cp -a numpy-$pkgver numpy-py3-$pkgver-${CARCH} + cp -a numpy-${pkgver} numpy-py2-${pkgver}-${CARCH} + cp -a numpy-${pkgver} numpy-py3-${pkgver}-${CARCH} - cd numpy-py2-$pkgver-${CARCH} + cd numpy-py2-${pkgver}-${CARCH} sed -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \ - -i $(find . -name '*.py') + -i $(find . -name '*.py') } build() { @@ -47,12 +50,12 @@ build() { export LDFLAGS="$LDFLAGS -shared" echo "Building Python2" - cd numpy-py2-$pkgver-${CARCH} + cd numpy-py2-${pkgver}-${CARCH} MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ ${MINGW_PREFIX}/bin/python2 setup.py config_fc --fcompiler=gnu95 build echo "Building Python3" - cd ../numpy-py3-$pkgver-${CARCH} + cd ../numpy-py3-${pkgver}-${CARCH} MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ ${MINGW_PREFIX}/bin/python3 setup.py config_fc --fcompiler=gnu95 build } @@ -66,7 +69,7 @@ package_python2-numpy() { export ATLAS=None export LDFLAGS="$LDFLAGS -shared" - cd numpy-py2-$pkgver-${CARCH} + cd numpy-py2-${pkgver}-${CARCH} MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ ${MINGW_PREFIX}/bin/python2 setup.py config_fc --fcompiler=gnu95 install --prefix=${MINGW_PREFIX} --root="${pkgdir}" --optimize=1 @@ -77,9 +80,7 @@ package_python2-numpy() { cp -rf ${pkgdir}${MINGW_PREFIX}/lib/python${_pyver}/site-packages/numpy/core/include/numpy "${pkgdir}${MINGW_PREFIX}/include/python${_pyver}/" # fix python command in files - pushd ${MINGW_PREFIX} > /dev/null - local _mingw_prefix=`pwd -W` - popd > /dev/null + local _mingw_prefix=$(cygpath -am ${MINGW_PREFIX}) for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do sed -e "s|${_mingw_prefix}/bin/|/usr/bin/env |g" -i ${_f} done @@ -95,20 +96,18 @@ package_python3-numpy() { export ATLAS=None export LDFLAGS="$LDFLAGS -shared" - cd numpy-py3-$pkgver-${CARCH} + cd numpy-py3-${pkgver}-${CARCH} MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ ${MINGW_PREFIX}/bin/python3 setup.py config_fc --fcompiler=gnu95 install --prefix=${MINGW_PREFIX} --root="${pkgdir}" --optimize=1 - install -m755 -d "${pkgdir}${MINGW_PREFIX}/share/licenses/python-numpy" - install -m644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-numpy/" + install -m755 -d "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-numpy" + install -m644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-numpy/" install -m755 -d "${pkgdir}${MINGW_PREFIX}/include/python${_pyinc}" cp -rf ${pkgdir}${MINGW_PREFIX}/lib/python${_pyver}/site-packages/numpy/core/include/numpy "${pkgdir}${MINGW_PREFIX}/include/python${_pyinc}/" # fix python command in files - pushd ${MINGW_PREFIX} > /dev/null - local _mingw_prefix=`pwd -W` - popd > /dev/null + local _mingw_prefix=$(cygpath -am ${MINGW_PREFIX}) for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*.py; do sed -e "s|${_mingw_prefix}/bin/|/usr/bin/env |g" -i ${_f} done diff --git a/mingw-w64-python-numpy/fix-testsuite.patch b/mingw-w64-python-numpy/fix-testsuite.patch index ff799c1d34..2b19f8703b 100644 --- a/mingw-w64-python-numpy/fix-testsuite.patch +++ b/mingw-w64-python-numpy/fix-testsuite.patch @@ -1,5 +1,5 @@ ---- numpy-1.9.0/numpy/core/tests/test_multiarray.py 2014-09-07 10:57:48.000000000 +0200 -+++ /mingw64/lib/python3.4/site-packages/numpy/core/tests/test_multiarray.py 2014-09-22 20:42:55.177362800 +0200 +--- numpy-1.9.0/numpy/core/tests/test_multiarray.py.orig 2014-09-07 10:57:48.000000000 +0200 ++++ numpy-1.9.0/numpy/core/tests/test_multiarray.py 2014-09-22 20:42:55.177362800 +0200 @@ -2691,7 +2691,7 @@ """Test workarounds for 32-bit limited fwrite, fseek, and ftell calls in windows. These normally would hang doing something like this. diff --git a/mingw-w64-python-scipy/PKGBUILD b/mingw-w64-python-scipy/PKGBUILD index a14e17ebd5..6901b65645 100644 --- a/mingw-w64-python-scipy/PKGBUILD +++ b/mingw-w64-python-scipy/PKGBUILD @@ -1,21 +1,19 @@ # Contributor: Runar Tenfjord < runar dot tenfjord at gmail dot com > _realname=scipy -pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname" "${MINGW_PACKAGE_PREFIX}-python3-$_realname") +pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=0.15.1 -pkgrel=1 +pkgrel=2 pkgdesc="SciPy is open-source software for mathematics, science, and engineering. (mingw-w64)" arch=('any') url="http://www.scipy.org/" license=('BSD') -makedepends=( - "${MINGW_PACKAGE_PREFIX}-gcc-fortran" - "${MINGW_PACKAGE_PREFIX}-openblas" - "${MINGW_PACKAGE_PREFIX}-python2-numpy" - "${MINGW_PACKAGE_PREFIX}-python3-numpy" - "${MINGW_PACKAGE_PREFIX}-python2-setuptools" - "${MINGW_PACKAGE_PREFIX}-python3-setuptools" -) +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc-fortran" + "${MINGW_PACKAGE_PREFIX}-openblas" + "${MINGW_PACKAGE_PREFIX}-python2-numpy" + "${MINGW_PACKAGE_PREFIX}-python3-numpy" + "${MINGW_PACKAGE_PREFIX}-python2-setuptools" + "${MINGW_PACKAGE_PREFIX}-python3-setuptools") source=("https://pypi.python.org/packages/source/s/scipy/scipy-${pkgver}.tar.gz"{,.asc} fix-qhull.patch) md5sums=('be56cd8e60591d6332aac792a5880110' @@ -39,7 +37,7 @@ prepare() { } build() { - export LDFLAGS="-Wall -shared" + LDFLAGS="${LDFLAGS} -Wall -shared" # build for python2 cd ${srcdir}/${_realname}-py2-${pkgver} @@ -59,36 +57,32 @@ build() { } package_python2-scipy() { - depends=( - "${MINGW_PACKAGE_PREFIX}-openblas" - "${MINGW_PACKAGE_PREFIX}-python2-numpy" - ) + depends=("${MINGW_PACKAGE_PREFIX}-openblas" + "${MINGW_PACKAGE_PREFIX}-python2-numpy") optdepends=("${MINGW_PACKAGE_PREFIX}-python2-nose: testsuite") cd ${_realname}-py2-${pkgver} - export LDFLAGS="-Wall -shared" + LDFLAGS="${LDFLAGS} -Wall -shared" MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ ${MINGW_PREFIX}/bin/python2 setup.py config_fc --fcompiler=gnu95 install \ - --prefix=${MINGW_PREFIX} --root=${pkgdir} --optimize=1 + --prefix=${MINGW_PREFIX} --root=${pkgdir} --optimize=1 install -Dm644 LICENSE.txt \ "${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE" } package_python3-scipy() { - depends=( - "${MINGW_PACKAGE_PREFIX}-openblas" - "${MINGW_PACKAGE_PREFIX}-python3-numpy" - ) + depends=("${MINGW_PACKAGE_PREFIX}-openblas" + "${MINGW_PACKAGE_PREFIX}-python3-numpy") optdepends=("${MINGW_PACKAGE_PREFIX}-python3-nose: testsuite") cd ${_realname}-py3-${pkgver} - export LDFLAGS="-Wall -shared" + LDFLAGS="${LDFLAGS} -Wall -shared" MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ ${MINGW_PREFIX}/bin/python3 setup.py config_fc --fcompiler=gnu95 install \ - --prefix=${MINGW_PREFIX} --root=${pkgdir} --optimize=1 + --prefix=${MINGW_PREFIX} --root=${pkgdir} --optimize=1 install -Dm644 LICENSE.txt \ "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE" diff --git a/mingw-w64-recode/PKGBUILD b/mingw-w64-recode/PKGBUILD index 323a2f46fa..e8b8b33efc 100644 --- a/mingw-w64-recode/PKGBUILD +++ b/mingw-w64-recode/PKGBUILD @@ -3,7 +3,7 @@ _realname=recode pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=3.6 -pkgrel=4 +pkgrel=5 pkgdesc="Converts files between various character sets and usages (mingw-w64)" arch=('any') url="http://recode.progiciels-bpi.ca/index.html" @@ -76,17 +76,20 @@ prepare() { } build() { + [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST} + export ac_cv_func_malloc_0_nonnull=yes export jm_cv_func_working_malloc=yes export jm_cv_func_working_realloc=yes - ${srcdir}/pinard-Recode-2127b34/configure \ + ../pinard-Recode-2127b34/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --mandir=${MINGW_PREFIX}/share/man \ --infodir=${MINGW_PREFIX}/share/info \ --without-included-gettext + make } diff --git a/mingw-w64-rust/PKGBUILD b/mingw-w64-rust/PKGBUILD index 0861534e83..c5994695ba 100644 --- a/mingw-w64-rust/PKGBUILD +++ b/mingw-w64-rust/PKGBUILD @@ -3,7 +3,7 @@ _realname=rust pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.1.0 -pkgrel=2 +pkgrel=3 pkgdesc="A safe, concurrent, practical language from Mozilla (mingw-w64)" arch=('any') url="http://www.rust-lang.org/" diff --git a/mingw-w64-speex/PKGBUILD b/mingw-w64-speex/PKGBUILD index 156247bfaf..095fea15ea 100644 --- a/mingw-w64-speex/PKGBUILD +++ b/mingw-w64-speex/PKGBUILD @@ -3,7 +3,7 @@ _realname=speex pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.2rc2 -pkgrel=1 +pkgrel=2 pkgdesc="A free codec for free speech (mingw-w64)" arch=('any') license=('BSD') @@ -12,7 +12,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-libogg" "${MINGW_PACKAGE_PREFIX}-speexdsp") options=('strip' '!libtool' 'staticlibs') makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") -source=(http://downloads.us.xiph.org/releases/${_realname}/${_realname}-$pkgver.tar.gz +source=(http://downloads.us.xiph.org/releases/${_realname}/${_realname}-${pkgver}.tar.gz 01-mingw-winmm.patch) md5sums=('6ae7db3bab01e1d4b86bacfa8ca33e81' '8edb0120f01d93e8202a97ebb1f5fc24') @@ -25,8 +25,9 @@ prepare() { } build() { + [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}" mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST} - ${srcdir}/${_realname}-${pkgver}/configure \ + ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ diff --git a/mingw-w64-speexdsp/PKGBUILD b/mingw-w64-speexdsp/PKGBUILD index 1d2e3d6855..e07453e9c6 100644 --- a/mingw-w64-speexdsp/PKGBUILD +++ b/mingw-w64-speexdsp/PKGBUILD @@ -3,7 +3,7 @@ _realname=speexdsp pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.2rc3 -pkgrel=1 +pkgrel=2 pkgdesc="DSP library derived from Speex (mingw-w64)" arch=('any') license=('BSD') @@ -11,7 +11,7 @@ url="http://www.speex.org/" depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") options=('strip' '!libtool' 'staticlibs') makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") -source=(http://downloads.us.xiph.org/releases/speex/${_realname}-$pkgver.tar.gz) +source=(http://downloads.us.xiph.org/releases/speex/${_realname}-${pkgver}.tar.gz) md5sums=('70d9d31184f7eb761192fd1ef0b73333') prepare() { @@ -20,8 +20,9 @@ prepare() { build() { #export lt_cv_deplibs_check_method='pass_all' + [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}" mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST} - ${srcdir}/${_realname}-${pkgver}/configure \ + ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ diff --git a/mingw-w64-x264/PKGBUILD b/mingw-w64-x264/PKGBUILD index 4283f60530..1e05bc17b4 100644 --- a/mingw-w64-x264/PKGBUILD +++ b/mingw-w64-x264/PKGBUILD @@ -2,7 +2,7 @@ _realname=x264 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=r2491.24e4fed +pkgver=r2538.121396c pkgrel=1 pkgdesc="Library for encoding H264/AVC video streams (mingw-w64)" arch=('any') @@ -31,6 +31,7 @@ prepare() { } build() { + [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}" mkdir -p "${srcdir}/build-${MINGW_CHOST}" cd "${srcdir}/build-${MINGW_CHOST}" ../${_realname}/configure \ @@ -44,5 +45,5 @@ build() { package() { cd "${srcdir}/build-${MINGW_CHOST}" - make DESTDIR="$pkgdir" install + make DESTDIR="${pkgdir}" install } diff --git a/mingw-w64-x265/PKGBUILD b/mingw-w64-x265/PKGBUILD index eb67377679..f461f595ff 100644 --- a/mingw-w64-x265/PKGBUILD +++ b/mingw-w64-x265/PKGBUILD @@ -4,7 +4,7 @@ _realname=x265 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.7 -pkgrel=2 +pkgrel=3 pkgdesc='Open Source H265/HEVC video encoder (mingw-w64)' arch=('any') license=('GPL') @@ -31,9 +31,10 @@ build() { mkdir -p 8bit cd 8bit + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ -G "MSYS Makefiles" \ - -DCMAKE_INSTALL_PREFIX=${pkgdir}${MINGW_PREFIX} \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ ../../../source make @@ -50,10 +51,12 @@ build() { _ENABLE_ASM=ON fi + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ -G "MSYS Makefiles" \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DHIGH_BIT_DEPTH=ON \ - -DENABLE_ASSEMBLY=$_ENABLE_ASM \ + -DENABLE_ASSEMBLY=${_ENABLE_ASM} \ -DENABLE_CLI=OFF \ ../../../source make @@ -61,11 +64,7 @@ build() { package() { cd "${srcdir}"/multicoreware-x265-*/build/msys/8bit - make install - - local PREFIX_WIN=$(cygpath -am ${pkgdir}${MINGW_PREFIX}) - sed -s "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" \ - -i "${pkgdir}"${MINGW_PREFIX}/lib/pkgconfig/x265.pc + make DESTDIR=${pkgdir} install # Install 10 bit-depth dll. cd "${srcdir}"/multicoreware-x265-*/build/msys/10bit