diff --git a/mingw-w64-cocos2dx-git/PKGBUILD b/mingw-w64-cocos2dx-git/PKGBUILD index 381ccc53cf..aa1e904c13 100644 --- a/mingw-w64-cocos2dx-git/PKGBUILD +++ b/mingw-w64-cocos2dx-git/PKGBUILD @@ -2,7 +2,8 @@ _realname=cocos2d-x pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git" -pkgver=r25639.c9d0b0f +pkgver=r31154.b6aa396 +_deps_ver=69 pkgrel=1 pkgdesc="Open source game framework written in C++ (mingw-w64)." arch=('any') @@ -11,59 +12,58 @@ license=("MIT") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "make" "${MINGW_PACKAGE_PREFIX}-cmake" "git") provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") -depends=("${MINGW_PACKAGE_PREFIX}-glfw" - "${MINGW_PACKAGE_PREFIX}-glew" - "${MINGW_PACKAGE_PREFIX}-box2d" +depends=("${MINGW_PACKAGE_PREFIX}-box2d" + "${MINGW_PACKAGE_PREFIX}-bullet" "${MINGW_PACKAGE_PREFIX}-chipmunk" - "${MINGW_PACKAGE_PREFIX}-libwebp" - "${MINGW_PACKAGE_PREFIX}-libpng" - "${MINGW_PACKAGE_PREFIX}-freetype" - "${MINGW_PACKAGE_PREFIX}-libiconv" - "${MINGW_PACKAGE_PREFIX}-tinyxml2" "${MINGW_PACKAGE_PREFIX}-curl" - "${MINGW_PACKAGE_PREFIX}-protobuf" - "${MINGW_PACKAGE_PREFIX}-mpg123" + "${MINGW_PACKAGE_PREFIX}-freetype" + "${MINGW_PACKAGE_PREFIX}-glfw" + "${MINGW_PACKAGE_PREFIX}-glew" + "${MINGW_PACKAGE_PREFIX}-libiconv" "${MINGW_PACKAGE_PREFIX}-libjpeg-turbo" + "${MINGW_PACKAGE_PREFIX}-libpng" "${MINGW_PACKAGE_PREFIX}-libtiff" "${MINGW_PACKAGE_PREFIX}-libwebsockets" + "${MINGW_PACKAGE_PREFIX}-libwebp" + "${MINGW_PACKAGE_PREFIX}-mpg123" + "${MINGW_PACKAGE_PREFIX}-tinyxml2" + "${MINGW_PACKAGE_PREFIX}-protobuf" "${MINGW_PACKAGE_PREFIX}-xxhash" "${MINGW_PACKAGE_PREFIX}-zlib") options=('staticlibs' 'strip') - source=("${_realname}"::"git+git://github.com/cocos2d/cocos2d-x.git#branch=v3" - "http://github.com/cocos2d/cocos2d-x-3rd-party-libs-bin/archive/v3-deps-20.tar.gz") - + "http://github.com/cocos2d/cocos2d-x-3rd-party-libs-bin/archive/v3-deps-${_deps_ver}.tar.gz") md5sums=('SKIP' 'SKIP') pkgver() { - cd "$srcdir/$_realname" + cd "${srcdir}/${_realname}" printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } prepare() { - cd "$srcdir/$_realname" + cd "${srcdir}/${_realname}" - #git am "$srcdir/0001-mingw64-mirgrate-to-upstream-minizip.patch" - cp -r $srcdir/cocos2d-x-3rd-party-libs-bin-3-deps-20/. $srcdir/$_realname/external + #git am "${srcdir}/0001-mingw64-mirgrate-to-upstream-minizip.patch" + cp -r ${srcdir}/cocos2d-x-3rd-party-libs-bin-3-deps-${_deps_ver}/. ${srcdir}/${_realname}/external #we need to change glfw to mingw-glfw3 - #sed -i "s/glfw3.h/GLFW\/glfw3.h/g" $srcdir/$_realname/cocos/platform/desktop/CCGLViewImpl-desktop.h + #sed -i "s/glfw3.h/GLFW\/glfw3.h/g" ${srcdir}/$_realname/cocos/platform/desktop/CCGLViewImpl-desktop.h #sed -i "s/glfw3native.h/GLFW\/glfw3native.h/g" $srcdir/$_realname/cocos/platform/desktop/CCGLViewImpl-desktop.h #sed -i "s/ft2build.h/freetype2\/ft2build.h/g" $srcdir/$_realname/cocos/2d/CCFontFreeType.h - #sed -i "s/unzip.h/minizip\/unzip.h/g" $srcdir/$_realname/cocos/platform/CCFileUtils.cpp - #sed -i "s/unzip.h/minizip\/unzip.h/g" $srcdir/$_realname/cocos/base/ZipUtils.cpp - #sed -i "s/unzip.h/minizip\/unzip.h/g" $srcdir/$_realname/extensions/assets-manager/AssetsManager.cpp - #sed -i "s/unzip.h/minizip\/unzip.h/g" $srcdir/$_realname/extensions/assets-manager/AssetsManagerEx.cpp + #sed -i "s/unzip.h/minizip\/unzip.h/g" ${srcdir}/${_realname}/cocos/platform/CCFileUtils.cpp + #sed -i "s/unzip.h/minizip\/unzip.h/g" ${srcdir}/${_realname}/cocos/base/ZipUtils.cpp + #sed -i "s/unzip.h/minizip\/unzip.h/g" ${srcdir}/${_realname}/extensions/assets-manager/AssetsManager.cpp + #sed -i "s/unzip.h/minizip\/unzip.h/g" ${srcdir}/${_realname}/extensions/assets-manager/AssetsManagerEx.cpp - #sed -i "s/tinyxml2\/tinyxml2.h/tinyxml2.h/g" $srcdir/$_realname/cocos/editor-support/cocostudio/CCSGUIReader.cpp - #sed -i "s/decode.h/webp\/decode.h/g" $srcdir/$_realname/cocos/platform/CCImage.cpp + #sed -i "s/tinyxml2\/tinyxml2.h/tinyxml2.h/g" ${srcdir}/${_realname}/cocos/editor-support/cocostudio/CCSGUIReader.cpp + #sed -i "s/decode.h/webp\/decode.h/g" ${srcdir}/${_realname}/cocos/platform/CCImage.cpp #force depend on mingw-tinyxml2 - rm -rf $srcdir/$_realname/external/tinyxml2 - rm -rf $srcdir/$_realname/external/unzip + rm -rf ${srcdir}/${_realname}/external/tinyxml2 + rm -rf ${srcdir}/${_realname}/external/unzip } build() { @@ -72,7 +72,9 @@ build() { unset LDFLAGS CFLAGS CXXFLAGS - cmake -G"MSYS Makefiles" \ + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ + ${MINGW_PREFIX}/bin/cmake \ + -G"MSYS Makefiles" \ -DDEBUG_MODE=OFF \ -DBUILD_LUA_LIBS=OFF \ -DBUILD_LUA_TESTS=OFF \ @@ -80,15 +82,16 @@ build() { -DBUILD_EDITOR_COCOSTUDIO=OFF \ -DBUILD_EDITOR_COCOSBUILDER=OFF \ -DBUILD_EDITOR_SPINE=OFF \ - ../$_realname + ../${_realname} # -DBUILD_EXTERN_LIBS=OFF \ - make -j4 + + make } package() { mkdir -p "${pkgdir}${MINGW_PREFIX}/include/cocos" mkdir -p "${pkgdir}${MINGW_PREFIX}/lib" - cd "$srcdir/$_realname/cocos" + cd "${srcdir}/${_realname}/cocos" cp -r ${srcdir}/build-${CARCH}/lib/. ${pkgdir}${MINGW_PREFIX}/lib #little helper because we don't want to pollute include with all the sub dirs ;) @@ -107,7 +110,7 @@ package() { # add extensions mkdir -p "${pkgdir}${MINGW_PREFIX}/include/extensions" - cd "$srcdir/$_realname/extensions" + cd "${srcdir}/${_realname}/extensions" find -type f \( -name "*.h*" -o -name "*.inl" \) -exec install -D {} ${pkgdir}${MINGW_PREFIX}/include/extensions/{} \; # install templates for cocos2d-console diff --git a/mingw-w64-coq/PKGBUILD b/mingw-w64-coq/PKGBUILD index 0c9ed8c254..35be821c1f 100644 --- a/mingw-w64-coq/PKGBUILD +++ b/mingw-w64-coq/PKGBUILD @@ -2,15 +2,15 @@ _realname=coq pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=8.4pl5 -pkgrel=2 +pkgver=8.4pl6 +pkgrel=1 pkgdesc="A formal proof management system (mingw-w64)" arch=('any') url='https://coq.inria.fr/' license=('LGPL 2.1') depends=("${MINGW_PACKAGE_PREFIX}-ocaml" "${MINGW_PACKAGE_PREFIX}-ocaml-camlp4") -source=("https://coq.inria.fr/distrib/V8.4pl5/files/coq-8.4pl5.tar.gz" +source=("https://coq.inria.fr/distrib/V${pkgver}/files/${_realname}-${pkgver}.tar.gz" "0001-Guess-the-libraries-are-located-at-lib-coq-instead-o.patch") sha1sums=('107717cbaef3a469e8ff775ae54dbbc457935816' '5683480358e92b4eb38adc2402dd0febf37ebb2e') @@ -25,16 +25,17 @@ build() { cp -rf ${_realname}-${pkgver} build-${MINGW_CHOST} cd ${srcdir}/build-${MINGW_CHOST} - ./configure -prefix ${MINGW_PREFIX} \ - -bindir ${MINGW_PREFIX}/bin \ - -libdir ${MINGW_PREFIX}/lib/coq \ - -mandir ${MINGW_PREFIX}/share/man \ - -configdir ${MINGW_PREFIX}/etc/xdg/coq \ - -datadir ${MINGW_PREFIX}/share/coq \ - -docdir ${MINGW_PREFIX}/share/doc/coq \ - -emacslib ${MINGW_PREFIX}/share/emacs/site-lisp/coq \ - -coqdocdir ${MINGW_PREFIX}/share/texmf/tex \ - -usecamlp4 -arch win32 -coqide no + ./configure \ + -prefix ${MINGW_PREFIX} \ + -bindir ${MINGW_PREFIX}/bin \ + -libdir ${MINGW_PREFIX}/lib/coq \ + -mandir ${MINGW_PREFIX}/share/man \ + -configdir ${MINGW_PREFIX}/etc/xdg/coq \ + -datadir ${MINGW_PREFIX}/share/coq \ + -docdir ${MINGW_PREFIX}/share/doc/coq \ + -emacslib ${MINGW_PREFIX}/share/emacs/site-lisp/coq \ + -coqdocdir ${MINGW_PREFIX}/share/texmf/tex \ + -usecamlp4 -arch win32 -coqide no make revision make coq diff --git a/mingw-w64-crypto++/PKGBUILD b/mingw-w64-crypto++/PKGBUILD index 40f9486987..a4eb99d34a 100644 --- a/mingw-w64-crypto++/PKGBUILD +++ b/mingw-w64-crypto++/PKGBUILD @@ -3,7 +3,7 @@ _realname=crypto++ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=5.6.2 -pkgrel=2 +pkgrel=3 pkgdesc="Crypto++ Library is a free C++ class library of cryptographic schemes." arch=('any') url="http://www.cryptopp.com/" diff --git a/mingw-w64-dnssec-anchors/PKGBUILD b/mingw-w64-dnssec-anchors/PKGBUILD index 804ddf6d46..0b1dfa2fdb 100644 --- a/mingw-w64-dnssec-anchors/PKGBUILD +++ b/mingw-w64-dnssec-anchors/PKGBUILD @@ -1,7 +1,6 @@ # Maintainer: Alexey Pavlov _realname=dnssec-anchors - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=20130320 pkgrel=1 diff --git a/mingw-w64-freerdp-git/PKGBUILD b/mingw-w64-freerdp-git/PKGBUILD index f926f60c39..6cf0c6f7bf 100644 --- a/mingw-w64-freerdp-git/PKGBUILD +++ b/mingw-w64-freerdp-git/PKGBUILD @@ -5,7 +5,7 @@ _realname=freerdp-git pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} pkgdesc="Free RDP client (mingw-w64)" -pkgver=r8559.9fe7ad2 +pkgver=r8949.43a5680 pkgrel=1 depends=("${MINGW_PACKAGE_PREFIX}-openssl" "${MINGW_PACKAGE_PREFIX}-ffmpeg") @@ -20,7 +20,7 @@ source=("${_realname}::git://github.com/FreeRDP/FreeRDP.git") sha256sums=('SKIP') pkgver() { - cd "$srcdir"/${_realname} + cd "${srcdir}"/${_realname} printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } @@ -29,22 +29,24 @@ prepare() { } build() { - [ -d ${CARCH}-build ] && rm -rf ${CARCH}-build + [[ -d ${CARCH}-build ]] && rm -rf ${CARCH}-build mkdir ${CARCH}-build cd ${CARCH}-build MSYS2_ARG_CONV_EXCL=-DCMAKE_INSTALL_PREFIX \ - cmake -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DCMAKE_WINDOWS_VERSION="WINXP" \ - -DWITH_PULSE=OFF \ - -DWITH_SERVER=ON \ - -DMSVC_RUNTIME="dynamic" \ - -G'MSYS Makefiles' \ - ../${_realname} - make VERBOSE=1 + ${MINGW_PREFIX}/bin/cmake \ + -G'MSYS Makefiles' \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DCMAKE_WINDOWS_VERSION="WINXP" \ + -DWITH_PULSE=OFF \ + -DWITH_SERVER=ON \ + -DMSVC_RUNTIME="dynamic" \ + ../${_realname} + + make VERBOSE=1 } package() { cd ${CARCH}-build - make DESTDIR="${pkgdir}/" install + make DESTDIR="${pkgdir}" install } diff --git a/mingw-w64-freerdp-git/mingw-w64-redefinitions.patch b/mingw-w64-freerdp-git/mingw-w64-redefinitions.patch new file mode 100644 index 0000000000..515d61694a --- /dev/null +++ b/mingw-w64-freerdp-git/mingw-w64-redefinitions.patch @@ -0,0 +1,54 @@ +--- freerdp-git/winpr/include/winpr/nt.h.orig 2015-07-19 10:16:50.940895800 +0300 ++++ freerdp-git/winpr/include/winpr/nt.h 2015-07-19 10:25:19.643991900 +0300 +@@ -1286,12 +1286,15 @@ + + #include + ++#ifndef __MINGW64_VERSION_MAJOR + #undef FILE_INFORMATION_CLASS + #undef _FILE_INFORMATION_CLASS + #undef FileDirectoryInformation ++#endif + + #endif + ++#ifndef __MINGW64_VERSION_MAJOR + typedef enum _FILE_INFORMATION_CLASS + { + FileDirectoryInformation = 1, +@@ -1335,6 +1338,7 @@ + FileValidDataLengthInformation, + FileShortNameInformation + } FILE_INFORMATION_CLASS; ++#endif + + #ifndef _WIN32 + +--- freerdp-git/winpr/include/winpr/synch.h.orig 2015-07-19 10:21:55.124294100 +0300 ++++ freerdp-git/winpr/include/winpr/synch.h 2015-07-19 10:29:13.460365500 +0300 +@@ -285,7 +285,7 @@ + #if (!defined(_WIN32)) || (defined(_WIN32) && (_WIN32_WINNT < 0x0600)) + + /* One-Time Initialization */ +- ++#ifndef _RTL_RUN_ONCE_DEF + typedef struct _RTL_RUN_ONCE + { + PVOID Ptr; +@@ -293,6 +293,7 @@ + + #define RTL_RUN_ONCE_INIT { 0 } + #define INIT_ONCE_STATIC_INIT RTL_RUN_ONCE_INIT ++#endif + + typedef RTL_RUN_ONCE INIT_ONCE; + typedef PRTL_RUN_ONCE PINIT_ONCE; +@@ -308,7 +309,7 @@ + + /* Synchronization Barrier */ + +-#if (!defined(_WIN32)) || (defined(_WIN32) && (_WIN32_WINNT < 0x0602)) ++#if (!defined(_WIN32)) || (defined(_WIN32) && (_WIN32_WINNT < 0x0602) && !defined(__MINGW64_VERSION_MAJOR)) + + typedef struct _RTL_BARRIER + { diff --git a/mingw-w64-glsl-optimizer/0001-cmake-Link-OpenGL-with-glsl_test.patch b/mingw-w64-glsl-optimizer/0001-cmake-Link-OpenGL-with-glsl_test.patch index 4910298d1e..57ebac196c 100644 --- a/mingw-w64-glsl-optimizer/0001-cmake-Link-OpenGL-with-glsl_test.patch +++ b/mingw-w64-glsl-optimizer/0001-cmake-Link-OpenGL-with-glsl_test.patch @@ -1,35 +1,14 @@ -From 7aa3b231cd1a6359eb3e2cff15047f189f0bafa6 Mon Sep 17 00:00:00 2001 -From: Ray Donnelly -Date: Wed, 11 Dec 2013 21:58:11 +0000 -Subject: [PATCH 1/2] cmake: Link OpenGL with glsl_test - ---- - CMakeLists.txt | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1215af7..fcd364c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -16,6 +16,9 @@ else() - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -s") - endif() - -+find_package(OpenGL REQUIRED) -+link_directories(${OpenGL_LIBRARY_DIRS}) -+ - file(GLOB glcpp-library_sources src/glsl/glcpp/*.c) - #file(GLOB glcpp-library_sources_remove src/glsl/glcpp/glcpp.c) - #list(REMOVE_ITEM glcpp-library_sources ${glcpp-library_sources_remove}) -@@ -35,7 +38,7 @@ target_link_libraries(glsl_compiler glsl_optimizer) - - file(GLOB glsl_test_sources tests/*.cpp) - add_executable(glsl_test ${glsl_test_sources}) --target_link_libraries(glsl_test glsl_optimizer) -+target_link_libraries(glsl_test ${OPENGL_LIBRARIES} glsl_optimizer) +--- glsl-optimizer/CMakeLists.txt.orig 2015-07-19 12:59:40.145662300 +0300 ++++ glsl-optimizer/CMakeLists.txt 2015-07-19 13:01:15.179097900 +0300 +@@ -41,7 +41,10 @@ + # OSX-specific build requirements + find_library(OpenGL_LIBRARY OpenGL ) + target_link_libraries(glsl_test ${OpenGL_LIBRARY}) +-endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") ++elseif(MINGW) ++ find_package(OpenGL) ++ target_link_libraries(glsl_test ${OPENGL_gl_LIBRARY}) ++endif() file(GLOB glslopt_sources contrib/glslopt/*.cpp) add_executable(glslopt ${glslopt_sources}) --- -1.8.5.1 - diff --git a/mingw-w64-glsl-optimizer/0002-Fix-glslopt-compile-failure.patch b/mingw-w64-glsl-optimizer/0002-Fix-glslopt-compile-failure.patch deleted file mode 100644 index 70b6baabfc..0000000000 --- a/mingw-w64-glsl-optimizer/0002-Fix-glslopt-compile-failure.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7c1500ad4ce2e2d279b60adc25db72956b08c85b Mon Sep 17 00:00:00 2001 -From: Ray Donnelly -Date: Wed, 11 Dec 2013 21:58:28 +0000 -Subject: [PATCH 2/2] Fix glslopt compile failure - ---- - contrib/glslopt/Main.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/contrib/glslopt/Main.cpp b/contrib/glslopt/Main.cpp -index c9e2546..bf2bbf4 100644 ---- a/contrib/glslopt/Main.cpp -+++ b/contrib/glslopt/Main.cpp -@@ -17,7 +17,7 @@ static int printhelp(const char* msg) - - static bool init() - { -- gContext = glslopt_initialize(false); -+ gContext = glslopt_initialize(kGlslTargetOpenGL); - if( !gContext ) - return false; - return true; --- -1.8.5.1 - diff --git a/mingw-w64-glsl-optimizer/0004-Fix-incorrect-Windows-64-hash_table_find-cast.patch b/mingw-w64-glsl-optimizer/0004-Fix-incorrect-Windows-64-hash_table_find-cast.patch index e6749c3868..e8d08bf4b2 100644 --- a/mingw-w64-glsl-optimizer/0004-Fix-incorrect-Windows-64-hash_table_find-cast.patch +++ b/mingw-w64-glsl-optimizer/0004-Fix-incorrect-Windows-64-hash_table_find-cast.patch @@ -1,15 +1,15 @@ --- glsl-optimizer/src/glsl/ir_print_glsl_visitor.cpp.orig 2014-01-18 16:35:24.773200000 +0400 +++ glsl-optimizer/src/glsl/ir_print_glsl_visitor.cpp 2014-01-18 17:11:06.406600000 +0400 -@@ -302,7 +302,7 @@ +@@ -337,7 +337,7 @@ void ir_print_glsl_visitor::print_var_name (ir_variable* v) { - long id = (long)hash_table_find (globals->var_hash, v); + intptr_t id = (intptr_t)hash_table_find (globals->var_hash, v); - if (!id && v->mode == ir_var_temporary) + if (!id && v->data.mode == ir_var_temporary) { id = ++globals->var_counter; -@@ -406,7 +406,7 @@ +@@ -465,7 +465,7 @@ // give an id to any variable defined in a function that is not an uniform if ((this->mode == kPrintGlslNone && ir->mode != ir_var_uniform)) { @@ -18,3 +18,23 @@ if (id == 0) { id = ++globals->var_counter; +--- glsl-optimizer/src/glsl/ir_print_metal_visitor.cpp.orig 2014-01-18 16:35:24.773200000 +0400 ++++ glsl-optimizer/src/glsl/ir_print_metal_visitor.cpp 2014-01-18 17:11:06.406600000 +0400 +@@ -377,7 +377,7 @@ + + void ir_print_metal_visitor::print_var_name (ir_variable* v) + { +- long id = (long)hash_table_find (globals->var_hash, v); ++ intptr_t id = (intptr_t)hash_table_find (globals->var_hash, v); + if (!id && v->data.mode == ir_var_temporary) + { + id = ++globals->var_counter; +@@ -546,7 +546,7 @@ + // give an id to any variable defined in a function that is not an uniform + if ((this->mode == kPrintGlslNone && ir->data.mode != ir_var_uniform)) + { +- long id = (long)hash_table_find (globals->var_hash, ir); ++ intptr_t id = (intptr_t)hash_table_find (globals->var_hash, ir); + if (id == 0) + { + id = ++globals->var_counter; diff --git a/mingw-w64-glsl-optimizer/PKGBUILD b/mingw-w64-glsl-optimizer/PKGBUILD index de77d79a7f..75a785a4d8 100644 --- a/mingw-w64-glsl-optimizer/PKGBUILD +++ b/mingw-w64-glsl-optimizer/PKGBUILD @@ -1,68 +1,58 @@ # Maintainer: Alexey Pavlov _realname=glsl-optimizer - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git" -pkgver=r60842.9b2a2d2 +pkgver=r66854.14946bd pkgrel=1 pkgdesc="C++ library that takes GLSL shaders, does some GPU-independent optimizations on them and outputs GLSL back (mingw-w64)" arch=('any') -url='https://github.com/aras-p/glsl-optimizer' +url="https://github.com/aras-p/glsl-optimizer" license=('MIT') -depends=("") makedepends=("git" "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-gcc") -optdepends=() provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") -replaces=() -backup=() options=('!strip' 'staticlibs' '!emptydirs') source=("${_realname}"::"git+https://github.com/aras-p/glsl-optimizer.git" - 0001-cmake-Link-OpenGL-with-glsl_test.patch - 0002-Fix-glslopt-compile-failure.patch - 0003-fix-tests-compile.patch - 0004-Fix-incorrect-Windows-64-hash_table_find-cast.patch - ) + 0001-cmake-Link-OpenGL-with-glsl_test.patch + 0002-Fix-glslopt-compile-failure.patch + 0003-fix-tests-compile.patch + 0004-Fix-incorrect-Windows-64-hash_table_find-cast.patch) md5sums=('SKIP' - 'a69f07671525c48ac0a9a0321fda2b42' + 'cad18a6556d133048c4bc9559205b2fb' '42190f0e6a8f434885e8347831f5d407' '2b647ac196a91e08bd7e5aa35c851cdd' - '4223ad35f51d21a77b0b89c1cb8a26c0') + '94a782944d4916fb1909af97093b4df8') pkgver() { - cd "$srcdir/${_realname}" + cd "${srcdir}/${_realname}" printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } prepare() { - cd "$srcdir/${_realname}" + cd "${srcdir}/${_realname}" patch -p1 -i ${srcdir}/0001-cmake-Link-OpenGL-with-glsl_test.patch - patch -p1 -i ${srcdir}/0002-Fix-glslopt-compile-failure.patch + #patch -p1 -i ${srcdir}/0002-Fix-glslopt-compile-failure.patch patch -p1 -i ${srcdir}/0003-fix-tests-compile.patch patch -p1 -i ${srcdir}/0004-Fix-incorrect-Windows-64-hash_table_find-cast.patch } build() { - mkdir -p ${pkgdir}${MINGW_PREFIX} - pushd ${pkgdir}${MINGW_PREFIX} > /dev/null - export PREFIX_WIN=`pwd -W` - popd > /dev/null - + [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST} mkdir ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST} + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ -G"MSYS Makefiles" \ - -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX_WIN} \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ ../${_realname} - make + make } package() { - cd ${srcdir}/build-${MINGW_CHOST} - mkdir -p ${pkgdir}${MINGW_PREFIX}/{bin,include,lib} + cd ${srcdir}/build-${MINGW_CHOST} + mkdir -p ${pkgdir}${MINGW_PREFIX}/{bin,include,lib} cp *.exe ${pkgdir}${MINGW_PREFIX}/bin/ cp $srcdir/${_realname}/src/glsl/glsl_optimizer.h ${pkgdir}${MINGW_PREFIX}/include/ cp libglsl_optimizer.a ${pkgdir}${MINGW_PREFIX}/lib/ } - diff --git a/mingw-w64-gnu-cobol-svn/PKGBUILD b/mingw-w64-gnu-cobol-svn/PKGBUILD index 1175383975..fd51459e85 100644 --- a/mingw-w64-gnu-cobol-svn/PKGBUILD +++ b/mingw-w64-gnu-cobol-svn/PKGBUILD @@ -14,16 +14,16 @@ url="http://sourceforge.net/projects/open-cobol/" options=('strip') license=('GPL' 'LGPL') makedepends=("subversion" - "${MINGW_PACKAGE_PREFIX}-gcc" - "${MINGW_PACKAGE_PREFIX}-libiconv") + "${MINGW_PACKAGE_PREFIX}-gcc" + "${MINGW_PACKAGE_PREFIX}-libiconv") depends=("${MINGW_PACKAGE_PREFIX}-db" - "${MINGW_PACKAGE_PREFIX}-gmp" - "${MINGW_PACKAGE_PREFIX}-ncurses") + "${MINGW_PACKAGE_PREFIX}-gmp" + "${MINGW_PACKAGE_PREFIX}-ncurses") source=("$_realname::svn+http://svn.code.sf.net/p/open-cobol/code/branches/gnu-cobol-2.0") md5sums=('SKIP') pkgver() { - cd "$srcdir/$_realname" + cd "${srcdir}/${_realname}" local ver="$(svnversion)" printf "%s.r%s" "${_base_ver}" "${ver//[[:alpha:]]}" } @@ -37,7 +37,7 @@ build() { export lt_cv_deplibs_check_method='pass_all' # libncurses [[ -d ${srcdir}/build-${CARCH} ]] && rm -rf ${srcdir}/build-${CARCH} mkdir -p ${srcdir}/build-${CARCH} && cd ${srcdir}/build-${CARCH} - ../$_realname/configure \ + ../${_realname}/configure \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ @@ -52,7 +52,7 @@ build() { package() { cd ${srcdir}/build-${CARCH} - make DESTDIR="$pkgdir" install + make DESTDIR="${pkgdir}" install mkdir -p ${pkgdir}${MINGW_PREFIX}/share/licenses/$_realname cp -pf ${srcdir}/${_realname}/COPYING* \ diff --git a/mingw-w64-gtkada/PKGBUILD b/mingw-w64-gtkada/PKGBUILD index f64db99049..1d9954403b 100644 --- a/mingw-w64-gtkada/PKGBUILD +++ b/mingw-w64-gtkada/PKGBUILD @@ -2,8 +2,8 @@ _realname=gtkada pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} -pkgrel=1 pkgver=3.8.2 +pkgrel=2 pkgdesc="GtkAda is a Gtk3+ binding for Ada using the OOP and other features of this programming language" arch=('any') conflicts=("${MINGW_PACKAGE_PREFIX}-GtkAda-svn") @@ -20,13 +20,13 @@ sha1sums=('84285ea8c016d18bac8860573ff5223ecea8ecf4' 'ca7dcd32bfbfecdcbd923bb2e12dc5b8b0f91305') prepare() { - cd ${srcdir}/${_realnam}e-${pkgver}-src + cd ${srcdir}/${_realname}-${pkgver}-src patch -p0 < contrib/gtkada-3-win32.diff patch -p1 < ${srcdir}/gtkada-mingw.diff } build() { - cd ${srcdir}/$_{realname}-${pkgver}-src + cd ${srcdir}/${_realname}-${pkgver}-src if [ -f Makefile ]; then make distclean fi diff --git a/mingw-w64-hlsl2glsl/PKGBUILD b/mingw-w64-hlsl2glsl/PKGBUILD index 9e63c86e97..ff3dee2f81 100644 --- a/mingw-w64-hlsl2glsl/PKGBUILD +++ b/mingw-w64-hlsl2glsl/PKGBUILD @@ -1,7 +1,6 @@ # Maintainer: Alexey Pavlov _realname=hlsl2glsl - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git" pkgver=r749.9af03c9 pkgrel=1 @@ -9,46 +8,44 @@ pkgdesc="HLSL to GLSL shader language translator" arch=('any') url='https://github.com/mingwandroid/hlsl2glslfork' license=('MIT') -depends=("") makedepends=("git" "${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-gcc") -optdepends=() provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") options=('!strip' 'staticlibs' '!emptydirs') source=("${_realname}"::"git+https://github.com/mingwandroid/hlsl2glslfork.git#branch=say-hello-to-qbs" - 0001-Fix-CMakeLists.txt.patch - 0002-Generalize-CMakeLists.txt-a-bit.patch - 0003-MinGW-w64-build-fixes-for-hlsl2glsltest.cpp.patch - ) + 0001-Fix-CMakeLists.txt.patch + 0002-Generalize-CMakeLists.txt-a-bit.patch + 0003-MinGW-w64-build-fixes-for-hlsl2glsltest.cpp.patch + ) md5sums=('SKIP' '30240eff0c158e302b34c880dc961bef' '76d65ee71bc4f32ece29822221c4dd6e' '493f2b1579556df1211d9df7d0c06d79') pkgver() { - cd "$srcdir/${_realname}" + cd "${srcdir}/${_realname}" printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } prepare() { - cd "$srcdir/${_realname}" + cd "${srcdir}/${_realname}" patch -p1 -i ${srcdir}/0001-Fix-CMakeLists.txt.patch patch -p1 -i ${srcdir}/0002-Generalize-CMakeLists.txt-a-bit.patch patch -p1 -i ${srcdir}/0003-MinGW-w64-build-fixes-for-hlsl2glsltest.cpp.patch } build() { - cd ${srcdir}/${_realname} + cd ${srcdir}/${_realname} ${MINGW_PREFIX}/bin/cmake \ -G"MSYS Makefiles" - BISON_SIMPLE=${srcdir}/${_realname}/tools/bison.simple make + BISON_SIMPLE=${srcdir}/${_realname}/tools/bison.simple make } package() { - cd ${srcdir}/${_realname} - mkdir -p ${pkgdir}${MINGW_PREFIX}/{bin,lib,include} + cd ${srcdir}/${_realname} + mkdir -p ${pkgdir}${MINGW_PREFIX}/{bin,lib,include} cp *.exe ${pkgdir}${MINGW_PREFIX}/bin/ cp include/hlsl2glsl.h ${pkgdir}${MINGW_PREFIX}/include/ cp libhlsl2glsl.a ${pkgdir}${MINGW_PREFIX}/lib/ diff --git a/mingw-w64-innoextract/PKGBUILD b/mingw-w64-innoextract/PKGBUILD index 3a723933c4..50c4bad501 100644 --- a/mingw-w64-innoextract/PKGBUILD +++ b/mingw-w64-innoextract/PKGBUILD @@ -1,30 +1,29 @@ # Maintainer: Alexey Pavlov _realname=innoextract - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.4 -pkgrel=1 +pkgrel=2 pkgdesc="A tool to extract installers created by Inno Setup (mingw-w64)." arch=('any') url="http://constexpr.org/innoextract/" license=("MIT") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" - "${MINGW_PACKAGE_PREFIX}-cmake") + "${MINGW_PACKAGE_PREFIX}-cmake") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" - "${MINGW_PACKAGE_PREFIX}-boost" - "${MINGW_PACKAGE_PREFIX}-xz" - "${MINGW_PACKAGE_PREFIX}-zlib" - "${MINGW_PACKAGE_PREFIX}-bzip2" - "${MINGW_PACKAGE_PREFIX}-libiconv") + "${MINGW_PACKAGE_PREFIX}-boost" + "${MINGW_PACKAGE_PREFIX}-xz" + "${MINGW_PACKAGE_PREFIX}-zlib" + "${MINGW_PACKAGE_PREFIX}-bzip2" + "${MINGW_PACKAGE_PREFIX}-libiconv") options=('staticlibs' '!strip') source=("http://downloads.sourceforge.net/${_realname}/${_realname}-${pkgver}.tar.gz" - fix-typo-in-comment.patch - fix-crash-on-startup.patch - dont-set-background.patch - fix-flickering-progress-bar.patch - fix-restoring-original-console-color.patch - fix-an-infinite-loop-with-truncated-LZMA-streams.patch) + fix-typo-in-comment.patch + fix-crash-on-startup.patch + dont-set-background.patch + fix-flickering-progress-bar.patch + fix-restoring-original-console-color.patch + fix-an-infinite-loop-with-truncated-LZMA-streams.patch) sha1sums=('3fd3ac98c802c72a1f4ae5f6e6a5dca35747ff98' '554408d4be410563828d2599db698f0f76cef51e' 'd35974339a83db0cd04c343d865075d99fc426ba' @@ -44,29 +43,28 @@ prepare() { } build() { - mkdir -p ${pkgdir}${MINGW_PREFIX} - pushd ${pkgdir}${MINGW_PREFIX} > /dev/null - export PREFIX_WIN=`pwd -W` - popd > /dev/null - - cd "${srcdir}/${_realname}-${pkgver}" + [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST} + mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST} + #MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" ${MINGW_PREFIX}/bin/cmake.exe \ -G"MSYS Makefiles" \ - -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX_WIN} \ + -DCMAKE_INSTALL_PREFIX=${pkgdir}${MINGW_PREFIX} \ -DCMAKE_BUILD_TYPE=Release \ - -DUSE_STATIC_LIBS=OFF + -DUSE_STATIC_LIBS=OFF \ + ../${_realname}-${pkgver} + make } package() { - cd "${srcdir}/${_realname}-${pkgver}" + cd "${srcdir}/build-${MINGW_CHOST}" make install - install -Dm644 README.md \ + install -Dm644 ${srcdir}/${_realname}-${pkgver}/README.md \ "${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}/README.md" - install -Dm644 CHANGELOG \ + install -Dm644 ${srcdir}/${_realname}-${pkgver}/CHANGELOG \ "${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}/CHANGELOG" - install -Dm644 LICENSE \ + install -Dm644 ${srcdir}/${_realname}-${pkgver}/LICENSE \ "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" } diff --git a/mingw-w64-itk/PKGBUILD b/mingw-w64-itk/PKGBUILD index a96b823d7f..20e27cc6b6 100644 --- a/mingw-w64-itk/PKGBUILD +++ b/mingw-w64-itk/PKGBUILD @@ -2,7 +2,7 @@ _realname=itk pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=4.7.2 +pkgver=4.8.0 pkgrel=1 pkgdesc='An open-source C++ toolkit for medical image processing (mingw-w64)' arch=('any') @@ -23,8 +23,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" optdepends=("${MINGW_PACKAGE_PREFIX}-opencv: ITK-OpenCV bridge" "${MINGW_PACKAGE_PREFIX}-vtk: ITK-VTK bridge") source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/InsightSoftwareConsortium/ITK/archive/v${pkgver}.tar.gz") -sha1sums=('1926161605b015f53bb21e3ee3cf132a8b07991b') -_src="${_realname}-${pkgver}" +sha1sums=('b20c1b1641c436e86dae081937bb36385fe72a65') build() { CFLAGS+=" ${CPPFLAGS}" @@ -43,9 +42,10 @@ build() { [[ -d "${srcdir}/build-${CARCH}" ]] && rm -rf "${srcdir}/build-${CARCH}" mkdir -p "${srcdir}/build-${CARCH}" && cd "${srcdir}/build-${CARCH}" + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ "${MINGW_PREFIX}/bin/cmake.exe" \ -G"MSYS Makefiles" \ - -DCMAKE_INSTALL_PREFIX="${pkgdir}${MINGW_PREFIX}" \ + -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \ -DBUILD_DOCUMENTATION=OFF \ -DBUILD_EXAMPLES=OFF \ -DBUILD_TESTING=OFF \ @@ -68,24 +68,23 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS=ON \ "${_extra_config[@]}" \ - "../${_src}" + "../${_realname}-${pkgver}" make } package() { cd "${srcdir}/build-${CARCH}" - make -j1 install + make DESTDIR=${pkgdir} -j1 install pushd "${pkgdir}${MINGW_PREFIX}" > /dev/null - local _MINGW_PREFIX_WIN="$(cygpath -m ${MINGW_PREFIX})" - sed -s "s|${_MINGW_PREFIX_WIN}|\${_IMPORT_PREFIX}|g" \ + sed -s "s|${MINGW_PREFIX}|\${_IMPORT_PREFIX}|g" \ -i "lib/cmake/${_realname}-${pkgver%.*}/ITKTargets-release.cmake" find "lib/cmake/${_realname}-${pkgver%.*}" -name '*.cmake' -exec \ - sed -s "s|${_MINGW_PREFIX_WIN}|\${ITK_INSTALL_PREFIX}|g" -i {} \; - install -Dm644 "${srcdir}/${_src}/LICENSE" "share/licenses/${_realname}/LICENSE" - install -Dm644 "${srcdir}/${_src}/NOTICE" "share/licenses/${_realname}/NOTICE" - install -Dm644 "${srcdir}/${_src}/Modules/ThirdParty/KWSys/src/KWSys/Copyright.txt" \ + sed -s "s|${MINGW_PREFIX}|\${ITK_INSTALL_PREFIX}|g" -i {} \; + install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE" "share/licenses/${_realname}/LICENSE" + install -Dm644 "${srcdir}/${_realname}-${pkgver}/NOTICE" "share/licenses/${_realname}/NOTICE" + install -Dm644 "${srcdir}/${_realname}-${pkgver}/Modules/ThirdParty/KWSys/src/KWSys/Copyright.txt" \ "share/licenses/${_realname}/KWSys/Copyright.txt" popd > /dev/null } diff --git a/mingw-w64-kicad-git/PKGBUILD b/mingw-w64-kicad-git/PKGBUILD index d0b263a037..7804c3b0c7 100644 --- a/mingw-w64-kicad-git/PKGBUILD +++ b/mingw-w64-kicad-git/PKGBUILD @@ -2,28 +2,28 @@ _realname=kicad pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git" -pkgver=r7248.0d77a86 +pkgver=r7676.ba5d45c pkgrel=1 -pkgdesc="Software for the creation of electronic schematic diagrams and printed circuit board artwork" +pkgdesc="Software for the creation of electronic schematic diagrams and printed circuit board artwork (mingw-w64)" arch=('any') url="http://www.kicad-pcb.org" license=("GPL2+") provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") depends=("${MINGW_PACKAGE_PREFIX}-boost" - "${MINGW_PACKAGE_PREFIX}-cairo" - "${MINGW_PACKAGE_PREFIX}-glew" - "${MINGW_PACKAGE_PREFIX}-openssl" - "${MINGW_PACKAGE_PREFIX}-wxPython" - "${MINGW_PACKAGE_PREFIX}-wxWidgets") + "${MINGW_PACKAGE_PREFIX}-cairo" + "${MINGW_PACKAGE_PREFIX}-glew" + "${MINGW_PACKAGE_PREFIX}-openssl" + "${MINGW_PACKAGE_PREFIX}-wxPython" + "${MINGW_PACKAGE_PREFIX}-wxWidgets") makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" + "${MINGW_PACKAGE_PREFIX}-doxygen" "${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-python2" "${MINGW_PACKAGE_PREFIX}-pkg-config" "${MINGW_PACKAGE_PREFIX}-swig" "bzr" - "git" - "doxygen") + "git") source=("${_realname}"::"git+https://github.com/KiCad/kicad-source-mirror.git" "${_realname}-docs"::"bzr+https://code.launchpad.net/~kicad-developers/kicad/doc" "${_realname}-libs"::"git+https://github.com/KiCad/kicad-library.git" @@ -34,7 +34,7 @@ md5sums=('SKIP' ) pkgver() { - cd "$srcdir/$_realname" + cd "${srcdir}/${_realname}" printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } @@ -42,10 +42,12 @@ build() { # Configure and build KiCad. [[ -d build-${MINGW_CHOST} ]] && rm -r build-${MINGW_CHOST} mkdir build-${MINGW_CHOST} && cd build-${MINGW_CHOST} + + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=;" \ ${MINGW_PREFIX}/bin/cmake.exe \ -G"MSYS Makefiles" \ -DCMAKE_PREFIX_PATH=${MINGW_PREFIX} \ - -DCMAKE_INSTALL_PREFIX=${pkgdir}${MINGW_PREFIX} \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DDEFAULT_INSTALL_PATH=${MINGW_PREFIX} \ -DOPENSSL_ROOT_DIR=${MINGW_PREFIX} \ -DKICAD_SKIP_BOOST=ON \ @@ -63,9 +65,10 @@ build() { # Configure the documentation installation build. [[ -d build-docs ]] && rm -r build-docs mkdir build-docs && cd build-docs + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake.exe \ -G "MSYS Makefiles" \ - -DCMAKE_INSTALL_PREFIX=${pkgdir}${MINGW_PREFIX} \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ ../${_realname}-docs cd ../ @@ -73,9 +76,10 @@ build() { # Configure the library installation build. [[ -d build-libs ]] && rm -r build-libs mkdir build-libs && cd build-libs + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake.exe \ -G "MSYS Makefiles" \ - -DCMAKE_INSTALL_PREFIX=${pkgdir}${MINGW_PREFIX} \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ ../${_realname}-libs } @@ -83,17 +87,17 @@ build() { package() { # Install KiCad. cd build-${MINGW_CHOST} - make install + make DESTDIR=${pkgdir} install cd ../ # Install KiCad documentation. cd build-docs - make install + make DESTDIR=${pkgdir} install cd ../ # Install KiCad libraries. cd build-libs - make install + make DESTDIR=${pkgdir} install } diff --git a/mingw-w64-ldns/PKGBUILD b/mingw-w64-ldns/PKGBUILD index 664d2e793c..7c129705d8 100644 --- a/mingw-w64-ldns/PKGBUILD +++ b/mingw-w64-ldns/PKGBUILD @@ -3,14 +3,14 @@ _realname=ldns pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.6.17 -pkgrel=2 +pkgrel=3 pkgdesc="Fast DNS library supporting recent RFCs (mingw-w64)" arch=('any') url='http://www.nlnetlabs.nl/projects/ldns/' license=('custom:BSD') -makedepends=("${MINGW_PACKAGE_PREFIX}-gcc") -depends=("${MINGW_PACKAGE_PREFIX}-openssl" - "${MINGW_PACKAGE_PREFIX}-dnssec-anchors") +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-python2") +depends=("${MINGW_PACKAGE_PREFIX}-openssl") +optdepends=("${MINGW_PACKAGE_PREFIX}-dnssec-anchors") options=(strip staticlibs) source=("http://www.nlnetlabs.nl/downloads/${_realname}/${_realname}-${pkgver}.tar.gz" ldns-1.6.17-relocate.patch) @@ -26,10 +26,12 @@ prepare() { build() { [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" - mkdir -p "${srcdir}/build-${MINGW_CHOST}" - export PYTHON=${MINGW_PREFIX}/bin/python2 + cp -rf ${_realname}-${pkgver} build-${MINGW_CHOST} + #mkdir -p "${srcdir}/build-${MINGW_CHOST}" cd "${srcdir}/build-${MINGW_CHOST}" - ../${_realname}-${pkgver}/configure \ + + PYTHON=${MINGW_PREFIX}/bin/python2 \ + ./configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ @@ -40,14 +42,14 @@ build() { --with-trust-anchor=${MINGW_PREFIX}/etc/trusted-key.key \ --with-drill \ --with-examples \ - --without-pyldns \ - --without-pyldnsx + --with-pyldns \ + --with-pyldnsx make } package() { cd "${srcdir}/build-${MINGW_CHOST}" - make -j1 DESTDIR="$pkgdir" install + make -j1 DESTDIR="${pkgdir}" install install -Dm644 ${srcdir}/${_realname}-${pkgver}/LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" }