From 6bc5380cb82d23f5263a2f9fc28859f8690cc718 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Thu, 9 Jul 2015 15:32:38 +0300 Subject: [PATCH] == Rebuild with GCC-5.1.0. Part V === --- mingw-w64-LibRaw/PKGBUILD | 16 +- mingw-w64-SDL2/PKGBUILD | 19 +- .../SDL2-fix-gcc-compatibility.patch | 413 ++++++++++++++++++ ...prevent-duplicate-d3d11-declarations.patch | 27 ++ mingw-w64-SDL2_gfx/PKGBUILD | 20 +- mingw-w64-SDL2_image/PKGBUILD | 16 +- mingw-w64-SDL2_mixer/PKGBUILD | 13 +- mingw-w64-SDL2_net/PKGBUILD | 9 +- mingw-w64-SDL2_sound-hg/PKGBUILD | 8 +- mingw-w64-SDL2_ttf/PKGBUILD | 5 +- mingw-w64-SDL_gfx/PKGBUILD | 12 +- mingw-w64-SDL_image/PKGBUILD | 8 +- mingw-w64-SDL_ttf/PKGBUILD | 13 +- mingw-w64-SDL_ttf/bug1433.patch | 11 - mingw-w64-check/PKGBUILD | 5 +- mingw-w64-chromaprint/PKGBUILD | 16 +- mingw-w64-clutter/PKGBUILD | 34 +- mingw-w64-cogl/PKGBUILD | 8 +- .../0003-missing-include.patch | 10 + mingw-w64-daala-git/0004-xp-sp2.all.patch | 11 + .../0005-no-pkg-config-prefix.mingw.patch | 27 ++ mingw-w64-daala-git/PKGBUILD | 30 +- mingw-w64-eigen3/PKGBUILD | 47 +- mingw-w64-eigen3/eigen-pkgconfig.patch | 19 +- mingw-w64-eigen3/eigen-test.patch | 11 + mingw-w64-enchant/PKGBUILD | 20 +- mingw-w64-ffmpeg/PKGBUILD | 8 +- mingw-w64-field3d/PKGBUILD | 19 +- mingw-w64-glib-networking/PKGBUILD | 8 +- mingw-w64-gsl/PKGBUILD | 20 +- mingw-w64-gst-plugins-base/PKGBUILD | 29 +- mingw-w64-gst-plugins-good/PKGBUILD | 37 +- mingw-w64-gstreamer/PKGBUILD | 36 +- mingw-w64-hdf5/PKGBUILD | 22 +- mingw-w64-hdf5/hdf5-fix-install-docs.patch | 2 +- mingw-w64-hdf5/hdf5-link-ws2_32-mingw.patch | 4 +- mingw-w64-hunspell/PKGBUILD | 18 +- mingw-w64-ilmbase/PKGBUILD | 38 +- mingw-w64-intel-tbb/PKGBUILD | 6 +- mingw-w64-libblueray/PKGBUILD | 15 +- mingw-w64-libcaca/PKGBUILD | 27 +- mingw-w64-libdvdcss/PKGBUILD | 29 +- mingw-w64-libdvdnav/PKGBUILD | 22 +- mingw-w64-libdvdread/PKGBUILD | 26 +- mingw-w64-libexif/PKGBUILD | 11 +- mingw-w64-libgme/PKGBUILD | 22 +- mingw-w64-libmimic/PKGBUILD | 23 +- mingw-w64-libmodplug/PKGBUILD | 5 +- mingw-w64-libshout/PKGBUILD | 6 +- .../0002-fix-keyword-conflict.patch | 62 --- mingw-w64-libsoup/PKGBUILD | 26 +- mingw-w64-libtheora/PKGBUILD | 13 +- mingw-w64-libvorbisidec-svn/PKGBUILD | 2 +- mingw-w64-opencollada-git/PKGBUILD | 11 +- .../PKGBUILD | 32 +- .../detect-mingw-python.patch | 0 .../fix-redefinitions.patch | 0 .../mingw-w64.patch | 0 mingw-w64-opencore-amr/PKGBUILD | 7 +- mingw-w64-opencv/PKGBUILD | 74 ++-- .../free-tls-keys-on-dll-unload.patch | 63 --- mingw-w64-opencv/issue-4107.patch | 13 + mingw-w64-opencv/mingw-w64-cmake.patch | 82 ++-- ...ngs-generation-DetectionBasedTracker.patch | 34 ++ mingw-w64-openexr/PKGBUILD | 43 +- mingw-w64-opus-tools/PKGBUILD | 6 +- mingw-w64-opus/PKGBUILD | 10 +- mingw-w64-opusfile/PKGBUILD | 3 +- mingw-w64-orc/PKGBUILD | 9 +- mingw-w64-physfs-hg/PKGBUILD | 31 +- mingw-w64-physfs/PKGBUILD | 19 +- mingw-w64-pyqt5/PKGBUILD | 6 +- mingw-w64-python-dateutil/PKGBUILD | 30 +- mingw-w64-python-matplotlib/PKGBUILD | 29 +- mingw-w64-python-pygments/PKGBUILD | 4 +- mingw-w64-python-pyparsing/PKGBUILD | 20 +- mingw-w64-python2-cairo/PKGBUILD | 11 +- .../1050-fix-hashfunc-prototype.patch | 11 - mingw-w64-python2/PKGBUILD | 5 +- mingw-w64-python3-cairo/PKGBUILD | 15 +- mingw-w64-ruby/PKGBUILD | 2 +- mingw-w64-schroedinger/PKGBUILD | 9 +- mingw-w64-sip/PKGBUILD | 7 +- mingw-w64-smpeg2/PKGBUILD | 10 +- mingw-w64-soundtouch/PKGBUILD | 2 +- mingw-w64-szip/PKGBUILD | 23 +- mingw-w64-taglib/PKGBUILD | 29 +- mingw-w64-tinyxml/PKGBUILD | 17 +- mingw-w64-tinyxml2/PKGBUILD | 48 +- mingw-w64-vtk/PKGBUILD | 23 +- mingw-w64-wavpack/PKGBUILD | 17 +- mingw-w64-xvidcore/PKGBUILD | 2 +- mingw-w64-yaml-cpp/PKGBUILD | 57 +-- mingw-w64-yaml-cpp0.3/PKGBUILD | 50 +-- 94 files changed, 1334 insertions(+), 894 deletions(-) create mode 100644 mingw-w64-SDL2/SDL2-fix-gcc-compatibility.patch create mode 100644 mingw-w64-SDL2/SDL2-prevent-duplicate-d3d11-declarations.patch delete mode 100644 mingw-w64-SDL_ttf/bug1433.patch create mode 100644 mingw-w64-daala-git/0003-missing-include.patch create mode 100644 mingw-w64-daala-git/0004-xp-sp2.all.patch create mode 100644 mingw-w64-daala-git/0005-no-pkg-config-prefix.mingw.patch create mode 100644 mingw-w64-eigen3/eigen-test.patch delete mode 100644 mingw-w64-libsoup/0002-fix-keyword-conflict.patch rename {mingw-w64-opencolorio => mingw-w64-opencolorio-git}/PKGBUILD (74%) rename {mingw-w64-opencolorio => mingw-w64-opencolorio-git}/detect-mingw-python.patch (100%) rename {mingw-w64-opencolorio => mingw-w64-opencolorio-git}/fix-redefinitions.patch (100%) rename {mingw-w64-opencolorio => mingw-w64-opencolorio-git}/mingw-w64.patch (100%) delete mode 100644 mingw-w64-opencv/free-tls-keys-on-dll-unload.patch create mode 100644 mingw-w64-opencv/issue-4107.patch create mode 100644 mingw-w64-opencv/remove-bindings-generation-DetectionBasedTracker.patch delete mode 100644 mingw-w64-python2/1050-fix-hashfunc-prototype.patch diff --git a/mingw-w64-LibRaw/PKGBUILD b/mingw-w64-LibRaw/PKGBUILD index 4fc9c8c47a..b883e99487 100644 --- a/mingw-w64-LibRaw/PKGBUILD +++ b/mingw-w64-LibRaw/PKGBUILD @@ -3,7 +3,7 @@ _realname=LibRaw pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=0.16.2 -pkgrel=1 +pkgrel=2 pkgdesc="Library for reading RAW files obtained from digital photo cameras (mingw-w64)" arch=(any) url="http://www.libraw.org" @@ -25,11 +25,11 @@ sha256sums=('6344e355f7c23f13e266844b36265d5f624237ba5a62dc901c7b91b510a84187' '4a31c0ee066f43915beff6f7959b6b2cd246d390720df379bfc047d4cedb6a8f') prepare() { - mv $srcdir/${_realname}-demosaic-pack-GPL2-${pkgver} $srcdir/${_realname}-$pkgver/ - mv $srcdir/${_realname}-demosaic-pack-GPL3-${pkgver} $srcdir/${_realname}-$pkgver/ - cd "$srcdir/${_realname}-$pkgver" - patch -Np1 -i "$srcdir/LibRaw_wsock32.patch" - patch -Np1 -i "$srcdir/LibRaw_obsolete-macros.patch" + mv ${srcdir}/${_realname}-demosaic-pack-GPL2-${pkgver} $srcdir/${_realname}-$}pkgver}/ + mv ${srcdir}/${_realname}-demosaic-pack-GPL3-${pkgver} $srcdir/${_realname}-${pkgver}/ + cd "${srcdir}/${_realname}-${pkgver}" + patch -Np1 -i "${srcdir}/LibRaw_wsock32.patch" + patch -Np1 -i "${srcdir}/LibRaw_obsolete-macros.patch" autoreconf -ifv } @@ -39,7 +39,7 @@ 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} \ @@ -53,5 +53,5 @@ build() { package() { cd "${srcdir}/build-${MINGW_CHOST}" - make DESTDIR="$pkgdir" install + make DESTDIR="${pkgdir}" install } diff --git a/mingw-w64-SDL2/PKGBUILD b/mingw-w64-SDL2/PKGBUILD index 7dc3074ee6..2b1462947d 100644 --- a/mingw-w64-SDL2/PKGBUILD +++ b/mingw-w64-SDL2/PKGBUILD @@ -3,7 +3,7 @@ _realname=SDL2 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.0.3 -pkgrel=2 +pkgrel=3 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (Version 2) (mingw-w64)" arch=('any') url="http://libsdl.org" @@ -11,14 +11,20 @@ license=("MIT") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-libiconv") options=('staticlibs' 'strip') -source=("http://libsdl.org/release/SDL2-$pkgver.tar.gz" - fix-linker-flags.patch) +source=("http://libsdl.org/release/SDL2-${pkgver}.tar.gz" + fix-linker-flags.patch + SDL2-prevent-duplicate-d3d11-declarations.patch + SDL2-fix-gcc-compatibility.patch) md5sums=('fe6c61d2e9df9ef570e7e80c6e822537' - '932a4c42f068a9117c3c02efead14b29') + '932a4c42f068a9117c3c02efead14b29' + 'a70714d69deaea9e4f0cbfb17e9f4acf' + 'abbdbc90d737c8296b58d6af462b68b7') prepare() { cd "${srcdir}"/${_realname}-${pkgver} patch -p1 -i ${srcdir}/fix-linker-flags.patch + patch -p1 -i ${srcdir}/SDL2-prevent-duplicate-d3d11-declarations.patch + patch -p1 -i ${srcdir}/SDL2-fix-gcc-compatibility.patch ./autogen.sh } @@ -26,15 +32,16 @@ prepare() { build() { 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} + 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/sdl2.pc } diff --git a/mingw-w64-SDL2/SDL2-fix-gcc-compatibility.patch b/mingw-w64-SDL2/SDL2-fix-gcc-compatibility.patch new file mode 100644 index 0000000000..a17e037e4a --- /dev/null +++ b/mingw-w64-SDL2/SDL2-fix-gcc-compatibility.patch @@ -0,0 +1,413 @@ +--- a/src/render/direct3d11/SDL_render_d3d11.c.orig 2015-03-21 20:17:57.816864185 +0100 ++++ b/src/render/direct3d11/SDL_render_d3d11.c 2015-03-21 22:21:30.123045735 +0100 +@@ -46,6 +46,9 @@ + #endif /* __WINRT__ */ + + ++#define SDL_DEBUG_STRINGIFY_ARG(str) #str ++#define SDL_DEBUG(str) SDL_DEBUG_STRINGIFY_ARG(__FUNCTION__) str ++ + #define SAFE_RELEASE(X) if ((X)) { IUnknown_Release(SDL_static_cast(IUnknown*, X)); X = NULL; } + + +@@ -910,7 +925,7 @@ + blendDesc.RenderTarget[0].RenderTargetWriteMask = D3D11_COLOR_WRITE_ENABLE_ALL; + result = ID3D11Device_CreateBlendState(data->d3dDevice, &blendDesc, blendStateOutput); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateBlendState", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateBlendState"), result); + return result; + } + +@@ -992,14 +1007,14 @@ + + result = CreateDXGIFactoryFunc(&IID_IDXGIFactory2, &data->dxgiFactory); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", CreateDXGIFactory", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", CreateDXGIFactory"), result); + goto done; + } + + /* FIXME: Should we use the default adapter? */ + result = IDXGIFactory2_EnumAdapters(data->dxgiFactory, 0, &data->dxgiAdapter); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", D3D11CreateDevice", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", D3D11CreateDevice"), result); + goto done; + } + +@@ -1028,25 +1043,25 @@ + &d3dContext /* Returns the device immediate context. */ + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", D3D11CreateDevice", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", D3D11CreateDevice"), result); + goto done; + } + + result = ID3D11Device_QueryInterface(d3dDevice, &IID_ID3D11Device1, &data->d3dDevice); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device to ID3D11Device1", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device to ID3D11Device1"), result); + goto done; + } + + result = ID3D11DeviceContext_QueryInterface(d3dContext, &IID_ID3D11DeviceContext1, &data->d3dContext); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11DeviceContext to ID3D11DeviceContext1", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11DeviceContext to ID3D11DeviceContext1"), result); + goto done; + } + + result = ID3D11Device_QueryInterface(d3dDevice, &IID_IDXGIDevice1, &dxgiDevice); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device to IDXGIDevice1", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device to IDXGIDevice1"), result); + goto done; + } + +@@ -1055,7 +1070,7 @@ + */ + result = IDXGIDevice1_SetMaximumFrameLatency(dxgiDevice, 1); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGIDevice1::SetMaximumFrameLatency", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", IDXGIDevice1::SetMaximumFrameLatency"), result); + goto done; + } + +@@ -1084,7 +1099,7 @@ + break; + + default: +- SDL_SetError(__FUNCTION__ ", Unexpected feature level: %d", data->featureLevel); ++ SDL_SetError("%s, Unexpected feature level: %d", __FUNCTION__, data->featureLevel); + result = E_FAIL; + goto done; + } +@@ -1097,7 +1112,7 @@ + &data->vertexShader + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateVertexShader", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateVertexShader"), result); + goto done; + } + +@@ -1110,7 +1125,7 @@ + &data->inputLayout + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateInputLayout", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateInputLayout"), result); + goto done; + } + +@@ -1122,7 +1137,7 @@ + &data->colorPixelShader + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreatePixelShader ['color' shader]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreatePixelShader ['color' shader]"), result); + goto done; + } + +@@ -1133,7 +1148,7 @@ + &data->texturePixelShader + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreatePixelShader ['textures' shader]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreatePixelShader ['textures' shader]"), result); + goto done; + } + +@@ -1144,7 +1159,7 @@ + &data->yuvPixelShader + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreatePixelShader ['yuv' shader]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreatePixelShader ['yuv' shader]"), result); + goto done; + } + +@@ -1159,7 +1174,7 @@ + &data->vertexShaderConstants + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateBuffer [vertex shader constants]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateBuffer [vertex shader constants]"), result); + goto done; + } + +@@ -1179,7 +1194,7 @@ + &data->nearestPixelSampler + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateSamplerState [nearest-pixel filter]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateSamplerState [nearest-pixel filter]"), result); + goto done; + } + +@@ -1189,7 +1204,7 @@ + &data->linearSampler + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateSamplerState [linear filter]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateSamplerState [linear filter]"), result); + goto done; + } + +@@ -1207,14 +1222,14 @@ + rasterDesc.SlopeScaledDepthBias = 0.0f; + result = ID3D11Device_CreateRasterizerState(data->d3dDevice, &rasterDesc, &data->mainRasterizer); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateRasterizerState [main rasterizer]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateRasterizerState [main rasterizer]"), result); + goto done; + } + + rasterDesc.ScissorEnable = TRUE; + result = ID3D11Device_CreateRasterizerState(data->d3dDevice, &rasterDesc, &data->clippedRasterizer); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateRasterizerState [clipped rasterizer]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateRasterizerState [clipped rasterizer]"), result); + goto done; + } + +@@ -1374,7 +1389,7 @@ + &data->swapChain + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGIFactory2::CreateSwapChainForCoreWindow", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", IDXGIFactory2::CreateSwapChainForCoreWindow"), result); + goto done; + } + } else if (usingXAML) { +@@ -1384,18 +1399,18 @@ + NULL, + &data->swapChain); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGIFactory2::CreateSwapChainForComposition", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", IDXGIFactory2::CreateSwapChainForComposition"), result); + goto done; + } + + #if WINAPI_FAMILY == WINAPI_FAMILY_APP + result = ISwapChainBackgroundPanelNative_SetSwapChain(WINRT_GlobalSwapChainBackgroundPanelNative, (IDXGISwapChain *) data->swapChain); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ISwapChainBackgroundPanelNative::SetSwapChain", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ISwapChainBackgroundPanelNative::SetSwapChain"), result); + goto done; + } + #else +- SDL_SetError(__FUNCTION__ ", XAML support is not yet available for Windows Phone"); ++ SDL_SetError(SDL_DEBUG(", XAML support is not yet available for Windows Phone")); + result = E_FAIL; + goto done; + #endif +@@ -1414,7 +1429,7 @@ + &data->swapChain + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGIFactory2::CreateSwapChainForHwnd", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", IDXGIFactory2::CreateSwapChainForHwnd"), result); + goto done; + } + #else +@@ -1464,7 +1479,7 @@ + 0 + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain::ResizeBuffers", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", IDXGISwapChain::ResizeBuffers"), result); + goto done; + } + #endif +@@ -1485,7 +1500,7 @@ + if (data->swapEffect == DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL) { + result = IDXGISwapChain1_SetRotation(data->swapChain, data->rotation); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain1::SetRotation", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", IDXGISwapChain1::SetRotation"), result); + goto done; + } + } +@@ -1497,7 +1512,7 @@ + &backBuffer + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain::GetBuffer [back-buffer]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", IDXGISwapChain::GetBuffer [back-buffer]"), result); + goto done; + } + +@@ -1508,7 +1523,7 @@ + &data->mainRenderTargetView + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device::CreateRenderTargetView", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device::CreateRenderTargetView"), result); + goto done; + } + +@@ -1628,7 +1643,7 @@ + ); + if (FAILED(result)) { + D3D11_DestroyTexture(renderer, texture); +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateTexture2D"), result); + return -1; + } + +@@ -1646,7 +1661,7 @@ + ); + if (FAILED(result)) { + D3D11_DestroyTexture(renderer, texture); +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateTexture2D"), result); + return -1; + } + +@@ -1657,7 +1672,7 @@ + ); + if (FAILED(result)) { + D3D11_DestroyTexture(renderer, texture); +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateTexture2D"), result); + return -1; + } + } +@@ -1673,7 +1688,7 @@ + ); + if (FAILED(result)) { + D3D11_DestroyTexture(renderer, texture); +- WIN_SetErrorFromHRESULT(__FUNCTION__ "ID3D11Device1::CreateShaderResourceView", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG("ID3D11Device1::CreateShaderResourceView"), result); + return -1; + } + +@@ -1685,7 +1700,7 @@ + ); + if (FAILED(result)) { + D3D11_DestroyTexture(renderer, texture); +- WIN_SetErrorFromHRESULT(__FUNCTION__ "ID3D11Device1::CreateShaderResourceView", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG("ID3D11Device1::CreateShaderResourceView"), result); + return -1; + } + result = ID3D11Device_CreateShaderResourceView(rendererData->d3dDevice, +@@ -1695,7 +1710,7 @@ + ); + if (FAILED(result)) { + D3D11_DestroyTexture(renderer, texture); +- WIN_SetErrorFromHRESULT(__FUNCTION__ "ID3D11Device1::CreateShaderResourceView", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG("ID3D11Device1::CreateShaderResourceView"), result); + return -1; + } + } +@@ -1712,7 +1727,7 @@ + &textureData->mainTextureRenderTargetView); + if (FAILED(result)) { + D3D11_DestroyTexture(renderer, texture); +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateRenderTargetView", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateRenderTargetView"), result); + return -1; + } + } +@@ -1768,7 +1783,7 @@ + NULL, + &stagingTexture); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D [create staging texture]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateTexture2D [create staging texture]"), result); + return -1; + } + +@@ -1781,7 +1796,7 @@ + &textureMemory + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11DeviceContext1::Map [map staging texture]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11DeviceContext1::Map [map staging texture]"), result); + SAFE_RELEASE(stagingTexture); + return -1; + } +@@ -1943,7 +1958,7 @@ + NULL, + &textureData->stagingTexture); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D [create staging texture]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateTexture2D [create staging texture]"), result); + return -1; + } + +@@ -1956,7 +1971,7 @@ + &textureMemory + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11DeviceContext1::Map [map staging texture]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11DeviceContext1::Map [map staging texture]"), result); + SAFE_RELEASE(textureData->stagingTexture); + return -1; + } +@@ -2238,7 +2253,7 @@ + &mappedResource + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11DeviceContext1::Map [vertex buffer]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11DeviceContext1::Map [vertex buffer]"), result); + return -1; + } + SDL_memcpy(mappedResource.pData, vertexData, dataSizeInBytes); +@@ -2262,7 +2277,7 @@ + &rendererData->vertexBuffer + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateBuffer [vertex buffer]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateBuffer [vertex buffer]"), result); + return -1; + } + +@@ -2732,7 +2747,7 @@ + &backBuffer + ); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain1::GetBuffer [get back buffer]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", IDXGISwapChain1::GetBuffer [get back buffer]"), result); + goto done; + } + +@@ -2749,7 +2764,7 @@ + NULL, + &stagingTexture); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11Device1::CreateTexture2D [create staging texture]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11Device1::CreateTexture2D [create staging texture]"), result); + goto done; + } + +@@ -2781,7 +2796,7 @@ + 0, + &textureMemory); + if (FAILED(result)) { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", ID3D11DeviceContext1::Map [map staging texture]", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", ID3D11DeviceContext1::Map [map staging texture]"), result); + goto done; + } + +@@ -2800,7 +2815,7 @@ + * Get the error message, and attach some extra data to it. + */ + char errorMessage[1024]; +- SDL_snprintf(errorMessage, sizeof(errorMessage), __FUNCTION__ ", Convert Pixels failed: %s", SDL_GetError()); ++ SDL_snprintf(errorMessage, sizeof(errorMessage), "%s, Convert Pixels failed: %s", __FUNCTION__, SDL_GetError()); + SDL_SetError(errorMessage); + goto done; + } +@@ -2869,7 +2884,7 @@ + /* We probably went through a fullscreen <-> windowed transition */ + D3D11_CreateWindowSizeDependentResources(renderer); + } else { +- WIN_SetErrorFromHRESULT(__FUNCTION__ ", IDXGISwapChain::Present", result); ++ WIN_SetErrorFromHRESULT(SDL_DEBUG(", IDXGISwapChain::Present"), result); + } + } + } diff --git a/mingw-w64-SDL2/SDL2-prevent-duplicate-d3d11-declarations.patch b/mingw-w64-SDL2/SDL2-prevent-duplicate-d3d11-declarations.patch new file mode 100644 index 0000000000..32670831d0 --- /dev/null +++ b/mingw-w64-SDL2/SDL2-prevent-duplicate-d3d11-declarations.patch @@ -0,0 +1,27 @@ +--- a/src/render/direct3d11/SDL_render_d3d11.c.orig 2015-03-21 20:17:57.816864185 +0100 ++++ b/src/render/direct3d11/SDL_render_d3d11.c 2015-03-21 22:16:38.285858676 +0100 +@@ -132,12 +132,24 @@ + + + /* Defined here so we don't have to include uuid.lib */ ++#ifndef __IDXGIFactory2_INTERFACE_DEFINED__ + static const GUID IID_IDXGIFactory2 = { 0x50c83a1c, 0xe072, 0x4c48, { 0x87, 0xb0, 0x36, 0x30, 0xfa, 0x36, 0xa6, 0xd0 } }; ++#endif ++#ifndef __IDXGIDevice1_INTERFACE_DEFINED__ + static const GUID IID_IDXGIDevice1 = { 0x77db970f, 0x6276, 0x48ba, { 0xba, 0x28, 0x07, 0x01, 0x43, 0xb4, 0x39, 0x2c } }; ++#endif ++#ifndef __ID3D11Texture2D_INTERFACE_DEFINED__ + static const GUID IID_ID3D11Texture2D = { 0x6f15aaf2, 0xd208, 0x4e89, { 0x9a, 0xb4, 0x48, 0x95, 0x35, 0xd3, 0x4f, 0x9c } }; ++#endif ++#ifndef __ID3D11Device1_INTERFACE_DEFINED__ + static const GUID IID_ID3D11Device1 = { 0xa04bfb29, 0x08ef, 0x43d6, { 0xa4, 0x9c, 0xa9, 0xbd, 0xbd, 0xcb, 0xe6, 0x86 } }; ++#endif ++#ifndef __ID3D11DeviceContext1_INTERFACE_DEFINED__ + static const GUID IID_ID3D11DeviceContext1 = { 0xbb2c6faa, 0xb5fb, 0x4082, { 0x8e, 0x6b, 0x38, 0x8b, 0x8c, 0xfa, 0x90, 0xe1 } }; ++#endif ++#ifndef __ID3D11Debug_INTERFACE_DEFINED__ + static const GUID IID_ID3D11Debug = { 0x79cf2233, 0x7536, 0x4948, { 0x9d, 0x36, 0x1e, 0x46, 0x92, 0xdc, 0x57, 0x60 } }; ++#endif + + /* Direct3D 11.x shaders + diff --git a/mingw-w64-SDL2_gfx/PKGBUILD b/mingw-w64-SDL2_gfx/PKGBUILD index 592508260b..ffae4ff7db 100644 --- a/mingw-w64-SDL2_gfx/PKGBUILD +++ b/mingw-w64-SDL2_gfx/PKGBUILD @@ -3,29 +3,37 @@ _realname=SDL2_gfx pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.0.1 -pkgrel=1 -pkgdesc="SDL graphics drawing primitives and other support functions wrapped up in an addon library for the Simple Direct Media (SDL) cross-platform API layer." +pkgrel=2 +pkgdesc="SDL graphics drawing primitives and other support functions wrapped up in an addon library for the Simple Direct Media (SDL) cross-platform API layer" arch=('any') url="http://cms.ferzkopp.net/index.php/software/13-sdl-gfx" license=("zlib") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") depends=("${MINGW_PACKAGE_PREFIX}-SDL2") options=('staticlibs' 'strip') -source=("http://www.ferzkopp.net/Software/SDL2_gfx/SDL2_gfx-$pkgver.tar.gz") +source=("http://www.ferzkopp.net/Software/SDL2_gfx/SDL2_gfx-${pkgver}.tar.gz") md5sums=('9c96816618e3e086d885d1d214e59d87') +prepare() { + cd ${_realname}-${pkgver} + autoreconf -fiv +} + 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}" - "${srcdir}"/${_realname}-${pkgver}/configure \ + ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} + make } package() { cd "${srcdir}/build-${MINGW_CHOST}" - make DESTDIR="$pkgdir" install - install -Dm644 "${srcdir}"/${_realname}-${pkgver}/COPYING.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" + make DESTDIR="${pkgdir}" install + install -Dm644 "${srcdir}"/${_realname}-${pkgver}/COPYING "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" } diff --git a/mingw-w64-SDL2_image/PKGBUILD b/mingw-w64-SDL2_image/PKGBUILD index 1fd979a08a..d91bac0712 100644 --- a/mingw-w64-SDL2_image/PKGBUILD +++ b/mingw-w64-SDL2_image/PKGBUILD @@ -3,17 +3,17 @@ _realname=SDL2_image pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} pkgver=2.0.0 -pkgrel=3 +pkgrel=4 pkgdesc=("A simple library to load images of various formats as SDL surfaces (Version 2)") arch=('any') url="http://www.libsdl.org/projects/SDL_image" license=('MIT') depends=("${MINGW_PACKAGE_PREFIX}-SDL2" - "${MINGW_PACKAGE_PREFIX}-libpng" - "${MINGW_PACKAGE_PREFIX}-libtiff" - "${MINGW_PACKAGE_PREFIX}-libjpeg-turbo" - "${MINGW_PACKAGE_PREFIX}-libwebp") -makedepends=("${MINGW_PACKAGE_PREFIX}-cmake") + "${MINGW_PACKAGE_PREFIX}-libpng" + "${MINGW_PACKAGE_PREFIX}-libtiff" + "${MINGW_PACKAGE_PREFIX}-libjpeg-turbo" + "${MINGW_PACKAGE_PREFIX}-libwebp") +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") source=("${url}/release/${_realname}-${pkgver}.tar.gz") sha1sums=('20b1b0db9dd540d6d5e40c7da8a39c6a81248865') @@ -21,7 +21,7 @@ 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} \ @@ -33,8 +33,8 @@ build() { package() { cd "${srcdir}/build-${MINGW_CHOST}/" + make DESTDIR="${pkgdir}" install - make DESTDIR="${pkgdir}/" install install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING.txt" \ "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" } diff --git a/mingw-w64-SDL2_mixer/PKGBUILD b/mingw-w64-SDL2_mixer/PKGBUILD index e7e3050ff6..3f7bb9a0dc 100644 --- a/mingw-w64-SDL2_mixer/PKGBUILD +++ b/mingw-w64-SDL2_mixer/PKGBUILD @@ -3,7 +3,7 @@ _realname=SDL2_mixer pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.0.0 -pkgrel=4 +pkgrel=5 pkgdesc="A simple multi-channel audio mixer (Version 2) (mingw-w64)" arch=('any') url="http://www.libsdl.org/projects/SDL_mixer" @@ -22,8 +22,7 @@ source=("$url/release/${_realname}-${pkgver}.tar.gz") md5sums=('65f6d80df073a1fb3bb537fbda031b50') prepare() { - cd $startdir/ - [ -d $srcdir/${_realname}-$pkgver ] || tar -xzvf ${_realname}-${pkgver}.tar.gz -C $srcdir || true + [[ -d ${srcdir}/${_realname}-${pkgver} ]] || tar -xzvf ${_realname}-${pkgver}.tar.gz -C ${srcdir} || true cd "${srcdir}"/${_realname}-${pkgver} @@ -32,19 +31,21 @@ 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 \ + cd "${srcdir}/build-${MINGW_CHOST}/" + ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --enable-shared \ --enable-static + make } package() { cd "${srcdir}/build-${MINGW_CHOST}" - make DESTDIR="$pkgdir" install + make DESTDIR="${pkgdir}" install install -Dm644 "${srcdir}"/${_realname}-${pkgver}/COPYING.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" } diff --git a/mingw-w64-SDL2_net/PKGBUILD b/mingw-w64-SDL2_net/PKGBUILD index e284e0e37b..5256723433 100644 --- a/mingw-w64-SDL2_net/PKGBUILD +++ b/mingw-w64-SDL2_net/PKGBUILD @@ -3,7 +3,7 @@ _realname=SDL2_net pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="A small sample cross-platform networking library (Version 2) (mingw-w64)" arch=('any') url="http://www.libsdl.org/projects/SDL_net" @@ -11,23 +11,24 @@ license=("MIT") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-SDL2") options=('staticlibs' 'strip') -source=("$url/release/${_realname}-${pkgver}.tar.gz") +source=("${url}/release/${_realname}-${pkgver}.tar.gz") md5sums=('83bcd0e67796b81b35b08a014c677200') build() { 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-shared \ --enable-static + make } package() { cd "${srcdir}/build-${MINGW_CHOST}" - make DESTDIR="$pkgdir" install + make DESTDIR="${pkgdir}" install install -Dm644 "${srcdir}"/${_realname}-${pkgver}/COPYING.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" } diff --git a/mingw-w64-SDL2_sound-hg/PKGBUILD b/mingw-w64-SDL2_sound-hg/PKGBUILD index 0075a3b95c..9ee67ce8c2 100644 --- a/mingw-w64-SDL2_sound-hg/PKGBUILD +++ b/mingw-w64-SDL2_sound-hg/PKGBUILD @@ -22,7 +22,7 @@ makedepends=('mercurial') conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") options=('strip' 'staticlibs') -source=($_realname::"hg+http://hg.icculus.org/icculus/SDL_sound" +source=(${_realname}::"hg+http://hg.icculus.org/icculus/SDL_sound" 'pkgconfig.patch' 'physfs-renamed-export.patch' 'no-undefined.patch' @@ -53,7 +53,7 @@ build() { export lt_cv_deplibs_check_method='pass_all' 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} \ @@ -61,11 +61,11 @@ build() { --enable-shared \ --enable-static \ --disable-mikmod + make } package() { cd ${srcdir}/build-${MINGW_CHOST} - - make DESTDIR="$pkgdir/" install + make DESTDIR="${pkgdir}/" install } diff --git a/mingw-w64-SDL2_ttf/PKGBUILD b/mingw-w64-SDL2_ttf/PKGBUILD index 93d8a5507a..cdda89a06b 100644 --- a/mingw-w64-SDL2_ttf/PKGBUILD +++ b/mingw-w64-SDL2_ttf/PKGBUILD @@ -4,7 +4,7 @@ _realname=SDL2_ttf pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} pkgver=2.0.12 -pkgrel=2 +pkgrel=3 pkgdesc="A library that allows you to use TrueType fonts in your SDL applications (Version 2)" arch=('any') url="http://www.libsdl.org/projects/SDL_ttf" @@ -20,8 +20,7 @@ build() { mkdir -p ${srcdir}/build-${MINGW_CHOST} cd ${srcdir}/build-${MINGW_CHOST} - ${srcdir}/${_realname}-${pkgver}/configure \ - --disable-static \ + ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ diff --git a/mingw-w64-SDL_gfx/PKGBUILD b/mingw-w64-SDL_gfx/PKGBUILD index e1fad79a4a..4f03e471b7 100644 --- a/mingw-w64-SDL_gfx/PKGBUILD +++ b/mingw-w64-SDL_gfx/PKGBUILD @@ -3,7 +3,7 @@ _realname=SDL_gfx pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} pkgver=2.0.25 -pkgrel=1 +pkgrel=2 pkgdesc="SDL Graphic Primitives (mingw-w64)" arch=('any') url="http://www.ferzkopp.net/joomla/software-mainmenu-14/4-ferzkopps-linux-software/19-sdlgfx" @@ -14,10 +14,10 @@ source=("http://www.ferzkopp.net/Software/SDL_gfx-2.0/${_realname}-${pkgver}.tar sha1sums=('20a89d0b71b7b790b830c70f17ed2c44100bc0f4') 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 \ - --disable-static \ + cd "${srcdir}/build-${MINGW_CHOST}" + ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ @@ -28,9 +28,9 @@ build() { } package() { - cd "${srcdir}/build-${MINGW_CHOST}/" + 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}/LICENSE" } diff --git a/mingw-w64-SDL_image/PKGBUILD b/mingw-w64-SDL_image/PKGBUILD index 20cbd5f87a..29a55331a7 100644 --- a/mingw-w64-SDL_image/PKGBUILD +++ b/mingw-w64-SDL_image/PKGBUILD @@ -3,7 +3,7 @@ _realname=SDL_image pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} pkgver=1.2.12 -pkgrel=2 +pkgrel=3 pkgdesc=("A simple library to load images of various formats as SDL surfaces (mingw-w64)") arch=('any') url="http://www.libsdl.org/projects/SDL_image" @@ -19,10 +19,10 @@ source=("${url}/release/${_realname}-${pkgver}.tar.gz") sha1sums=('5e3e393d4e366638048bbb10d6a269ea3f4e4cf2') 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 \ - --disable-static \ + cd "${srcdir}/build-${MINGW_CHOST}" + ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ diff --git a/mingw-w64-SDL_ttf/PKGBUILD b/mingw-w64-SDL_ttf/PKGBUILD index 4ff202cb57..89987f5642 100644 --- a/mingw-w64-SDL_ttf/PKGBUILD +++ b/mingw-w64-SDL_ttf/PKGBUILD @@ -3,7 +3,7 @@ _realname=SDL_ttf pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.0.11 -pkgrel=1 +pkgrel=3 pkgdesc="A library that allows you to use TrueType fonts in your SDL applications (mingw-w64)" arch=('any') url="http://www.libsdl.org/projects/SDL_ttf/" @@ -11,15 +11,14 @@ license=("custom") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") depends=("${MINGW_PACKAGE_PREFIX}-SDL" "${MINGW_PACKAGE_PREFIX}-freetype") options=('staticlibs' 'strip') -source=(http://www.libsdl.org/projects/SDL_ttf/release/${_realname}-$pkgver.tar.gz - bug1433.patch) -md5sums=('61e29bd9da8d245bc2471d1b2ce591aa' - '52d4ce6ec81588cba9fb9f3ff57a4e92') +source=(http://www.libsdl.org/projects/SDL_ttf/release/${_realname}-${pkgver}.tar.gz) +md5sums=('61e29bd9da8d245bc2471d1b2ce591aa') 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} \ @@ -31,6 +30,6 @@ 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}/LICENSE" } diff --git a/mingw-w64-SDL_ttf/bug1433.patch b/mingw-w64-SDL_ttf/bug1433.patch deleted file mode 100644 index 819fcc4586..0000000000 --- a/mingw-w64-SDL_ttf/bug1433.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/SDL_ttf.c 2012-02-12 16:36:41.859977617 +0100 -+++ b/SDL_ttf.c 2012-02-12 16:36:53.696580159 +0100 -@@ -1747,7 +1747,7 @@ - /* Copy the character from the pixmap */ - src = glyph->pixmap.buffer; - dst = (Uint8*) textbuf->pixels; -- for ( row = 0; row < glyph->bitmap.rows; ++row ) { -+ for ( row = 0; row < glyph->pixmap.rows; ++row ) { - memcpy( dst, src, glyph->pixmap.width ); - src += glyph->pixmap.pitch; - dst += textbuf->pitch; diff --git a/mingw-w64-check/PKGBUILD b/mingw-w64-check/PKGBUILD index b8e6c38832..dfa0c29e98 100644 --- a/mingw-w64-check/PKGBUILD +++ b/mingw-w64-check/PKGBUILD @@ -3,17 +3,18 @@ _realname=check pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=0.9.14 -pkgrel=1 +pkgrel=2 pkgdesc="A unit testing framework for C (mingw-w64)" arch=('any') url="http://check.sourceforge.net/" license=("LGPL") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") options=('strip' 'staticlibs') -source=(http://downloads.sourceforge.net/sourceforge/${_realname}/${_realname}-$pkgver.tar.gz) +source=(http://downloads.sourceforge.net/sourceforge/${_realname}/${_realname}-${pkgver}.tar.gz) md5sums=('38263d115d784c17aa3b959ce94be8b8') 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-chromaprint/PKGBUILD b/mingw-w64-chromaprint/PKGBUILD index 4b82184596..6f58824af2 100644 --- a/mingw-w64-chromaprint/PKGBUILD +++ b/mingw-w64-chromaprint/PKGBUILD @@ -3,7 +3,7 @@ _realname=chromaprint pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.2 -pkgrel=1 +pkgrel=2 pkgdesc="Library that implements a custom algorithm for extracting fingerprints from any audio source (mingw-w64)" arch=('any') url="http://acoustid.org/chromaprint/" @@ -22,23 +22,19 @@ prepare() { build() { mkdir -p "${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=${pkgdir}${MINGW_PREFIX} \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DCMAKE_BUILD_TYPE=Release \ -DWITH_AVFFT=ON \ ../${_realname}-${pkgver} + make } package() { cd "${srcdir}/build-${MINGW_CHOST}" - make install - - mkdir -p ${pkgdir}${MINGW_PREFIX} - 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/libchromaprint.pc + make DESTDIR=${pkgdir} install } diff --git a/mingw-w64-clutter/PKGBUILD b/mingw-w64-clutter/PKGBUILD index 2f7877d7f7..d90d4d55b2 100644 --- a/mingw-w64-clutter/PKGBUILD +++ b/mingw-w64-clutter/PKGBUILD @@ -2,31 +2,29 @@ _realname=clutter pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.22.2 +pkgver=1.23.2 pkgrel=1 -pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces. (mingw-w64)" +pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces (mingw-w64)" arch=('any') url="http://clutter-project.org/" license=("LGPL") -makedepends=('automake' 'libtool' 'intltool' 'itstool' 'gtk-doc' 'gnome-doc-utils' 'yelp-tools') -depends=("${MINGW_PACKAGE_PREFIX}-gobject-introspection" - "${MINGW_PACKAGE_PREFIX}-atk" - "${MINGW_PACKAGE_PREFIX}-json-glib" - "${MINGW_PACKAGE_PREFIX}-cogl" - ) +makedepends=('automake' 'libtool' 'intltool' 'itstool' 'gtk-doc' 'gnome-doc-utils' 'yelp-tools' + "${MINGW_PACKAGE_PREFIX}-gobject-introspection") +depends=("${MINGW_PACKAGE_PREFIX}-gobject-introspection-runtime" + "${MINGW_PACKAGE_PREFIX}-atk" + "${MINGW_PACKAGE_PREFIX}-json-glib" + "${MINGW_PACKAGE_PREFIX}-cogl") options=(!libtool strip staticlibs) - -source=(http://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-$pkgver.tar.xz +source=(http://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz #"git://git.gnome.org/$_realname#tag=${pkgver}" "0001-msys2-add-header-for-BOOL-defintion.patch" "0002-msys2-add-CC-flags-to-gir-scanner.patch") - -md5sums=('48398ac43d45916eec03abc7a6e4f2ec' +md5sums=('48001c0b7f499cbf07f2b8af1999a2f9' '3a92db8341129b0db058d47f97062f65' '993eabbeb6fa31af855a593956727e6f') prepare() { - cd ${_realname}-$pkgver + cd ${_realname}-${pkgver} patch -p1 -i ${srcdir}/0001-msys2-add-header-for-BOOL-defintion.patch patch -p1 -i ${srcdir}/0002-msys2-add-CC-flags-to-gir-scanner.patch autoreconf -fvi @@ -38,12 +36,7 @@ build() { mkdir -p "${srcdir}/build-${MINGW_CHOST}" cd "${srcdir}/build-${MINGW_CHOST}" - mkdir -p doc/reference/cally/html - cp -rf ../${_realname}-${pkgver}/doc/reference/cally/html/* doc/reference/cally/html - mkdir -p doc/reference/clutter/html - cp -rf ../${_realname}-${pkgver}/doc/reference/clutter/html/* doc/reference/clutter/html - - ../${_realname}-$pkgver/configure \ + ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ @@ -51,12 +44,13 @@ build() { --enable-shared \ --enable-silent-rules \ --disable-gtk-doc + make } package() { cd "${srcdir}/build-${MINGW_CHOST}" - make -j1 DESTDIR="$pkgdir" install + make -j1 DESTDIR="${pkgdir}" install install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING" } diff --git a/mingw-w64-cogl/PKGBUILD b/mingw-w64-cogl/PKGBUILD index 60e1779f0f..67d9c790a4 100644 --- a/mingw-w64-cogl/PKGBUILD +++ b/mingw-w64-cogl/PKGBUILD @@ -3,15 +3,14 @@ _realname=cogl pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.20.0 -pkgrel=1 +pkgrel=2 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer (mingw-w64)" arch=('any') url="http://www.clutter-project.org/" license=('GPL2') makedepends=('automake' 'libtool' 'intltool' 'itstool' 'gtk-doc' 'gnome-doc-utils' 'yelp-tools') depends=("${MINGW_PACKAGE_PREFIX}-pango" - "${MINGW_PACKAGE_PREFIX}-gdk-pixbuf2" - ) + "${MINGW_PACKAGE_PREFIX}-gdk-pixbuf2") options=(!libtool strip staticlibs) source=(http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz "0001-msys2-fix-introspection-build.patch" @@ -29,7 +28,6 @@ prepare() { } build() { - mkdir -p "${srcdir}/build-${MINGW_CHOST}" [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" mkdir -p "${srcdir}/build-${MINGW_CHOST}" cd "${srcdir}/build-${MINGW_CHOST}" @@ -47,5 +45,5 @@ build() { package() { cd "${srcdir}/build-${MINGW_CHOST}" - make -j1 DESTDIR="$pkgdir" install + make -j1 DESTDIR="${pkgdir}" install } diff --git a/mingw-w64-daala-git/0003-missing-include.patch b/mingw-w64-daala-git/0003-missing-include.patch new file mode 100644 index 0000000000..682a0ffd69 --- /dev/null +++ b/mingw-w64-daala-git/0003-missing-include.patch @@ -0,0 +1,10 @@ +--- daala/src/mc.c.orig 2015-07-09 05:02:28.000000000 +0000 ++++ daala/src/mc.c 2015-07-09 12:24:59.844345500 +0000 +@@ -28,6 +28,7 @@ + + #include + #include ++#include + #include "logging.h" + #include "mc.h" + #include "state.h" diff --git a/mingw-w64-daala-git/0004-xp-sp2.all.patch b/mingw-w64-daala-git/0004-xp-sp2.all.patch new file mode 100644 index 0000000000..12ca426ad4 --- /dev/null +++ b/mingw-w64-daala-git/0004-xp-sp2.all.patch @@ -0,0 +1,11 @@ +--- daala-cb5f87b/configure.ac.orig 2015-01-16 05:02:28.000000000 +0000 ++++ daala-cb5f87b/configure.ac 2015-01-18 12:24:59.844345500 +0000 +@@ -52,7 +52,7 @@ + # It's okay to define this even when HTTP support is disabled, as it only + # affects header declarations, not linking (unless we actually use some + # XP-only functions). +- AC_DEFINE_UNQUOTED(_WIN32_WINNT,0x501, ++ AC_DEFINE_UNQUOTED(_WIN32_WINNT,0x502, + [We need at least WindowsXP for getaddrinfo/freaddrinfo]) + host_mingw=true + ;; diff --git a/mingw-w64-daala-git/0005-no-pkg-config-prefix.mingw.patch b/mingw-w64-daala-git/0005-no-pkg-config-prefix.mingw.patch new file mode 100644 index 0000000000..24f5933fca --- /dev/null +++ b/mingw-w64-daala-git/0005-no-pkg-config-prefix.mingw.patch @@ -0,0 +1,27 @@ +--- daala-cc4432e/m4/pkg.m4.orig 2015-04-03 02:08:04.000000000 +0000 ++++ daala-cc4432e/m4/pkg.m4 2015-04-06 12:13:46.678780600 +0000 +@@ -122,9 +122,9 @@ + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then +- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --dont-define-prefix --short-errors --print-errors --cflags --libs "$2" 2>&1` + else +- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --dont-define-prefix --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD +--- daala-cc4432e/m4/pkg.m4.orig 2015-04-06 12:17:39.485343300 +0000 ++++ daala-cc4432e/m4/pkg.m4 2015-04-06 12:19:32.115645500 +0000 +@@ -111,8 +111,8 @@ + pkg_failed=no + AC_MSG_CHECKING([for $1]) + +-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +-_PKG_CONFIG([$1][_LIBS], [libs], [$2]) ++_PKG_CONFIG([$1][_CFLAGS], [cflags --dont-define-prefix], [$2]) ++_PKG_CONFIG([$1][_LIBS], [libs --dont-define-prefix], [$2]) + + m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS + and $1[]_LIBS to avoid the need to call pkg-config. diff --git a/mingw-w64-daala-git/PKGBUILD b/mingw-w64-daala-git/PKGBUILD index c4fc138e3a..6345a4bf1e 100644 --- a/mingw-w64-daala-git/PKGBUILD +++ b/mingw-w64-daala-git/PKGBUILD @@ -2,24 +2,34 @@ _realname=daala pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git" -pkgdesc="Daala is next-next-gen video compression technology from Xiph.org, Mozilla and others." -pkgver=r1109.07ba88c +pkgdesc="Daala is next-next-gen video compression technology from Xiph.org, Mozilla and others (mingw-w64)" +pkgver=r1373.efb96ed pkgrel=1 arch=('any') url="https://www.xiph.org/daala/" license=('BSD') -makedepends=('git' "${MINGW_PACKAGE_PREFIX}-check") +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" + "${MINGW_PACKAGE_PREFIX}-check" + "${MINGW_PACKAGE_PREFIX}-doxygen" + "git") depends=("${MINGW_PACKAGE_PREFIX}-libogg" - "${MINGW_PACKAGE_PREFIX}-libpng") + "${MINGW_PACKAGE_PREFIX}-libpng" + "${MINGW_PACKAGE_PREFIX}-SDL2") provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") options=('strip' 'staticlibs') source=("${_realname}"::"git+https://git.xiph.org/daala.git" 0001-make-daalabase-public.mingw.patch - 0002-make-daalabase-public.mingw.patch) + 0002-make-daalabase-public.mingw.patch + 0003-missing-include.patch + 0004-xp-sp2.all.patch + 0005-no-pkg-config-prefix.mingw.patch) md5sums=('SKIP' 'b6aae57a2a95c785aa7b94f67c428b51' - '901557d36c62ccebf40d508ad834f157') + '901557d36c62ccebf40d508ad834f157' + '24df25713bb777ea48ba89ec0e4ccee5' + 'cc34a41847702531b0f3291bb51893d0' + '77ffed41ff865827171a6e70c4cd04d0') pkgver() { cd "${srcdir}/${_realname}" @@ -30,12 +40,17 @@ prepare() { cd ${srcdir}/${_realname} patch -p1 -i ${srcdir}/0001-make-daalabase-public.mingw.patch patch -p1 -i ${srcdir}/0002-make-daalabase-public.mingw.patch + patch -p1 -i ${srcdir}/0003-missing-include.patch + patch -p1 -i ${srcdir}/0004-xp-sp2.all.patch + patch -p1 -i ${srcdir}/0005-no-pkg-config-prefix.mingw.patch autoreconf -fi } build() { - mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST} + [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" + mkdir -p "${srcdir}/build-${MINGW_CHOST}" + cd "${srcdir}/build-${MINGW_CHOST}" ../${_realname}/configure \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ @@ -45,6 +60,7 @@ build() { --enable-static \ --enable-tools \ --disable-unit-tests + make } diff --git a/mingw-w64-eigen3/PKGBUILD b/mingw-w64-eigen3/PKGBUILD index 48b51efe38..b4134f796d 100644 --- a/mingw-w64-eigen3/PKGBUILD +++ b/mingw-w64-eigen3/PKGBUILD @@ -2,25 +2,32 @@ _realname=eigen pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}3") -pkgver=3.2.4 +pkgver=3.2.5 pkgrel=1 pkgdesc="Lightweight C++ template library for vector and matrix math (mingw-w64)" arch=('any') url='http://eigen.tuxfamily.org' license=('MPL2') options=('strip' 'staticlibs') -depends=("${MINGW_PACKAGE_PREFIX}-recode") -makedepends=("${MINGW_PACKAGE_PREFIX}-gcc") -source=("http://bitbucket.org/eigen/eigen/get/${pkgver}.tar.bz2" +makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" + "${MINGW_PACKAGE_PREFIX}-doxygen" + "${MINGW_PACKAGE_PREFIX}-fftw" + "${MINGW_PACKAGE_PREFIX}-gcc" + "${MINGW_PACKAGE_PREFIX}-mpfr" + #"${MINGW_PACKAGE_PREFIX}-qt4" + ) +source=(${_realname}-${pkgver}.tar.bz2::"http://bitbucket.org/eigen/eigen/get/${pkgver}.tar.bz2" 'eigen-3.1.2_osversion.patch' 'eigen-3.2_gcc58087.patch' 'TryRunResults.cmake' - 'eigen-pkgconfig.patch') -md5sums=('4c4b5ed9a388a1e475166d575af25477' + 'eigen-pkgconfig.patch' + 'eigen-test.patch') +md5sums=('21a928f6e0f1c7f24b6f63ff823593f5' '89587f79971efc8f363d478f48f86829' '1db055c7681799bb21118b2dcf95980a' '67e151de214f29c1e6cf00452916d7d4' - '1add870c05bb4c7bfcb4b739bc895cd4') + 'e07e847d7a87348b554fafe5e14b97ab' + '84d0f7d8967a9b04bf4e0fc7613c0f56') prepare() { cd "${srcdir}"/eigen-eigen-* @@ -28,31 +35,27 @@ prepare() { patch -Np2 -i "${srcdir}/eigen-3.1.2_osversion.patch" patch -Np1 -i "${srcdir}/eigen-3.2_gcc58087.patch" patch -Np1 -i "${srcdir}/eigen-pkgconfig.patch" + patch -Np1 -i "${srcdir}/eigen-test.patch" } build() { - cd ${srcdir}/eigen-eigen-* [[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST} mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST} + + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake.exe \ - -C "$srcdir"/TryRunResults.cmake \ -G"MSYS Makefiles" \ - -DCMAKE_INSTALL_PREFIX:PATH=${pkgdir}${MINGW_PREFIX} \ - -DEIGEN_BUILD_PKGCONFIG:BOOL=ON \ - .. + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ + -DEIGEN_BUILD_PKGCONFIG=ON \ + -DFFTW_USE_STATIC_LIBS=ON \ + -DFFTW_ROOT=${MINGW_PREFIX} \ + -C "${srcdir}"/TryRunResults.cmake \ + ../eigen-eigen-* make } package() { - cd ${srcdir}/eigen-eigen-*/build-${MINGW_CHOST} - - make install - mv ${pkgdir}${MINGW_PREFIX}/share ${pkgdir}${MINGW_PREFIX}/lib - - 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/eigen3.pc + cd ${srcdir}/build-${MINGW_CHOST} + make DESTDIR=${pkgdir} install } diff --git a/mingw-w64-eigen3/eigen-pkgconfig.patch b/mingw-w64-eigen3/eigen-pkgconfig.patch index 4129a49b6a..d39e560426 100644 --- a/mingw-w64-eigen3/eigen-pkgconfig.patch +++ b/mingw-w64-eigen3/eigen-pkgconfig.patch @@ -16,7 +16,24 @@ +Cflags: -I${includedir} --- eigen-eigen-1306d75b4a21/CMakeLists.txt.orig 2014-12-21 00:45:25.606600000 +0300 +++ eigen-eigen-1306d75b4a21/CMakeLists.txt 2014-12-21 00:45:50.519800000 +0300 -@@ -336,7 +336,7 @@ +@@ -92,9 +92,9 @@ + endif() + + option(EIGEN_BUILD_BTL "Build benchmark suite" OFF) +-if(NOT WIN32) ++if(NOT MSVC) + option(EIGEN_BUILD_PKGCONFIG "Build pkg-config .pc file for Eigen" ON) +-endif(NOT WIN32) ++endif(NOT MSVC) + + set(CMAKE_INCLUDE_CURRENT_DIR ON) + +@@ -336,11 +336,11 @@ + SET(pkg_config_install_dir ${pkg_config_libdir}) + message(STATUS "found ${pkg_config_libdir}/pkgconfig" ) + else(pkg_config_libdir) +- SET(pkg_config_install_dir ${CMAKE_INSTALL_PREFIX}/share) ++ SET(pkg_config_install_dir ${CMAKE_INSTALL_PREFIX}/lib) message(STATUS "pkgconfig not found; installing in ${pkg_config_install_dir}" ) endif(pkg_config_libdir) diff --git a/mingw-w64-eigen3/eigen-test.patch b/mingw-w64-eigen3/eigen-test.patch new file mode 100644 index 0000000000..7aaeee219f --- /dev/null +++ b/mingw-w64-eigen3/eigen-test.patch @@ -0,0 +1,11 @@ +--- eigen-eigen-bdd17ee3b1b3/cmake/EigenTesting.cmake.orig 2014-08-04 13:51:54.000000000 +0300 ++++ eigen-eigen-bdd17ee3b1b3/cmake/EigenTesting.cmake 2014-12-21 00:44:50.850000000 +0300 +@@ -324,7 +324,7 @@ + # on all other system we rely on ${CMAKE_CXX_COMPILER} + # supporting a "--version" or "/version" flag + +- if(WIN32 AND NOT CYGWIN) ++ if(WIN32 AND NOT CYGWIN AND NOT MINGW) + set(EIGEN_CXX_FLAG_VERSION "/version") + else() + set(EIGEN_CXX_FLAG_VERSION "--version") diff --git a/mingw-w64-enchant/PKGBUILD b/mingw-w64-enchant/PKGBUILD index 59d203a50d..ff732c81e3 100644 --- a/mingw-w64-enchant/PKGBUILD +++ b/mingw-w64-enchant/PKGBUILD @@ -4,16 +4,16 @@ _realname=enchant pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.6.0 -pkgrel=7 +pkgrel=8 pkgdesc="Enchanting Spell Checking Library (mingw-w64)" arch=('any') url="http://www.abisource.com/" license=(LGPL2.1) makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") depends=(${MINGW_PACKAGE_PREFIX}-gcc-libs - ${MINGW_PACKAGE_PREFIX}-glib2 - #${MINGW_PACKAGE_PREFIX}-aspell - ${MINGW_PACKAGE_PREFIX}-hunspell) + ${MINGW_PACKAGE_PREFIX}-glib2 + #${MINGW_PACKAGE_PREFIX}-aspell + ${MINGW_PACKAGE_PREFIX}-hunspell) options=('!libtool' 'strip' '!debug' '!makeflags') source=("http://www.abisource.com/downloads/${_realname}/${pkgver}/${_realname}-${pkgver}.tar.gz" 01-relocate.patch @@ -23,7 +23,7 @@ md5sums=('de11011aff801dc61042828041fb59c7' '4fc6176b94518ac1307e4a2173dc64d4') prepare() { - cd "$srcdir/${_realname}-$pkgver" + cd "${srcdir}/${_realname}-${pkgver}" # True relocate patch #patch -p1 -i ${srcdir}/01-relocate.patch # Use instead relocate patch @@ -33,11 +33,11 @@ prepare() { } build() { + [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" + mkdir -p "${srcdir}/build-${MINGW_CHOST}" + cd "${srcdir}/build-${MINGW_CHOST}" - mkdir -p "${srcdir}/${_realname}-${pkgver}-build-${CARCH}" - cd "${srcdir}/${_realname}-${pkgver}-build-${CARCH}" - - ${srcdir}/${_realname}-${pkgver}/configure \ + ../${_realname}-${pkgver}/configure \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ @@ -57,7 +57,7 @@ build() { } package() { - cd "${srcdir}/${_realname}-${pkgver}-build-${CARCH}" + cd "${srcdir}/build-${MINGW_CHOST}" # MSYS2_ARG_CONV_EXCL="-DENCHANT_USPELL_DICT_DIR=;-DENCHANT_MYSPELL_DICT_DIR=;-DENCHANT_ISPELL_DICT_DIR=;-DENCHANT_PREFIX_DIR=;-DENCHANT_GLOBAL_MODULE_DIR=;-DENCHANT_GLOBAL_ORDERING=;-DENCHANT_BIN_DIR=" make DESTDIR="${pkgdir}" install install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING.LIB" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING.LIB" diff --git a/mingw-w64-ffmpeg/PKGBUILD b/mingw-w64-ffmpeg/PKGBUILD index 44904ffca8..57f47d7ece 100644 --- a/mingw-w64-ffmpeg/PKGBUILD +++ b/mingw-w64-ffmpeg/PKGBUILD @@ -3,7 +3,7 @@ _realname=ffmpeg pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") pkgver=2.7.1 -pkgrel=1 +pkgrel=2 pkgdesc="Complete and free Internet live audio and video broadcasting solution (mingw-w64)" arch=('any') url="http://ffmpeg.org/" @@ -38,7 +38,7 @@ depends=( "${MINGW_PACKAGE_PREFIX}-xvidcore" "${MINGW_PACKAGE_PREFIX}-zlib" ) -makedepends=("yasm" "${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config" "${MINGW_PACKAGE_PREFIX}-yasm") source=(http://ffmpeg.org/releases/${_realname}-${pkgver}.tar.bz2) md5sums=('f159c6d7eed8546b23e1a17325cbf1f8') @@ -47,6 +47,7 @@ prepare() { } build() { + [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}" mkdir -p "${srcdir}/build-${MINGW_CHOST}" cd "${srcdir}/build-${MINGW_CHOST}" #CPPFLAGS+=" --save-temps" @@ -91,6 +92,7 @@ build() { --enable-postproc \ --enable-runtime-cpudetect \ --enable-shared \ + --enable-static \ --enable-swresample \ --enable-version3 \ --enable-zlib \ @@ -111,4 +113,6 @@ package() { mv "${pkgdir}${MINGW_PREFIX}"/bin/*.lib "${pkgdir}${MINGW_PREFIX}"/lib/ #find ${pkgdir}${MINGW_PREFIX}/bin -type f -name "*.exe" -exec objcopy --subsystem console {} \; + # rm -f ${pkgdir}${MINGW_PREFIX}/lib/*.def + # rm -f ${pkgdir}${MINGW_PREFIX}/lib/*.lib } diff --git a/mingw-w64-field3d/PKGBUILD b/mingw-w64-field3d/PKGBUILD index 20c8792dd2..13be25bef0 100644 --- a/mingw-w64-field3d/PKGBUILD +++ b/mingw-w64-field3d/PKGBUILD @@ -3,17 +3,19 @@ _realname=field3d pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.4.3 -pkgrel=2 +pkgrel=1 pkgdesc="Open source library for storing voxel data (mingw-w64)" arch=('any') url="https://sites.google.com/site/field3d/" license=("custom") depends=("${MINGW_PACKAGE_PREFIX}-boost" - "${MINGW_PACKAGE_PREFIX}-hdf5" - "${MINGW_PACKAGE_PREFIX}-openexr") -makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-gcc") + "${MINGW_PACKAGE_PREFIX}-hdf5" + "${MINGW_PACKAGE_PREFIX}-openexr") +makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" + "${MINGW_PACKAGE_PREFIX}-doxygen" + "${MINGW_PACKAGE_PREFIX}-gcc") options=('strip' 'buildflags') -source=(https://github.com/imageworks/Field3D/archive/v${pkgver}.tar.gz +source=(${_realname}-${pkgver}.tar.gz::https://github.com/imageworks/Field3D/archive/v${pkgver}.tar.gz cmake-mingw.patch) md5sums=('f76d8537f1d058ede0bcb14fbc09e28c' 'ceaf0f2e8b9afb0b3a3ae117ff2553e4') @@ -21,22 +23,21 @@ md5sums=('f76d8537f1d058ede0bcb14fbc09e28c' prepare() { cd ${srcdir}/Field3D-${pkgver} patch -p1 -i ${srcdir}/cmake-mingw.patch - #patch -p1 -i ${srcdir}/workaround-ansidecl-h-PTR-define-conflict.patch } build() { [[ -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_INSTALL_PREFIX=${pkgdir}${MINGW_PREFIX} \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ ../Field3D-${pkgver} make } package() { cd "$srcdir"/build-${MINGW_CHOST} - - make install + make DESTDIR=${pkgdir} install } diff --git a/mingw-w64-glib-networking/PKGBUILD b/mingw-w64-glib-networking/PKGBUILD index cdb335fa9d..5f767ed9e5 100644 --- a/mingw-w64-glib-networking/PKGBUILD +++ b/mingw-w64-glib-networking/PKGBUILD @@ -20,7 +20,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-p11-kit" "${MINGW_PACKAGE_PREFIX}-xz") options=('staticlibs' 'strip') -source=("http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver%.*}/${_realname}-$pkgver.tar.xz" +source=("http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz" 0001-dont-overwrite-prefix-remain-relative.mingw.patch 0001-hack-path.patch 0002-relative-system-ca-file.mingw.patch) @@ -30,7 +30,7 @@ md5sums=('6989b20cf3b26dd5ae272e04a9acb0b3' 'b96895469c4dc36e172056763aa0d014') prepare() { - cd "$srcdir/${_realname}-$pkgver" + cd "${srcdir}/${_realname}-${pkgver}" #patch -p1 -i ${srcdir}/0001-dont-overwrite-prefix-remain-relative.mingw.patch patch -p1 -i ${srcdir}/0001-hack-path.patch patch -p1 -i ${srcdir}/0002-relative-system-ca-file.mingw.patch @@ -42,7 +42,7 @@ build() { mkdir -p "${srcdir}/build-${MINGW_CHOST}" cd build-${MINGW_CHOST} - ../${_realname}-$pkgver/configure \ + ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ @@ -56,6 +56,6 @@ build() { package() { cd "${srcdir}/build-${MINGW_CHOST}" - make DESTDIR="$pkgdir" install + make DESTDIR="${pkgdir}" install rm -f ${pkgdir}${MINGW_PREFIX}/lib/gio/modules/*.a } diff --git a/mingw-w64-gsl/PKGBUILD b/mingw-w64-gsl/PKGBUILD index 99ce70ae47..90f9432ecf 100644 --- a/mingw-w64-gsl/PKGBUILD +++ b/mingw-w64-gsl/PKGBUILD @@ -1,30 +1,32 @@ # Maintainer: Alexey Pavlov _realname=gsl - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.16 -pkgrel=2 +pkgrel=3 pkgdesc="The GNU Scientific Library (GSL) is a modern numerical library for C and C++ programmers (mingw-w64)" arch=('any') url="http://www.gnu.org/software/gsl/gsl.html" license=("GPL") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") options=('staticlibs' 'strip') -source=("http://mirror.ibcp.fr/pub/gnu/gsl/gsl-$pkgver.tar.gz") +source=("http://mirror.ibcp.fr/pub/gnu/gsl/${_realname}-${pkgver}.tar.gz") md5sums=('e49a664db13d81c968415cd53f62bc8b') build() { - cd "$srcdir/gsl-$pkgver" - mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST} - ../configure \ + [[ -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 \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} - make + + make } package() { - cd "${srcdir}/gsl-${pkgver}/build-${MINGW_CHOST}" - make DESTDIR="$pkgdir" install + cd "${srcdir}/build-${MINGW_CHOST}" + make DESTDIR="${pkgdir}" install } diff --git a/mingw-w64-gst-plugins-base/PKGBUILD b/mingw-w64-gst-plugins-base/PKGBUILD index 6a06c86f99..3d69ec6954 100644 --- a/mingw-w64-gst-plugins-base/PKGBUILD +++ b/mingw-w64-gst-plugins-base/PKGBUILD @@ -3,24 +3,24 @@ _realname=gst-plugins-base pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.4.5 -pkgrel=1 +pkgrel=2 pkgdesc="GStreamer Multimedia Framework Base Plugins (mingw-w64)" arch=('any') url="http://gstreamer.freedesktop.org/" license=("LGPL") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" - "${MINGW_PACKAGE_PREFIX}-pkg-config" - "${MINGW_PACKAGE_PREFIX}-gobject-introspection" + "${MINGW_PACKAGE_PREFIX}-pkg-config" + "${MINGW_PACKAGE_PREFIX}-gobject-introspection" ) depends=("${MINGW_PACKAGE_PREFIX}-freetype" - "${MINGW_PACKAGE_PREFIX}-libvorbis" - "${MINGW_PACKAGE_PREFIX}-libtheora" - "${MINGW_PACKAGE_PREFIX}-libvorbisidec" - "${MINGW_PACKAGE_PREFIX}-pango" - #"${MINGW_PACKAGE_PREFIX}-libvisual" - #"${MINGW_PACKAGE_PREFIX}-cdparanoia" - "${MINGW_PACKAGE_PREFIX}-gstreamer" - "${MINGW_PACKAGE_PREFIX}-orc" + "${MINGW_PACKAGE_PREFIX}-libvorbis" + "${MINGW_PACKAGE_PREFIX}-libtheora" + "${MINGW_PACKAGE_PREFIX}-libvorbisidec" + "${MINGW_PACKAGE_PREFIX}-pango" + #"${MINGW_PACKAGE_PREFIX}-libvisual" + #"${MINGW_PACKAGE_PREFIX}-cdparanoia" + "${MINGW_PACKAGE_PREFIX}-gstreamer" + "${MINGW_PACKAGE_PREFIX}-orc" ) options=(!libtool strip staticlibs) source=(${url}/src/${_realname}/${_realname}-${pkgver}.tar.xz @@ -51,11 +51,10 @@ prepare() { } build() { - mkdir -p "${srcdir}/build-${MINGW_CHOST}" [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" - cp -r "${srcdir}/${_realname}-${pkgver}" "${srcdir}/build-${MINGW_CHOST}" + mkdir -p "${srcdir}/build-${MINGW_CHOST}" cd "${srcdir}/build-${MINGW_CHOST}" - ./configure \ + ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ @@ -69,7 +68,7 @@ build() { package() { cd "${srcdir}/build-${MINGW_CHOST}" - make -j1 DESTDIR="$pkgdir" install + make -j1 DESTDIR="${pkgdir}" install find "${pkgdir}${MINGW_PREFIX}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm rm -f ${pkgdir}${MINGW_PREFIX}/lib/gstreamer*/*.a } diff --git a/mingw-w64-gst-plugins-good/PKGBUILD b/mingw-w64-gst-plugins-good/PKGBUILD index 1dc5e90c3d..fce40d6a10 100644 --- a/mingw-w64-gst-plugins-good/PKGBUILD +++ b/mingw-w64-gst-plugins-good/PKGBUILD @@ -3,27 +3,27 @@ _realname=gst-plugins-good pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.4.5 -pkgrel=1 +pkgrel=2 pkgdesc="GStreamer Multimedia Framework Base Plugins (mingw-w64)" arch=('any') url="http://gstreamer.freedesktop.org/" license=("LGPL") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" - "${MINGW_PACKAGE_PREFIX}-pkg-config" - "${MINGW_PACKAGE_PREFIX}-python2" + "${MINGW_PACKAGE_PREFIX}-pkg-config" + "${MINGW_PACKAGE_PREFIX}-python2" ) depends=("${MINGW_PACKAGE_PREFIX}-cairo" - "${MINGW_PACKAGE_PREFIX}-flac" - "${MINGW_PACKAGE_PREFIX}-gdk-pixbuf2" - "${MINGW_PACKAGE_PREFIX}-gstreamer" - "${MINGW_PACKAGE_PREFIX}-gst-plugins-base" - "${MINGW_PACKAGE_PREFIX}-libcaca" - "${MINGW_PACKAGE_PREFIX}-libshout" - "${MINGW_PACKAGE_PREFIX}-libsoup" - "${MINGW_PACKAGE_PREFIX}-libvpx" - "${MINGW_PACKAGE_PREFIX}-speex" - "${MINGW_PACKAGE_PREFIX}-taglib" - "${MINGW_PACKAGE_PREFIX}-wavpack" + "${MINGW_PACKAGE_PREFIX}-flac" + "${MINGW_PACKAGE_PREFIX}-gdk-pixbuf2" + "${MINGW_PACKAGE_PREFIX}-gstreamer" + "${MINGW_PACKAGE_PREFIX}-gst-plugins-base" + "${MINGW_PACKAGE_PREFIX}-libcaca" + "${MINGW_PACKAGE_PREFIX}-libshout" + "${MINGW_PACKAGE_PREFIX}-libsoup" + "${MINGW_PACKAGE_PREFIX}-libvpx" + "${MINGW_PACKAGE_PREFIX}-speex" + "${MINGW_PACKAGE_PREFIX}-taglib" + "${MINGW_PACKAGE_PREFIX}-wavpack" ) options=(!libtool strip staticlibs) source=(${url}/src/${_realname}/${_realname}-${pkgver}.tar.xz @@ -42,11 +42,11 @@ prepare() { } build() { - mkdir -p "${srcdir}/build-${MINGW_CHOST}" [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" - cp -r "${srcdir}/${_realname}-${pkgver}" "${srcdir}/build-${MINGW_CHOST}" + mkdir -p "${srcdir}/build-${MINGW_CHOST}" + #cp -r "${srcdir}/${_realname}-${pkgver}" "${srcdir}/build-${MINGW_CHOST}" cd "${srcdir}/build-${MINGW_CHOST}" - ./configure \ + ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ @@ -55,12 +55,13 @@ build() { --enable-silent-rules \ --enable-experimental \ --disable-gtk-doc + make } package() { cd "${srcdir}/build-${MINGW_CHOST}" - make -j1 DESTDIR="$pkgdir" install + make -j1 DESTDIR="${pkgdir}" install find "${pkgdir}${MINGW_PREFIX}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm rm -f ${pkgdir}${MINGW_PREFIX}/lib/gstreamer*/*.a } diff --git a/mingw-w64-gstreamer/PKGBUILD b/mingw-w64-gstreamer/PKGBUILD index 9533514bdb..58c5e6ad16 100644 --- a/mingw-w64-gstreamer/PKGBUILD +++ b/mingw-w64-gstreamer/PKGBUILD @@ -3,25 +3,24 @@ _realname=gstreamer pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.4.5 -pkgrel=1 +pkgrel=2 pkgdesc="GStreamer Multimedia Framework (mingw-w64)" arch=('any') url="http://gstreamer.freedesktop.org/" license=("LGPL") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" - "${MINGW_PACKAGE_PREFIX}-pkg-config" - "${MINGW_PACKAGE_PREFIX}-gobject-introspection" - "intltool" - "gtk-doc" - "flex" - "bison" - ) + "${MINGW_PACKAGE_PREFIX}-pkg-config" + "${MINGW_PACKAGE_PREFIX}-gobject-introspection" + "intltool" + "gtk-doc" + "flex" + "bison") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" - "${MINGW_PACKAGE_PREFIX}-libxml2" - "${MINGW_PACKAGE_PREFIX}-glib2" - "${MINGW_PACKAGE_PREFIX}-gettext" - "${MINGW_PACKAGE_PREFIX}-gmp" - "${MINGW_PACKAGE_PREFIX}-gsl") + "${MINGW_PACKAGE_PREFIX}-libxml2" + "${MINGW_PACKAGE_PREFIX}-glib2" + "${MINGW_PACKAGE_PREFIX}-gettext" + "${MINGW_PACKAGE_PREFIX}-gmp" + "${MINGW_PACKAGE_PREFIX}-gsl") options=(!libtool strip staticlibs) source=("${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz" 'give-cc-to-gir-scanner.mingw.patch' @@ -46,11 +45,11 @@ build() { fi [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" - cp -r "${srcdir}/${_realname}-${pkgver}" "${srcdir}/build-${MINGW_CHOST}" - #mkdir -p "${srcdir}/build-${MINGW_CHOST}" + #cp -r "${srcdir}/${_realname}-${pkgver}" "${srcdir}/build-${MINGW_CHOST}" + mkdir -p "${srcdir}/build-${MINGW_CHOST}" cd "${srcdir}/build-${MINGW_CHOST}" - export PKG_CONFIG_EXPAND_PATHS=1 - ./configure \ + + ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ @@ -63,12 +62,13 @@ build() { --enable-check \ --disable-silent-rules \ "${extra_config[@]}" + make } package() { cd "${srcdir}/build-${MINGW_CHOST}" - make -j1 DESTDIR="$pkgdir" install + make -j1 DESTDIR="${pkgdir}" install find "${pkgdir}${MINGW_PREFIX}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm rm -f ${pkgdir}${MINGW_PREFIX}/lib/gstreamer*/*.a } diff --git a/mingw-w64-hdf5/PKGBUILD b/mingw-w64-hdf5/PKGBUILD index 1235175c50..c6acec4bd6 100644 --- a/mingw-w64-hdf5/PKGBUILD +++ b/mingw-w64-hdf5/PKGBUILD @@ -3,22 +3,24 @@ _realname=hdf5 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.8.14 +_ver=1.8.15 +patch=-patch1 +pkgver=${_ver}${patch//-/.} pkgrel=1 pkgdesc="General purpose library and file format for storing scientific data" arch=('any') url="http://www.hdfgroup.org/HDF5/" -source=("http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-${pkgver}/src/hdf5-${pkgver}.tar.bz2" +source=("http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-${_ver}${patch}/src/hdf5-${_ver}${patch}.tar.bz2" "hdf5-link-ws2_32-mingw.patch" "hdf5-default-import-suffix.patch" "hdf5-install.patch" "hdf5-fix-install-docs.patch" ) -md5sums=('4e31a751ef12f5958e23e4ee548c4ca5' - '35e0198f4ed456ee5673c23a06aa5eb6' +md5sums=('3c0d7a8c38d1abc7b40fc12c1d5f2bb8' + 'a7521a2d777df6cb971d646720f353a9' '4a9a46e98db4a6ed68e0dd2d3e2cf4ac' 'f08826ac66e319190a01d3f82a692c0e' - '44ac9317cb413eca5ed506033fd3b676') + '45267f00ae4feca9862de19f68f487d0') depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-gcc-libgfortran" "${MINGW_PACKAGE_PREFIX}-szip" @@ -30,7 +32,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" options=('staticlibs' 'strip') prepare() { - cd ${srcdir}/${_realname}-${pkgver} + cd ${srcdir}/${_realname}-${_ver}${patch} patch -p1 -i ${srcdir}/hdf5-link-ws2_32-mingw.patch patch -p1 -i ${srcdir}/hdf5-install.patch patch -p1 -i ${srcdir}/hdf5-default-import-suffix.patch @@ -53,9 +55,11 @@ prepare() { build() { [[ -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=${pkgdir}${MINGW_PREFIX} \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DBUILD_SHARED_LIBS=ON \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ @@ -66,11 +70,11 @@ build() { -DHDF5_ENABLE_DEPRECATED_SYMBOLS=ON \ -DHDF5_ENABLE_SZIP_SUPPORT=ON \ -DHDF5_ENABLE_Z_LIB_SUPPORT=ON \ - ../${_realname}-${pkgver} + ../${_realname}-${_ver}${patch} make } package() { cd "${srcdir}/build-${MINGW_CHOST}" - make -j1 install + make DESTDIR=${pkgdir} install } diff --git a/mingw-w64-hdf5/hdf5-fix-install-docs.patch b/mingw-w64-hdf5/hdf5-fix-install-docs.patch index 00c233a94b..0474279a12 100644 --- a/mingw-w64-hdf5/hdf5-fix-install-docs.patch +++ b/mingw-w64-hdf5/hdf5-fix-install-docs.patch @@ -14,7 +14,7 @@ install ( FILES ${release_files} - DESTINATION ${HDF5_INSTALL_DATA_DIR} -+ DESTINATION ${HDF5_INSTALL_DATA_DIR}/doc/hdf5 ++ DESTINATION ${HDF5_INSTALL_DATA_DIR}/doc/hdf5 COMPONENT hdfdocuments ) endif (EXISTS "${HDF5_SOURCE_DIR}/release_docs" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/release_docs") diff --git a/mingw-w64-hdf5/hdf5-link-ws2_32-mingw.patch b/mingw-w64-hdf5/hdf5-link-ws2_32-mingw.patch index ec8ae0e09e..851fd87eb1 100644 --- a/mingw-w64-hdf5/hdf5-link-ws2_32-mingw.patch +++ b/mingw-w64-hdf5/hdf5-link-ws2_32-mingw.patch @@ -4,7 +4,7 @@ diff -ur hdf5-1.8.12.orig/src/CMakeLists.txt hdf5-1.8.12/src/CMakeLists.txt @@ -615,9 +615,11 @@ #----------------------------------------------------------------------------- add_executable (H5detect ${HDF5_SRC_DIR}/H5detect.c) - TARGET_C_PROPERTIES (H5detect " " " ") + TARGET_C_PROPERTIES (H5detect STATIC " " " ") -if (MSVC OR MINGW) +if (MSVC) target_link_libraries (H5detect "ws2_32.lib") @@ -18,7 +18,7 @@ diff -ur hdf5-1.8.12.orig/src/CMakeLists.txt hdf5-1.8.12/src/CMakeLists.txt @@ -629,9 +629,11 @@ add_executable (H5make_libsettings ${HDF5_SRC_DIR}/H5make_libsettings.c) - TARGET_C_PROPERTIES (H5make_libsettings " " " ") + TARGET_C_PROPERTIES (H5make_libsettings STATIC " " " ") -if (MSVC OR MINGW) +if (MSVC) target_link_libraries (H5make_libsettings "ws2_32.lib") diff --git a/mingw-w64-hunspell/PKGBUILD b/mingw-w64-hunspell/PKGBUILD index 75557f3e21..28dfab668a 100644 --- a/mingw-w64-hunspell/PKGBUILD +++ b/mingw-w64-hunspell/PKGBUILD @@ -5,7 +5,7 @@ _realname=hunspell pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.3.3 -pkgrel=9 +pkgrel=10 pkgdesc="Spell checker and morphological analyzer library and program (mingw-w64)" arch=('any') url="http://hunspell.sourceforge.net/" @@ -15,9 +15,9 @@ license=(GPL2+ LGPL2.1+) makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") depends=(${MINGW_PACKAGE_PREFIX}-gcc-libs - ${MINGW_PACKAGE_PREFIX}-gettext) + ${MINGW_PACKAGE_PREFIX}-gettext) options=('!libtool' 'strip' '!debug') -source=("http://download.sourceforge.net/${_realname}/${_realname}-$pkgver.tar.gz" +source=("http://download.sourceforge.net/${_realname}/${_realname}-${pkgver}.tar.gz" "hunspell-1.3.2-canonicalhost.patch" "hunspell-1.3.3-exit-on-MAX_PREFIXES_SUFFIXES.patch" "hunspell-1.3.3-inc-MAX_PREFIXES_SUFFIXES-to-2048.patch" @@ -31,7 +31,7 @@ md5sums=('4967da60b23413604c9e563beacc63b4' '7d59a4f3c4c2f6b40cba5c54072cbd67') prepare() { - cd "$srcdir/${_realname}-$pkgver" + cd "${srcdir}/${_realname}-${pkgver}" patch -Np1 -i "$srcdir"/hunspell-1.3.2-canonicalhost.patch patch -Np1 -i "$srcdir"/hunspell-1.3.3-exit-on-MAX_PREFIXES_SUFFIXES.patch patch -Np1 -i "$srcdir"/hunspell-1.3.3-inc-MAX_PREFIXES_SUFFIXES-to-2048.patch @@ -42,11 +42,11 @@ prepare() { } build() { + [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" + mkdir -p "${srcdir}/build-${MINGW_CHOST}" + cd "${srcdir}/build-${MINGW_CHOST}" - mkdir -p "${srcdir}/build-${CARCH}" - cd "${srcdir}/build-${CARCH}" - - ${srcdir}/${_realname}-${pkgver}/configure \ + ../${_realname}-${pkgver}/configure \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ @@ -61,7 +61,7 @@ build() { } package() { - cd "${srcdir}/build-${CARCH}" + cd "${srcdir}/build-${MINGW_CHOST}" MSYS2_ARG_CONV_EXCL="-DBINDIR=;-DDATA_DIR=" \ make DESTDIR="${pkgdir}" install cp ${pkgdir}${MINGW_PREFIX}/lib/lib${_realname}-${pkgver%.*}.dll.a ${pkgdir}${MINGW_PREFIX}/lib/lib${_realname}.dll.a diff --git a/mingw-w64-ilmbase/PKGBUILD b/mingw-w64-ilmbase/PKGBUILD index e5b0f38aaf..9a4e1ee2c3 100644 --- a/mingw-w64-ilmbase/PKGBUILD +++ b/mingw-w64-ilmbase/PKGBUILD @@ -3,12 +3,12 @@ _realname=ilmbase pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Base libraries from ILM for OpenEXR (mingw-w64)" arch=('any') url="http://http://www.openexr.com/" license=("custom") -makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config" "libtool") +makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") options=('staticlibs' 'strip') source=("http://download.savannah.nongnu.org/releases/openexr/${_realname}-${pkgver}.tar.gz" @@ -26,24 +26,26 @@ md5sums=('b540db502c5fa42078249f43d18a4652' 'baaa4fa9467969a611c70e62efa1fe6b' '20447d0f67bbcd7b98d51fd0c37dabec') prepare(){ - cd "$srcdir/${_realname}-$pkgver" + cd "${srcdir}/${_realname}-${pkgver}" # Use either one or the other of the ilmthread patches # depending on the sort of threads that you want. - # patch -Np1 -i "$srcdir/ilmthread-mingw-win32.patch" - patch -Np1 -i "$srcdir/ilmthread-mingw-pthreads.patch" - patch -Np1 -i "$srcdir/ilmbase-2.1.0_obsolete-macros.patch" - patch -Np1 -i "$srcdir/cmake-soversion.patch" - patch -Np1 -i "$srcdir/cmake-install-binaries.patch" - patch -Np2 -i "$srcdir/pull93.patch" - #./bootstrap + # patch -p1 -i "${srcdir}/ilmthread-mingw-win32.patch" + patch -p1 -i "${srcdir}/ilmthread-mingw-pthreads.patch" + patch -p1 -i "${srcdir}/ilmbase-2.1.0_obsolete-macros.patch" + patch -p1 -i "${srcdir}/cmake-soversion.patch" + patch -p1 -i "${srcdir}/cmake-install-binaries.patch" + patch -p2 -i "${srcdir}/pull93.patch" } build() { - mkdir build-${CARCH} - cd build-${CARCH} + [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "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 \ -G"MSYS Makefiles" \ - -DCMAKE_INSTALL_PREFIX=${pkgdir}${MINGW_PREFIX} \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DBUILD_SHARED_LIBS=ON \ -DNAMESPACE_VERSIONING=ON \ ../${_realname}-${pkgver} @@ -52,12 +54,6 @@ build() { } package() { - cd "${srcdir}/build-${CARCH}" - 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/IlmBase.pc + cd "${srcdir}/build-${MINGW_CHOST}" + make DESTDIR=${pkgdir} install } diff --git a/mingw-w64-intel-tbb/PKGBUILD b/mingw-w64-intel-tbb/PKGBUILD index 02c1934b48..5d0b508880 100644 --- a/mingw-w64-intel-tbb/PKGBUILD +++ b/mingw-w64-intel-tbb/PKGBUILD @@ -2,7 +2,7 @@ _realname=intel-tbb pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=4.3_20150209 +pkgver=4.3_20150611 pkgrel=1 pkgdesc='High level abstract threading library (mingw-w64)' depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") @@ -11,9 +11,9 @@ options=('!strip' 'staticlibs') arch=('any') url='http://www.threadingbuildingblocks.org/' license=('GPL') -source=("http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb${pkgver/\./}oss_src.tgz" +source=(https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb${pkgver//./}oss_src.tgz 'tbb-disable_windows_api.patch') -sha1sums=('cb17bee2a9c98a2b98f3ff16208c1c1fae29e6ab' +sha1sums=('5457cd15ad13625442283e67844199a79e88a3a4' '13784f69be6915a0e9d751bfa5b6cc0166449ac7') prepare () { diff --git a/mingw-w64-libblueray/PKGBUILD b/mingw-w64-libblueray/PKGBUILD index 72cbba663d..8b8f8aa50b 100644 --- a/mingw-w64-libblueray/PKGBUILD +++ b/mingw-w64-libblueray/PKGBUILD @@ -2,7 +2,7 @@ _realname=libbluray pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=0.8.0 +pkgver=0.8.1 pkgrel=1 pkgdesc='Library to access Blu-Ray disks for video playback (mingw-w64)' arch=('any') @@ -10,10 +10,12 @@ url='http://www.videolan.org/developers/libbluray.html' license=('LGPL2.1') depends=("${MINGW_PACKAGE_PREFIX}-libxml2" "${MINGW_PACKAGE_PREFIX}-freetype") options=('strip' 'staticlibs') -makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") -source=(ftp://ftp.videolan.org/pub/videolan/libbluray/$pkgver/${_realname}-$pkgver.tar.bz2 +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" + "${MINGW_PACKAGE_PREFIX}-doxygen" + "${MINGW_PACKAGE_PREFIX}-pkg-config") +source=(ftp://ftp.videolan.org/pub/videolan/libbluray/${pkgver}/${_realname}-${pkgver}.tar.bz2 no-undefined.patch) -md5sums=('bd2b8684d5afd17dc270f19eb1a5bb9a' +md5sums=('c7a89966ad091fa6075a58d31a698e70' 'abefd822b6db0a042640e9a6dda06254') prepare() { @@ -28,17 +30,18 @@ build() { mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}" export lt_cv_deplibs_check_method='pass_all' - ../${_realname}-$pkgver/configure \ + ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ --enable-examples \ --disable-bdjava + make } package() { cd ${srcdir}/build-${MINGW_CHOST} - make DESTDIR="$pkgdir" install + make DESTDIR="${pkgdir}" install } diff --git a/mingw-w64-libcaca/PKGBUILD b/mingw-w64-libcaca/PKGBUILD index 68d6d46fa8..09781114d9 100644 --- a/mingw-w64-libcaca/PKGBUILD +++ b/mingw-w64-libcaca/PKGBUILD @@ -1,24 +1,22 @@ # Maintainer: Alexey Pavlov _realname=libcaca - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=0.99.beta19 -pkgrel=1 +pkgrel=2 pkgdesc="Color AsCii Art library (mingw-w64)" arch=('any') url="http://caca.zoy.org/wiki/libcaca" license=("LGPL") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" - "${MINGW_PACKAGE_PREFIX}-pkg-config" - #"${MINGW_PACKAGE_PREFIX}-ncurses" - "${MINGW_PACKAGE_PREFIX}-python2" - "${MINGW_PACKAGE_PREFIX}-ruby" - ) -depends=("${MINGW_PACKAGE_PREFIX}-zlib" - "${MINGW_PACKAGE_PREFIX}-freetype" + "${MINGW_PACKAGE_PREFIX}-pkg-config" + #"${MINGW_PACKAGE_PREFIX}-ncurses" + "${MINGW_PACKAGE_PREFIX}-python2" + "${MINGW_PACKAGE_PREFIX}-ruby") +depends=("${MINGW_PACKAGE_PREFIX}-cppunit" "${MINGW_PACKAGE_PREFIX}-fontconfig" - "${MINGW_PACKAGE_PREFIX}-cppunit") + "${MINGW_PACKAGE_PREFIX}-freetype" + "${MINGW_PACKAGE_PREFIX}-zlib") options=(!libtool strip staticlibs) source=(http://libcaca.zoy.org/files/libcaca/${_realname}-${pkgver}.tar.gz 0001-win32-is-not-msvc-it-could-be.mingw.patch @@ -45,22 +43,21 @@ prepare() { } build() { - mkdir -p "${srcdir}/build-${MINGW_CHOST}" [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" - cp -r "${srcdir}/${_realname}-${pkgver}" "${srcdir}/build-${MINGW_CHOST}" - cd "${srcdir}/build-${MINGW_CHOST}" - ./configure \ + mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}" + ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --enable-static \ --enable-shared \ --disable-ncurses + make } package() { cd "${srcdir}/build-${MINGW_CHOST}" - make -j1 DESTDIR="$pkgdir" install + make -j1 DESTDIR="${pkgdir}" install find "${pkgdir}${MINGW_PREFIX}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm } diff --git a/mingw-w64-libdvdcss/PKGBUILD b/mingw-w64-libdvdcss/PKGBUILD index 6ce9cf604d..6db8edb561 100644 --- a/mingw-w64-libdvdcss/PKGBUILD +++ b/mingw-w64-libdvdcss/PKGBUILD @@ -2,29 +2,42 @@ _realname=libdvdcss pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.3.0 +pkgver=1.3.99 pkgrel=1 pkgdesc="Portable abstraction library for DVD decryption (mingw-w64)" arch=('any') url="http://www.videolan.org/libdvdcss" license=("GPL") -makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" + "${MINGW_PACKAGE_PREFIX}-doxygen" + "${MINGW_PACKAGE_PREFIX}-pkg-config" + "git") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") options=('staticlibs' 'strip') -source=("http://download.videolan.org/pub/${_realname}/$pkgver/${_realname}-$pkgver.tar.bz2") -sha256sums=('7c414acd520c4e4dd7267952f72d738ff50321a7869af4d75c65aefad44f1395') +source=(#"http://download.videolan.org/pub/${_realname}/${pkgver}/${_realname}-${pkgver}.tar.bz2" + "${_realname}-${pkgver}"::"git://git.videolan.org/${_realname}.git#tag=${pkgver}") +sha256sums=('SKIP') + +prepare() { + cd ${srcdir}/${_realname}-${pkgver} + autoreconf -fi +} build() { - mkdir -p "${srcdir}/build-${MINGW_CHOST}" + [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" + #mkdir -p "${srcdir}/build-${MINGW_CHOST}" + cp -rf ${_realname}-${pkgver} build-${MINGW_CHOST} cd "${srcdir}/build-${MINGW_CHOST}" - "${srcdir}"/${_realname}-$pkgver/configure \ + ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ - --host=${MINGW_CHOST} + --host=${MINGW_CHOST} \ + --disable-doc + make } package() { cd "${srcdir}/build-${MINGW_CHOST}" - make DESTDIR="$pkgdir" install + make DESTDIR="${pkgdir}" install } diff --git a/mingw-w64-libdvdnav/PKGBUILD b/mingw-w64-libdvdnav/PKGBUILD index 2fc63c68b2..063dbe9e0f 100644 --- a/mingw-w64-libdvdnav/PKGBUILD +++ b/mingw-w64-libdvdnav/PKGBUILD @@ -2,16 +2,19 @@ _realname=libdvdnav pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=5.0.1 +pkgver=5.0.3 pkgrel=1 pkgdesc="The library for xine-dvdnav plugin (mingw-w64)" arch=('any') url="http://dvdnav.mplayerhq.hu/" license=("GPL") -makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config" "git") +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" + "${MINGW_PACKAGE_PREFIX}-doxygen" + "${MINGW_PACKAGE_PREFIX}-pkg-config" + "git") depends=("${MINGW_PACKAGE_PREFIX}-libdvdread") options=('staticlibs' 'strip') -source=("${_realname}-${pkgver}"::"git://git.videolan.org/libdvdnav.git#tag=$pkgver" +source=("${_realname}-${pkgver}"::"git://git.videolan.org/${_realname}.git#tag=${pkgver}" #"http://dvdnav.mplayerhq.hu/releases/${_realname}-${pkgver}.tar.xz" 001-no-undefined.patch) sha256sums=('SKIP' @@ -24,17 +27,20 @@ prepare() { } build() { - cd "${srcdir}/${_realname}-$pkgver" - ./configure \ + [[ -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 \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --enable-shared \ - --enable-static + --enable-static \ + --disable-doc make } package() { - cd "${srcdir}/${_realname}-$pkgver" - make DESTDIR="$pkgdir" install + cd "${srcdir}/build-${MINGW_CHOST}" + make DESTDIR="${pkgdir}" install } diff --git a/mingw-w64-libdvdread/PKGBUILD b/mingw-w64-libdvdread/PKGBUILD index 2960425354..6325a77d20 100644 --- a/mingw-w64-libdvdread/PKGBUILD +++ b/mingw-w64-libdvdread/PKGBUILD @@ -2,16 +2,21 @@ _realname=libdvdread pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=5.0.0 +pkgver=5.0.3 pkgrel=1 pkgdesc="Provides a simple foundation for reading DVD video disks (mingw-w64)" arch=('any') url="http://dvdnav.mplayerhq.hu" license=("GPL") -makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config" "git") +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" + "${MINGW_PACKAGE_PREFIX}-doxygen" + "${MINGW_PACKAGE_PREFIX}-pkg-config" + "git") depends=("${MINGW_PACKAGE_PREFIX}-libdvdcss") options=('staticlibs' 'strip') -source=("${_realname}-${pkgver}"::"git://git.videolan.org/libdvdread.git#tag=$pkgver" +source=(#"http://download.videolan.org/pub/${_realname}/${pkgver}/${_realname}-${pkgver}.tar.bz2" + #ftp://ftp.videolan.org/pub/videolan/${_realname}/${pkgver}/${_realname}-${pkgver}.tar.bz2 + "${_realname}-${pkgver}"::"git://git.videolan.org/${_realname}.git#tag=${pkgver}" 0001-no-undefined-on.all.patch) sha256sums=('SKIP' '0a9664cce3a2e001445d150edfe5d8f06f3ca0d1affb91b50b1b5bde90c2713e') @@ -19,24 +24,27 @@ sha256sums=('SKIP' prepare() { cd ${srcdir}/${_realname}-${pkgver} patch -p1 -i ${srcdir}/0001-no-undefined-on.all.patch - autoreconf -fi } build() { - cd "${srcdir}/${_realname}-$pkgver" - ./configure \ + [[ -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 \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --enable-shared \ --enable-static \ --disable-dlfcn \ - --with-libdvdcss + --with-libdvdcss \ + --disable-doc + make } package() { - cd "${srcdir}/${_realname}-$pkgver" - make DESTDIR="$pkgdir" install + cd "${srcdir}/build-${MINGW_CHOST}" + make DESTDIR="${pkgdir}" install } diff --git a/mingw-w64-libexif/PKGBUILD b/mingw-w64-libexif/PKGBUILD index c51c89bc7b..b2ba1a5859 100644 --- a/mingw-w64-libexif/PKGBUILD +++ b/mingw-w64-libexif/PKGBUILD @@ -1,10 +1,9 @@ # Maintainer: Alexey Pavlov _realname=libexif - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=0.6.21 -pkgrel=2 +pkgrel=3 pkgdesc="A library to parse an EXIF file and read the data from those tags (mingw-w64)" arch=('any') url="http://sourceforge.net/projects/libexif" @@ -16,21 +15,23 @@ source=("http://downloads.sf.net/sourceforge/libexif/libexif-${pkgver}.tar.bz2") md5sums=('27339b89850f28c8f1c237f233e05b27') 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} \ --target=${MINGW_CHOST} \ --disable-docs \ --enable-shared \ - --disable-static + --enable-static + make } package() { cd "${srcdir}/build-${MINGW_CHOST}" - make DESTDIR="$pkgdir" install + make DESTDIR="${pkgdir}" install find "${pkgdir}${MINGW_PREFIX}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm } diff --git a/mingw-w64-libgme/PKGBUILD b/mingw-w64-libgme/PKGBUILD index 22cd32c661..ab5751b8ed 100644 --- a/mingw-w64-libgme/PKGBUILD +++ b/mingw-w64-libgme/PKGBUILD @@ -6,15 +6,15 @@ pkgver=0.6.0 pkgrel=1 pkgdesc="Video game music file emulation/playback library (mingw-w64)" arch=('any') -url="http://game-music-emu.googlecode.com/" +url="https://bitbucket.org/mpyne/game-music-emu/wiki/Home" license=('LGPL') depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" - "${MINGW_PACKAGE_PREFIX}-pkgconf" + "${MINGW_PACKAGE_PREFIX}-pkg-config" "${MINGW_PACKAGE_PREFIX}-cmake" ) options=('strip' '!emptydirs') -source=("https://game-music-emu.googlecode.com/files/game-music-emu-${pkgver}.tar.bz2") +source=("https://bitbucket.org/mpyne/game-music-emu/downloads/game-music-emu-${pkgver}.tar.bz2") md5sums=('b98fafb737bc889dc65e7a8b94bd1bf5') prepare() { @@ -22,12 +22,14 @@ prepare() { } build() { - mkdir $srcdir/build-${MINGW_CHOST} - cd $srcdir/build-${MINGW_CHOST} + [[ -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 \ -G"MSYS Makefiles" \ - -DCMAKE_INSTALL_PREFIX:PATH=${pkgdir}${MINGW_PREFIX} \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DCMAKE_BUILD_TYPE=Release \ ../game-music-emu-${pkgver} @@ -36,11 +38,5 @@ build() { package() { cd "${srcdir}/build-${MINGW_CHOST}" - make install - - pushd ${pkgdir}${MINGW_PREFIX} > /dev/null - export PREFIX_WIN=`pwd -W` - popd > /dev/null - - sed -e "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i ${pkgdir}${MINGW_PREFIX}/lib/pkgconfig/libgme.pc + make DESTDIR=${pkgdir} install } diff --git a/mingw-w64-libmimic/PKGBUILD b/mingw-w64-libmimic/PKGBUILD index f35a1aa181..aa3c8e06e0 100644 --- a/mingw-w64-libmimic/PKGBUILD +++ b/mingw-w64-libmimic/PKGBUILD @@ -1,15 +1,14 @@ # Maintainer: Alexey Pavlov _realname=libmimic - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.0.4 -pkgrel=1 +pkgrel=2 pkgdesc="An open source video encoding/decoding library for Mimic V2.x (mingw-w64)" arch=('any') url="ttp://farsight.sourceforge.net" license=("LGPL") -makedepends=("${MINGW_PACKAGE_PREFIX}-gcc") +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-doxygen") depends=("${MINGW_PACKAGE_PREFIX}-glib2") options=('strip' 'staticlibs') source=("http://downloads.sourceforge.net/sourceforge/farsight/${_realname}-${pkgver}.tar.gz" @@ -22,27 +21,33 @@ md5sums=('94f0dbb1d3c253201553a4069555fb84' 'e7eedf26c42f266010ef18d4498e2c33') prepare() { - cd "$srcdir/${_realname}-${pkgver}" - patch -p1 -i "$srcdir"/0001-update-ac-and-silent-rules.mingw.patch - patch -p1 -i "$srcdir"/0002-no-undefined.mingw.patch - patch -p1 -i "$srcdir"/0003-link-to-glib.mingw.patch + cd "${srcdir}/${_realname}-${pkgver}" + patch -p1 -i "${srcdir}"/0001-update-ac-and-silent-rules.mingw.patch + patch -p1 -i "${srcdir}"/0002-no-undefined.mingw.patch + patch -p1 -i "${srcdir}"/0003-link-to-glib.mingw.patch WANT_AUTOMAKE=latest autoreconf -fi } 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-shared \ --enable-static + + cd doc + ${MINGW_PREFIX}/bin/doxygen -u + cd .. + make } package() { cd "${srcdir}/build-${MINGW_CHOST}" - make DESTDIR="$pkgdir" install + make DESTDIR="${pkgdir}" install } diff --git a/mingw-w64-libmodplug/PKGBUILD b/mingw-w64-libmodplug/PKGBUILD index 44888cf56b..0565c6120c 100644 --- a/mingw-w64-libmodplug/PKGBUILD +++ b/mingw-w64-libmodplug/PKGBUILD @@ -1,10 +1,9 @@ # Maintainer: Alexey Pavlov _realname=libmodplug - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=0.8.8.5 -pkgrel=2 +pkgrel=3 pkgdesc="A MOD playing library (mingw-w64)" arch=('any') url="http://modplug-xmms.sourceforge.net/" @@ -26,6 +25,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 \ @@ -35,6 +35,7 @@ build() { --target=${MINGW_CHOST} \ --enable-shared \ --enable-static + make } diff --git a/mingw-w64-libshout/PKGBUILD b/mingw-w64-libshout/PKGBUILD index b482a512df..1a0fd7ba6b 100644 --- a/mingw-w64-libshout/PKGBUILD +++ b/mingw-w64-libshout/PKGBUILD @@ -3,7 +3,7 @@ _realname=libshout pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="Library for accessing a shoutcast/icecast server (mingw-w64)" arch=("any") url="http://www.icecast.org/" @@ -35,10 +35,9 @@ prepare() { } build() { - [ -d ${srcdir}/build-${MINGW_CHOST} ] && rm -rf ${srcdir}/build-${MINGW_CHOST} + [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST} mkdir ${srcdir}/build-${MINGW_CHOST} cd ${srcdir}/build-${MINGW_CHOST} - #cd ${_realname}-${pkgver} ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ @@ -46,6 +45,7 @@ build() { --target=${MINGW_CHOST} \ --enable-shared \ --enable-static + make } diff --git a/mingw-w64-libsoup/0002-fix-keyword-conflict.patch b/mingw-w64-libsoup/0002-fix-keyword-conflict.patch deleted file mode 100644 index c90c0d9a2a..0000000000 --- a/mingw-w64-libsoup/0002-fix-keyword-conflict.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -Naur libsoup-2.48.0-orig/libsoup/soup-cache.c libsoup-2.48.0/libsoup/soup-cache.c ---- libsoup-2.48.0-orig/libsoup/soup-cache.c 2014-09-23 03:02:43.000000000 +0500 -+++ libsoup-2.48.0/libsoup/soup-cache.c 2014-09-23 15:15:23.836600000 +0500 -@@ -51,7 +51,7 @@ - static void soup_cache_session_feature_init (SoupSessionFeatureInterface *feature_interface, gpointer interface_data); - - static SoupContentProcessorInterface *soup_cache_default_content_processor_interface; --static void soup_cache_content_processor_init (SoupContentProcessorInterface *interface, gpointer interface_data); -+static void soup_cache_content_processor_init (SoupContentProcessorInterface *interface_name, gpointer interface_data); - - #define DEFAULT_MAX_SIZE 50 * 1024 * 1024 - #define MAX_ENTRY_DATA_PERCENTAGE 10 /* Percentage of the total size -diff -Naur libsoup-2.48.0-orig/libsoup/soup-content-decoder.c libsoup-2.48.0/libsoup/soup-content-decoder.c ---- libsoup-2.48.0-orig/libsoup/soup-content-decoder.c 2014-06-18 19:42:51.000000000 +0500 -+++ libsoup-2.48.0/libsoup/soup-content-decoder.c 2014-09-23 15:15:43.508200000 +0500 -@@ -59,7 +59,7 @@ - static void soup_content_decoder_session_feature_init (SoupSessionFeatureInterface *feature_interface, gpointer interface_data); - - static SoupContentProcessorInterface *soup_content_decoder_default_content_processor_interface; --static void soup_content_decoder_content_processor_init (SoupContentProcessorInterface *interface, gpointer interface_data); -+static void soup_content_decoder_content_processor_init (SoupContentProcessorInterface *interface_name, gpointer interface_data); - - - G_DEFINE_TYPE_WITH_CODE (SoupContentDecoder, soup_content_decoder, G_TYPE_OBJECT, -diff -Naur libsoup-2.48.0-orig/libsoup/soup-content-processor.c libsoup-2.48.0/libsoup/soup-content-processor.c ---- libsoup-2.48.0-orig/libsoup/soup-content-processor.c 2014-06-18 19:42:51.000000000 +0500 -+++ libsoup-2.48.0/libsoup/soup-content-processor.c 2014-09-23 15:16:35.081800000 +0500 -@@ -11,7 +11,7 @@ - #include "soup-content-processor.h" - #include "soup.h" - --static void soup_content_processor_default_init (SoupContentProcessorInterface *interface); -+static void soup_content_processor_default_init (SoupContentProcessorInterface *interface_name); - - G_DEFINE_INTERFACE (SoupContentProcessor, soup_content_processor, G_TYPE_OBJECT) - -@@ -25,10 +25,10 @@ - } - - static void --soup_content_processor_default_init (SoupContentProcessorInterface *interface) -+soup_content_processor_default_init (SoupContentProcessorInterface *interface_name) - { -- interface->processing_stage = SOUP_STAGE_INVALID; -- interface->wrap_input = soup_content_processor_real_wrap_input; -+ interface_name->processing_stage = SOUP_STAGE_INVALID; -+ interface_name->wrap_input = soup_content_processor_real_wrap_input; - } - - GInputStream * -diff -Naur libsoup-2.48.0-orig/libsoup/soup-content-sniffer.c libsoup-2.48.0/libsoup/soup-content-sniffer.c ---- libsoup-2.48.0-orig/libsoup/soup-content-sniffer.c 2014-06-18 19:42:51.000000000 +0500 -+++ libsoup-2.48.0/libsoup/soup-content-sniffer.c 2014-09-23 15:16:58.232200000 +0500 -@@ -38,7 +38,7 @@ - static void soup_content_sniffer_session_feature_init (SoupSessionFeatureInterface *feature_interface, gpointer interface_data); - - static SoupContentProcessorInterface *soup_content_sniffer_default_content_processor_interface; --static void soup_content_sniffer_content_processor_init (SoupContentProcessorInterface *interface, gpointer interface_data); -+static void soup_content_sniffer_content_processor_init (SoupContentProcessorInterface *interface_name, gpointer interface_data); - - - G_DEFINE_TYPE_WITH_CODE (SoupContentSniffer, soup_content_sniffer, G_TYPE_OBJECT, diff --git a/mingw-w64-libsoup/PKGBUILD b/mingw-w64-libsoup/PKGBUILD index 8a0ae7e9aa..d6a6e1fcf8 100644 --- a/mingw-w64-libsoup/PKGBUILD +++ b/mingw-w64-libsoup/PKGBUILD @@ -2,32 +2,32 @@ _realname=libsoup pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=2.50.0 +pkgver=2.51.3 pkgrel=1 pkgdesc="HTTP client/server library (mingw-w64)" arch=(any) url="http://ftp.gnome.org/pub/GNOME/sources/libsoup" license=("LGPL") -makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config" "${MINGW_PACKAGE_PREFIX}-gobject-introspection" "intltool") +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" + "${MINGW_PACKAGE_PREFIX}-gobject-introspection" + "${MINGW_PACKAGE_PREFIX}-pkg-config" + "intltool") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" - "${MINGW_PACKAGE_PREFIX}-glib2" - "${MINGW_PACKAGE_PREFIX}-libxml2" - "${MINGW_PACKAGE_PREFIX}-sqlite3" - "${MINGW_PACKAGE_PREFIX}-glib-networking") + "${MINGW_PACKAGE_PREFIX}-glib2" + "${MINGW_PACKAGE_PREFIX}-libxml2" + "${MINGW_PACKAGE_PREFIX}-sqlite3" + "${MINGW_PACKAGE_PREFIX}-glib-networking") options=('staticlibs' 'strip') -source=("http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver%.*}/${_realname}-$pkgver.tar.xz" +source=("http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz" 0001-give-cc-to-gir-scanner.mingw.patch - 0002-fix-keyword-conflict.patch 0004-localedir-fix.patch) -md5sums=('9a84d66e1b7ccd3bd340574b11eccc15' +md5sums=('0a08e41c112ef52d9e66ccdfa95887c5' 'a1ddc19ab3f73bbddda1d41a6a7de399' - '48305a9372aa62df66f49271ce3eebb9' 'ee2cc56c1448c32020288c817b81ff7f') prepare() { - cd "$srcdir/${_realname}-$pkgver" + cd "${srcdir}/${_realname}-${pkgver}" patch -p1 -i ${srcdir}/0001-give-cc-to-gir-scanner.mingw.patch - patch -p1 -i ${srcdir}/0002-fix-keyword-conflict.patch patch -p1 -i ${srcdir}/0004-localedir-fix.patch autoreconf -fi } @@ -49,5 +49,5 @@ build() { package() { cd "${srcdir}/build-${MINGW_CHOST}" - make DESTDIR="$pkgdir" install + make DESTDIR="${pkgdir}" install } diff --git a/mingw-w64-libtheora/PKGBUILD b/mingw-w64-libtheora/PKGBUILD index 9341b08414..dec806cc33 100644 --- a/mingw-w64-libtheora/PKGBUILD +++ b/mingw-w64-libtheora/PKGBUILD @@ -3,7 +3,7 @@ _realname=libtheora pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.1.1 -pkgrel=2 +pkgrel=3 pkgdesc="An open video codec developed by the Xiph.org (mingw-w64)" arch=('any') url="http://xiph.org" @@ -28,18 +28,19 @@ prepare() { } build() { - mkdir -p $srcdir/build-$MINGW_CHOST - cd "$srcdir/build-$MINGW_CHOST" - ../$_realname-$pkgver/configure \ + [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}" + mkdir -p ${srcdir}/build-$MINGW_CHOST + cd "${srcdir}/build-$MINGW_CHOST" + ../${_realname}-${pkgver}/configure \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ --prefix=${MINGW_PREFIX} - make -j1 + make } package() { - cd "$srcdir/build-$MINGW_CHOST" + cd "${srcdir}/build-$MINGW_CHOST" make install DESTDIR="${pkgdir}" } diff --git a/mingw-w64-libvorbisidec-svn/PKGBUILD b/mingw-w64-libvorbisidec-svn/PKGBUILD index 9e9cdc98e3..ed53bfec7c 100644 --- a/mingw-w64-libvorbisidec-svn/PKGBUILD +++ b/mingw-w64-libvorbisidec-svn/PKGBUILD @@ -5,7 +5,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-svn" _revision= _fragment= [[ -n ${_revision} ]] && _fragment="#revision=${_revision}" -pkgver=r19222 +pkgver=r19494 pkgrel=1 pkgdesc='Integer-only Ogg Vorbis decoder, AKA \"tremor\" (mingw-w64)' arch=('any') diff --git a/mingw-w64-opencollada-git/PKGBUILD b/mingw-w64-opencollada-git/PKGBUILD index e2bf7d4166..2590da355a 100644 --- a/mingw-w64-opencollada-git/PKGBUILD +++ b/mingw-w64-opencollada-git/PKGBUILD @@ -2,7 +2,7 @@ _realname=opencollada pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git" -pkgver=r1079.2effbf1 +pkgver=r1184.0496c15 pkgrel=1 pkgdesc="Stream based reader and writer library for COLLADA files (mingw-w64)" arch=('any') @@ -22,7 +22,7 @@ md5sums=('SKIP' '11ff58142f0feb1dca80f004615a01ca') pkgver() { - cd "$srcdir/$_realname" + cd "${srcdir}/${_realname}" printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } @@ -33,11 +33,14 @@ prepare() { } build() { + [[ -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=${pkgdir}${MINGW_PREFIX} \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DCMAKE_BUILD_TYPE=Release \ ../${_realname} make @@ -45,7 +48,7 @@ build() { package() { cd "${srcdir}"/build-${MINGW_CHOST} - make -j1 install + make DESTDIR=${pkgdir} install # replace absolute paths in .cmake scripts sed -i '1i get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE)' "${pkgdir}${MINGW_PREFIX}/lib/${_realname}/cmake"/*Targets*.cmake diff --git a/mingw-w64-opencolorio/PKGBUILD b/mingw-w64-opencolorio-git/PKGBUILD similarity index 74% rename from mingw-w64-opencolorio/PKGBUILD rename to mingw-w64-opencolorio-git/PKGBUILD index 79ac466df8..5efc612128 100644 --- a/mingw-w64-opencolorio/PKGBUILD +++ b/mingw-w64-opencolorio-git/PKGBUILD @@ -3,7 +3,7 @@ _realname=opencolorio pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git" pkgver=701.a557a85 -pkgrel=1 +pkgrel=2 pkgdesc="A color management framework for visual effects and animation (mingw-w64)" arch=('any') url="http://opencolorio.org" @@ -11,17 +11,17 @@ license=('BSD') provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") depends=("${MINGW_PACKAGE_PREFIX}-boost" - "${MINGW_PACKAGE_PREFIX}-glew" - "${MINGW_PACKAGE_PREFIX}-lcms2" - "${MINGW_PACKAGE_PREFIX}-python2" - "${MINGW_PACKAGE_PREFIX}-tinyxml") + "${MINGW_PACKAGE_PREFIX}-glew" + "${MINGW_PACKAGE_PREFIX}-lcms2" + "${MINGW_PACKAGE_PREFIX}-python2" + "${MINGW_PACKAGE_PREFIX}-tinyxml") makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" - "${MINGW_PACKAGE_PREFIX}-yaml-cpp" - "${MINGW_PACKAGE_PREFIX}-pkg-config" - "git") + "${MINGW_PACKAGE_PREFIX}-yaml-cpp" + "${MINGW_PACKAGE_PREFIX}-pkg-config" + "git") options=('strip') source=("${_realname}"::"git+https://github.com/imageworks/OpenColorIO.git" - #http://github.com/imageworks/OpenColorIO/tarball/v$pkgver + #${_realname}-${pkgver}.tar.gz::http://github.com/imageworks/OpenColorIO/tarball/v${pkgver}.tar.gz mingw-w64.patch fix-redefinitions.patch detect-mingw-python.patch) @@ -31,24 +31,26 @@ sha1sums=('SKIP' 'ff94a1cbfc4935d4f04e5225d078158d5bcaedcc') pkgver() { - cd "$srcdir/$_realname" + cd "${srcdir}/${_realname}" printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } prepare() { - cd $_realname + cd ${_realname} patch -p1 -i ${srcdir}/mingw-w64.patch patch -p1 -i ${srcdir}/fix-redefinitions.patch patch -p1 -i ${srcdir}/detect-mingw-python.patch } build() { + [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "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 \ -G"MSYS Makefiles" \ - -DCMAKE_INSTALL_PREFIX=${pkgdir}${MINGW_PREFIX} \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DGLEW_INCLUDES=${MINGW_PREFIX}/include \ -DGLEW_LIBRARIES=${MINGW_PREFIX}/lib/libglew32.dll.a \ -DUSE_EXTERNAL_TINYXML=ON \ @@ -66,14 +68,10 @@ build() { package() { cd build-${MINGW_CHOST} - make install + make DESTDIR=${pkgdir} install install -Dm644 ${srcdir}/${_realname}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE cd ${pkgdir}${MINGW_PREFIX} - export PREFIX_WIN=`pwd -W` mkdir -p bin mv lib/*.dll bin/ - for ff in lib/pkgconfig/*.pc; do - sed -i "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" $ff - done } diff --git a/mingw-w64-opencolorio/detect-mingw-python.patch b/mingw-w64-opencolorio-git/detect-mingw-python.patch similarity index 100% rename from mingw-w64-opencolorio/detect-mingw-python.patch rename to mingw-w64-opencolorio-git/detect-mingw-python.patch diff --git a/mingw-w64-opencolorio/fix-redefinitions.patch b/mingw-w64-opencolorio-git/fix-redefinitions.patch similarity index 100% rename from mingw-w64-opencolorio/fix-redefinitions.patch rename to mingw-w64-opencolorio-git/fix-redefinitions.patch diff --git a/mingw-w64-opencolorio/mingw-w64.patch b/mingw-w64-opencolorio-git/mingw-w64.patch similarity index 100% rename from mingw-w64-opencolorio/mingw-w64.patch rename to mingw-w64-opencolorio-git/mingw-w64.patch diff --git a/mingw-w64-opencore-amr/PKGBUILD b/mingw-w64-opencore-amr/PKGBUILD index 869507c057..b14c77d888 100644 --- a/mingw-w64-opencore-amr/PKGBUILD +++ b/mingw-w64-opencore-amr/PKGBUILD @@ -1,10 +1,9 @@ # Maintainer: Alexey Pavlov _realname=opencore-amr - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=0.1.3 -pkgrel=2 +pkgrel=3 pkgdesc="Open source implementation of the Adaptive Multi Rate (AMR) speech codec (mingw-w64)" arch=('any') url="http://opencore-amr.sourceforge.net/" @@ -19,6 +18,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 \ @@ -26,7 +26,8 @@ build() { --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ - --disable-static + --enable-shared \ + --enable-static make } diff --git a/mingw-w64-opencv/PKGBUILD b/mingw-w64-opencv/PKGBUILD index 599a9244b4..b3ba90fd37 100644 --- a/mingw-w64-opencv/PKGBUILD +++ b/mingw-w64-opencv/PKGBUILD @@ -2,50 +2,54 @@ _realname=opencv pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=2.4.11 -pkgrel=2 +pkgver=3.0.0 +pkgrel=1 pkgdesc="Open Source Computer Vision Library (mingw-w64)" arch=('any') url="http://opencv.org/" depends=(#"${MINGW_PACKAGE_PREFIX}-gst-plugins-base0.10" - "${MINGW_PACKAGE_PREFIX}-intel-tbb" - "${MINGW_PACKAGE_PREFIX}-jasper" - "${MINGW_PACKAGE_PREFIX}-libjpeg" - "${MINGW_PACKAGE_PREFIX}-libpng" - "${MINGW_PACKAGE_PREFIX}-libtiff" - "${MINGW_PACKAGE_PREFIX}-openexr" - "${MINGW_PACKAGE_PREFIX}-zlib" - #"${MINGW_PACKAGE_PREFIX}-qt5" - #"${MINGW_PACKAGE_PREFIX}-gtkglext" - #"${MINGW_PACKAGE_PREFIX}-gtk2" + "${MINGW_PACKAGE_PREFIX}-intel-tbb" + "${MINGW_PACKAGE_PREFIX}-jasper" + "${MINGW_PACKAGE_PREFIX}-libjpeg" + "${MINGW_PACKAGE_PREFIX}-libpng" + "${MINGW_PACKAGE_PREFIX}-libtiff" + "${MINGW_PACKAGE_PREFIX}-openexr" + "${MINGW_PACKAGE_PREFIX}-zlib" + #"${MINGW_PACKAGE_PREFIX}-qt5" + #"${MINGW_PACKAGE_PREFIX}-gtkglext" + #"${MINGW_PACKAGE_PREFIX}-gtk2" ) makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" - #"${MINGW_PACKAGE_PREFIX}-qt5" - "${MINGW_PACKAGE_PREFIX}-eigen3" - "${MINGW_PACKAGE_PREFIX}-ffmpeg" - "${MINGW_PACKAGE_PREFIX}-python2-numpy" - "${MINGW_PACKAGE_PREFIX}-vtk" + #"${MINGW_PACKAGE_PREFIX}-qt5" + "${MINGW_PACKAGE_PREFIX}-eigen3" + "${MINGW_PACKAGE_PREFIX}-ffmpeg" + "${MINGW_PACKAGE_PREFIX}-python2-numpy" + "${MINGW_PACKAGE_PREFIX}-python3-numpy" + "${MINGW_PACKAGE_PREFIX}-vtk" ) optdepends=("${MINGW_PACKAGE_PREFIX}-eigen3" "${MINGW_PACKAGE_PREFIX}-ffmpeg: support to read and write video files" "${MINGW_PACKAGE_PREFIX}-python2-numpy: Python 2.x interface" + "${MINGW_PACKAGE_PREFIX}-python3-numpy: Python 3.x interface" "${MINGW_PACKAGE_PREFIX}-vtk: opencv_viz module") -source=(#"http://downloads.sourceforge.net/opencvlibrary/${_realname}-$pkgver.zip" - https://github.com/Itseez/opencv/archive/$pkgver.tar.gz +source=("${_realname}-${pkgver}.tar.gz"::https://github.com/Itseez/opencv/archive/${pkgver}.tar.gz 'mingw-w64-cmake.patch' - 'free-tls-keys-on-dll-unload.patch' - 'solve_deg3-underflow.patch') -md5sums=('fa06384719cb0be48183b4de972f0b2a' - '8d7819b9507cc070511ac3c64fd2bfb0' - '0f3f69b677d129260322ccf3e9412962' - 'ae03a59cf1202d5eafa94c2aac419ae6') + 'solve_deg3-underflow.patch' + 'issue-4107.patch' + 'remove-bindings-generation-DetectionBasedTracker.patch') +md5sums=('e6c72f54f7127161b371ef798f34d5c9' + '8ff3af2593c9c92f48c2e9f59adaaa3d' + 'ae03a59cf1202d5eafa94c2aac419ae6' + '49b6e0d5a376300238a769074cd5d32c' + '232993e4a053e1014b513c39b789188a') prepare() { cd "${srcdir}/${_realname}-${pkgver}" - patch -Np1 -i "$srcdir/mingw-w64-cmake.patch" - patch -Np1 -i "$srcdir/free-tls-keys-on-dll-unload.patch" - patch -Np1 -i "$srcdir/solve_deg3-underflow.patch" + patch -Np1 -i "${srcdir}/mingw-w64-cmake.patch" + patch -Np1 -i "${srcdir}/solve_deg3-underflow.patch" + patch -Np1 -i "${srcdir}/issue-4107.patch" + patch -Np1 -i "${srcdir}/remove-bindings-generation-DetectionBasedTracker.patch" } build() { @@ -67,15 +71,17 @@ build() { pushd ${srcdir}/${_realname}-${pkgver}/3rdparty/ffmpeg > /dev/null rm -f ./*.dll gcc -Wall -shared -o ${_ffmpeg_plugin} ${CXXFLAGS} -x c++ \ - -I../include -I../../modules/highgui/src ffopencv.c \ + -I../include -I../../modules/highgui/src -I../../modules/videoio/src ffopencv.c \ -lavformat -lavcodec -lavdevice -lswscale -lavutil -lws2_32 popd > /dev/null [[ -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 -Wno-dev \ -G"MSYS Makefiles" \ - -DCMAKE_INSTALL_PREFIX=${pkgdir}${MINGW_PREFIX} \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DWITH_OPENCL=ON \ -DWITH_OPENGL=ON \ -DWITH_TBB=ON \ @@ -103,11 +109,5 @@ build() { package() { cd "${srcdir}/build-${CARCH}" - make -j1 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/opencv.pc + make DESTDIR=${pkgdir} -j1 install } diff --git a/mingw-w64-opencv/free-tls-keys-on-dll-unload.patch b/mingw-w64-opencv/free-tls-keys-on-dll-unload.patch deleted file mode 100644 index 10027eb80b..0000000000 --- a/mingw-w64-opencv/free-tls-keys-on-dll-unload.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -Naur a/modules/core/src/alloc.cpp b/modules/core/src/alloc.cpp ---- a/modules/core/src/alloc.cpp 2015-02-25 18:10:31.000000000 +0600 -+++ b/modules/core/src/alloc.cpp 2015-03-05 22:17:56.243231600 +0600 -@@ -56,7 +56,7 @@ - #if CV_USE_SYSTEM_MALLOC - - #if defined WIN32 || defined _WIN32 --void deleteThreadAllocData() {} -+void deleteThreadAllocData(unsigned long) {} - #endif - - void* fastMalloc( size_t size ) -diff -Naur a/modules/core/src/precomp.hpp b/modules/core/src/precomp.hpp ---- a/modules/core/src/precomp.hpp 2015-02-25 18:10:31.000000000 +0600 -+++ b/modules/core/src/precomp.hpp 2015-03-05 22:17:56.243231600 +0600 -@@ -83,8 +83,8 @@ - - - #if defined WIN32 || defined _WIN32 --void deleteThreadAllocData(); --void deleteThreadRNGData(); -+void deleteThreadAllocData(unsigned long); -+void deleteThreadRNGData(unsigned long); - #endif - - template struct OpAdd -diff -Naur a/modules/core/src/rand.cpp b/modules/core/src/rand.cpp ---- a/modules/core/src/rand.cpp 2015-02-25 18:10:31.000000000 +0600 -+++ b/modules/core/src/rand.cpp 2015-03-05 22:17:56.258831700 +0600 -@@ -752,10 +752,15 @@ - #endif - static DWORD tlsRNGKey = TLS_OUT_OF_INDEXES; - -- void deleteThreadRNGData() -- { -- if( tlsRNGKey != TLS_OUT_OF_INDEXES ) -- delete (RNG*)TlsGetValue( tlsRNGKey ); -+void deleteThreadRNGData(unsigned long reason) -+{ -+ if( tlsRNGKey != TLS_OUT_OF_INDEXES ) -+ delete (RNG*)TlsGetValue( tlsRNGKey ); -+ if( reason == DLL_PROCESS_DETACH && tlsRNGKey != TLS_OUT_OF_INDEXES ) -+ { -+ TlsFree(tlsRNGKey); -+ tlsRNGKey = TLS_OUT_OF_INDEXES; -+ } - } - - RNG& theRNG() -diff -Naur a/modules/core/src/system.cpp b/modules/core/src/system.cpp ---- a/modules/core/src/system.cpp 2015-02-25 18:10:31.000000000 +0600 -+++ b/modules/core/src/system.cpp 2015-03-05 22:17:56.258831700 +0600 -@@ -1082,8 +1082,8 @@ - { - if (fdwReason == DLL_THREAD_DETACH || fdwReason == DLL_PROCESS_DETACH) - { -- cv::deleteThreadAllocData(); -- cv::deleteThreadRNGData(); -+ cv::deleteThreadAllocData(fdwReason); -+ cv::deleteThreadRNGData(fdwReason); - cv::deleteThreadData(); - } - return TRUE; diff --git a/mingw-w64-opencv/issue-4107.patch b/mingw-w64-opencv/issue-4107.patch new file mode 100644 index 0000000000..2befda41eb --- /dev/null +++ b/mingw-w64-opencv/issue-4107.patch @@ -0,0 +1,13 @@ +http://code.opencv.org/issues/4107 + +diff -Naur a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake +--- a/cmake/OpenCVCompilerOptions.cmake 2015-02-25 18:10:31.000000000 +0600 ++++ b/cmake/OpenCVCompilerOptions.cmake 2015-03-05 22:18:10.532856700 +0600 +@@ -64,7 +64,6 @@ + add_extra_compiler_option(-W) + add_extra_compiler_option(-Wall) + add_extra_compiler_option(-Werror=return-type) +- add_extra_compiler_option(-Werror=non-virtual-dtor) + add_extra_compiler_option(-Werror=address) + add_extra_compiler_option(-Werror=sequence-point) + add_extra_compiler_option(-Wformat) diff --git a/mingw-w64-opencv/mingw-w64-cmake.patch b/mingw-w64-opencv/mingw-w64-cmake.patch index 7b74f4ce02..b43d02a18d 100644 --- a/mingw-w64-opencv/mingw-w64-cmake.patch +++ b/mingw-w64-opencv/mingw-w64-cmake.patch @@ -1,27 +1,3 @@ -diff -Naur a/cmake/OpenCVDetectCXXCompiler.cmake b/cmake/OpenCVDetectCXXCompiler.cmake ---- a/cmake/OpenCVDetectCXXCompiler.cmake 2015-02-25 18:10:31.000000000 +0600 -+++ b/cmake/OpenCVDetectCXXCompiler.cmake 2015-03-05 22:18:10.532856700 +0600 -@@ -147,7 +147,7 @@ - execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpmachine - OUTPUT_VARIABLE OPENCV_GCC_TARGET_MACHINE - OUTPUT_STRIP_TRAILING_WHITESPACE) -- if(CMAKE_OPENCV_GCC_TARGET_MACHINE MATCHES "64") -+ if(CMAKE_OPENCV_GCC_TARGET_MACHINE MATCHES "amd64|x86_64|AMD64") - set(MINGW64 1) - set(OpenCV_ARCH x64) - else() -diff -Naur a/cmake/OpenCVDetectPython.cmake b/cmake/OpenCVDetectPython.cmake ---- a/cmake/OpenCVDetectPython.cmake 2015-02-25 18:10:31.000000000 +0600 -+++ b/cmake/OpenCVDetectPython.cmake 2015-03-05 22:18:10.517256700 +0600 -@@ -52,7 +52,7 @@ - endif() - - if(NOT ANDROID AND NOT IOS) -- if(CMAKE_HOST_UNIX) -+ if(CMAKE_HOST_UNIX OR MINGW) - execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import *; print get_python_lib()" - RESULT_VARIABLE PYTHON_CVPY_PROCESS - OUTPUT_VARIABLE PYTHON_STD_PACKAGES_PATH diff -Naur a/cmake/OpenCVFindOpenEXR.cmake b/cmake/OpenCVFindOpenEXR.cmake --- a/cmake/OpenCVFindOpenEXR.cmake 2015-02-25 18:10:31.000000000 +0600 +++ b/cmake/OpenCVFindOpenEXR.cmake 2015-03-05 22:18:10.517256700 +0600 @@ -34,6 +10,18 @@ diff -Naur a/cmake/OpenCVFindOpenEXR.cmake b/cmake/OpenCVFindOpenEXR.cmake SET(OPENEXR_ROOT "C:/Deploy" CACHE STRING "Path to the OpenEXR \"Deploy\" folder") if(CMAKE_CL_64) SET(OPENEXR_LIBSEARCH_SUFFIXES x64/Release x64 x64/Debug) +diff -Naur a/cmake/OpenCVDetectPython.cmake b/cmake/OpenCVDetectPython.cmake +--- a/cmake/OpenCVDetectPython.cmake 2015-02-25 18:10:31.000000000 +0600 ++++ b/cmake/OpenCVDetectPython.cmake 2015-03-05 22:18:10.517256700 +0600 +@@ -125,7 +125,7 @@ + endif() + + if(NOT ANDROID AND NOT IOS) +- if(CMAKE_HOST_UNIX) ++ if(CMAKE_HOST_UNIX OR MINGW) + execute_process(COMMAND ${_executable} -c "from distutils.sysconfig import *; print(get_python_lib())" + RESULT_VARIABLE _cvpy_process + OUTPUT_VARIABLE _std_packages_path diff -Naur a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake --- a/cmake/OpenCVGenConfig.cmake 2015-02-25 18:10:31.000000000 +0600 +++ b/cmake/OpenCVGenConfig.cmake 2015-03-05 22:18:10.532856700 +0600 @@ -63,7 +51,7 @@ diff -Naur a/cmake/OpenCVGenPkgconfig.cmake b/cmake/OpenCVGenPkgconfig.cmake @ONLY) -if(UNIX AND NOT ANDROID) -+if(UNIX OR MINGW AND NOT ANDROID) ++if((UNIX AND NOT ANDROID) OR MINGW) install(FILES ${CMAKE_BINARY_DIR}/unix-install/${OPENCV_PC_FILE_NAME} DESTINATION ${OPENCV_LIB_INSTALL_PATH}/pkgconfig COMPONENT dev) endif() diff -Naur a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake @@ -116,8 +104,17 @@ diff -Naur a/CMakeLists.txt b/CMakeLists.txt # ---------------------------------------------------------------------------- # OpenCV cmake options # ---------------------------------------------------------------------------- +@@ -156,7 +156,7 @@ + OCV_OPTION(WITH_GSTREAMER_0_10 "Enable Gstreamer 0.10 support (instead of 1.x)" OFF ) + OCV_OPTION(WITH_GTK "Include GTK support" ON IF (UNIX AND NOT APPLE AND NOT ANDROID) ) + OCV_OPTION(WITH_GTK_2_X "Use GTK version 2" OFF IF (UNIX AND NOT APPLE AND NOT ANDROID) ) +-OCV_OPTION(WITH_IPP "Include Intel IPP support" ON IF (X86_64 OR X86) AND NOT WINRT) ++OCV_OPTION(WITH_IPP "Include Intel IPP support" ON IF (X86_64 OR X86) AND NOT WINRT AND NOT MINGW) + OCV_OPTION(WITH_JASPER "Include JPEG2K support" ON IF (NOT IOS) ) + OCV_OPTION(WITH_JPEG "Include JPEG support" ON) + OCV_OPTION(WITH_WEBP "Include WebP support" ON IF (NOT IOS AND NOT WINRT) ) @@ -191,12 +177,12 @@ - OCV_OPTION(BUILD_ANDROID_PACKAGE "Build platform-specific package for Google Play" OFF IF ANDROID ) + OCV_OPTION(BUILD_CUDA_STUBS "Build CUDA modules stubs when no CUDA SDK" OFF IF (NOT IOS) ) # 3rd party libs -OCV_OPTION(BUILD_ZLIB "Build zlib from source" WIN32 OR APPLE ) @@ -125,40 +122,47 @@ diff -Naur a/CMakeLists.txt b/CMakeLists.txt -OCV_OPTION(BUILD_JASPER "Build libjasper from source" WIN32 OR ANDROID OR APPLE ) -OCV_OPTION(BUILD_JPEG "Build libjpeg from source" WIN32 OR ANDROID OR APPLE ) -OCV_OPTION(BUILD_PNG "Build libpng from source" WIN32 OR ANDROID OR APPLE ) --OCV_OPTION(BUILD_OPENEXR "Build openexr from source" WIN32 OR ANDROID OR APPLE ) +-OCV_OPTION(BUILD_OPENEXR "Build openexr from source" (WIN32 OR ANDROID OR APPLE) AND NOT WINRT) +OCV_OPTION(BUILD_ZLIB "Build zlib from source" WIN32 AND NOT MINGW OR APPLE ) +OCV_OPTION(BUILD_TIFF "Build libtiff from source" WIN32 AND NOT MINGW OR ANDROID OR APPLE ) +OCV_OPTION(BUILD_JASPER "Build libjasper from source" WIN32 AND NOT MINGW OR ANDROID OR APPLE ) +OCV_OPTION(BUILD_JPEG "Build libjpeg from source" WIN32 AND NOT MINGW OR ANDROID OR APPLE ) +OCV_OPTION(BUILD_PNG "Build libpng from source" WIN32 AND NOT MINGW OR ANDROID OR APPLE ) -+OCV_OPTION(BUILD_OPENEXR "Build openexr from source" WIN32 AND NOT MINGW OR ANDROID OR APPLE ) ++OCV_OPTION(BUILD_OPENEXR "Build openexr from source" (WIN32 OR ANDROID OR APPLE) AND NOT WINRT AND NOT MINGW ) OCV_OPTION(BUILD_TBB "Download and build TBB from source" ANDROID ) # OpenCV installation options -@@ -268,7 +254,7 @@ +@@ -268,13 +254,13 @@ endif() endif() -if(ANDROID OR WIN32) -+if(ANDROID OR WIN32 AND NOT MINGW) ++if((ANDROID OR WIN32) AND NOT MINGW) set(OPENCV_DOC_INSTALL_PATH doc) - elseif(INSTALL_TO_MANGLED_PATHS) - set(OPENCV_DOC_INSTALL_PATH share/OpenCV-${OPENCV_VERSION}/doc) -@@ -276,7 +262,7 @@ + else() set(OPENCV_DOC_INSTALL_PATH share/OpenCV/doc) endif() --if(WIN32) -+if(WIN32 AND NOT MINGW) +-if(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows) ++if((WIN32 AND NOT MINGW) AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows) if(DEFINED OpenCV_RUNTIME AND DEFINED OpenCV_ARCH) set(OpenCV_INSTALL_BINARIES_PREFIX "${OpenCV_ARCH}/${OpenCV_RUNTIME}/") else() -@@ -316,7 +302,7 @@ +@@ -305,7 +305,7 @@ + if(ANDROID) + set(OPENCV_SAMPLES_BIN_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}samples/${ANDROID_NDK_ABI_NAME}") else() +- set(OPENCV_SAMPLES_BIN_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}samples") ++ set(OPENCV_SAMPLES_BIN_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}share/OpenCV/samples") + endif() + + if(ANDROID) +@@ -345,7 +345,7 @@ set(LIBRARY_OUTPUT_PATH "${OpenCV_BINARY_DIR}/lib") set(3P_LIBRARY_OUTPUT_PATH "${OpenCV_BINARY_DIR}/3rdparty/lib${LIB_SUFFIX}") -- if(WIN32) -+ if(WIN32 AND NOT MINGW) + +- if(WIN32 AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows) ++ if((WIN32 AND NOT MINGW) AND CMAKE_HOST_SYSTEM_NAME MATCHES Windows) if(OpenCV_STATIC) set(OPENCV_LIB_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}staticlib${LIB_SUFFIX}") else() @@ -167,7 +171,7 @@ diff -Naur a/CMakeLists.txt b/CMakeLists.txt # for UNIX it does not make sense as LICENSE and readme will be part of the package automatically -if(ANDROID OR NOT UNIX) -+if(ANDROID OR NOT UNIX AND NOT MINGW) ++if((ANDROID OR NOT UNIX) AND NOT MINGW) install(FILES ${OPENCV_LICENSE_FILE} PERMISSIONS OWNER_READ GROUP_READ WORLD_READ DESTINATION . COMPONENT libs) diff --git a/mingw-w64-opencv/remove-bindings-generation-DetectionBasedTracker.patch b/mingw-w64-opencv/remove-bindings-generation-DetectionBasedTracker.patch new file mode 100644 index 0000000000..5edac6ba12 --- /dev/null +++ b/mingw-w64-opencv/remove-bindings-generation-DetectionBasedTracker.patch @@ -0,0 +1,34 @@ +From caaf60ba008bb7b61e2a791aab31dafe5267ab33 Mon Sep 17 00:00:00 2001 +From: Alexander Alekhin +Date: Tue, 9 Jun 2015 16:58:58 +0300 +Subject: [PATCH] remove bindings generation for DetectionBasedTracker + +--- + modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp | 1 + + modules/python/common.cmake | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp b/modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp +index 54117fd..1f5f1d3 100644 +--- a/modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp ++++ b/modules/objdetect/include/opencv2/objdetect/detection_based_tracker.hpp +@@ -44,6 +44,7 @@ + #ifndef __OPENCV_OBJDETECT_DBT_HPP__ + #define __OPENCV_OBJDETECT_DBT_HPP__ + ++// After this condition removal update blacklist for bindings: modules/python/common.cmake + #if defined(__linux__) || defined(LINUX) || defined(__APPLE__) || defined(__ANDROID__) || \ + (defined(__cplusplus) && __cplusplus > 201103L) || (defined(_MSC_VER) && _MSC_VER >= 1700) + +diff --git a/modules/python/common.cmake b/modules/python/common.cmake +index 5743980..2444b77 100644 +--- a/modules/python/common.cmake ++++ b/modules/python/common.cmake +@@ -28,6 +28,7 @@ endforeach(m) + ocv_list_filterout(opencv_hdrs ".h$") + ocv_list_filterout(opencv_hdrs "cuda") + ocv_list_filterout(opencv_hdrs "cudev") ++ocv_list_filterout(opencv_hdrs "detection_based_tracker.hpp") # Conditional compilation + + set(cv2_generated_hdrs + "${CMAKE_CURRENT_BINARY_DIR}/pyopencv_generated_include.h" diff --git a/mingw-w64-openexr/PKGBUILD b/mingw-w64-openexr/PKGBUILD index c121e43c90..0f7f41f0bd 100644 --- a/mingw-w64-openexr/PKGBUILD +++ b/mingw-w64-openexr/PKGBUILD @@ -3,13 +3,13 @@ _realname=openexr pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Openexr library for EXR images (mingw-w64)" arch=('any') -url="http://http://www.openexr.com/" +url="http://www.openexr.com/" license=("custom") -makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") -depends=("${MINGW_PACKAGE_PREFIX}-ilmbase") +makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") +depends=("${MINGW_PACKAGE_PREFIX}-ilmbase" "${MINGW_PACKAGE_PREFIX}-zlib") options=('staticlibs' 'strip') source=("http://download.savannah.nongnu.org/releases/openexr/${_realname}-${pkgver}.tar.gz" mingw-w64-fix.patch @@ -35,19 +35,19 @@ md5sums=('b64e931c82aa3790329c21418373db4e' 'e913e6fa443d2ae28951ed22ae680653') prepare(){ - cd "$srcdir/${_realname}-$pkgver" + cd "${srcdir}/${_realname}-$pkgver" sed -i 's/#define ZLIB_WINAPI/\/\/#define ZLIB_WINAPI/g' IlmImf/ImfZipCompressor.cpp sed -i 's/#define ZLIB_WINAPI/\/\/#define ZLIB_WINAPI/g' IlmImf/ImfPxr24Compressor.cpp - patch -Np1 -i "$srcdir/mingw-w64-fix.patch" - patch -Np1 -i "$srcdir/openexr-2.1.0-headers.patch" - #patch -Np1 -i "$srcdir/openexr-2.1.0_bb44ExpLogTable.patch" - patch -Np1 -i "$srcdir/openexr-2.1.0_aligned-malloc.patch" - patch -Np1 -i "$srcdir/openexr-2.1.0_cast.patch" - patch -Np1 -i "$srcdir/openexr_obsolete-macros.patch" - patch -Np1 -i "$srcdir/cmake-soversion.patch" - patch -Np2 -i "$srcdir/pull93.patch" + patch -p1 -i "${srcdir}/mingw-w64-fix.patch" + patch -p1 -i "${srcdir}/openexr-2.1.0-headers.patch" + #patch -p1 -i "${srcdir}/openexr-2.1.0_bb44ExpLogTable.patch" + patch -p1 -i "${srcdir}/openexr-2.1.0_aligned-malloc.patch" + patch -p1 -i "${srcdir}/openexr-2.1.0_cast.patch" + patch -p1 -i "${srcdir}/openexr_obsolete-macros.patch" + patch -p1 -i "${srcdir}/cmake-soversion.patch" + patch -p2 -i "${srcdir}/pull93.patch" patch -p2 -i ${srcdir}/change-suffixes-for-64bit-literals.patch patch -p1 -i ${srcdir}/win-dwalookups.patch @@ -55,13 +55,14 @@ prepare(){ build() { CXXFLAGS+=" -I${MINGW_PREFIX}/include/OpenEXR" - [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" - mkdir "${srcdir}/build-${MINGW_CHOST}" + [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "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 \ -G"MSYS Makefiles" \ - -DCMAKE_INSTALL_PREFIX=${pkgdir}${MINGW_PREFIX} \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DBUILD_SHARED_LIBS=ON \ -DNAMESPACE_VERSIONING=ON \ -DUSE_ZLIB_WINAPI=OFF \ @@ -73,11 +74,5 @@ build() { package() { cd "${srcdir}/build-${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/OpenEXR.pc + make DESTDIR=${pkgdir} install } diff --git a/mingw-w64-opus-tools/PKGBUILD b/mingw-w64-opus-tools/PKGBUILD index 5c326fc5f8..23443d848e 100644 --- a/mingw-w64-opus-tools/PKGBUILD +++ b/mingw-w64-opus-tools/PKGBUILD @@ -4,7 +4,7 @@ _realname=opus-tools pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=0.1.9 -pkgrel=1 +pkgrel=2 pkgdesc="Collection of tools for Opus audio codec (mingw-w64)" arch=('any') url="http://www.opus-codec.org/" @@ -15,10 +15,11 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-libogg" "${MINGW_PACKAGE_PREFIX}-opus") options=('strip' 'staticlibs') -source=(http://downloads.xiph.org/releases/opus/$_realname-$pkgver.tar.gz) +source=(http://downloads.xiph.org/releases/opus/${_realname}-${pkgver}.tar.gz) md5sums=('20682e4d8d1ae9ec5af3cf43e808b8cb') build() { + [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}" mkdir -p "${srcdir}/build-${MINGW_CHOST}" cd "${srcdir}/build-${MINGW_CHOST}" ../${_realname}-${pkgver}/configure \ @@ -26,6 +27,7 @@ build() { --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} + make } diff --git a/mingw-w64-opus/PKGBUILD b/mingw-w64-opus/PKGBUILD index 860d55bb45..910e3d198c 100644 --- a/mingw-w64-opus/PKGBUILD +++ b/mingw-w64-opus/PKGBUILD @@ -1,10 +1,9 @@ # Maintainer: Alexey Pavlov _realname=opus - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.1 -pkgrel=2 +pkgrel=3 pkgdesc="Codec designed for interactive speech and audio transmission over the Internet (mingw-w64)" arch=('any') url="http://www.opus-codec.org/" @@ -12,7 +11,7 @@ license=("BSD") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") options=('strip' 'staticlibs') source=("http://downloads.us.xiph.org/releases/${_realname}/${_realname}-${pkgver}.tar.gz" - 0001-correctly-detect-alloca.mingw.patch) + 0001-correctly-detect-alloca.mingw.patch) md5sums=('c5a8cf7c0b066759542bc4ca46817ac6' '006d3e2769d82904837b95abc20d196a') @@ -23,6 +22,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 \ @@ -31,7 +31,9 @@ build() { --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ --enable-custom-modes \ - --disable-static + --enable-shared \ + --enable-static + make } diff --git a/mingw-w64-opusfile/PKGBUILD b/mingw-w64-opusfile/PKGBUILD index b0275ebd08..a95a40cdcc 100644 --- a/mingw-w64-opusfile/PKGBUILD +++ b/mingw-w64-opusfile/PKGBUILD @@ -3,7 +3,7 @@ _realname=opusfile pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=0.6 -pkgrel=1 +pkgrel=2 pkgdesc="Library for opening, seeking, and decoding .opus files (mingw-w64)" arch=('any') url="https://www.opus-codec.org/" @@ -21,6 +21,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-orc/PKGBUILD b/mingw-w64-orc/PKGBUILD index 5c24c0a7fb..b9f1e9c667 100644 --- a/mingw-w64-orc/PKGBUILD +++ b/mingw-w64-orc/PKGBUILD @@ -2,7 +2,7 @@ _realname=orc pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=0.4.22 +pkgver=0.4.24 pkgrel=1 pkgdesc="The Oild Runtime Compiler (mingw-w64)" arch=('any') @@ -10,15 +10,15 @@ url="http://code.entropywave.com/projects/orc/" license=("custom") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") options=('strip' 'staticlibs') -source=(#"http://gstreamer.freedesktop.org/src/orc/${_realname}-${pkgver}.tar.gz" - "http://gstreamer.freedesktop.org/src/orc/${_realname}-${pkgver}.tar.xz") -md5sums=('eecd4788688a95aae97adf1125585cbf') +source=("http://gstreamer.freedesktop.org/src/orc/${_realname}-${pkgver}.tar.xz") +md5sums=('9e793ec34c0e20339659dd4bbbf62135') prepare() { cd "${srcdir}/${_realname}-${pkgver}" } build() { + [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}" mkdir -p "${srcdir}/build-${MINGW_CHOST}" cd "${srcdir}/build-${MINGW_CHOST}" ../${_realname}-${pkgver}/configure \ @@ -28,6 +28,7 @@ build() { --target=${MINGW_CHOST} \ --enable-static \ --enable-shared + make } diff --git a/mingw-w64-physfs-hg/PKGBUILD b/mingw-w64-physfs-hg/PKGBUILD index 108480342a..dc04175ec1 100644 --- a/mingw-w64-physfs-hg/PKGBUILD +++ b/mingw-w64-physfs-hg/PKGBUILD @@ -5,8 +5,8 @@ _realname=physfs pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}-hg -pkgver=r1345.29ab417d9453 -pkgrel=2 +pkgver=r1363.a3dabf75a0d0 +pkgrel=1 pkgdesc="A library to provide abstract access to various archives (development version)" arch=('any') url="http://icculus.org/physfs/" @@ -14,7 +14,7 @@ license=('zlib') options=('staticlibs' 'strip') depends=("${MINGW_PACKAGE_PREFIX}-zlib") makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" - 'doxygen' + "${MINGW_PACKAGE_PREFIX}-doxygen" 'mercurial') provides=("${MINGW_PACKAGE_PREFIX}-${_realname}") conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}") @@ -37,34 +37,25 @@ prepare() { } build() { - mkdir -p ${pkgdir}${MINGW_PREFIX} - #pushd ${pkgdir}${MINGW_PREFIX} > /dev/null - #export PREFIX_WIN=`pwd -W` - #popd > /dev/null - mkdir -p ${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=${pkgdir}${MINGW_PREFIX} \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DPHYSFS_BUILD_TEST=OFF \ -DCMAKE_BUILD_TYPE=Release \ - -DPHYSFS_BUILD_WX_TEST=OFF ${srcdir}/${_realname} - make all + -DPHYSFS_BUILD_WX_TEST=OFF \ + ../${_realname} + + make } package() { cd ${srcdir}/build-${MINGW_CHOST} - - make install + make DESTDIR=${pkgdir} install install -Dm644 ${srcdir}/${_realname}/LICENSE.txt \ - "$pkgdir"${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE - - 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/physfs.pc + "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE } diff --git a/mingw-w64-physfs/PKGBUILD b/mingw-w64-physfs/PKGBUILD index a164af6f86..177ce768a9 100644 --- a/mingw-w64-physfs/PKGBUILD +++ b/mingw-w64-physfs/PKGBUILD @@ -1,10 +1,9 @@ # Maintainer: Alexey Pavlov _realname=physfs - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="A library to provide abstract access to various archives (mingw-w64)" arch=('any') url="http://icculus.org/physfs/" @@ -24,25 +23,23 @@ build() { #Unstrict warnings are required as 64 bit compiler complains about an int->pointer cast (which should be safe) sed -i 's/-Werror//g' CMakeLists.txt - mkdir -p ${pkgdir}${MINGW_PREFIX} - pushd ${pkgdir}${MINGW_PREFIX} > /dev/null - export PREFIX_WIN=`pwd -W` - popd > /dev/null - mkdir -p "${srcdir}/build-${MINGW_CHOST}" cd "${srcdir}/build-${MINGW_CHOST}" - ${MINGW_PREFIX}/bin/cmake \ + + 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} \ -DPHYSFS_BUILD_TEST=OFF \ -DPHYSFS_BUILD_WX_TEST=OFF \ ../${_realname}-${pkgver} - make all + + make } package() { cd "${srcdir}/build-${MINGW_CHOST}" - make install + make DESTDIR=${pkgdir} install cd "${srcdir}/physfs-${pkgver}" install -D -m644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" } diff --git a/mingw-w64-pyqt5/PKGBUILD b/mingw-w64-pyqt5/PKGBUILD index 0642f00f29..ec1559f0f1 100644 --- a/mingw-w64-pyqt5/PKGBUILD +++ b/mingw-w64-pyqt5/PKGBUILD @@ -2,7 +2,7 @@ _realname=pyqt5 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-common" "${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") -pkgver=5.4.1 +pkgver=5.4.2 pkgrel=1 pkgdesc="Qt5 bindings for Python (mingw-w64)" arch=('any') @@ -12,10 +12,10 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python2-sip" "${MINGW_PACKAGE_PREFIX}-python3-sip" "${MINGW_PACKAGE_PREFIX}-qt5") options=('strip' 'staticlibs') -source=("http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-$pkgver/PyQt-gpl-$pkgver.tar.gz" +source=("http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-${pkgver}/PyQt-gpl-${pkgver}.tar.gz" #"http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-${pkgver%.*}/PyQt-gpl-${pkgver%.*}.tar.gz" 001-mingw-python.patch) -md5sums=('a07bd7c426c7cda39f9a5072ee724aba' +md5sums=('33936458544b69251a8f4a2308d469d3' '3b11ff26e229e256ee13f484422047d9') prepare() { diff --git a/mingw-w64-python-dateutil/PKGBUILD b/mingw-w64-python-dateutil/PKGBUILD index 917ad9c6ed..8410f5df39 100644 --- a/mingw-w64-python-dateutil/PKGBUILD +++ b/mingw-w64-python-dateutil/PKGBUILD @@ -2,8 +2,8 @@ _realname=dateutil pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname" "${MINGW_PACKAGE_PREFIX}-python3-$_realname") -pkgver=2.2 -pkgrel=2 +pkgver=2.4.2 +pkgrel=1 pkgdesc="Provides powerful extensions to the standard datetime module (mingw-w64)" arch=('any') license=('custom:PYTHON') @@ -14,53 +14,53 @@ makedepends=( "${MINGW_PACKAGE_PREFIX}-python2-six" "${MINGW_PACKAGE_PREFIX}-python3-six" ) -source=(http://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-$pkgver.tar.gz) -md5sums=('c1f654d0ff7e33999380a8ba9783fd5c') +source=(http://pypi.python.org/packages/source/p/python-dateutil/python-dateutil-${pkgver}.tar.gz) +md5sums=('4ef68e1c485b09e9f034e10473e5add2') prepare() { cd "${srcdir}" - cp -r python-dateutil-$pkgver python2-dateutil-$pkgver - cp -r python-dateutil-$pkgver python3-dateutil-$pkgver + cp -r python-dateutil-${pkgver} python2-build + cp -r python-dateutil-${pkgver} python3-build } check() { - cd $srcdir/python3-dateutil-$pkgver + cd ${srcdir}/python3-build ${MINGW_PREFIX}/bin/python3 test.py - cd $srcdir/python2-dateutil-$pkgver + cd ${srcdir}/python2-build ${MINGW_PREFIX}/bin/python2 test.py } package_python3-dateutil() { depends=("${MINGW_PACKAGE_PREFIX}-python3-six") - cd $srcdir/python3-dateutil-$pkgver + cd ${srcdir}/python3-build MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \ - --root=$pkgdir --optimize=1 + --root=${pkgdir} --optimize=1 install -Dm644 LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE chmod -R a+r $pkgdir/${MINGW_PREFIX}/lib/python3.4/ # Remove data files - rm $pkgdir/${MINGW_PREFIX}/lib/python3.4/site-packages/dateutil/zoneinfo/zoneinfo--latest.tar.gz + #rm ${pkgdir}${MINGW_PREFIX}/lib/python3.4/site-packages/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz } package_python2-dateutil() { depends=("${MINGW_PACKAGE_PREFIX}-python2-six") - cd $srcdir/python2-dateutil-$pkgver + cd ${srcdir}/python2-build MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} \ - --root=$pkgdir --optimize=1 + --root=${pkgdir} --optimize=1 install -Dm644 LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE - chmod -R a+r $pkgdir/${MINGW_PREFIX}/lib/python2.7/ + chmod -R a+r ${pkgdir}/${MINGW_PREFIX}/lib/python2.7/ # Remove data files - rm $pkgdir/${MINGW_PREFIX}/lib/python2.7/site-packages/dateutil/zoneinfo/zoneinfo--latest.tar.gz + #rm ${pkgdir}${MINGW_PREFIX}/lib/python2.7/site-packages/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz } package_mingw-w64-i686-python2-dateutil() { diff --git a/mingw-w64-python-matplotlib/PKGBUILD b/mingw-w64-python-matplotlib/PKGBUILD index fe9bb70a7b..6a5ccde64a 100644 --- a/mingw-w64-python-matplotlib/PKGBUILD +++ b/mingw-w64-python-matplotlib/PKGBUILD @@ -2,7 +2,7 @@ _realname=matplotlib pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname" "${MINGW_PACKAGE_PREFIX}-python3-$_realname") -pkgver=1.4.2 +pkgver=1.4.3 pkgrel=1 pkgdesc="A python plotting library, making publication quality plots (mingw-w64)" arch=('any') @@ -25,34 +25,33 @@ makedepends=( "${MINGW_PACKAGE_PREFIX}-libpng" #"${MINGW_PACKAGE_PREFIX}-qhull" ) -source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/matplotlib/matplotlib/archive/v$pkgver.tar.gz" +source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/matplotlib/matplotlib/archive/v${pkgver}.tar.gz" setupext.py.patch setup.py.patch) -md5sums=('79d86283a47530611b3695670c0a9b3c' +md5sums=('f1bb5e2317cceed593119fad2071e236' '24b0ed92631fd0adb2ae11ff1ef31490' 'b5f64259a266ccc517586debb8c4e5c8') noextract=("${_realname}-${pkgver}.tar.gz") prepare() { - cd $startdir/ # Clean up old sources so re-patching doesn't fail. - [ -d $srcdir/${_realname}-$pkgver ] && rm -rf $srcdir/${_realname}-$pkgver - tar -xzvf ${_realname}-${pkgver}.tar.gz -C $srcdir + [[ -d ${srcdir}/${_realname}-${pkgver} ]] && rm -rf $srcdir/${_realname}-${pkgver} + tar -xzvf ${_realname}-${pkgver}.tar.gz -C ${srcdir} - cd $srcdir/${_realname}-$pkgver + cd ${srcdir}/${_realname}-${pkgver} patch -p1 -i ${srcdir}/setupext.py.patch patch -p1 -i ${srcdir}/setup.py.patch cd ${srcdir} - cp -a $_realname-$pkgver $_realname-py2-$pkgver - cp -a $_realname-$pkgver $_realname-py3-$pkgver + cp -a ${_realname}-${pkgver} ${_realname}-py2-${pkgver} + cp -a ${_realname}-${pkgver} ${_realname}-py3-${pkgver} - cd ${srcdir}/$_realname-py3-$pkgver + cd ${srcdir}/${_realname}-py3-${pkgver} # remove cairo which fails for python3 sed -i 's/setupext\.BackendGtk3Cairo/#setupext\.BackendGtk3Cairo/g' setup.py sed -i 's/setupext\.BackendCairo/#setupext\.BackendCairo/g' setup.py - cd ${srcdir}/$_realname-py2-$pkgver + cd ${srcdir}/${_realname}-py2-${pkgver} sed -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/env python2|" \ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \ @@ -60,11 +59,11 @@ prepare() { } build() { - cd ${srcdir}/$_realname-py2-$pkgver + cd ${srcdir}/${_realname}-py2-${pkgver} MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ ${MINGW_PREFIX}/bin/python2 setup.py build - cd ${srcdir}/$_realname-py3-$pkgver + cd ${srcdir}/$_realname-py3-${pkgver} MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ ${MINGW_PREFIX}/bin/python3 setup.py build } @@ -81,7 +80,7 @@ package_python3-matplotlib() { "${MINGW_PACKAGE_PREFIX}-libpng" #"${MINGW_PACKAGE_PREFIX}-qhull" ) - cd ${srcdir}/$_realname-py3-$pkgver + cd ${srcdir}/$_realname-py3-${pkgver} MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ ${MINGW_PREFIX}/bin/python3 setup.py install -O1 --skip-build \ @@ -102,7 +101,7 @@ package_python2-matplotlib() { "${MINGW_PACKAGE_PREFIX}-libpng" #"${MINGW_PACKAGE_PREFIX}-qhull" ) - cd ${srcdir}/$_realname-py2-$pkgver + cd ${srcdir}/$_realname-py2-${pkgver} MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ ${MINGW_PREFIX}/bin/python2 setup.py install -O1 --skip-build \ diff --git a/mingw-w64-python-pygments/PKGBUILD b/mingw-w64-python-pygments/PKGBUILD index 37ff5007ed..8ae977c7ed 100644 --- a/mingw-w64-python-pygments/PKGBUILD +++ b/mingw-w64-python-pygments/PKGBUILD @@ -5,13 +5,13 @@ _realname=pygments pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=2.0.2 -pkgrel=2 +pkgrel=3 pkgdesc="Python syntax highlighter (mingw-w64)" arch=('any') license=('BSD') url="http://pygments.org/" makedepends=("${MINGW_PACKAGE_PREFIX}-python2-setuptools" "${MINGW_PACKAGE_PREFIX}-python3-setuptools") -source=(http://pypi.python.org/packages/source/P/Pygments/Pygments-$pkgver.tar.gz) +source=(http://pypi.python.org/packages/source/P/Pygments/Pygments-${pkgver}.tar.gz) noextract=("Pygments-${pkgver}.tar.gz") sha256sums=('7320919084e6dac8f4540638a46447a3bd730fca172afc17d2c03eed22cf4f51') diff --git a/mingw-w64-python-pyparsing/PKGBUILD b/mingw-w64-python-pyparsing/PKGBUILD index 13d59d9957..293cd37638 100644 --- a/mingw-w64-python-pyparsing/PKGBUILD +++ b/mingw-w64-python-pyparsing/PKGBUILD @@ -1,8 +1,8 @@ # Contributor: Runar Tenfjord < runar dot tenfjord at gmail dot com > _realname=pyparsing -pkgname=("${MINGW_PACKAGE_PREFIX}-python2-$_realname" "${MINGW_PACKAGE_PREFIX}-python3-$_realname") -pkgver=2.0.2 +pkgname=("${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") +pkgver=2.0.3 pkgrel=1 pkgdesc='General parsing module for Python (mingw-w64)' arch=('any') @@ -12,22 +12,22 @@ makedepends=( "${MINGW_PACKAGE_PREFIX}-python3" "${MINGW_PACKAGE_PREFIX}-python2" ) -source=("http://downloads.sourceforge.net/pyparsing/pyparsing-$pkgver.tar.gz") -sha256sums=('17e43d6b17588ed5968735575b3983a952133ec4082596d214d7090b56d48a06') +source=("http://downloads.sourceforge.net/pyparsing/pyparsing-${pkgver}.tar.gz") +sha256sums=('06e729e1cbf5274703b1f47b6135ed8335999d547f9d8cf048b210fb8ebf844f') prepare() { cd "${srcdir}" - cp -r pyparsing-$pkgver python2-pyparsing-$pkgver - cp -r pyparsing-$pkgver python3-pyparsing-$pkgver + cp -r pyparsing-${pkgver} python2-build + cp -r pyparsing-${pkgver} python3-build } package_python3-pyparsing() { depends=("${MINGW_PACKAGE_PREFIX}-python3") - cd $srcdir/python3-pyparsing-$pkgver + cd ${srcdir}/python3-build MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ ${MINGW_PREFIX}/bin/python3 setup.py install --prefix=${MINGW_PREFIX} \ - --root="$pkgdir" --optimize=1 + --root="${pkgdir}" --optimize=1 install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python3-${_realname}/LICENSE" } @@ -35,10 +35,10 @@ package_python3-pyparsing() { package_python2-pyparsing() { depends=("${MINGW_PACKAGE_PREFIX}-python2") - cd $srcdir/python2-pyparsing-$pkgver + cd ${srcdir}/python2-build MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \ ${MINGW_PREFIX}/bin/python2 setup.py install --prefix=${MINGW_PREFIX} \ - --root="$pkgdir" --optimize=1 + --root="${pkgdir}" --optimize=1 install -Dm644 LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/python2-${_realname}/LICENSE" } diff --git a/mingw-w64-python2-cairo/PKGBUILD b/mingw-w64-python2-cairo/PKGBUILD index ac56adc0ca..ca07bcbe9a 100644 --- a/mingw-w64-python2-cairo/PKGBUILD +++ b/mingw-w64-python2-cairo/PKGBUILD @@ -1,17 +1,16 @@ # Maintainer: Alexey Pavlov _realname=python2-cairo - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="Python2 bindings for the cairo graphics library (mingw-w64)" url="http://www.cairographics.org/pycairo" arch=('any') license=('LGPL' 'MPL') depends=("${MINGW_PACKAGE_PREFIX}-python2" "${MINGW_PACKAGE_PREFIX}-python3" "${MINGW_PACKAGE_PREFIX}-cairo") source=(http://cairographics.org/releases/py2cairo-${pkgver}.tar.bz2 - waflib.patch) + waflib.patch) md5sums=('20337132c4ab06c1146ad384d55372c5' 'dfbfb1d1901a311c2d2ca8e8ea1be592') @@ -24,12 +23,8 @@ build() { rm -f waflib/*.pyc popd - pushd ${MINGW_PREFIX} > /dev/null - export PREFIX_DEPS=`pwd -W` - popd > /dev/null - export PYTHON=${MINGW_PREFIX}/bin/python2 - CFLAGS+=" -I${MINGW_PREFIX}/include/python2.7" + CFLAGS+=" -I${MINGW_PREFIX}/include/python2.7 -I${MINGW_PREFIX}/include/cairo" /usr/bin/python2 ./waf --help /usr/bin/python2 ./waf configure --prefix=${MINGW_PREFIX} /usr/bin/python2 ./waf build diff --git a/mingw-w64-python2/1050-fix-hashfunc-prototype.patch b/mingw-w64-python2/1050-fix-hashfunc-prototype.patch deleted file mode 100644 index 7dbb449ccb..0000000000 --- a/mingw-w64-python2/1050-fix-hashfunc-prototype.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Python-2.7.10/Include/object.h.orig 2015-06-26 10:28:53.932400000 +0300 -+++ Python-2.7.10/Include/object.h 2015-06-26 10:29:01.950800000 +0300 -@@ -311,7 +311,7 @@ - typedef int (*setattrofunc)(PyObject *, PyObject *, PyObject *); - typedef int (*cmpfunc)(PyObject *, PyObject *); - typedef PyObject *(*reprfunc)(PyObject *); --typedef long (*hashfunc)(PyObject *); -+typedef Py_ssize_t (*hashfunc)(PyObject *); - typedef PyObject *(*richcmpfunc) (PyObject *, PyObject *, int); - typedef PyObject *(*getiterfunc) (PyObject *); - typedef PyObject *(*iternextfunc) (PyObject *); diff --git a/mingw-w64-python2/PKGBUILD b/mingw-w64-python2/PKGBUILD index 264bee7af3..4e8e8c43cc 100644 --- a/mingw-w64-python2/PKGBUILD +++ b/mingw-w64-python2/PKGBUILD @@ -5,7 +5,7 @@ _realname=python2 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.7.10 -pkgrel=3 +pkgrel=4 _pybasever=${pkgver%.*} pkgdesc="A high-level scripting language (mingw-w64)" arch=('any') @@ -103,7 +103,6 @@ source=("http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz" 1020-gdbm-module-includes.patch 1030-use-gnu_printf-in-format.patch 1040-install-msilib.patch - 1050-fix-hashfunc-prototype.patch 2000-distutils-add-windmc-to-cygwinccompiler.patch) prepare() { @@ -200,7 +199,6 @@ prepare() { patch -p1 -i "${srcdir}"/1020-gdbm-module-includes.patch patch -p1 -i "${srcdir}"/1030-use-gnu_printf-in-format.patch patch -p1 -i "${srcdir}"/1040-install-msilib.patch - patch -p1 -i "${srcdir}"/1050-fix-hashfunc-prototype.patch plain "Apply Renato Silva's patch to distutils" patch -p1 -i "${srcdir}"/2000-distutils-add-windmc-to-cygwinccompiler.patch @@ -424,5 +422,4 @@ sha1sums=('ee5a50c5562e7448f037d35fdedc18d95c748b9e' '06ebbcf50d6d30780f47a0d3425f956b2eb8e847' '9042c4902ff03ecc12e0b41059aaebd6ad409009' 'dc6aa85fa4dc68a6809c1321e4a28a360a242f39' - '7afbbdc5f04fe8969818d5ab47caab2a01c6b892' '5c5d9fb5d1fc576251a68c781437d27ea8d7e208') diff --git a/mingw-w64-python3-cairo/PKGBUILD b/mingw-w64-python3-cairo/PKGBUILD index 5c3313541a..33f974a343 100644 --- a/mingw-w64-python3-cairo/PKGBUILD +++ b/mingw-w64-python3-cairo/PKGBUILD @@ -1,27 +1,32 @@ # Maintainer: Alexey Pavlov _realname=pycairo - pkgname="${MINGW_PACKAGE_PREFIX}-python3-cairo" pkgver=1.10.0 -pkgrel=3 +pkgrel=4 pkgdesc="Python2 bindings for the cairo graphics library (mingw-w64)" url="http://www.cairographics.org/pycairo" arch=('any') license=('LGPL' 'MPL') depends=("${MINGW_PACKAGE_PREFIX}-python3" "${MINGW_PACKAGE_PREFIX}-cairo") +makedepends=("python3") source=(http://cairographics.org/releases/${_realname}-${pkgver}.tar.bz2 - context.patch - pycairo-1.10.0-waf-python3.4.tar.bz2) + context.patch + pycairo-1.10.0-waf-python3.4.tar.bz2) md5sums=('e6fd3f2f1e6a72e0db0868c4985669c5' 'd4ded5af833f9072954c8bc434f90986' '06a60ae51953a2d4e89eb46ac4d282f6') -build() { +prepare() { cd "${srcdir}/pycairo-${pkgver}" patch -p1 -i ${srcdir}/context.patch patch -p1 -i ${srcdir}/pycairo-1.10.0-waf-python3.4.patch sed -i 's:bin/env python:bin/env python3:' waf +} + +build() { + cd "${srcdir}/pycairo-${pkgver}" + /usr/bin/python3 ./waf --version || true pushd .waf3-* #patch -p0 -i ${srcdir}/waflib.patch diff --git a/mingw-w64-ruby/PKGBUILD b/mingw-w64-ruby/PKGBUILD index e45d0b1a23..14d3598a1d 100644 --- a/mingw-w64-ruby/PKGBUILD +++ b/mingw-w64-ruby/PKGBUILD @@ -3,7 +3,7 @@ _realname=ruby pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="An object-oriented language for quick and easy programming (mingw-w64)" arch=('any') url="http://www.ruby-lang.org/en" diff --git a/mingw-w64-schroedinger/PKGBUILD b/mingw-w64-schroedinger/PKGBUILD index dc0eb53666..74a7905155 100644 --- a/mingw-w64-schroedinger/PKGBUILD +++ b/mingw-w64-schroedinger/PKGBUILD @@ -1,10 +1,9 @@ # Maintainer: Alexey Pavlov _realname=schroedinger - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.0.11 -pkgrel=2 +pkgrel=3 pkgdesc="An implemenation of the Dirac video codec in ANSI C code (mingw-w64)" arch=('any') url="http://www.diracvideo.org/" @@ -13,8 +12,8 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") depends=("${MINGW_PACKAGE_PREFIX}-orc") options=('strip' 'staticlibs') source=("http://www.diracvideo.org/download/schroedinger/${_realname}-${pkgver}.tar.gz" - 0001-builddir-not-srcdir.all.patch - 0002-link-testsuite-to-orc-tmp.mingw.patch) + 0001-builddir-not-srcdir.all.patch + 0002-link-testsuite-to-orc-tmp.mingw.patch) md5sums=('da6af08e564ca1157348fb8d92efc891' '2a98d3929c8e4106768d437cc0ce58fb' 'e073b0580ca3e8171a2266aa529472bd') @@ -27,6 +26,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 \ @@ -35,6 +35,7 @@ build() { --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ --with-opengl=${MINGW_PREFIX} + make } diff --git a/mingw-w64-sip/PKGBUILD b/mingw-w64-sip/PKGBUILD index b5cb3fbe53..8533898d10 100644 --- a/mingw-w64-sip/PKGBUILD +++ b/mingw-w64-sip/PKGBUILD @@ -4,15 +4,14 @@ _realname=sip pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-python2-${_realname}" "${MINGW_PACKAGE_PREFIX}-python3-${_realname}") pkgver=4.16.8 -pkgrel=1 +pkgrel=2 pkgdesc="Tool to create Python bindings for C and C++ libraries" arch=('any') license=('GPL') url="http://www.riverbankcomputing.co.uk/software/sip" makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" - "${MINGW_PACKAGE_PREFIX}-python2" - "${MINGW_PACKAGE_PREFIX}-python3") - + "${MINGW_PACKAGE_PREFIX}-python2" + "${MINGW_PACKAGE_PREFIX}-python3") source=("http://downloads.sourceforge.net/project/pyqt/${_realname}/${_realname}-${pkgver}/${_realname}-${pkgver}.tar.gz" "0001-mingw-python.patch") md5sums=('8e48cd78bcd31f9310a701a4111c2739' diff --git a/mingw-w64-smpeg2/PKGBUILD b/mingw-w64-smpeg2/PKGBUILD index 650df19497..bbc3011f5f 100644 --- a/mingw-w64-smpeg2/PKGBUILD +++ b/mingw-w64-smpeg2/PKGBUILD @@ -3,7 +3,7 @@ _realname=smpeg2 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="SDL2 MPEG Player Library (mingw-w64)" arch=('any') url="http://icculus.org/smpeg/" @@ -21,21 +21,23 @@ 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}/configure \ + cd "${srcdir}/build-${MINGW_CHOST}/" + ../${_realname}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --mandir=${MINGW_PREFIX}/share/man \ --enable-shared \ --enable-static + make } package() { cd "${srcdir}/build-${MINGW_CHOST}" - make DESTDIR="$pkgdir" install + make DESTDIR="${pkgdir}" install # hacky way of resolving conflicts rm ${pkgdir}${MINGW_PREFIX}/bin/plaympeg diff --git a/mingw-w64-soundtouch/PKGBUILD b/mingw-w64-soundtouch/PKGBUILD index 4016c3aca5..0bdecb3aad 100644 --- a/mingw-w64-soundtouch/PKGBUILD +++ b/mingw-w64-soundtouch/PKGBUILD @@ -3,7 +3,7 @@ _realname=soundtouch pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.9.0 -pkgrel=1 +pkgrel=2 pkgdesc="An audio processing library (mingw-w64)" arch=('any') url="http://www.surina.net/soundtouch/" diff --git a/mingw-w64-szip/PKGBUILD b/mingw-w64-szip/PKGBUILD index ac0523c225..1cfd382847 100644 --- a/mingw-w64-szip/PKGBUILD +++ b/mingw-w64-szip/PKGBUILD @@ -2,20 +2,17 @@ # Contributor: Xin Sun _realname=szip - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.1 -pkgrel=1 -pkgdesc="Extended-Rice lossless compression algorithm implementation" +pkgrel=2 +pkgdesc="Extended-Rice lossless compression algorithm implementation (mingw-w64)" arch=('any') url="http://www.hdfgroup.org/doc_resource/SZIP/" -source=( - "http://www.hdfgroup.org/ftp/lib-external/szip/${pkgver}/src/szip-${pkgver}.tar.gz" - "szip-hdf5.patch" - "szip-default-import-suffix.patch" - "szip-fix-install-docs.patch" - "szip-fix-cmake-macros.patch" - ) +source=("http://www.hdfgroup.org/ftp/lib-external/szip/${pkgver}/src/szip-${pkgver}.tar.gz" + "szip-hdf5.patch" + "szip-default-import-suffix.patch" + "szip-fix-install-docs.patch" + "szip-fix-cmake-macros.patch") md5sums=('902f831bcefb69c6b635374424acbead' '2ac1108913387e1f7b4749a18cc353a3' '574aff51b619b306fc8cac05a600d89b' @@ -40,9 +37,11 @@ prepare() { build() { [[ -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=${pkgdir}${MINGW_PREFIX} \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DBUILD_SHARED_LIBS=ON \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ @@ -52,5 +51,5 @@ build() { package() { cd "${srcdir}/build-${MINGW_CHOST}" - make -j1 install + make DESTDIR=${pkgdir} install } diff --git a/mingw-w64-taglib/PKGBUILD b/mingw-w64-taglib/PKGBUILD index ca2377d960..85f7701bc2 100644 --- a/mingw-w64-taglib/PKGBUILD +++ b/mingw-w64-taglib/PKGBUILD @@ -1,7 +1,6 @@ # Maintainer: Alexey Pavlov _realname=taglib - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.9.1 pkgrel=3 @@ -33,12 +32,13 @@ build() { 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} \ - -DENABLE_STATIC:BOOL=OFF \ - -DWITH_ASF:BOOL=ON \ - -DWITH_MP4:BOOL=ON \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ + -DENABLE_STATIC=OFF \ + -DWITH_ASF=ON \ + -DWITH_MP4=ON \ ../${_realname}-${pkgver} make @@ -47,12 +47,13 @@ build() { 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} \ - -DENABLE_STATIC:BOOL=ON \ - -DWITH_ASF:BOOL=ON \ - -DWITH_MP4:BOOL=ON \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ + -DENABLE_STATIC=ON \ + -DWITH_ASF=ON \ + -DWITH_MP4=ON \ ../${_realname}-${pkgver} make @@ -60,14 +61,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/taglib.pc + make DESTDIR=${pkgdir} install } diff --git a/mingw-w64-tinyxml/PKGBUILD b/mingw-w64-tinyxml/PKGBUILD index af6e089d6a..00b7224f33 100644 --- a/mingw-w64-tinyxml/PKGBUILD +++ b/mingw-w64-tinyxml/PKGBUILD @@ -1,10 +1,9 @@ # Maintainer: Alexey Pavlov _realname=tinyxml - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=2.6.2 -pkgrel=2 +pkgrel=3 pkgdesc="Simple, small, C++ XML parser that can be easily integrated into other programs (mingw-w64)" arch=('any') url="http://www.grinninglizard.com/tinyxml" @@ -13,18 +12,18 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") options=('strip' 'staticlibs') source=("http://downloads.sourceforge.net/tinyxml/tinyxml_${pkgver//./_}.tar.gz" - "entity.patch" - "tinyxml-2.5.3-stl.patch" - "tinyxml.pc") + "entity.patch" + "tinyxml-2.5.3-stl.patch" + "tinyxml.pc") sha256sums=('15bdfdcec58a7da30adc87ac2b078e4417dbe5392f3afb719f9ba6d062645593' 'ef493209b0a51160171fd834a7ecdddd02679463b85fb89a2ea254213e47f99b' '3baf2c4dbc2c8f54a151dac8860113d2f549174f83ed85d552b094dfaebb52af' '60bcff16486698f4d2f076f5a3c6e5566e098e3d0d30f1bdbbe7012d3d36c095') prepare() { - cd "$srcdir/tinyxml" - patch -p0 -i "$srcdir"/entity.patch - patch -p1 -i "$srcdir"/tinyxml-2.5.3-stl.patch + cd "${srcdir}/tinyxml" + patch -p0 -i "${srcdir}"/entity.patch + patch -p1 -i "${srcdir}"/tinyxml-2.5.3-stl.patch } build() { @@ -32,7 +31,7 @@ build() { cp -r "${srcdir}/tinyxml/"* "${srcdir}/build-${MINGW_CHOST}" cd "${srcdir}/build-${MINGW_CHOST}" for file in $(ls *.cpp | grep -v xmltest); do - g++ -c -Wall -Wno-unknown-pragmas -Wno-format -O3 $file + g++ -c -Wall -Wno-unknown-pragmas -Wno-format -O3 ${file} done ar rcs -o libtinyxml.a $(ls *.o) g++ -shared -o libtinyxml-0.dll -Xlinker --out-implib -Xlinker libtinyxml.dll.a $(ls *.o) diff --git a/mingw-w64-tinyxml2/PKGBUILD b/mingw-w64-tinyxml2/PKGBUILD index fa85d17d5b..fd7ddbd669 100644 --- a/mingw-w64-tinyxml2/PKGBUILD +++ b/mingw-w64-tinyxml2/PKGBUILD @@ -2,7 +2,7 @@ _realname=tinyxml2 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=2.2.0 +pkgver=3.0.0 pkgrel=1 pkgdesc="Simple, small, C++ XML parser that can be easily integrated into other programs (mingw-w64)" arch=('any') @@ -11,35 +11,45 @@ license=("zlib") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") options=('strip' 'staticlibs') -source=(https://github.com/leethomason/tinyxml2/archive/${pkgver}.tar.gz) -md5sums=('3c7a9191c8f26e4f056a89902ac848b1') +source=(${_realname}-${pkgver}.tar.gz::https://github.com/leethomason/tinyxml2/archive/${pkgver}.tar.gz) +md5sums=('26584d2c1666aea5e664c105eb4e8153') prepare() { - cd "$srcdir/${_realname}-$pkgver" + cd "${srcdir}/${_realname}-${pkgver}" } build() { + [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST} + mkdir ${srcdir}/build-${MINGW_CHOST} + cd ${srcdir}/build-${MINGW_CHOST} - [[ -d $srcdir/build-${MINGW_CHOST} ]] && rm -rf $srcdir/build-${MINGW_CHOST} - mkdir $srcdir/build-${MINGW_CHOST} - cd $srcdir/build-${MINGW_CHOST} - + msg "Build shared version..." + mkdir shared && cd shared + 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} \ -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_STATIC_LIBS:BOOL=ON \ - ../${_realname}-$pkgver + -DBUILD_SHARED_LIBS=ON \ + ../../${_realname}-${pkgver} + make + + cd ${srcdir}/build-${MINGW_CHOST} + msg "Build static version..." + mkdir static && cd static + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ + ${MINGW_PREFIX}/bin/cmake \ + -G"MSYS Makefiles" \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_SHARED_LIBS=OFF \ + ../../${_realname}-${pkgver} make } package() { - cd "${srcdir}/build-${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/tinyxml2.pc + cd "${srcdir}/build-${MINGW_CHOST}/shared" + make DESTDIR=${pkgdir} install + + cp ${srcdir}/build-${MINGW_CHOST}/static/libtinyxml2.a ${pkgdir}${MINGW_PREFIX}/lib/ } diff --git a/mingw-w64-vtk/PKGBUILD b/mingw-w64-vtk/PKGBUILD index e4ab0f9487..b9db145636 100644 --- a/mingw-w64-vtk/PKGBUILD +++ b/mingw-w64-vtk/PKGBUILD @@ -3,7 +3,7 @@ _realname=vtk pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=6.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="A software system for 3D computer graphics, image processing and visualization (mingw-w64)" arch=('any') url="http://www.vtk.org/" @@ -37,7 +37,7 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-boost: InfovisBoost and InfovisBoostGraphAl "${MINGW_PACKAGE_PREFIX}-python2: Python bindings" "${MINGW_PACKAGE_PREFIX}-python2-matplotlib: Matplotlib renderer" "${MINGW_PACKAGE_PREFIX}-tk: TCL bindings, Python Tk widgets") -source=("https://github.com/Kitware/VTK/archive/v$pkgver.tar.gz" +source=(${_realname}-${pkgver}.tar.gz::"https://github.com/Kitware/VTK/archive/v${pkgver}.tar.gz" "vtk-mingw-w64.patch" "win64-ptr-cast.patch") md5sums=('742a2b3fbe5520c75d2a3925e8774040' @@ -64,11 +64,12 @@ 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=;-DVTK_INSTALL_QT_PLUGIN_DIR=;-DVTK_INSTALL_TCL_DIR=" \ ${MINGW_PREFIX}/bin/cmake.exe -Wno-dev \ -G"MSYS Makefiles" \ - -DCMAKE_INSTALL_PREFIX=${pkgdir}${MINGW_PREFIX} \ - -DVTK_INSTALL_QT_PLUGIN_DIR=${pkgdir}${MINGW_PREFIX}/share/qt5/plugins/designer \ - -DVTK_INSTALL_TCL_DIR=${pkgdir}${MINGW_PREFIX}/lib/vtk-${pkgver%.*} \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ + -DVTK_INSTALL_QT_PLUGIN_DIR=${MINGW_PREFIX}/share/qt5/plugins/designer \ + -DVTK_INSTALL_TCL_DIR=${MINGW_PREFIX}/lib/vtk-${pkgver%.*} \ -DBUILD_DOCUMENTATION=OFF \ -DBUILD_EXAMPLES=OFF \ -DBUILD_TESTING=OFF \ @@ -126,17 +127,15 @@ build() { package() { cd "${srcdir}/build-${CARCH}" - make -j1 install + make -j1 DESTDIR=${pkgdir} install - pushd ${MINGW_PREFIX} > /dev/null - export PREFIX_DEPS=`pwd -W` - popd > /dev/null + #local PREFIX_DEPS=$(cygpath -am ${MINGW_PREFIX}) pushd ${pkgdir}${MINGW_PREFIX}/lib/cmake/${_realname}-${pkgver%.*} > /dev/null sed -s 's|Qt5::|Qt5|g' -i ./VTKTargets*.cmake - sed -s "s|${PREFIX_DEPS}|\${_IMPORT_PREFIX}|g" -i ./VTKTargets.cmake - find . -name '*.cmake' -exec \ - sed -s "s|${PREFIX_DEPS}|\${VTK_INSTALL_PREFIX}|g" -i {} \; + #sed -s "s|${PREFIX_DEPS}|\${_IMPORT_PREFIX}|g" -i ./VTKTargets.cmake + #find . -name '*.cmake' -exec \ + # sed -s "s|${PREFIX_DEPS}|\${VTK_INSTALL_PREFIX}|g" -i {} \; popd > /dev/null install -Dm644 ${srcdir}/${_realname}-${pkgver}/Copyright.txt \ diff --git a/mingw-w64-wavpack/PKGBUILD b/mingw-w64-wavpack/PKGBUILD index 61bd7a1b99..9a0ca9f1fe 100644 --- a/mingw-w64-wavpack/PKGBUILD +++ b/mingw-w64-wavpack/PKGBUILD @@ -1,9 +1,8 @@ # Maintainer: Alexey Pavlov _realname=wavpack - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=4.70.0 +pkgver=4.75.0 pkgrel=1 pkgdesc="Audio compression format with lossless, lossy and hybrid compression modes (mingw-w64)" arch=('any') @@ -13,27 +12,27 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc") depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") options=(!libtool strip staticlibs) source=(http://www.wavpack.com/${_realname}-${pkgver}.tar.bz2) -sha1sums=('7bf2022c988c19067196ee1fdadc919baacf46d1') +sha1sums=('ef99ec8d2e91bcb486ad640cfec0d970f43eb750') prepare() { cd ${srcdir}/${_realname}-${pkgver} } build() { - mkdir -p "${srcdir}/build-${MINGW_CHOST}" [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" - cp -r "${srcdir}/${_realname}-${pkgver}" "${srcdir}/build-${MINGW_CHOST}" - cd "${srcdir}/build-${MINGW_CHOST}" - ./configure \ + mkdir -p "${srcdir}/build-${MINGW_CHOST}" && cd "${srcdir}/build-${MINGW_CHOST}" + ../${_realname}-${pkgver}/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ - --enable-mmx + --enable-shared \ + --enable-static + make } package() { cd "${srcdir}/build-${MINGW_CHOST}" - make -j1 DESTDIR="$pkgdir" install + make -j1 DESTDIR="${pkgdir}" install find "${pkgdir}${MINGW_PREFIX}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm } diff --git a/mingw-w64-xvidcore/PKGBUILD b/mingw-w64-xvidcore/PKGBUILD index de5d166600..82270b82a6 100644 --- a/mingw-w64-xvidcore/PKGBUILD +++ b/mingw-w64-xvidcore/PKGBUILD @@ -3,7 +3,7 @@ _realname=xvidcore pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.3.4 -pkgrel=1 +pkgrel=2 pkgdesc="XviD is an open source MPEG-4 video codec (mingw-w64)" arch=('any') license=('GPL') diff --git a/mingw-w64-yaml-cpp/PKGBUILD b/mingw-w64-yaml-cpp/PKGBUILD index a710f4c26f..5e2833428d 100644 --- a/mingw-w64-yaml-cpp/PKGBUILD +++ b/mingw-w64-yaml-cpp/PKGBUILD @@ -1,61 +1,46 @@ # Maintainer: Alexey Pavlov _realname=yaml-cpp - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=0.5.1 -pkgrel=2 +pkgver=0.5.2 +pkgrel=1 pkgdesc="A YAML parser and emitter in C++ matching the YAML 1.2 spec (mingw-w64)" arch=('any') -url="https://code.google.com/p/yaml-cpp/" +url="https://github.com/jbeder/yaml-cpp" license=("MIT") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" - "${MINGW_PACKAGE_PREFIX}-pkg-config" - "${MINGW_PACKAGE_PREFIX}-cmake" - "${MINGW_PACKAGE_PREFIX}-boost") + "${MINGW_PACKAGE_PREFIX}-cmake" + "${MINGW_PACKAGE_PREFIX}-boost" + "${MINGW_PACKAGE_PREFIX}-pkg-config" + "${MINGW_PACKAGE_PREFIX}-python2") options=('staticlibs' 'strip') -source=(http://yaml-cpp.googlecode.com/files/${_realname}-${pkgver}.tar.gz - mingw-install-pkgconfig.patch) -md5sums=('0fa47a5ed8fedefab766592785c85ee7' +source=(${_realname}-${pkgver}.tar.gz::https://github.com/jbeder/yaml-cpp/archive/release-${pkgver}.tar.gz + mingw-install-pkgconfig.patch) +md5sums=('2728af8a15e2b2c407730c45b99b274b' 'acf096cb06ee28ecb730a8e0b0cf044d') prepare() { - cd ${srcdir}/${_realname}-${pkgver} + cd ${srcdir}/${_realname}-release-${pkgver} patch -p1 -i ${srcdir}/mingw-install-pkgconfig.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 -p ${srcdir}/build-${MINGW_CHOST} + cd ${srcdir}/build-${MINGW_CHOST} - pushd ${MINGW_PREFIX} > /dev/null - export PREFIX_DEPS=`pwd -W` - popd > /dev/null - - mkdir $srcdir/build-${MINGW_CHOST} - - cd "$srcdir/build-${MINGW_CHOST}" + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake.exe \ - ../${_realname}-${pkgver} \ -G"MSYS Makefiles" \ - -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX_WIN} \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DBUILD_SHARED_LIBS=OFF \ - ../${_realname}-${pkgver} + ../${_realname}-release-${pkgver} + make } package() { - cd "$srcdir/build-${MINGW_CHOST}" - make -j1 install - install -Dm644 ${srcdir}/${_realname}-${pkgver}/license.txt ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE - - mkdir -p ${pkgdir}${MINGW_PREFIX} - pushd ${pkgdir}${MINGW_PREFIX} > /dev/null - export PREFIX_WIN=`pwd -W` - popd > /dev/null - - cd ${pkgdir}${MINGW_PREFIX} - sed -i "s|$PREFIX_WIN|$MINGW_PREFIX|g" lib/pkgconfig/yaml-cpp.pc + cd "${srcdir}/build-${MINGW_CHOST}" + make DESTDIR=${pkgdir} install + install -Dm644 ${srcdir}/${_realname}-release-${pkgver}/license.txt ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE } diff --git a/mingw-w64-yaml-cpp0.3/PKGBUILD b/mingw-w64-yaml-cpp0.3/PKGBUILD index 1e577fda32..6bf6ae9142 100644 --- a/mingw-w64-yaml-cpp0.3/PKGBUILD +++ b/mingw-w64-yaml-cpp0.3/PKGBUILD @@ -1,62 +1,46 @@ # Maintainer: Alexey Pavlov _realname=yaml-cpp0.3 - pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=0.3.0 pkgrel=2 pkgdesc="A YAML parser and emitter in C++ matching the YAML 1.2 spec (mingw-w64) - old version" arch=('any') -url="https://code.google.com/p/yaml-cpp/" +url="https://github.com/jbeder/yaml-cpp" license=("MIT") provides=("${MINGW_PACKAGE_PREFIX}-yaml-cpp") conflicts=("${MINGW_PACKAGE_PREFIX}-yaml-cpp") makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" - "${MINGW_PACKAGE_PREFIX}-pkg-config" - "${MINGW_PACKAGE_PREFIX}-cmake" - "${MINGW_PACKAGE_PREFIX}-boost") + "${MINGW_PACKAGE_PREFIX}-cmake" + "${MINGW_PACKAGE_PREFIX}-pkg-config") options=('staticlibs' 'strip') -source=(http://yaml-cpp.googlecode.com/files/yaml-cpp-${pkgver}.tar.gz - mingw-install-pkgconfig.patch) -md5sums=('9aa519205a543f9372bf4179071c8ac6' +source=(yaml-cpp-${pkgver}.tar.gz::https://github.com/jbeder/yaml-cpp/archive/release-${pkgver}.tar.gz + mingw-install-pkgconfig.patch) +md5sums=('0c0496b195299e956056430444e237b9' 'acf096cb06ee28ecb730a8e0b0cf044d') prepare() { - cd ${srcdir}/yaml-cpp + cd ${srcdir}/yaml-cpp-release-${pkgver} patch -p1 -i ${srcdir}/mingw-install-pkgconfig.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 -p ${srcdir}/build-${MINGW_CHOST} + cd ${srcdir}/build-${MINGW_CHOST} - pushd ${MINGW_PREFIX} > /dev/null - export PREFIX_DEPS=`pwd -W` - popd > /dev/null - - mkdir $srcdir/build-${MINGW_CHOST} - - cd "$srcdir/build-${MINGW_CHOST}" + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake.exe \ - ../yaml-cpp-${pkgver} \ -G"MSYS Makefiles" \ - -DCMAKE_INSTALL_PREFIX:PATH=${PREFIX_WIN} \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DBUILD_SHARED_LIBS=OFF \ - ../yaml-cpp + ../yaml-cpp-release-${pkgver} + make } package() { - cd "$srcdir/build-${MINGW_CHOST}" - make -j1 install - - mkdir -p ${pkgdir}${MINGW_PREFIX} - pushd ${pkgdir}${MINGW_PREFIX} > /dev/null - export PREFIX_WIN=`pwd -W` - popd > /dev/null - - cd ${pkgdir}${MINGW_PREFIX} - sed -i "s|$PREFIX_WIN|$MINGW_PREFIX|g" lib/pkgconfig/yaml-cpp.pc + cd "${srcdir}/build-${MINGW_CHOST}" + make DESTDIR=${pkgdir} install + install -Dm644 ${srcdir}/yaml-cpp-release-${pkgver}/license.txt ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE }