diff --git a/mingw-w64-blender-git/PKGBUILD b/mingw-w64-blender-git/PKGBUILD index 8c6956b8a7..1d4aef8d7d 100644 --- a/mingw-w64-blender-git/PKGBUILD +++ b/mingw-w64-blender-git/PKGBUILD @@ -6,7 +6,7 @@ pkgname="${_mingw_suff}-${_realname}-git" provides=("${_mingw_suff}-${_realname}") conflicts=("${_mingw_suff}-${_realname}") blender_version=2.70 -pkgver=r53522.b3972ae +pkgver=r53528.e6cdce7 pkgrel=1 pkgdesc="A fully integrated 3D graphics creation suite (mingw-w64)" arch=('any') @@ -32,7 +32,7 @@ depends=("${_mingw_suff}-boost" makedepends=("${_mingw_suff}-boost" "${_mingw_suff}-clang" "${_mingw_suff}-cmake") #[[ $CARCH == x86_64 ]] && makedepends+=('cuda') optdepends=('cuda: cycles renderer cuda support') -options=(!strip staticlibs !buildflags) +options=(staticlibs !buildflags) # debug !strip #install=blender.install source=("${_realname}"::"git://git.blender.org/blender.git" "translations"::"git://git.blender.org/blender-translations.git" @@ -71,22 +71,44 @@ build() { export PREFIX_DEPS=`pwd -W` popd > /dev/null + [ -d $srcdir/build-${MINGW_CHOST} ] && rm -rf $srcdir/build-${MINGW_CHOST} mkdir $srcdir/build-${MINGW_CHOST} cd $srcdir/build-${MINGW_CHOST} [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD=OFF" [[ $CARCH == i686 ]] && BUILDCUDA="OFF" || BUILDCUDA="ON" [[ $CARCH == i686 ]] && PMARCH="i686" || PMARCH="x86-64" + if check_option "debug" "y"; then + BUILD_TYPE="Debug" + # Prevent: + # CMakeFiles/extern_libmv.dir/libmv/multiview/fundamental.cc.obj: too many sections (35936) + # also .. + # cp C:/msys64/mingw64/lib/libpython3.4m.dll.a C:/msys64/mingw64/lib/libpython3_d.4m.dll.a + # cp C:/msys64/mingw64/lib/opencollada/libOpenCOLLADAStreamWriter.a C:/msys64/mingw64/lib/opencollada/libOpenCOLLADAStreamWriter_d.a + # cp C:/msys64/mingw64/lib/opencollada/libOpenCOLLADASaxFrameworkLoader.a C:/msys64/mingw64/lib/opencollada/libOpenCOLLADASaxFrameworkLoader_d.a + # cp C:/msys64/mingw64/lib/opencollada/libOpenCOLLADAFramework.a C:/msys64/mingw64/lib/opencollada/libOpenCOLLADAFramework_d.a + # cp C:/msys64/mingw64/lib/opencollada/libOpenCOLLADABaseUtils.a C:/msys64/mingw64/lib/opencollada/libOpenCOLLADABaseUtils_d.a + # cp C:/msys64/mingw64/lib/opencollada/libGeneratedSaxParser.a C:/msys64/mingw64/lib/opencollada/libGeneratedSaxParser_d.a + # cp C:/msys64/mingw64/lib/opencollada/libMathMLSolver.a C:/msys64/mingw64/lib/opencollada/libMathMLSolver_d.a + # cp C:/msys64/mingw64/lib/opencollada/libbuffer.a C:/msys64/mingw64/lib/opencollada/libbuffer_d.a + # cp C:/msys64/mingw64/lib/opencollada/libftoa.a C:/msys64/mingw64/lib/opencollada/libftoa_d.a + # cp C:/msys64/mingw64/lib/opencollada/libUTF.a C:/msys64/mingw64/lib/opencollada/libUTF_d.a + # cp C:/msys64/mingw64/lib/libxml2.dll.a C:/msys64/mingw64/lib/libxml2_d.dll.a + # cp C:/msys64/mingw64/lib/libpcre.dll.a C:/msys64/mingw64/lib/libpcre_d.dll.a + BIG_OBJECTS="-Wa,-mbig-obj" + else + BUILD_TYPE="Release" + fi #unset CFLAGS #unset CXXFLAGS #CFLAGS+=" -D__USE_MINGW_ANSI_STDIO=1" #CXXFLAGS+=" -D__USE_MINGW_ANSI_STDIO=1" - CFLAGS="-O2 -pipe -march=${PMARCH} -mtune=generic -D__USE_MINGW_ANSI_STDIO=1" + CFLAGS="${OPTIM} -pipe -march=${PMARCH} -mtune=generic -D__USE_MINGW_ANSI_STDIO=1 ${BIG_OBJECTS}" CXXFLAGS="$CFLAGS" ${MINGW_PREFIX}/bin/cmake \ -G"MSYS Makefiles" \ -DMINGW_LIBS=${PREFIX_DEPS} \ - -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ -DWITH_SYSTEM_GLEW=ON \ -DWITH_SYSTEM_OPENJPEG=ON \ -DWITH_INSTALL_PORTABLE=OFF \ @@ -115,7 +137,7 @@ build() { ../${_realname} # Remove the openjpeg line once blender accepts my patch - make # -j1 VERBOSE=1 + make VERBOSE=1 ${MAKE_TARGET} # -j1 VERBOSE=1 } package() { @@ -132,4 +154,3 @@ package() { ${pkgdir}${MINGW_PREFIX}/bin/$blender_version/scripts/modules \ ${pkgdir}${MINGW_PREFIX}/bin/$blender_version/scripts/addons } - diff --git a/mingw-w64-clang-svn/PKGBUILD b/mingw-w64-clang-svn/PKGBUILD index 93f2b04e70..4dee1356fc 100644 --- a/mingw-w64-clang-svn/PKGBUILD +++ b/mingw-w64-clang-svn/PKGBUILD @@ -3,7 +3,7 @@ _realname=clang _mingw_suff=mingw-w64-${CARCH} pkgname=("${_mingw_suff}-${_realname}-svn" "${_mingw_suff}-clang-analyzer-svn" "${_mingw_suff}-llvm-svn") # "${_mingw_suff}-compiler-rt-svn" -pkgver=50791.64729e5 +pkgver=50803.9bc4192 pkgrel=1 pkgdesc="LC language family frontend for LLVM (mingw-w64)" arch=('any') diff --git a/mingw-w64-coin3d-hg/PKGBUILD b/mingw-w64-coin3d-hg/PKGBUILD index 736513aa89..aff4040227 100644 --- a/mingw-w64-coin3d-hg/PKGBUILD +++ b/mingw-w64-coin3d-hg/PKGBUILD @@ -3,7 +3,7 @@ _realname=coin3d _mingw_suff=mingw-w64-${CARCH} pkgname="${_mingw_suff}-${_realname}-hg" -pkgver=r11346.ecd7b724798a +pkgver=r11348.46b2e54e300b pkgrel=1 pkgdesc="High-level, retained-mode toolkit for effective 3D graphics development (mingw-w64)" arch=('any') diff --git a/mingw-w64-crt/PKGBUILD b/mingw-w64-crt/PKGBUILD index 1bb6f94ee6..ac4e5baf46 100644 --- a/mingw-w64-crt/PKGBUILD +++ b/mingw-w64-crt/PKGBUILD @@ -7,7 +7,7 @@ _ver_base=4.0.0 _revision= _fragment= [[ -n ${_revision} ]] && _fragment="#revision=${_revision}" -pkgver=4.0.0.6568 +pkgver=4.0.0.6592 pkgrel=1 pkgdesc='MinGW-w64 CRT for Windows' arch=('any') diff --git a/mingw-w64-headers/PKGBUILD b/mingw-w64-headers/PKGBUILD index d340c5a0e1..af1e613970 100644 --- a/mingw-w64-headers/PKGBUILD +++ b/mingw-w64-headers/PKGBUILD @@ -8,7 +8,7 @@ _ver_base=4.0.0 _revision= _fragment= [[ -n ${_revision} ]] && _fragment="#revision=${_revision}" -pkgver=4.0.0.6584 +pkgver=4.0.0.6592 pkgrel=1 arch=('any') url="http://mingw-w64.sourceforge.net" diff --git a/mingw-w64-openscenegraph/PKGBUILD b/mingw-w64-openscenegraph/PKGBUILD index d8591e1f3c..ebdd578b53 100644 --- a/mingw-w64-openscenegraph/PKGBUILD +++ b/mingw-w64-openscenegraph/PKGBUILD @@ -5,7 +5,7 @@ _mingw_suff=mingw-w64-${CARCH} pkgname="${_mingw_suff}-${_realname}" _pkgver=3.2.1-rc2 pkgver=${_pkgver//-/} -pkgrel=2 +pkgrel=3 pkgdesc="Open source high performance 3D graphics toolkit (mingw-w64)" arch=('any') url="http://www.openscenegraph.org/" diff --git a/mingw-w64-quarter-hg/PKGBUILD b/mingw-w64-quarter-hg/PKGBUILD index 4c90ff2ac1..0f724fa0f0 100644 --- a/mingw-w64-quarter-hg/PKGBUILD +++ b/mingw-w64-quarter-hg/PKGBUILD @@ -3,7 +3,7 @@ _realname=quarter _mingw_suff=mingw-w64-${CARCH} pkgname="${_mingw_suff}-${_realname}-hg" -pkgver=r487.8f8f660a5866 +pkgver=r488.550ec597831a pkgrel=1 pkgdesc="Light-weight glue library that provides seamless integration between Coin and Qt5 (mingw-w64)" arch=('any') @@ -32,7 +32,7 @@ build() { [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf ${srcdir}/build-${MINGW_CHOST} mkdir ${srcdir}/build-${MINGW_CHOST} cd ${srcdir}/build-${MINGW_CHOST} - ../"${_realname}"/configure \ + ../"${_realname}"/configure \ --prefix=${MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ @@ -44,7 +44,8 @@ build() { --enable-pkgconfig \ --with-coin=${MINGW_PREFIX} \ --with-qt=${MINGW_PREFIX} \ - --without-x + --without-x \ + sim_ac_qt_debug=false make -j1 }