diff --git a/msys2/PKGBUILD/10-mingw-w64-libiconv/PKGBUILD b/msys2/PKGBUILD/10-mingw-w64-libiconv/PKGBUILD index ae82e12b2..63372d261 100644 --- a/msys2/PKGBUILD/10-mingw-w64-libiconv/PKGBUILD +++ b/msys2/PKGBUILD/10-mingw-w64-libiconv/PKGBUILD @@ -31,8 +31,8 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-gettext-tools" "${MINGW_PACKAGE_PREFIX}-gperf") - -export MINGW_PREFIX="${MINGW_PREFIX}/ffbuild/" + +export FF_MINGW_PREFIX="${MINGW_PREFIX}/ffbuild/" apply_patch_with_msg() { for _patch in "$@" @@ -62,11 +62,11 @@ build() { mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" ../${_realname}-${pkgver}/configure \ - --prefix=${MINGW_PREFIX} \ + --prefix=${FF_MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ - --docdir=${MINGW_PREFIX}/share/doc/libiconv \ + --docdir=${FF_MINGW_PREFIX}/share/doc/libiconv \ --enable-static \ --disable-shared \ --enable-extra-encodings \ @@ -89,23 +89,23 @@ package_libiconv() { cd "${srcdir}/build-${MSYSTEM}" make install DESTDIR="${pkgdir}" - rm -fr "${pkgdir}${MINGW_PREFIX}"/bin/*.exe - rm -f "${pkgdir}${MINGW_PREFIX}"/lib/charset.alias - rm -fr "${pkgdir}${MINGW_PREFIX}"/share/locale - rm -f "${pkgdir}${MINGW_PREFIX}"/share/doc/libiconv/*.1.* - rm -fr "${pkgdir}${MINGW_PREFIX}"/share/man/man1 + rm -fr "${pkgdir}${FF_MINGW_PREFIX}"/bin/*.exe + rm -f "${pkgdir}${FF_MINGW_PREFIX}"/lib/charset.alias + rm -fr "${pkgdir}${FF_MINGW_PREFIX}"/share/locale + rm -f "${pkgdir}${FF_MINGW_PREFIX}"/share/doc/libiconv/*.1.* + rm -fr "${pkgdir}${FF_MINGW_PREFIX}"/share/man/man1 # Pkg-config file - install -Dm644 "${srcdir}/iconv.pc" "${pkgdir}${MINGW_PREFIX}/lib/pkgconfig/iconv.pc" - sed -e "s|@PREFIX@|${MINGW_PREFIX}|g" \ + install -Dm644 "${srcdir}/iconv.pc" "${pkgdir}${FF_MINGW_PREFIX}/lib/pkgconfig/iconv.pc" + sed -e "s|@PREFIX@|${FF_MINGW_PREFIX}|g" \ -e "s|@VERSION@|${pkgver}|g" \ - -i "${pkgdir}${MINGW_PREFIX}/lib/pkgconfig/iconv.pc" + -i "${pkgdir}${FF_MINGW_PREFIX}/lib/pkgconfig/iconv.pc" # Licenses - install -Dm644 "${srcdir}/${_realname}-${pkgver}/README" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/README" - install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING" - install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING.LIB" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING.LIB" - install -Dm644 "${srcdir}/${_realname}-${pkgver}/libcharset/COPYING.LIB" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/libcharset/COPYING.LIB" + install -Dm644 "${srcdir}/${_realname}-${pkgver}/README" "${pkgdir}${FF_MINGW_PREFIX}/share/licenses/${_realname}/README" + install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${FF_MINGW_PREFIX}/share/licenses/${_realname}/COPYING" + install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING.LIB" "${pkgdir}${FF_MINGW_PREFIX}/share/licenses/${_realname}/COPYING.LIB" + install -Dm644 "${srcdir}/${_realname}-${pkgver}/libcharset/COPYING.LIB" "${pkgdir}${FF_MINGW_PREFIX}/share/licenses/${_realname}/libcharset/COPYING.LIB" } package_iconv() { @@ -116,15 +116,15 @@ package_iconv() { cd "${srcdir}/build-${MSYSTEM}" make install DESTDIR="${pkgdir}" - rm -f "${pkgdir}${MINGW_PREFIX}"/bin/*.dll - rm -fr "${pkgdir}${MINGW_PREFIX}"/include - rm -fr "${pkgdir}${MINGW_PREFIX}"/lib - rm -f "${pkgdir}${MINGW_PREFIX}"/share/doc/libiconv/*.3.* - rm -fr "${pkgdir}${MINGW_PREFIX}"/share/man/man3 + rm -f "${pkgdir}${FF_MINGW_PREFIX}"/bin/*.dll + rm -fr "${pkgdir}${FF_MINGW_PREFIX}"/include + rm -fr "${pkgdir}${FF_MINGW_PREFIX}"/lib + rm -f "${pkgdir}${FF_MINGW_PREFIX}"/share/doc/libiconv/*.3.* + rm -fr "${pkgdir}${FF_MINGW_PREFIX}"/share/man/man3 # Licenses - install -Dm644 "${srcdir}/${_realname}-${pkgver}/README" "${pkgdir}${MINGW_PREFIX}/share/licenses/iconv/README" - install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/iconv/COPYING" + install -Dm644 "${srcdir}/${_realname}-${pkgver}/README" "${pkgdir}${FF_MINGW_PREFIX}/share/licenses/iconv/README" + install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${FF_MINGW_PREFIX}/share/licenses/iconv/COPYING" } # template start; name=mingw-w64-splitpkg-wrappers; version=1.0; diff --git a/msys2/PKGBUILD/10-mingw-w64-libpng/PKGBUILD b/msys2/PKGBUILD/10-mingw-w64-libpng/PKGBUILD index 584f9ea2c..9253bf389 100644 --- a/msys2/PKGBUILD/10-mingw-w64-libpng/PKGBUILD +++ b/msys2/PKGBUILD/10-mingw-w64-libpng/PKGBUILD @@ -27,7 +27,7 @@ sha256sums=('6a5ca0652392a2d7c9db2ae5b40210843c0bbc081cbd410825ab00cc59f14a6c' '2a65fa19b126e85ad14ef1d1d9fc5079193e92af6b8db4454e3a875da5fdb79d') validpgpkeys=('8048643BA2C840F4F92A195FF54984BFA16C640F') # Glenn Randers-Pehrson (mozilla) -export MINGW_FFBUILD_PREFIX="${MINGW_PREFIX}/ffbuild/" +export FF_MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" prepare() { cd "${srcdir}/${_realname}-${pkgver}" @@ -51,7 +51,7 @@ build() { --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ - --prefix=${MINGW_FFBUILD_PREFIX} \ + --prefix=${FF_MINGW_PREFIX} \ --disable-shared --enable-static \ as_ln_s="cp -pR" @@ -60,17 +60,17 @@ build() { msg2 "Build contributed programs" mkdir -p ".libs/contrib/pngminus" && cd ".libs/contrib/pngminus" cp -r "${srcdir}/${_realname}-${pkgver}/contrib/pngminus"/* . -# libpng.a and libpng.dll.a are basically symlinks to libpng16.a +# libpng.a and libpng.dll.a are basically symlinks to libpng16.a # and libpng16.dll.a that are created at "make install" but we are # building the contributed programs before the "make install" so -# we have to link to libpng16.dll.a or libpng16.a if building +# we have to link to libpng16.dll.a or libpng16.a if building # statically. When building the static programs, we might also # want to build with the static version of zlib. make PNGINC="-I${srcdir}/${_realname}-${pkgver} -I${srcdir}/build-${MSYSTEM}" \ CC="${MINGW_PREFIX}/bin/cc" \ PNGLIB_SHARED="-L../.. -lpng16" \ PNGLIB_STATIC="../../libpng16.a" \ - ZLIB_STATIC="${MINGW_FFBUILD_PREFIX}/lib/libz.a" \ + ZLIB_STATIC="${FF_MINGW_PREFIX}/lib/libz.a" \ CFLAGS="$CFLAGS" \ LDFLAGS="-L../.. $LDFLAGS" \ png2pnm pnm2png png2pnm-static pnm2png-static @@ -84,7 +84,7 @@ package () { cd "${srcdir}/build-${MSYSTEM}" make install DESTDIR="${pkgdir}" - install -D -m644 "${srcdir}/libpng-${pkgver}/LICENSE" "${pkgdir}${MINGW_FFBUILD_PREFIX}/share/licenses/${_realname}/LICENSE" + install -D -m644 "${srcdir}/libpng-${pkgver}/LICENSE" "${pkgdir}${FF_MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" msg2 "Install contributed programs" cd ".libs/contrib/pngminus" diff --git a/msys2/PKGBUILD/10-mingw-w64-xz/PKGBUILD b/msys2/PKGBUILD/10-mingw-w64-xz/PKGBUILD index c4e9e02b5..f9eccec80 100644 --- a/msys2/PKGBUILD/10-mingw-w64-xz/PKGBUILD +++ b/msys2/PKGBUILD/10-mingw-w64-xz/PKGBUILD @@ -28,7 +28,7 @@ source=("https://github.com/tukaani-project/xz/releases/download/v${pkgver}/xz-$ sha256sums=('a9db3bb3d64e248a0fae963f8fb6ba851a26ba1822e504dc0efd18a80c626caf') validpgpkeys=('3690C240CE51B4670D30AD1C38EE757D69184620') # Lasse Collin -export MINGW_PREFIX="${MINGW_PREFIX}/ffbuild/" +export FF_MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" prepare() { cd "${_realname}-${pkgver}" @@ -41,7 +41,7 @@ build() { mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" ../${_realname}-${pkgver}/configure \ - --prefix=${MINGW_PREFIX} \ + --prefix=${FF_MINGW_PREFIX} \ --disable-rpath \ --disable-lzma-links \ --disable-symbol-versions \ @@ -56,5 +56,5 @@ package() { cd "${srcdir}/build-${MSYSTEM}" make DESTDIR="${pkgdir}" install - install -Dm644 ${srcdir}/${_realname}-${pkgver}/COPYING* -t ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname} + install -Dm644 ${srcdir}/${_realname}-${pkgver}/COPYING* -t ${pkgdir}${FF_MINGW_PREFIX}/share/licenses/${_realname} } diff --git a/msys2/PKGBUILD/10-mingw-w64-zlib/PKGBUILD b/msys2/PKGBUILD/10-mingw-w64-zlib/PKGBUILD index 78625190b..a72395b3f 100644 --- a/msys2/PKGBUILD/10-mingw-w64-zlib/PKGBUILD +++ b/msys2/PKGBUILD/10-mingw-w64-zlib/PKGBUILD @@ -35,7 +35,7 @@ sha256sums=('38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32' '0be98a7e660e7c068856f08b9e92d6c73a6b0d88c3e29a9716140b147f7c23c5') validpgpkeys=('5ED46A6721D365587791E2AA783FCD8E58BCAFBA') -export MINGW_PREFIX="${MINGW_PREFIX}/ffbuild/" +export FF_MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" apply_patch_with_msg() { for _patch in "$@" @@ -64,7 +64,7 @@ build() { CHOST=${MINGW_CHOST} \ ../${_realname}-${pkgver}/configure \ - --prefix=${MINGW_PREFIX} \ + --prefix=${FF_MINGW_PREFIX} \ --static make @@ -82,7 +82,7 @@ package_zlib() { make DESTDIR="${pkgdir}" install - install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" + install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${FF_MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" } # template start; name=mingw-w64-splitpkg-wrappers; version=1.0; diff --git a/msys2/PKGBUILD/20-mingw-w64-fftw/PKGBUILD b/msys2/PKGBUILD/20-mingw-w64-fftw/PKGBUILD index 53dc7970d..441082b68 100644 --- a/msys2/PKGBUILD/20-mingw-w64-fftw/PKGBUILD +++ b/msys2/PKGBUILD/20-mingw-w64-fftw/PKGBUILD @@ -31,7 +31,7 @@ precision="double float \ $( [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "quad" )" export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}" -export MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" +export FF_MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" apply_patch_with_msg() { for _patch in "$@" @@ -80,7 +80,7 @@ build() { -Wno-dev \ -GNinja \ ${_config_cmake} \ - -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \ + -DCMAKE_INSTALL_PREFIX="${FF_MINGW_PREFIX}" \ -DBUILD_SHARED_LIBS=ON \ -DENABLE_OPENMP=ON \ -DENABLE_THREADS=ON \ @@ -104,7 +104,7 @@ build() { fi ../${_realname}-${_pkgver}/configure \ - --prefix="${MINGW_PREFIX}" \ + --prefix="${FF_MINGW_PREFIX}" \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ ${_config} \ @@ -153,9 +153,9 @@ package() { ;; esac local _staging_prefix=$(cygpath -am ${srcdir}/build-${MSYSTEM}-${cur}) - sed -e "s|IMPORTED_IMPLIB_RELEASE \"${_staging_prefix}|IMPORTED_IMPLIB_RELEASE \"${MINGW_PREFIX}/lib|g" -i ./FFTW3LibraryDepends.cmake - sed -e "s|IMPORTED_LOCATION_RELEASE \"${_staging_prefix}|IMPORTED_LOCATION_RELEASE \"${MINGW_PREFIX}/bin|g" -i ./FFTW3LibraryDepends.cmake - install -Dm644 ./FFTW3LibraryDepends.cmake "${pkgdir}"${MINGW_PREFIX}/lib/cmake/${_prec_prefix}/FFTW3LibraryDepends.cmake - mv "${pkgdir}"${MINGW_PREFIX}/lib/cmake/fftw3/${_file_prefix}*.cmake "${pkgdir}"${MINGW_PREFIX}/lib/cmake/${_prec_prefix}/ + sed -e "s|IMPORTED_IMPLIB_RELEASE \"${_staging_prefix}|IMPORTED_IMPLIB_RELEASE \"${FF_MINGW_PREFIX}/lib|g" -i ./FFTW3LibraryDepends.cmake + sed -e "s|IMPORTED_LOCATION_RELEASE \"${_staging_prefix}|IMPORTED_LOCATION_RELEASE \"${FF_MINGW_PREFIX}/bin|g" -i ./FFTW3LibraryDepends.cmake + install -Dm644 ./FFTW3LibraryDepends.cmake "${pkgdir}"${FF_MINGW_PREFIX}/lib/cmake/${_prec_prefix}/FFTW3LibraryDepends.cmake + mv "${pkgdir}"${FF_MINGW_PREFIX}/lib/cmake/fftw3/${_file_prefix}*.cmake "${pkgdir}"${FF_MINGW_PREFIX}/lib/cmake/${_prec_prefix}/ done } diff --git a/msys2/PKGBUILD/20-mingw-w64-freetype/PKGBUILD b/msys2/PKGBUILD/20-mingw-w64-freetype/PKGBUILD index 3afcb5549..b75abf80c 100644 --- a/msys2/PKGBUILD/20-mingw-w64-freetype/PKGBUILD +++ b/msys2/PKGBUILD/20-mingw-w64-freetype/PKGBUILD @@ -38,7 +38,7 @@ sha256sums=('12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d' '0571f18d97834df020e4cbdb1338b14f9160669f868237080951e01f5b86727c') validpgpkeys=('E30674707856409FF1948010BE6C3AAC63AD8E3F') # Werner Lemberg -export MINGW_PREFIX="${MINGW_PREFIX}/ffbuild/" +export FF_MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" # Helper macros to help make tasks easier # apply_patch_with_msg() { @@ -73,7 +73,7 @@ build() { MSYS2_ARG_CONV_EXCL="--prefix=" \ meson setup \ - --prefix="${MINGW_PREFIX}" \ + --prefix="${FF_MINGW_PREFIX}" \ --wrap-mode=nodownload \ --auto-features=enabled \ --default-library=static \ @@ -89,6 +89,6 @@ package () { DESTDIR="${pkgdir}" meson install # Licenses - install -Dm644 "${srcdir}/${_realname}-${pkgver}/docs/GPLv2.TXT" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/GPLv2.TXT" - install -Dm644 "${srcdir}/${_realname}-${pkgver}/docs/FTL.TXT" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/FTL.TXT" + install -Dm644 "${srcdir}/${_realname}-${pkgver}/docs/GPLv2.TXT" "${pkgdir}${FF_MINGW_PREFIX}/share/licenses/${_realname}/GPLv2.TXT" + install -Dm644 "${srcdir}/${_realname}-${pkgver}/docs/FTL.TXT" "${pkgdir}${FF_MINGW_PREFIX}/share/licenses/${_realname}/FTL.TXT" } diff --git a/msys2/PKGBUILD/20-mingw-w64-fribidi/PKGBUILD b/msys2/PKGBUILD/20-mingw-w64-fribidi/PKGBUILD index 026d2905d..21e83993a 100644 --- a/msys2/PKGBUILD/20-mingw-w64-fribidi/PKGBUILD +++ b/msys2/PKGBUILD/20-mingw-w64-fribidi/PKGBUILD @@ -21,14 +21,14 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-meson" source=("https://github.com/fribidi/fribidi/releases/download/v${pkgver}/fribidi-${pkgver}.tar.xz") sha256sums=('0bbc7ff633bfa208ae32d7e369cf5a7d20d5d2557a0b067c9aa98bcbf9967587') -export MINGW_FFBUILD_PREFIX="${MINGW_PREFIX}/ffbuild/" +export FF_MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" build() { MSYS2_ARG_CONV_EXCL="--prefix=" \ ${MINGW_PREFIX}/bin/meson.exe setup \ - --prefix=${MINGW_FFBUILD_PREFIX} \ + --prefix=${FF_MINGW_PREFIX} \ --buildtype plain \ - --prefix=${MINGW_FFBUILD_PREFIX} \ + --prefix=${FF_MINGW_PREFIX} \ -Ddocs=false \ --default-library static \ build-${MSYSTEM}-static \ @@ -44,5 +44,5 @@ check() { package() { meson install -C build-${MSYSTEM}-static --destdir="${pkgdir}" - install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_FFBUILD_PREFIX}/share/licenses/${_realname}/COPYING" + install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${FF_MINGW_PREFIX}/share/licenses/${_realname}/COPYING" } diff --git a/msys2/PKGBUILD/20-mingw-w64-gmp/PKGBUILD b/msys2/PKGBUILD/20-mingw-w64-gmp/PKGBUILD index 78c292511..975564554 100644 --- a/msys2/PKGBUILD/20-mingw-w64-gmp/PKGBUILD +++ b/msys2/PKGBUILD/20-mingw-w64-gmp/PKGBUILD @@ -23,7 +23,7 @@ sha256sums=('a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898' '7c3cde2634baa2cb1c31404bbfed2d8d7ba33556971ac842a08f2e87667849ab') validpgpkeys=('343C2FF0FBEE5EC2EDBEF399F3599FF828C67298') # Niels Möller " -export MINGW_PREFIX="${MINGW_PREFIX}/ffbuild/" +export FF_MINGW_PREFIX="${MINGW_PREFIX}/ffbuild/" prepare() { cd "${srcdir}/${_realname}-${pkgver}" @@ -53,7 +53,7 @@ build() { mkdir -p "${srcdir}/static-${MSYSTEM}" && cd "${srcdir}/static-${MSYSTEM}" ../${_realname}-${pkgver}/configure \ --build=${MINGW_CHOST} \ - --prefix=${MINGW_PREFIX} \ + --prefix=${FF_MINGW_PREFIX} \ --enable-cxx \ "${extra_config[@]}" \ --enable-static \ diff --git a/msys2/PKGBUILD/20-mingw-w64-libxml2/PKGBUILD b/msys2/PKGBUILD/20-mingw-w64-libxml2/PKGBUILD index c8b4493ab..1f0784452 100644 --- a/msys2/PKGBUILD/20-mingw-w64-libxml2/PKGBUILD +++ b/msys2/PKGBUILD/20-mingw-w64-libxml2/PKGBUILD @@ -37,7 +37,7 @@ sha256sums=('43ad877b018bc63deb2468d71f95219c2fac196876ef36d1bee51d226173ec93' '06c0afaf1b8dec10d6f23dec983026cddf992528ffbc1cc50418302fabf9dee0' 'b4e3cf5faf0ba1100e2ae6b632dc429c0b25c8caca327e0888b41341d6ddbf9a') -export MINGW_PREFIX="${MINGW_PREFIX}/ffbuild/" +export FF_MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" # Helper macros to help make tasks easier # apply_patch_with_msg() { @@ -75,7 +75,7 @@ build() { [[ -d "${srcdir}"/build-static-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-static-${MSYSTEM} mkdir -p ${srcdir}/build-static-${MSYSTEM} && cd ${srcdir}/build-static-${MSYSTEM} ../${_realname}-${pkgver}/configure \ - --prefix=${MINGW_PREFIX} \ + --prefix=${FF_MINGW_PREFIX} \ --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ --build="${MINGW_CHOST}" \ @@ -97,15 +97,15 @@ package_libxml2() { make -C ${srcdir}/build-static-${MSYSTEM} install DESTDIR="${pkgdir}" # License - install -Dm644 "${srcdir}/${_realname}-${pkgver}/Copyright" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING" + install -Dm644 "${srcdir}/${_realname}-${pkgver}/Copyright" "${pkgdir}${FF_MINGW_PREFIX}/share/licenses/${_realname}/COPYING" # Remove hard coded library path from xlm2-config and libxml-2.0.pc files - local PREFIX_DEPS=$(cygpath -am ${MINGW_PREFIX}) - sed -s "s|${PREFIX_DEPS}\/lib|\${libdir}|g" -i "${pkgdir}"${MINGW_PREFIX}/bin/xml2-config - sed -s "s|${PREFIX_DEPS}\/lib|\${libdir}|g" -i "${pkgdir}"${MINGW_PREFIX}/lib/pkgconfig/libxml-2.0.pc + local PREFIX_DEPS=$(cygpath -am ${FF_MINGW_PREFIX}) + sed -s "s|${PREFIX_DEPS}\/lib|\${libdir}|g" -i "${pkgdir}"${FF_MINGW_PREFIX}/bin/xml2-config + sed -s "s|${PREFIX_DEPS}\/lib|\${libdir}|g" -i "${pkgdir}"${FF_MINGW_PREFIX}/lib/pkgconfig/libxml-2.0.pc - mkdir -p dest${MINGW_PREFIX}/share - mv "${pkgdir}${MINGW_PREFIX}"/share/{doc,gtk-doc} dest${MINGW_PREFIX}/share + mkdir -p dest${FF_MINGW_PREFIX}/share + mv "${pkgdir}${FF_MINGW_PREFIX}"/share/{doc,gtk-doc} dest${FF_MINGW_PREFIX}/share } package_libxml2-docs() { diff --git a/msys2/PKGBUILD/30-mingw-w64-chromaprint/PKGBUILD b/msys2/PKGBUILD/30-mingw-w64-chromaprint/PKGBUILD index 71673c46f..87aa34761 100644 --- a/msys2/PKGBUILD/30-mingw-w64-chromaprint/PKGBUILD +++ b/msys2/PKGBUILD/30-mingw-w64-chromaprint/PKGBUILD @@ -20,15 +20,15 @@ source=("https://github.com/acoustid/${_realname}/releases/download/v${pkgver}/$ sha256sums=('a1aad8fa3b8b18b78d3755b3767faff9abb67242e01b478ec9a64e190f335e1c') export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}" -export MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" -export CMAKE_PREFIX_PATH="${MINGW_PREFIX}" -export PKG_CONFIG_PATH="${MINGW_PREFIX}/lib/pkgconfig/:${PKG_CONFIG_PATH}" +export FF_MINGW_PREFIX="${MINGW_TOOLCHAIN_PREFIX}/ffbuild" prepare() { cd "${srcdir}"/${_realname}-${pkgver} } build() { + export CMAKE_PREFIX_PATH="${MINGW_TOOLCHAIN_PREFIX}" + export PKG_CONFIG_PATH="${MINGW_TOOLCHAIN_PREFIX}/lib/pkgconfig/:${PKG_CONFIG_PATH}" _common_opts=( -G"Ninja" -DCMAKE_BUILD_TYPE=Release \ @@ -43,7 +43,7 @@ build() { MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_TOOLCHAIN_PREFIX}/bin/cmake.exe \ - -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ + -DCMAKE_INSTALL_PREFIX=${FF_MINGW_PREFIX} \ -DBUILD_SHARED_LIBS=off \ "${_common_opts[@]}" \ ../${_realname}-${pkgver} @@ -52,13 +52,15 @@ build() { } package() { + export CMAKE_PREFIX_PATH="${MINGW_TOOLCHAIN_PREFIX}" + export PKG_CONFIG_PATH="${MINGW_TOOLCHAIN_PREFIX}/lib/pkgconfig/:${PKG_CONFIG_PATH}" # static cd "${srcdir}/static-${MSYSTEM}" DESTDIR="${pkgdir}" ${MINGW_TOOLCHAIN_PREFIX}/bin/cmake.exe --install ./ # Let ffmpeg also statically link to fftw3 and stdc++ - # sed -s "s|-lchromaprint|-lchromaprint\ -lfftw3f -lstdc++|g" -i "${pkgdir}"${MINGW_PREFIX}/lib/pkgconfig/libchromaprint.pc - # sed -s "s|Cflags\:|Cflags\:\ -DCHROMAPRINT_NODLL|g" -i "${pkgdir}"${MINGW_PREFIX}/lib/pkgconfig/libchromaprint.pc - echo "Libs.private: -lfftw3f -lstdc++" >> "${pkgdir}"${MINGW_PREFIX}/lib/pkgconfig/libchromaprint.pc - echo "Cflags.private: -DCHROMAPRINT_NODLL" >> "${pkgdir}"${MINGW_PREFIX}/lib/pkgconfig/libchromaprint.pc + # sed -s "s|-lchromaprint|-lchromaprint\ -lfftw3f -lstdc++|g" -i "${pkgdir}"${FF_MINGW_PREFIX}/lib/pkgconfig/libchromaprint.pc + # sed -s "s|Cflags\:|Cflags\:\ -DCHROMAPRINT_NODLL|g" -i "${pkgdir}"${FF_MINGW_PREFIX}/lib/pkgconfig/libchromaprint.pc + echo "Libs.private: -lfftw3f -lstdc++" >> "${pkgdir}"${FF_MINGW_PREFIX}/lib/pkgconfig/libchromaprint.pc + echo "Cflags.private: -DCHROMAPRINT_NODLL" >> "${pkgdir}"${FF_MINGW_PREFIX}/lib/pkgconfig/libchromaprint.pc } diff --git a/msys2/PKGBUILD/30-mingw-w64-fontconfig/PKGBUILD b/msys2/PKGBUILD/30-mingw-w64-fontconfig/PKGBUILD index 5b3eb9c8c..cac98dd76 100644 --- a/msys2/PKGBUILD/30-mingw-w64-fontconfig/PKGBUILD +++ b/msys2/PKGBUILD/30-mingw-w64-fontconfig/PKGBUILD @@ -38,7 +38,7 @@ sha256sums=('63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e' 'c225c156c4732a492c9588c8d33705ca29af6f3195f201f4012b09ff012f1831') export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}" -export MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" +export FF_MINGW_PREFIX="${MINGW_TOOLCHAIN_PREFIX}/ffbuild" prepare() { cd "${srcdir}"/${_realname}-${pkgver} @@ -55,7 +55,7 @@ prepare() { } build() { - export PKG_CONFIG_PATH="${MINGW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" + export PKG_CONFIG_PATH="${FF_MINGW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" mkdir -p "${srcdir}/build-${MINGW_CHOST}" cd "${srcdir}/build-${MINGW_CHOST}" @@ -64,15 +64,15 @@ build() { # and patch out symlinking PYTHON=/usr/bin/python \ ../${_realname}-${pkgver}/configure \ - --prefix=${MINGW_PREFIX} \ + --prefix=${FF_MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --disable-shared \ --enable-static \ --enable-iconv \ - --with-libiconv=${MINGW_PREFIX} \ + --with-libiconv=${FF_MINGW_PREFIX} \ --enable-libxml2 \ - --with-libxml2=${MINGW_PREFIX} \ + --with-libxml2=${FF_MINGW_PREFIX} \ --disable-docs \ --with-arch=${CARCH} \ as_ln_s="cp -pR" @@ -84,17 +84,17 @@ build() { package() { cd "${srcdir}/build-${MINGW_CHOST}" make -j1 DESTDIR="${pkgdir}" install - install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING" + install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${FF_MINGW_PREFIX}/share/licenses/${_realname}/COPYING" - find "${pkgdir}${MINGW_PREFIX}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm + find "${pkgdir}${FF_MINGW_PREFIX}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm # Also install libintl lib - cp "${MINGW_TOOLCHAIN_PREFIX}"/lib/libintl.a "${pkgdir}${MINGW_PREFIX}/lib/" + cp "${MINGW_TOOLCHAIN_PREFIX}"/lib/libintl.a "${pkgdir}${FF_MINGW_PREFIX}/lib/" # Convert MSYS2-specific paths to pkg-config variables (see issue #872) - sed -i "s#${MINGW_PREFIX}/lib#\${libdir}#g" "${pkgdir}${MINGW_PREFIX}"/lib/pkgconfig/fontconfig.pc - sed -i "s#${MINGW_PREFIX}/include#\${includedir}#g" "${pkgdir}${MINGW_PREFIX}"/lib/pkgconfig/fontconfig.pc + sed -i "s#${FF_MINGW_PREFIX}/lib#\${libdir}#g" "${pkgdir}${FF_MINGW_PREFIX}"/lib/pkgconfig/fontconfig.pc + sed -i "s#${FF_MINGW_PREFIX}/include#\${includedir}#g" "${pkgdir}${FF_MINGW_PREFIX}"/lib/pkgconfig/fontconfig.pc # Also statically link to libintl - sed -s "s|-liconv|-liconv\ -lintl|g" -i "${pkgdir}"${MINGW_PREFIX}/lib/pkgconfig/fontconfig.pc + sed -s "s|-liconv|-liconv\ -lintl|g" -i "${pkgdir}"${FF_MINGW_PREFIX}/lib/pkgconfig/fontconfig.pc } diff --git a/msys2/PKGBUILD/30-mingw-w64-harfbuzz/PKGBUILD b/msys2/PKGBUILD/30-mingw-w64-harfbuzz/PKGBUILD index b7129d1b4..cf2fab5fc 100644 --- a/msys2/PKGBUILD/30-mingw-w64-harfbuzz/PKGBUILD +++ b/msys2/PKGBUILD/30-mingw-w64-harfbuzz/PKGBUILD @@ -33,7 +33,7 @@ sha256sums=('a41b272ceeb920c57263ec851604542d9ec85ee3030506d94662067c7b6ab89e' noextract=("harfbuzz-${pkgver}.tar.xz") export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}" -export MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" +export FF_MINGW_PREFIX="${MINGW_TOOLCHAIN_PREFIX}/ffbuild" prepare() { echo "Extracting harfbuzz-${pkgver}.tar.xz..." @@ -44,7 +44,7 @@ prepare() { } build() { - export PKG_CONFIG_PATH="${MINGW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" + export PKG_CONFIG_PATH="${FF_MINGW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" local -a _static_flags=( -DGIO_STATIC_COMPILATION -DGLIB_STATIC_COMPILATION @@ -57,7 +57,7 @@ build() { CXXFLAGS+=" ${_static_flags[@]}" \ MSYS2_ARG_CONV_EXCL="--prefix=" \ ${MINGW_TOOLCHAIN_PREFIX}/bin/meson setup \ - --prefix="${MINGW_PREFIX}" \ + --prefix="${FF_MINGW_PREFIX}" \ --buildtype plain \ --prefer-static \ --wrap-mode=nofallback \ @@ -91,7 +91,7 @@ package_harfbuzz() { ${MINGW_TOOLCHAIN_PREFIX}/bin/meson install -C "build-${MSYSTEM}-static" --destdir "${pkgdir}" install -Dm644 "${srcdir}"/${_realname}-${pkgver}/COPYING \ - "${pkgdir}"${MINGW_PREFIX}/share/licenses/${_realname}/COPYING + "${pkgdir}"${FF_MINGW_PREFIX}/share/licenses/${_realname}/COPYING } # template start; name=mingw-w64-splitpkg-wrappers; version=1.0; diff --git a/msys2/PKGBUILD/30-mingw-w64-lame/PKGBUILD b/msys2/PKGBUILD/30-mingw-w64-lame/PKGBUILD index 4d03db6d7..9e0871d43 100644 --- a/msys2/PKGBUILD/30-mingw-w64-lame/PKGBUILD +++ b/msys2/PKGBUILD/30-mingw-w64-lame/PKGBUILD @@ -38,7 +38,7 @@ sha256sums=('ddfe36cab873794038ae2c1210557ad34857a4b6bdc515785d1da9e175b1da1e' '65edcb5090417f822227b4a43f2f0c0224ceca7486fb3fd01aa9a6cf153ad714') export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}" -export MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" +export FF_MINGW_PREFIX="${MINGW_TOOLCHAIN_PREFIX}/ffbuild" prepare() { cd "${srcdir}/${_realname}-${pkgver}" @@ -58,12 +58,12 @@ prepare() { } build() { - export PKG_CONFIG_PATH="${MINGW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" + export PKG_CONFIG_PATH="${FF_MINGW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}" mkdir -p "${srcdir}/build-${MINGW_CHOST}" cd "${srcdir}/build-${MINGW_CHOST}" ../${_realname}-${pkgver}/configure \ - --prefix=${MINGW_PREFIX} \ + --prefix=${FF_MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ diff --git a/msys2/PKGBUILD/30-mingw-w64-libbluray/PKGBUILD b/msys2/PKGBUILD/30-mingw-w64-libbluray/PKGBUILD index 961cced62..277bc1922 100644 --- a/msys2/PKGBUILD/30-mingw-w64-libbluray/PKGBUILD +++ b/msys2/PKGBUILD/30-mingw-w64-libbluray/PKGBUILD @@ -22,7 +22,7 @@ source=(https://download.videolan.org/pub/videolan/libbluray/${pkgver}/${_realna sha256sums=('478ffd68a0f5dde8ef6ca989b7f035b5a0a22c599142e5cd3ff7b03bbebe5f2b') export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}" -export MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" +export FF_MINGW_PREFIX="${MINGW_TOOLCHAIN_PREFIX}/ffbuild" prepare() { cd ${srcdir}/${_realname}-${pkgver} @@ -30,13 +30,13 @@ prepare() { build() { export lt_cv_deplibs_check_method='pass_all' - export PKG_CONFIG_PATH="${MINGW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" + export PKG_CONFIG_PATH="${FF_MINGW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" [[ -d "${srcdir}/build-static-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-static-${MSYSTEM}" mkdir -p "${srcdir}/build-static-${MSYSTEM}" && cd "${srcdir}/build-static-${MSYSTEM}" ../${_realname}-${pkgver}/configure \ - --prefix=${MINGW_PREFIX} \ + --prefix=${FF_MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ @@ -44,8 +44,8 @@ build() { --disable-bdjava-jar \ --enable-shared=no \ --enable-static=yes \ - LIBXML2_CFLAGS="$("${MINGW_PREFIX}"/bin/xml2-config --cflags) -DLIBXML_STATIC" \ - LIBXML2_LIBS="$("${MINGW_PREFIX}"/bin/xml2-config --libs)" + LIBXML2_CFLAGS="$("${FF_MINGW_PREFIX}"/bin/xml2-config --cflags) -DLIBXML_STATIC" \ + LIBXML2_LIBS="$("${FF_MINGW_PREFIX}"/bin/xml2-config --libs)" make } @@ -54,8 +54,8 @@ package() { cd "${srcdir}/build-static-${MSYSTEM}" make DESTDIR="${pkgdir}" install - local _prefix_win="$(cygpath -m "${MINGW_PREFIX}")" - sed -s "s|${_prefix_win}|${MINGW_PREFIX}|g" -i ${pkgdir}${MINGW_PREFIX}/lib/pkgconfig/libbluray.pc + local _prefix_win="$(cygpath -m "${FF_MINGW_PREFIX}")" + sed -s "s|${_prefix_win}|${FF_MINGW_PREFIX}|g" -i ${pkgdir}${FF_MINGW_PREFIX}/lib/pkgconfig/libbluray.pc - install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING" + install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${FF_MINGW_PREFIX}/share/licenses/${_realname}/COPYING" } diff --git a/msys2/PKGBUILD/30-mingw-w64-libogg/PKGBUILD b/msys2/PKGBUILD/30-mingw-w64-libogg/PKGBUILD index 12e8660a5..4195ba1b5 100644 --- a/msys2/PKGBUILD/30-mingw-w64-libogg/PKGBUILD +++ b/msys2/PKGBUILD/30-mingw-w64-libogg/PKGBUILD @@ -19,7 +19,7 @@ sha256sums=('0eb4b4b9420a0f51db142ba3f9c64b333f826532dc0f48c6410ae51f4799b664' '7f635d4ca41c75dc52206749b6346c174c6a028de09604c6d66929bcdabf6c33') export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}" -export MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" +export FF_MINGW_PREFIX="${MINGW_TOOLCHAIN_PREFIX}/ffbuild" prepare() { cd ${srcdir}/${_realname}-${pkgver} @@ -27,8 +27,8 @@ prepare() { } build() { - export CMAKE_PREFIX_PATH="${MINGW_PREFIX}" - export PKG_CONFIG_PATH="${MINGW_PREFIX}/lib/pkgconfig/:${PKG_CONFIG_PATH}" + export CMAKE_PREFIX_PATH="${FF_MINGW_PREFIX}" + export PKG_CONFIG_PATH="${FF_MINGW_PREFIX}/lib/pkgconfig/:${PKG_CONFIG_PATH}" declare -a extra_config if check_option "debug" "n"; then extra_config+=("-DCMAKE_BUILD_TYPE=Release") @@ -43,7 +43,7 @@ build() { MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_TOOLCHAIN_PREFIX}/bin/cmake \ -G'MSYS Makefiles' \ - -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ + -DCMAKE_INSTALL_PREFIX=${FF_MINGW_PREFIX} \ "${extra_config[@]}" \ -DBUILD_SHARED_LIBS=OFF \ -DBUILD_TESTING=OFF \ @@ -58,8 +58,8 @@ package() { make DESTDIR="${pkgdir}" install # m4 - install -Dm644 ${srcdir}/${_realname}-${pkgver}/ogg.m4 ${pkgdir}${MINGW_PREFIX}/share/aclocal/ogg.m4 + install -Dm644 ${srcdir}/${_realname}-${pkgver}/ogg.m4 ${pkgdir}${FF_MINGW_PREFIX}/share/aclocal/ogg.m4 # License - install -Dm644 ${srcdir}/${_realname}-${pkgver}/COPYING ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING + install -Dm644 ${srcdir}/${_realname}-${pkgver}/COPYING ${pkgdir}${FF_MINGW_PREFIX}/share/licenses/${_realname}/COPYING } diff --git a/msys2/PKGBUILD/30-mingw-w64-libvpx/PKGBUILD b/msys2/PKGBUILD/30-mingw-w64-libvpx/PKGBUILD index 4a9a86c4d..4db741eae 100644 --- a/msys2/PKGBUILD/30-mingw-w64-libvpx/PKGBUILD +++ b/msys2/PKGBUILD/30-mingw-w64-libvpx/PKGBUILD @@ -32,7 +32,7 @@ sha256sums=('5f21d2db27071c8a46f1725928a10227ae45c5cd1cad3727e4aafbe476e321fa' '7c511b5df935278da2cba32b03b90582f360ab6786a5e32028bc82025193fabd') export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}" -export MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" +export FF_MINGW_PREFIX="${MINGW_TOOLCHAIN_PREFIX}/ffbuild" # Helper macros to help make tasks easier # apply_patch_with_msg() { @@ -78,7 +78,7 @@ build() { LD=cc CFLAGS="$EXTRA_CFLAGS $CFLAGS -fno-asynchronous-unwind-tables" \ ../${_realname}-${pkgver}/configure \ - --prefix=${MINGW_PREFIX} \ + --prefix=${FF_MINGW_PREFIX} \ --target=${_targetarch} \ --enable-vp8 \ --enable-vp9 \ @@ -110,7 +110,7 @@ build() { package() { cd "${srcdir}/build-${MSYSTEM}" - make DIST_DIR="${pkgdir}${MINGW_PREFIX}" install + make DIST_DIR="${pkgdir}${FF_MINGW_PREFIX}" install # Also install pthread - cp "${MINGW_TOOLCHAIN_PREFIX}"/lib/libpthread.a "${pkgdir}${MINGW_PREFIX}/lib/" + cp "${MINGW_TOOLCHAIN_PREFIX}"/lib/libpthread.a "${pkgdir}${FF_MINGW_PREFIX}/lib/" } diff --git a/msys2/PKGBUILD/30-mingw-w64-libwebp/PKGBUILD b/msys2/PKGBUILD/30-mingw-w64-libwebp/PKGBUILD index 7bc19fa66..535a971b4 100644 --- a/msys2/PKGBUILD/30-mingw-w64-libwebp/PKGBUILD +++ b/msys2/PKGBUILD/30-mingw-w64-libwebp/PKGBUILD @@ -25,7 +25,7 @@ sha256sums=('12af50c45530f0a292d39a88d952637e43fb2d4ab1883c44ae729840f7273381' validpgpkeys=('6B0E6B70976DE303EDF2F601F9C3D6BDB8232B5D') export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}" -export MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" +export FF_MINGW_PREFIX="${MINGW_TOOLCHAIN_PREFIX}/ffbuild" prepare() { cd "${srcdir}/${_realname}-${pkgver}" @@ -34,8 +34,8 @@ prepare() { } build() { - export CMAKE_PREFIX_PATH="${MINGW_PREFIX}" - export PKG_CONFIG_PATH="${MINGW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" + export CMAKE_PREFIX_PATH="${FF_MINGW_PREFIX}" + export PKG_CONFIG_PATH="${FF_MINGW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" declare -a extra_config if check_option "debug" "n"; then extra_config+=("-DCMAKE_BUILD_TYPE=Release") @@ -49,7 +49,7 @@ build() { MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ "${MINGW_TOOLCHAIN_PREFIX}"/bin/cmake.exe \ -GNinja \ - -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \ + -DCMAKE_INSTALL_PREFIX="${FF_MINGW_PREFIX}" \ "${extra_config[@]}" \ -DBUILD_SHARED_LIBS=OFF \ -DWEBP_ENABLE_SWAP_16BIT_CSP=ON \ @@ -72,5 +72,5 @@ package() { DESTDIR="${pkgdir}" "${MINGW_TOOLCHAIN_PREFIX}"/bin/cmake.exe --install . - install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING" + install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${FF_MINGW_PREFIX}/share/licenses/${_realname}/COPYING" } diff --git a/msys2/PKGBUILD/30-mingw-w64-opus/PKGBUILD b/msys2/PKGBUILD/30-mingw-w64-opus/PKGBUILD index 6db5cf755..67023ca90 100644 --- a/msys2/PKGBUILD/30-mingw-w64-opus/PKGBUILD +++ b/msys2/PKGBUILD/30-mingw-w64-opus/PKGBUILD @@ -26,7 +26,7 @@ sha256sums=('65c1d2f78b9f2fb20082c38cbe47c951ad5839345876e46941612ee87f9a7ce1' '5fb0f28264492d6512acb6eec7b5e147c922751f6df30d1317114048eca01516') export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}" -export MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" +export FF_MINGW_PREFIX="${MINGW_TOOLCHAIN_PREFIX}/ffbuild" apply_patch_with_msg() { for _patch in "$@" @@ -49,7 +49,7 @@ build() { # -Dasm is for ARM fixed point, not neon or x86 avx/sse MSYS2_ARG_CONV_EXCL="--prefix=" \ ${MINGW_TOOLCHAIN_PREFIX}/bin/meson.exe setup \ - --prefix="${MINGW_PREFIX}" \ + --prefix="${FF_MINGW_PREFIX}" \ --wrap-mode=nodownload \ --auto-features=enabled \ --buildtype=plain \ @@ -69,9 +69,9 @@ check() { package_opus() { ${MINGW_TOOLCHAIN_PREFIX}/bin/meson.exe install -C "${srcdir}/build-${MSYSTEM}" --destdir "${pkgdir}" - install -Dm644 "${srcdir}/${_realname}-${pkgver}/opus.m4" "${pkgdir}${MINGW_PREFIX}/share/aclocal/opus.m4" + install -Dm644 "${srcdir}/${_realname}-${pkgver}/opus.m4" "${pkgdir}${FF_MINGW_PREFIX}/share/aclocal/opus.m4" - install -Dm644 "${srcdir}/${_realname}-${pkgver}"/COPYING "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING" + install -Dm644 "${srcdir}/${_realname}-${pkgver}"/COPYING "${pkgdir}${FF_MINGW_PREFIX}/share/licenses/${_realname}/COPYING" } # template start; name=mingw-w64-splitpkg-wrappers; version=1.0; # vim: set ft=bash : diff --git a/msys2/PKGBUILD/35-mingw-w64-libvorbis/PKGBUILD b/msys2/PKGBUILD/35-mingw-w64-libvorbis/PKGBUILD index b49756379..a8425612e 100644 --- a/msys2/PKGBUILD/35-mingw-w64-libvorbis/PKGBUILD +++ b/msys2/PKGBUILD/35-mingw-w64-libvorbis/PKGBUILD @@ -22,14 +22,14 @@ source=(https://downloads.xiph.org/releases/vorbis/${_realname}-${pkgver}.tar.gz sha256sums=('0e982409a9c3fc82ee06e08205b1355e5c6aa4c36bca58146ef399621b0ce5ab') export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}" -export MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" +export FF_MINGW_PREFIX="${MINGW_TOOLCHAIN_PREFIX}/ffbuild" build() { [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}" mkdir -p "${srcdir}/build-${MINGW_CHOST}" cd "${srcdir}/build-${MINGW_CHOST}" ../${_realname}-${pkgver}/configure \ - --prefix=${MINGW_PREFIX} \ + --prefix=${FF_MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ diff --git a/msys2/PKGBUILD/40-mingw-w64-dav1d/PKGBUILD b/msys2/PKGBUILD/40-mingw-w64-dav1d/PKGBUILD index 99706300d..1e76ce7d1 100644 --- a/msys2/PKGBUILD/40-mingw-w64-dav1d/PKGBUILD +++ b/msys2/PKGBUILD/40-mingw-w64-dav1d/PKGBUILD @@ -29,7 +29,7 @@ sha256sums=('42fe524bcc82ea3a830057178faace22923a79bad3d819a4962d8cfc54c36f19' validpgpkeys=('65F7C6B4206BD057A7EB73787180713BE58D1ADC') # VideoLAN Release Signing Key export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}" -export MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" +export FF_MINGW_PREFIX="${MINGW_TOOLCHAIN_PREFIX}/ffbuild" prepare() { cd "${_realname}-${pkgver}" @@ -42,7 +42,7 @@ build() { MSYS2_ARG_CONV_EXCL="--prefix=" \ ${MINGW_TOOLCHAIN_PREFIX}/bin/meson setup \ - --prefix=${MINGW_PREFIX} \ + --prefix=${FF_MINGW_PREFIX} \ --default-library static \ --buildtype plain \ -Denable_tests=false \ @@ -55,7 +55,7 @@ build() { check() { cd "${srcdir}/build-${MSYSTEM}" - ${MINGW_PREFIX}/bin/meson test + ${FF_MINGW_PREFIX}/bin/meson test } package() { @@ -64,7 +64,7 @@ package() { DESTDIR="${pkgdir}" ${MINGW_TOOLCHAIN_PREFIX}/bin/meson install # License - install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING" - install -Dm644 "${srcdir}/${_realname}-${pkgver}/doc/PATENTS" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/PATENTS" - install -Dm644 "${srcdir}/${_realname}-${pkgver}/README.md" "${pkgdir}${MINGW_PREFIX}/share/doc/${_realname}/README.md" + install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${FF_MINGW_PREFIX}/share/licenses/${_realname}/COPYING" + install -Dm644 "${srcdir}/${_realname}-${pkgver}/doc/PATENTS" "${pkgdir}${FF_MINGW_PREFIX}/share/licenses/${_realname}/PATENTS" + install -Dm644 "${srcdir}/${_realname}-${pkgver}/README.md" "${pkgdir}${FF_MINGW_PREFIX}/share/doc/${_realname}/README.md" } diff --git a/msys2/PKGBUILD/40-mingw-w64-fdk-aac/PKGBUILD b/msys2/PKGBUILD/40-mingw-w64-fdk-aac/PKGBUILD index 2c2c66921..59d5f66c8 100644 --- a/msys2/PKGBUILD/40-mingw-w64-fdk-aac/PKGBUILD +++ b/msys2/PKGBUILD/40-mingw-w64-fdk-aac/PKGBUILD @@ -19,7 +19,7 @@ source=("${_realname}"::"git+https://gitlab.freedesktop.org/wtaymans/${_realname sha256sums=('SKIP') export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}" -export MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" +export FF_MINGW_PREFIX="${MINGW_TOOLCHAIN_PREFIX}/ffbuild" prepare() { cd ${srcdir}/${_realname} @@ -31,7 +31,7 @@ build() { [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH} mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH} ../${_realname}/configure \ - --prefix=${MINGW_PREFIX} \ + --prefix=${FF_MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ @@ -46,8 +46,8 @@ package() { cd ${srcdir}/build-${CARCH} make DESTDIR=${pkgdir} install - + # Install license - install -dm 755 "${pkgdir}${MINGW_PREFIX}"/share/licenses/libfdk-aac - install -m 644 "${srcdir}"/${_realname}/NOTICE "${pkgdir}${MINGW_PREFIX}"/share/licenses/libfdk-aac/ + install -dm 755 "${pkgdir}${FF_MINGW_PREFIX}"/share/licenses/libfdk-aac + install -m 644 "${srcdir}"/${_realname}/NOTICE "${pkgdir}${FF_MINGW_PREFIX}"/share/licenses/libfdk-aac/ } diff --git a/msys2/PKGBUILD/40-mingw-w64-libass/PKGBUILD b/msys2/PKGBUILD/40-mingw-w64-libass/PKGBUILD index 581fe0f22..24c404a5d 100644 --- a/msys2/PKGBUILD/40-mingw-w64-libass/PKGBUILD +++ b/msys2/PKGBUILD/40-mingw-w64-libass/PKGBUILD @@ -26,7 +26,7 @@ source=(https://github.com/libass/${_realname}/releases/download/${pkgver}/${_re sha256sums=('SKIP') export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}" -export MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" +export FF_MINGW_PREFIX="${MINGW_TOOLCHAIN_PREFIX}/ffbuild" prepare() { cd "${srcdir}/${_realname}-${pkgver}" @@ -38,10 +38,10 @@ build() { [[ -d "${srcdir}/build-${MSYSTEM}-static" ]] && rm -rf "${srcdir}/build-${MSYSTEM}-static" mkdir -p "${srcdir}/build-${MSYSTEM}-static" && cd "${srcdir}/build-${MSYSTEM}-static" - export PKG_CONFIG_PATH="${MINGW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" + export PKG_CONFIG_PATH="${FF_MINGW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" CPPFLAGS+=" -DFRIBIDI_LIB_STATIC" \ ../${_realname}-${pkgver}/configure \ - --prefix=${MINGW_PREFIX} \ + --prefix=${FF_MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ diff --git a/msys2/PKGBUILD/40-mingw-w64-libopenmpt/PKGBUILD b/msys2/PKGBUILD/40-mingw-w64-libopenmpt/PKGBUILD index d523fa5ff..8aef2a614 100644 --- a/msys2/PKGBUILD/40-mingw-w64-libopenmpt/PKGBUILD +++ b/msys2/PKGBUILD/40-mingw-w64-libopenmpt/PKGBUILD @@ -23,7 +23,7 @@ source=("https://lib.openmpt.org/files/${_realname}/src/${_realname}-${pkgver}+r sha256sums=('87778c8046a226c6cbfb114f4c8e3e27c121b7b3dccce5cb7de45899250274cc') export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}" -export MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" +export FF_MINGW_PREFIX="${MINGW_TOOLCHAIN_PREFIX}/ffbuild" prepare() { cd "${srcdir}/${_realname}-${pkgver}+release.autotools" @@ -32,12 +32,12 @@ prepare() { } build() { - export PKG_CONFIG_PATH="${MINGW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" + export PKG_CONFIG_PATH="${FF_MINGW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}" CPPFLAGS+=" -DMPT_CHECK_CXX_IGNORE_WARNING_O2" \ ../${_realname}-${pkgver}+release.autotools/configure \ - --prefix=${MINGW_PREFIX} \ + --prefix=${FF_MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ @@ -57,5 +57,5 @@ package() { cd "${srcdir}/build-${MSYSTEM}" make DESTDIR="${pkgdir}" install - install -Dm644 "${srcdir}/${_realname}-${pkgver}+release.autotools/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" + install -Dm644 "${srcdir}/${_realname}-${pkgver}+release.autotools/LICENSE" "${pkgdir}${FF_MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" } diff --git a/msys2/PKGBUILD/40-mingw-w64-libtheora/PKGBUILD b/msys2/PKGBUILD/40-mingw-w64-libtheora/PKGBUILD index 1c0ba4f54..2dec86bd9 100644 --- a/msys2/PKGBUILD/40-mingw-w64-libtheora/PKGBUILD +++ b/msys2/PKGBUILD/40-mingw-w64-libtheora/PKGBUILD @@ -25,7 +25,7 @@ sha256sums=('b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc' '5627d26c3316fef71bca037e1834bcba063dbf949ea9293820f0e68b13641105') export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}" -export MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" +export FF_MINGW_PREFIX="${MINGW_TOOLCHAIN_PREFIX}/ffbuild" prepare() { cd ${srcdir}/${_realname}-${pkgver} @@ -38,7 +38,7 @@ prepare() { } build() { - export PKG_CONFIG_PATH="${MINGW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" + export PKG_CONFIG_PATH="${FF_MINGW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" [[ -d "build-${MINGW_CHOST}" ]] && rm -rf "build-${MINGW_CHOST}" mkdir -p ${srcdir}/build-$MINGW_CHOST cd "${srcdir}/build-$MINGW_CHOST" @@ -47,7 +47,7 @@ build() { --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ - --prefix=${MINGW_PREFIX} \ + --prefix=${FF_MINGW_PREFIX} \ --disable-{shared,examples,extra-programs,oggtest,vorbistest,spec,doc} \ --enable-static diff --git a/msys2/PKGBUILD/40-mingw-w64-opencl-headers/PKGBUILD b/msys2/PKGBUILD/40-mingw-w64-opencl-headers/PKGBUILD index 8ca7b7a59..c0d236861 100644 --- a/msys2/PKGBUILD/40-mingw-w64-opencl-headers/PKGBUILD +++ b/msys2/PKGBUILD/40-mingw-w64-opencl-headers/PKGBUILD @@ -18,21 +18,21 @@ source=(https://github.com/KhronosGroup/OpenCL-Headers/archive/v${pkgver}/OpenCL sha256sums=('SKIP') export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}" -export MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" +export FF_MINGW_PREFIX="${MINGW_TOOLCHAIN_PREFIX}/ffbuild" package() { - export CMAKE_PREFIX_PATH="${MINGW_PREFIX}" - export PKG_CONFIG_PATH="${MINGW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" + export CMAKE_PREFIX_PATH="${FF_MINGW_PREFIX}" + export PKG_CONFIG_PATH="${FF_MINGW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" cd "${srcdir}"/OpenCL-Headers-${pkgver} MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_TOOLCHAIN_PREFIX}/bin/cmake \ -G'Ninja' \ - -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ + -DCMAKE_INSTALL_PREFIX=${FF_MINGW_PREFIX} \ -DBUILD_TESTING=OFF \ ../${_realname}-${pkgver} DESTDIR=${pkgdir} cmake --install . - install -D -m644 "${srcdir}"/OpenCL-Headers-${pkgver}/LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" + install -D -m644 "${srcdir}"/OpenCL-Headers-${pkgver}/LICENSE "${pkgdir}${FF_MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" } diff --git a/msys2/PKGBUILD/40-mingw-w64-svt-av1/PKGBUILD b/msys2/PKGBUILD/40-mingw-w64-svt-av1/PKGBUILD index 6796d33b0..56bdb314b 100644 --- a/msys2/PKGBUILD/40-mingw-w64-svt-av1/PKGBUILD +++ b/msys2/PKGBUILD/40-mingw-w64-svt-av1/PKGBUILD @@ -18,15 +18,15 @@ source=("${url}/-/archive/v${pkgver}/${_realname}-v${pkgver}.tar.gz") sha256sums=('SKIP') export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}" -export MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" +export FF_MINGW_PREFIX="${MINGW_TOOLCHAIN_PREFIX}/ffbuild" prepare() { cd "${srcdir}"/${_realname}-v${pkgver} } build() { - export CMAKE_PREFIX_PATH="${MINGW_PREFIX}" - export PKG_CONFIG_PATH="${MINGW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" + export CMAKE_PREFIX_PATH="${FF_MINGW_PREFIX}" + export PKG_CONFIG_PATH="${FF_MINGW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" declare -a extra_config if check_option "debug" "n"; then extra_config+=("-DCMAKE_BUILD_TYPE=Release") @@ -40,7 +40,7 @@ build() { MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_TOOLCHAIN_PREFIX}/bin/cmake \ -GNinja \ - -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ + -DCMAKE_INSTALL_PREFIX=${FF_MINGW_PREFIX} \ "${extra_config[@]}" \ -DBUILD_SHARED_LIBS=OFF \ -DREPRODUCIBLE_BUILDS=ON \ @@ -53,6 +53,6 @@ package() { cd "${srcdir}"/build-${MSYSTEM}-static DESTDIR="${pkgdir}" ${MINGW_TOOLCHAIN_PREFIX}/bin/cmake --install . - install -Dm644 ${srcdir}/${_realname}-v${pkgver}/LICENSE.md ${pkgdir}${MINGW_PREFIX}/share/licenses/svt-av1/LICENSE - install -Dm644 ${srcdir}/${_realname}-v${pkgver}/PATENTS.md ${pkgdir}${MINGW_PREFIX}/share/licenses/svt-av1/PATENTS.md + install -Dm644 ${srcdir}/${_realname}-v${pkgver}/LICENSE.md ${pkgdir}${FF_MINGW_PREFIX}/share/licenses/svt-av1/LICENSE + install -Dm644 ${srcdir}/${_realname}-v${pkgver}/PATENTS.md ${pkgdir}${FF_MINGW_PREFIX}/share/licenses/svt-av1/PATENTS.md } diff --git a/msys2/PKGBUILD/40-mingw-w64-x264/PKGBUILD b/msys2/PKGBUILD/40-mingw-w64-x264/PKGBUILD index d1c351d1f..95d91684c 100644 --- a/msys2/PKGBUILD/40-mingw-w64-x264/PKGBUILD +++ b/msys2/PKGBUILD/40-mingw-w64-x264/PKGBUILD @@ -30,7 +30,7 @@ sha256sums=('SKIP' 'SKIP') export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}" -export MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" +export FF_MINGW_PREFIX="${MINGW_TOOLCHAIN_PREFIX}/ffbuild" pkgver() { cd ${srcdir}/${_realname} @@ -53,7 +53,7 @@ build() { mkdir -p "${srcdir}/build-${MINGW_CHOST}" cd "${srcdir}/build-${MINGW_CHOST}" ../${_realname}/configure \ - --prefix=${MINGW_PREFIX} \ + --prefix=${FF_MINGW_PREFIX} \ --host=${MINGW_CHOST} \ --enable-static \ --enable-strip \ diff --git a/msys2/PKGBUILD/40-mingw-w64-x265/PKGBUILD b/msys2/PKGBUILD/40-mingw-w64-x265/PKGBUILD index 99334090f..50cb6b990 100644 --- a/msys2/PKGBUILD/40-mingw-w64-x265/PKGBUILD +++ b/msys2/PKGBUILD/40-mingw-w64-x265/PKGBUILD @@ -28,7 +28,7 @@ source=("${_realname}"::"git+https://bitbucket.org/multicoreware/x265_git.git#co sha256sums=('SKIP') export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}" -export MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" +export FF_MINGW_PREFIX="${MINGW_TOOLCHAIN_PREFIX}/ffbuild" prepare() { mv "${srcdir}"/"x265"* "${srcdir}"/x265_${pkgver} @@ -44,8 +44,8 @@ prepare() { build() { - export CMAKE_PREFIX_PATH="${MINGW_PREFIX}" - export PKG_CONFIG_PATH="${MINGW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" + export CMAKE_PREFIX_PATH="${FF_MINGW_PREFIX}" + export PKG_CONFIG_PATH="${FF_MINGW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" if [ "${CARCH}" = 'x86_64' ]; then _ENABLE_ASM=ON else @@ -57,7 +57,7 @@ build() { MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_TOOLCHAIN_PREFIX}/bin/cmake \ -G Ninja \ - -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ + -DCMAKE_INSTALL_PREFIX=${FF_MINGW_PREFIX} \ -DHIGH_BIT_DEPTH=ON \ -DMAIN12=ON \ -DEXPORT_C_API=OFF \ @@ -72,7 +72,7 @@ build() { MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_TOOLCHAIN_PREFIX}/bin/cmake \ -G Ninja \ - -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ + -DCMAKE_INSTALL_PREFIX=${FF_MINGW_PREFIX} \ -DHIGH_BIT_DEPTH=ON \ -DEXPORT_C_API=OFF \ -DENABLE_CLI=OFF \ @@ -88,7 +88,7 @@ build() { MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_TOOLCHAIN_PREFIX}/bin/cmake \ -G Ninja \ - -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ + -DCMAKE_INSTALL_PREFIX=${FF_MINGW_PREFIX} \ -DENABLE_SHARED=OFF \ -DCMAKE_DLL_NAME_WITH_SOVERSION=ON \ -DENABLE_ASSEMBLY=${_ENABLE_ASM} \ diff --git a/msys2/PKGBUILD/40-mingw-w64-zimg/PKGBUILD b/msys2/PKGBUILD/40-mingw-w64-zimg/PKGBUILD index c5a52467e..0162c5ae6 100644 --- a/msys2/PKGBUILD/40-mingw-w64-zimg/PKGBUILD +++ b/msys2/PKGBUILD/40-mingw-w64-zimg/PKGBUILD @@ -22,7 +22,7 @@ sha256sums=('a9a0226bf85e0d83c41a8ebe4e3e690e1348682f6a2a7838f1b8cbff1b799bcf' '6e52d715d19080434392f04b33005fee428368e12176da20555f4059209c8134') export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}" -export MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" +export FF_MINGW_PREFIX="${MINGW_TOOLCHAIN_PREFIX}/ffbuild" prepare(){ bsdtar -xzf "${srcdir}/${_realname}-${pkgver}.tar.gz" || bsdtar -xzf "${srcdir}/${_realname}-${pkgver}.tar.gz" @@ -37,7 +37,7 @@ build() { cd "${srcdir}/build-${MINGW_CHOST}" ../${_realname}-release-${pkgver}/configure \ - --prefix=${MINGW_PREFIX} \ + --prefix=${FF_MINGW_PREFIX} \ --build=${MINGW_CHOST} \ --host=${MINGW_CHOST} \ --target=${MINGW_CHOST} \ diff --git a/msys2/PKGBUILD/50-mingw-w64-amf-headers/PKGBUILD b/msys2/PKGBUILD/50-mingw-w64-amf-headers/PKGBUILD index 6c1c9e483..43b5c85b2 100644 --- a/msys2/PKGBUILD/50-mingw-w64-amf-headers/PKGBUILD +++ b/msys2/PKGBUILD/50-mingw-w64-amf-headers/PKGBUILD @@ -14,16 +14,16 @@ source=("${_realname}-${pkgver}.tar.gz::https://github.com/GPUOpen-LibrariesAndS sha256sums=('SKIP') export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}" -export MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" +export FF_MINGW_PREFIX="${MINGW_TOOLCHAIN_PREFIX}/ffbuild" prepare() { cd "AMF-${pkgver}" } package() { - mkdir -p "${pkgdir}${MINGW_PREFIX}"/include/AMF/ - cp -r "${srcdir}/AMF-${pkgver}"/amf/public/include/core/ "${pkgdir}${MINGW_PREFIX}"/include/AMF/ - cp -r "${srcdir}/AMF-${pkgver}"/amf/public/include/components/ "${pkgdir}${MINGW_PREFIX}"/include/AMF/ + mkdir -p "${pkgdir}${FF_MINGW_PREFIX}"/include/AMF/ + cp -r "${srcdir}/AMF-${pkgver}"/amf/public/include/core/ "${pkgdir}${FF_MINGW_PREFIX}"/include/AMF/ + cp -r "${srcdir}/AMF-${pkgver}"/amf/public/include/components/ "${pkgdir}${FF_MINGW_PREFIX}"/include/AMF/ - install -D -m644 "${srcdir}/AMF-${pkgver}"/LICENSE.txt "${pkgdir}${MINGW_PREFIX}"/share/licenses/${_realname}/LICENSE + install -D -m644 "${srcdir}/AMF-${pkgver}"/LICENSE.txt "${pkgdir}${FF_MINGW_PREFIX}"/share/licenses/${_realname}/LICENSE } diff --git a/msys2/PKGBUILD/50-mingw-w64-ffnvcodec-headers/PKGBUILD b/msys2/PKGBUILD/50-mingw-w64-ffnvcodec-headers/PKGBUILD index 5b1f2fada..a1841a1b1 100644 --- a/msys2/PKGBUILD/50-mingw-w64-ffnvcodec-headers/PKGBUILD +++ b/msys2/PKGBUILD/50-mingw-w64-ffnvcodec-headers/PKGBUILD @@ -16,7 +16,7 @@ source=(git+https://github.com/FFmpeg/nv-codec-headers.git#tag=${_tag}) sha256sums=('SKIP') export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}" -export MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" +export FF_MINGW_PREFIX="${MINGW_TOOLCHAIN_PREFIX}/ffbuild" pkgver() { cd nv-codec-headers @@ -25,17 +25,17 @@ pkgver() { } build() { - make PREFIX=${MINGW_PREFIX} -C nv-codec-headers + make PREFIX=${FF_MINGW_PREFIX} -C nv-codec-headers sed -n '4,25p' nv-codec-headers/include/ffnvcodec/nvEncodeAPI.h > LICENSE # Extract license sed -i '1,22s/^.\{,3\}//' LICENSE # Delete C comments } package() { - make PREFIX=${MINGW_PREFIX} DESTDIR="${pkgdir}" -C nv-codec-headers install - install -Dm 644 LICENSE -t "${pkgdir}${MINGW_PREFIX}"/share/licenses/ffnvcodec-headers/ + make PREFIX=${FF_MINGW_PREFIX} DESTDIR="${pkgdir}" -C nv-codec-headers install + install -Dm 644 LICENSE -t "${pkgdir}${FF_MINGW_PREFIX}"/share/licenses/ffnvcodec-headers/ - local PREFIX_WIN=$(cygpath -wm ${MINGW_PREFIX}) - for pcfile in "${pkgdir}${MINGW_PREFIX}"/lib/pkgconfig/*.pc; do - sed -s "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i "${pcfile}" + local PREFIX_WIN=$(cygpath -wm ${FF_MINGW_PREFIX}) + for pcfile in "${pkgdir}${FF_MINGW_PREFIX}"/lib/pkgconfig/*.pc; do + sed -s "s|${PREFIX_WIN}|${FF_MINGW_PREFIX}|g" -i "${pcfile}" done } diff --git a/msys2/PKGBUILD/50-mingw-w64-libvpl/PKGBUILD b/msys2/PKGBUILD/50-mingw-w64-libvpl/PKGBUILD index 5f2008e3c..d3e44cb75 100644 --- a/msys2/PKGBUILD/50-mingw-w64-libvpl/PKGBUILD +++ b/msys2/PKGBUILD/50-mingw-w64-libvpl/PKGBUILD @@ -28,7 +28,7 @@ sha256sums=('SKIP' '21b2cc2f466f636940c8ef81f50dff177aff96d60dc4bc57f58c5c9f016502fe') export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}" -export MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" +export FF_MINGW_PREFIX="${MINGW_TOOLCHAIN_PREFIX}/ffbuild" apply_patch_with_msg() { for _patch in "$@" @@ -48,8 +48,8 @@ prepare() { } build() { - export CMAKE_PREFIX_PATH="${MINGW_PREFIX}" - export PKG_CONFIG_PATH="${MINGW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" + export CMAKE_PREFIX_PATH="${FF_MINGW_PREFIX}" + export PKG_CONFIG_PATH="${FF_MINGW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" declare -a extra_config if check_option "debug" "n"; then extra_config+=("-DCMAKE_BUILD_TYPE=Release") @@ -62,7 +62,7 @@ build() { MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ "${MINGW_TOOLCHAIN_PREFIX}"/bin/cmake.exe \ -GNinja \ - -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \ + -DCMAKE_INSTALL_PREFIX="${FF_MINGW_PREFIX}" \ "${extra_config[@]}" \ -DBUILD_SHARED_LIBS=OFF \ -DBUILD_{DISPATCHER,DEV}=ON \ @@ -78,7 +78,7 @@ package() { cd "${srcdir}/build-${MSYSTEM}-static" DESTDIR="${pkgdir}" "${MINGW_TOOLCHAIN_PREFIX}"/bin/cmake.exe --install . - rm -r "${pkgdir}${MINGW_PREFIX}/share/vpl/examples" + rm -r "${pkgdir}${FF_MINGW_PREFIX}/share/vpl/examples" - install -Dm644 "${srcdir}/libvpl-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" + install -Dm644 "${srcdir}/libvpl-${pkgver}/LICENSE" "${pkgdir}${FF_MINGW_PREFIX}/share/licenses/${_realname}/LICENSE" } diff --git a/msys2/PKGBUILD/50-mingw-w64-opencl-icd/PKGBUILD b/msys2/PKGBUILD/50-mingw-w64-opencl-icd/PKGBUILD index 4a3709547..a3ada0646 100644 --- a/msys2/PKGBUILD/50-mingw-w64-opencl-icd/PKGBUILD +++ b/msys2/PKGBUILD/50-mingw-w64-opencl-icd/PKGBUILD @@ -27,7 +27,7 @@ sha256sums=('SKIP' 'SKIP') export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}" -export MINGW_PREFIX="${MINGW_PREFIX}/ffbuild" +export FF_MINGW_PREFIX="${MINGW_TOOLCHAIN_PREFIX}/ffbuild" prepare() { cd "${srcdir}"/OpenCL-ICD-Loader-${pkgver} @@ -35,8 +35,8 @@ prepare() { } build() { - export CMAKE_PREFIX_PATH="${MINGW_PREFIX}" - export PKG_CONFIG_PATH="${MINGW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" + export CMAKE_PREFIX_PATH="${FF_MINGW_PREFIX}" + export PKG_CONFIG_PATH="${FF_MINGW_PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}" mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM} declare -a extra_config @@ -49,11 +49,11 @@ build() { MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_TOOLCHAIN_PREFIX}/bin/cmake \ -G'Ninja' \ - -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ + -DCMAKE_INSTALL_PREFIX=${FF_MINGW_PREFIX} \ "${extra_config[@]}" \ -DBUILD_SHARED_LIBS=OFF \ -DOPENCL_ICD_LOADER_DISABLE_OPENCLON12=ON \ - -DOPENCL_ICD_LOADER_HEADERS_DIR=${MINGW_PREFIX}/include \ + -DOPENCL_ICD_LOADER_HEADERS_DIR=${FF_MINGW_PREFIX}/include \ -DBUILD_TESTING=OFF \ ../OpenCL-ICD-Loader-${pkgver} @@ -65,10 +65,10 @@ package() { DESTDIR=${pkgdir} ${MINGW_TOOLCHAIN_PREFIX}/bin/cmake --install . # Replace the Pkg-config file - rm -f "${pkgdir}${MINGW_PREFIX}/lib/pkgconfig/OpenCL.pc" - install -Dm644 "${srcdir}/OpenCL.pc" "${pkgdir}${MINGW_PREFIX}/lib/pkgconfig/OpenCL.pc" - sed -e "s|@PREFIX@|${MINGW_PREFIX}|g" \ - -i "${pkgdir}${MINGW_PREFIX}/lib/pkgconfig/OpenCL.pc" + rm -f "${pkgdir}${FF_MINGW_PREFIX}/lib/pkgconfig/OpenCL.pc" + install -Dm644 "${srcdir}/OpenCL.pc" "${pkgdir}${FF_MINGW_PREFIX}/lib/pkgconfig/OpenCL.pc" + sed -e "s|@PREFIX@|${FF_MINGW_PREFIX}|g" \ + -i "${pkgdir}${FF_MINGW_PREFIX}/lib/pkgconfig/OpenCL.pc" - install -Dm644 ${srcdir}/OpenCL-ICD-Loader-${pkgver}/LICENSE ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE + install -Dm644 ${srcdir}/OpenCL-ICD-Loader-${pkgver}/LICENSE ${pkgdir}${FF_MINGW_PREFIX}/share/licenses/${_realname}/LICENSE }