Merge branch 'master' into arpack_64_v2

This commit is contained in:
Rafal
2022-02-06 11:03:38 +01:00
committed by GitHub
614 changed files with 22988 additions and 6939 deletions

View File

@@ -21,9 +21,8 @@ sed -i 's/^CheckSpace/#CheckSpace/g' /etc/pacman.conf
pacman --noconfirm -Fy
# Detect
list_commits || failure 'Could not detect added commits'
list_packages || failure 'Could not detect changed files'
message 'Processing changes' "${commits[@]}"
message 'Processing changes'
test -z "${packages}" && success 'No changes in package recipes'
# Build

View File

@@ -24,32 +24,6 @@ _status() {
printf "${items:+\t%s\n}" "${items:+${items[@]}}"
}
# Convert lines to array
_as_list() {
local -n nameref_list="${1}"
local filter="${2}"
local strip="${3}"
local lines="${4}"
local result=1
nameref_list=()
while IFS= read -r line; do
test -z "${line}" && continue
result=0
[[ "${line}" = ${filter} ]] && nameref_list+=("${line/${strip}/}")
done <<< "${lines}"
return "${result}"
}
# Changes since master or from head
_list_changes() {
local list_name="${1}"
local filter="${2}"
local strip="${3}"
local git_options=("${@:4}")
_as_list "${list_name}" "${filter}" "${strip}" "$(git log "${git_options[@]}" upstream/master.. | sort -u)" ||
_as_list "${list_name}" "${filter}" "${strip}" "$(git log "${git_options[@]}" HEAD^.. | sort -u)"
}
# Git configuration
git_config() {
local name="${1}"
@@ -73,11 +47,6 @@ execute(){
cd - > /dev/null
}
# Added commits
list_commits() {
_list_changes commits '*' '#*::' --pretty=format:'%ai::[%h] %s'
}
# Get changed packages in correct build order
list_packages() {
# readarray doesn't work with a plain pipe

View File

@@ -0,0 +1,39 @@
# Maintainer: Michał Łukowski <michal.lukowski@gmail.com>
_realname=abseil-cpp
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=20211102.0
pkgrel=1
pkgdesc="A collection of open source C++ libraries taken from the most fundamental pieces of Googles internal codebase, designed to extend the standard C ++ library. (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url="https://abseil.io"
license=('spdx:Apache-2.0')
makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-ninja"
"${MINGW_PACKAGE_PREFIX}-cc")
source=("https://github.com/abseil/abseil-cpp/archive/$pkgver/$_realname-$pkgver.tar.gz")
sha256sums=('dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4')
build() {
[[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
${MINGW_PREFIX}/bin/cmake \
-GNinja \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_STANDARD=17 \
-DBUILD_SHARED_LIBS=ON \
../${_realname}-${pkgver}
cmake --build .
}
package() {
cd "${srcdir}/build-${MSYSTEM}"
DESTDIR="${pkgdir}" cmake --install .
}

View File

@@ -0,0 +1,26 @@
From d376bd3f4d1e6bd8b6c7d4151caa701b238235ac Mon Sep 17 00:00:00 2001
From: Christopher Degawa <ccom@randomderp.com>
Date: Tue, 14 Dec 2021 12:58:39 -0600
Subject: [PATCH] Platform.h: tie typedef for HRESULT to !windows
The existence of `__clang__` there breaks clang on Windows compilation
due to conflicting LONG vs INT typedefs
Signed-off-by: Christopher Degawa <ccom@randomderp.com>
---
amf/public/include/core/Platform.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/amf/public/include/core/Platform.h b/amf/public/include/core/Platform.h
index 7fa61cc..a175e62 100644
--- a/amf/public/include/core/Platform.h
+++ b/amf/public/include/core/Platform.h
@@ -72,7 +72,7 @@
// #error Need to define AMF_ALIGN
#endif
-#if defined(__linux) || (__clang__)
+#if !defined(_WIN32)
typedef signed int HRESULT;
#define SUCCEEDED(hr) (((HRESULT)(hr)) >= 0)
#define FAILED(hr) (((HRESULT)(hr)) < 0)

View File

@@ -4,14 +4,23 @@ _realname=amf-headers
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.4.23
pkgrel=1
pkgrel=2
pkgdesc='Header files for AMD Advanced Media Framework'
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://github.com/GPUOpen-LibrariesAndSDKs/AMF/'
license=('MIT')
source=("${_realname}-${pkgver}.tar.gz::https://github.com/GPUOpen-LibrariesAndSDKs/AMF/archive/v${pkgver}.tar.gz")
sha256sums=('7c8a5c91bca54e257258e4efcc61925921f2efe432efd34cf77dd9dc1803c38a')
source=("${_realname}-${pkgver}.tar.gz::https://github.com/GPUOpen-LibrariesAndSDKs/AMF/archive/v${pkgver}.tar.gz"
"0001-prevent-some-redefinition.patch")
sha256sums=('7c8a5c91bca54e257258e4efcc61925921f2efe432efd34cf77dd9dc1803c38a'
'cb81680806a7049bff2b1ac70d46fe925fc91e5ab763db30f7f4f4a8b89daebc')
prepare() {
cd "AMF-${pkgver}"
# https://github.com/GPUOpen-LibrariesAndSDKs/AMF/pull/286
patch -p1 -i "${srcdir}/0001-prevent-some-redefinition.patch"
}
package() {
mkdir -p "${pkgdir}${MINGW_PREFIX}"/include/AMF/

View File

@@ -13,7 +13,7 @@ license=("custom")
url="https://argtable.sourceforge.io"
source=("https://downloads.sourceforge.net/project/argtable/argtable/${_realname}-${pkgver}/${_realname}${intver}.tar.gz")
sha256sums=('8f77e8a7ced5301af6e22f47302fdbc3b1ff41f2b83c43c77ae5ca041771ddbf')
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-autotools")
makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools")
options=('staticlibs' 'strip')

View File

@@ -3,7 +3,7 @@
_realname=armadillo
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=10.8.0
pkgver=10.8.1
pkgrel=2
pkgdesc="C++ linear algebra library (mingw-w64)"
arch=('any')
@@ -12,7 +12,8 @@ url="https://arma.sourceforge.io/"
license=(MPL2)
depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
"${MINGW_PACKAGE_PREFIX}-hdf5"
$([[ ${MSYSTEM} == CLANG32 ]] || echo "${MINGW_PACKAGE_PREFIX}-openblas")
"${MINGW_PACKAGE_PREFIX}-openblas"
$([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] && echo "${MINGW_PACKAGE_PREFIX}-f2cblaslapack")
$([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-arpack")
)
makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
@@ -21,7 +22,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
install=${_realname}-${MSYSTEM}.install
source=(https://sourceforge.net/projects/arma/files/${_realname}-${pkgver}.tar.xz
0001-mingw-config-fix.patch)
sha256sums=('7c5d2fd4bba095733829f7fe03d4a74e732b81c75dd4d40001163487c967d5bc'
sha256sums=('5087ab5a2268e5ce71798c1afcb6d1fb246463f8dc88a60db49a083600f98332'
'772719e60eb2970ecb37844382dbcb6d0439f949c5080f9865798115640b612a')
prepare() {
@@ -38,7 +39,7 @@ build() {
-G"Ninja" \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-DCMAKE_BUILD_TYPE=Release \
$([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo -DLAPACK_NAMES=openblas) \
$([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo -DOPENBLAS_PROVIDES_LAPACK=ON) \
../${_realname}-${pkgver}
cmake --build .

View File

@@ -3,7 +3,7 @@
_realname=arrow
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=6.0.1
pkgver=7.0.0
pkgrel=1
pkgdesc="Apache Arrow is a cross-language development platform for in-memory data (mingw-w64)"
arch=(any)
@@ -43,7 +43,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-boost"
options=("staticlibs" "strip" "!buildflags")
source=("apache-arrow-${pkgver}.tar.gz"::"https://www.apache.org/dyn/closer.lua?action=download&filename=arrow/arrow-${pkgver}/apache-arrow-${pkgver}.tar.gz"
"apache-arrow-${pkgver}.tar.gz.asc"::"https://www.apache.org/dyn/closer.lua?action=download&filename=arrow/arrow-${pkgver}/apache-arrow-${pkgver}.tar.gz.asc")
sha256sums=('3786b3d2df954d078b3e68f98d2e5aecbaa3fa2accf075d7a3a13c187b9c5294'
sha256sums=('e8f49b149a15ecef4e40fcfab1b87c113c6b1ee186005c169e5cdf95d31a99de'
'SKIP')
# See generate-valid-keys.sh
validpgpkeys=('35CF82A165DDBBA29B307B7497D7E8647AE7E47B'

View File

@@ -11,7 +11,7 @@ mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://asciidoctor.org/'
license=('MIT')
depends=("${MINGW_PACKAGE_PREFIX}-ruby")
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc")
makedepends=("${MINGW_PACKAGE_PREFIX}-cc")
source=(https://rubygems.org/downloads/${_realname}-${pkgver}.gem)
sha256sums=('02439a5b89b25550297a21c631035c2a6608d6fc9d9b63d7f137b3356bbd0482')

View File

@@ -10,7 +10,7 @@ url='https://think-async.com/Asio/'
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
license=('custom:boost')
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
#"${MINGW_PACKAGE_PREFIX}-boost"
"${MINGW_PACKAGE_PREFIX}-autotools"
"${MINGW_PACKAGE_PREFIX}-openssl")

View File

@@ -3,7 +3,7 @@
_realname=autotools
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=2021.12.15
pkgver=2022.01.16
pkgrel=1
pkgdesc="A meta package for the GNU autotools build system (mingw-w64)"
arch=('any')
@@ -11,7 +11,7 @@ mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
license=('GPL')
url="https://www.gnu.org/software/automake/manual/html_node/Autotools-Introduction.html"
depends=(
'autoconf'
'autoconf-wrapper'
'automake-wrapper'
'make'
'libtool'

View File

@@ -3,7 +3,7 @@
_realname=bat
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=0.18.3
pkgver=0.19.0
pkgrel=1
pkgdesc="Cat clone with syntax highlighting and git integration (mingw-w64)"
arch=('any')
@@ -16,7 +16,7 @@ makedepends=(
depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
options=('staticlibs' 'strip')
source=("${_realname}-${pkgver}.tar.gz::https://github.com/sharkdp/bat/archive/refs/tags/v${pkgver}.tar.gz")
sha256sums=('dff7fa5222f40c7b3c783d3ceb0c3ffb35662f1198b00d785f80f3f1523399dd')
sha256sums=('6a920cad1e7ae069eb9393f5b6883e0a7f2c957186b1075976331daaa5e0468a')
prepare() {
cp -r ${_realname}-${pkgver} build-${MSYSTEM}
@@ -28,11 +28,13 @@ prepare() {
build() {
${MINGW_PREFIX}/bin/cargo build \
--release \
--frozen \
--manifest-path build-${MSYSTEM}/Cargo.toml
}
package() {
${MINGW_PREFIX}/bin/cargo install \
--frozen \
--offline \
--no-track \
--path build-${MSYSTEM} \

View File

@@ -4,7 +4,7 @@
_realname=binaryen
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=104
pkgver=105
pkgrel=1
pkgdesc="Compiler infrastructure and toolchain library for WebAssembly, in C++ (mingw-w64)"
arch=('any')
@@ -15,7 +15,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-ninja")
source=("${_realname}-${pkgver}.tar.gz::https://github.com/WebAssembly/binaryen/archive/version_${pkgver}.tar.gz")
sha256sums=('a6acabb159fcc5b1d8c9506f5036dcd1e4446952b572903b256af955e959780d')
sha256sums=('c5ec27c157d3b33ce4360607cc6afe565fa490094237895db2162b3a7d667da2')
build() {
declare -a extra_config

View File

@@ -3,7 +3,7 @@
_realname=cargo-c
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=0.9.6
pkgver=0.9.7
pkgrel=1
pkgdesc='A cargo subcommand to build and install C-ABI compatibile dynamic and static libraries (mingw-w64)'
arch=('any')
@@ -17,8 +17,8 @@ depends=("${MINGW_PACKAGE_PREFIX}-curl"
makedepends=("${MINGW_PACKAGE_PREFIX}-rust")
source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/lu-zero/cargo-c/archive/v${pkgver}.tar.gz"
"${_realname}-${pkgver}.Cargo.lock"::"https://github.com/lu-zero/cargo-c/releases/download/v${pkgver}/Cargo.lock")
sha256sums=('c121bc2069373c25a89dcf9c357aa1e91d9eb4eb46a87db4d9931114070317c5'
'd89b9b02ae95d1993b12ef1a764157b5a42bc70d39e91eb5844320dc809a0e08')
sha256sums=('eead78d26b4e5924e9d750f66f2fef4d706680927542d87c895178fc0be016f0'
'3898341b624517daa50d95bd99e2fa873b15ea803f9e3d6f7edab11427b95de8')
prepare() {
cp "${srcdir}/${_realname}-${pkgver}.Cargo.lock" "${_realname}-${pkgver}/Cargo.lock"

View File

@@ -9,7 +9,7 @@ pkgdesc="A modern, C++-native, header-only, test framework for unit-tests, TDD a
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://github.com/philsquared/Catch'
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-python")
license=('custom')

View File

@@ -3,21 +3,22 @@
_realname=cereal
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.3.0
pkgver=1.3.1
pkgrel=1
pkgdesc="A C++11 library for serialization (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url="https://uscilab.github.io/cereal/"
license=('New BSD license')
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
"${MINGW_PACKAGE_PREFIX}-cmake")
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-ninja")
depends=("${MINGW_PACKAGE_PREFIX}-boost")
checkdepends=("${MINGW_PACKAGE_PREFIX}-gflags")
source=("${_realname}-${pkgver}.tar.gz::https://github.com/USCiLab/cereal/archive/v${pkgver}.tar.gz"
"${_realname}-1.2.2.patch")
sha256sums=('329ea3e3130b026c03a4acc50e168e7daff4e6e661bc6a7dfec0d77b570851d5'
'3a7f7a6e6d8e092c5ffb7b0342d0bfa8675a57985dc1c9e5a4209ce434156767')
sha256sums=('65ea6ddda98f4274f5c10fb3e07b2269ccdd1e5cbb227be6a2fd78b8f382c976'
'1f82ffd1cac9b171ef4a60612492fef2216c851960f84543742ac4206fcc5a94')
prepare() {
cd "${srcdir}/${_realname}-${pkgver}"
@@ -33,22 +34,23 @@ build() {
CXXFLAGS+=" -Wno-unused-variable"
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
${MINGW_PREFIX}/bin/cmake.exe \
-G"MSYS Makefiles" \
-G"Ninja" \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-DCMAKE_BUILD_TYPE="Release" \
-DWITH_WERROR=OFF \
"../${_realname}-${pkgver}"
make
${MINGW_PREFIX}/bin/cmake.exe --build ./
}
check() {
cd "${srcdir}/build-${MINGW_CHOST}"
make test
${MINGW_PREFIX}/bin/ctest.exe || true
}
package() {
cd "${srcdir}/build-${MINGW_CHOST}"
make DESTDIR="${pkgdir}" install
DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install ./
install -Dm644 ${srcdir}/${_realname}-${pkgver}/LICENSE ${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE
}

View File

@@ -1,7 +1,7 @@
diff -Naur cereal-1.2.2/include/cereal/archives/json.hpp cereal-1.2.2-patched/include/cereal/archives/json.hpp
--- cereal-1.2.2/include/cereal/archives/json.hpp 2017-02-13 01:06:58.000000000 +0300
+++ cereal-1.2.2-patched/include/cereal/archives/json.hpp 2018-10-23 22:38:05.621656900 +0300
@@ -643,7 +643,7 @@
@@ -661,7 +661,7 @@
// Special cases to handle various flavors of long, which tend to conflict with
// the int32_t or int64_t on various compiler/OS combinations. MSVC doesn't need any of this.
@@ -20,19 +20,19 @@ diff -Naur cereal-1.2.2/unittests/CMakeLists.txt cereal-1.2.2-patched/unittests/
- if(NOT MSVC)
+ if(NOT WIN32)
add_executable(portability_test32 portability_test.cpp)
target_link_libraries(portability_test32 ${CEREAL_THREAD_LIBS})
set_target_properties(portability_test32 PROPERTIES COMPILE_FLAGS "-m32")
set_target_properties(portability_test32 PROPERTIES LINK_FLAGS "-m32")
@@ -24,7 +24,7 @@
@@ -26,7 +26,7 @@
-DPORTABILITY_TEST_DIR=$<TARGET_FILE_DIR:portability_test64>
-P "${CMAKE_CURRENT_SOURCE_DIR}/run_portability_test.cmake")
- elseif(MSVC)
+ elseif()
add_executable(portability_test32 portability_test.cpp)
target_link_libraries(portability_test32 cereal::cereal)
endif()
endif()
@@ -45,7 +45,7 @@
add_test("${TEST_TARGET}" "${TEST_TARGET}")
@@ -48,7 +48,7 @@
add_test(NAME "${TEST_TARGET}" COMMAND "${TEST_TARGET}")
# If we are on a 64-bit machine, create an extra 32-bit version of the test if portability testing is enabled
- if((NOT MSVC) AND (${CMAKE_SIZEOF_VOID_P} EQUAL 8) AND (NOT SKIP_PORTABILITY_TEST))
@@ -40,7 +40,7 @@ diff -Naur cereal-1.2.2/unittests/CMakeLists.txt cereal-1.2.2-patched/unittests/
add_executable(${TEST_TARGET}_32 ${TEST_SOURCE})
set_target_properties(${TEST_TARGET}_32 PROPERTIES
COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")
@@ -57,7 +57,7 @@
@@ -61,7 +61,7 @@
endforeach()
# Add the valgrind target
@@ -49,28 +49,19 @@ diff -Naur cereal-1.2.2/unittests/CMakeLists.txt cereal-1.2.2-patched/unittests/
add_custom_target(valgrind
COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/run_valgrind.sh")
@@ -85,7 +85,7 @@
target_link_libraries(${COVERAGE_TARGET} ${CEREAL_THREAD_LIBS})
endif()
endforeach()
-endif(NOT MSVC)
+endif()
if(NOT CMAKE_VERSION VERSION_LESS 3.0)
add_test(test_cmake_config_module ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake-config-module.cmake)
diff -Naur cereal-1.3.0/unittests/boost/CMakeLists.txt cereal-1.3.0-patched/unittests/boost/CMakeLists.txt
--- cereal-1.3.0/unittests/boost/CMakeLists.txt 2020-06-11 01:06:58.000000000 +0300
+++ cereal-1.3.0-patched/unittests/boost/CMakeLists.txt 2020-06-11 22:45:34.970358200 +0300
@@ -12,7 +12,7 @@
add_test("${TEST_TARGET}" "${TEST_TARGET}")
@@ -14,7 +14,7 @@
add_test(NAME "${TEST_TARGET}" COMMAND "${TEST_TARGET}")
# If we are on a 64-bit machine, create an extra 32-bit version of the test if portability testing is enabled
- if((NOT MSVC) AND (${CMAKE_SIZEOF_VOID_P} EQUAL 8) AND (NOT SKIP_PORTABILITY_TEST))
+ if((NOT WIN32) AND (${CMAKE_SIZEOF_VOID_P} EQUAL 8) AND (NOT SKIP_PORTABILITY_TEST))
add_executable(${TEST_TARGET}_32 ${TEST_SOURCE})
target_link_libraries(${TEST_TARGET}_32 ${CEREAL_THREAD_LIBS})
set_target_properties(${TEST_TARGET}_32 PROPERTIES
COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")
@@ -21,7 +21,7 @@
@@ -24,7 +24,7 @@
endforeach()

View File

@@ -10,7 +10,7 @@ arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url="https://www.cgal.org/"
license=("LGPL, GPL")
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-eigen3"
"${MINGW_PACKAGE_PREFIX}-pkg-config"

View File

@@ -20,8 +20,8 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-compiler-rt"
"${MINGW_PACKAGE_PREFIX}-lld"
"${MINGW_PACKAGE_PREFIX}-llvm")
pkgver=13.0.0
pkgrel=5
pkgver=13.0.1
pkgrel=1
pkgdesc="C language family frontend for LLVM (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -69,17 +69,17 @@ source=("${_url}/llvm-${pkgver}.src.tar.xz"{,.sig}
#0101-0199 -> clang
#0201-0299 -> rt
#0301-0399 -> lld
sha256sums=('408d11708643ea826f519ff79761fcdfc12d641a2510229eec459e72f8163020'
sha256sums=('ec6b80d82c384acad2dc192903a6cf2cdbaffb889b84bfb98da9d71e630fc834'
'SKIP'
'5d611cbb06cfb6626be46eb2f23d003b2b80f40182898daa54b1c4e8b5b9e17e'
'787a9e2d99f5c8720aa1773e4be009461cd30d3bd40fdd24591e473467c917c9'
'SKIP'
'428b6060a28b22adf0cdf5d827abbc2ba81809f4661ede3d02b1d3fedaa3ead5'
'cc2bc8598848513fa2257a270083e986fd61048347eccf1d801926ea709392d0'
'SKIP'
'4c3602d76c7868a96b30c36165c4b7643e2a20173fced7e071b4baeb2d74db3f'
'7b33955031f9a9c5d63077dedb0f99d77e4e7c996266952c1cec55626dca5dfc'
'SKIP'
'20d1900bcd64ff62047291f6edb6ba2fed34d782675ff68713bf0c2fc9e69386'
'666af745e8bf7b680533b4d18b7a31dc7cab575b1e6e4d261922bbafd9644cfb'
'SKIP'
'36f819091216177a61da639244eda67306ccdd904c757d70d135e273278b65e1'
'e206dbf1bbe058a113bffe189386ded99a160b2443ee1e2cd41ff810f78551ba'
'SKIP'
'403f1711270ab62988d9f6a111a95049711cb36be6763025734ff4ded4b5e091'
'8831c6ea72baa315b20e5f1a9008a9bf4098ba8a18d5331f05216604489063a4'
@@ -196,7 +196,7 @@ build() {
if (( _clangprefix )); then
# A bit hacky but it works
local _clang_links="clang++;clang-cpp;as;c++;cc;cpp;g++;gcc;${MINGW_CHOST}-cc;${MINGW_CHOST}-c++;${MINGW_CHOST}-clang;${MINGW_CHOST}-clang++;${MINGW_CHOST}-g++;${MINGW_CHOST}-gcc"
local _clang_links="clang++;clang-cpp;as;c++;cc;cpp;${MINGW_CHOST}-cc;${MINGW_CHOST}-c++;${MINGW_CHOST}-clang;${MINGW_CHOST}-clang++"
platform_config+=(-DCLANG_DEFAULT_RTLIB=compiler-rt
-DCLANG_DEFAULT_UNWINDLIB=libunwind
@@ -286,7 +286,6 @@ package_clang() {
"${MINGW_PACKAGE_PREFIX}-winpthreads" \
|| echo "${MINGW_PACKAGE_PREFIX}-gcc"))
provides=($( (( _clangprefix )) && echo \
"${MINGW_PACKAGE_PREFIX}-gcc" \
"${MINGW_PACKAGE_PREFIX}-cc" \
|| true ))

View File

@@ -1,6 +1,7 @@
### Patches statuses
# Patches statuses
Legend:
- :grey_exclamation: - not meant to upstream, for compatibility with GCC only
- :x: - not upstreamed
- :grey_question: - sent but not merged yet
@@ -8,6 +9,7 @@ Legend:
- :arrow_down_small: - backported
-----
- `"0001-Use-posix-style-path-separators-with-MinGW.patch"` :x::x::x: - this one is really imporant
- `"0002-Fix-GetHostTriple-for-mingw-w64-in-msys.patch"` :x:
- `"0003-CMake-try-creating-symlink-first-on-windows.patch"` :x: (win symlinks don't play well with pacman packages)
@@ -16,7 +18,6 @@ Legend:
- `"0101-Disable-fPIC-errors.patch"` :x:
- `"0103-Use-posix-style-path-separators-with-MinGW.patch"` :x::x::x: - this one is really imporant
- `"0104-link-pthread-with-mingw.patch"` :grey_exclamation:
- `"0105-clang-Tooling-Use-Windows-command-lines.patch"` :arrow_up_small: - https://reviews.llvm.org/D111195
- `"0105-clang-Tooling-Use-Windows-command-lines.patch"` :arrow_up_small: - [https://reviews.llvm.org/D111195]
- `"0304-ignore-new-bfd-options.patch"` :x:
- `"0501-lldb-Make-the-thread_local-g_global_boundary-accesse.patch"` :arrow_down_small: - https://reviews.llvm.org/D111779
- `"0901-cast-to-make-gcc-happy.patch"` :grey_exclamation:

View File

@@ -3,7 +3,7 @@
_realname=cmake-doc-qt
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=3.22.1
pkgver=3.22.2
pkgrel=1
pkgdesc="CMake documentation in Qt Help format"
arch=('any')
@@ -13,7 +13,7 @@ url='https://www.cmake.org/documentation/'
# rename to include version of each release
# (prevents accidentally using the file of an older version)
source=("CMake-${pkgver}.qch::https://www.cmake.org/cmake/help/v${pkgver%.*}/CMake.qch")
sha256sums=('97d7760618a71966797015340c8c52ee2fd96c1dd88a7f648dd4848f34a7fa70')
sha256sums=('521ea0973dbfe09ca973d843d0eb091090ffae012fb9eabaf5808d5182d6629c')
package() {
mkdir -p "${pkgdir}${MINGW_PREFIX}/share/qt5/doc"

View File

@@ -1,11 +0,0 @@
--- cmake-3.22.0/Source/cmTimestamp.cxx.orig 2021-11-21 19:49:45.959000000 +0100
+++ cmake-3.22.0/Source/cmTimestamp.cxx 2021-11-21 19:49:59.378057000 +0100
@@ -194,7 +194,7 @@
char buffer[16];
-#ifdef __MINGW32__
+#if defined(__MINGW32__) && !defined(_UCRT)
/* See a bug in MinGW: https://sourceforge.net/p/mingw-w64/bugs/793/. A work
* around is to try to use strftime() from ucrtbase.dll. */
using T = size_t(WINAPI*)(char*, size_t, const char*, const struct tm*);

View File

@@ -4,7 +4,7 @@
_realname=cmake
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=3.22.1
pkgver=3.22.2
pkgrel=1
pkgdesc="A cross-platform open-source make system (mingw-w64)"
arch=('any')
@@ -38,14 +38,12 @@ source=("https://github.com/Kitware/CMake/releases/download/v${pkgver}/${_realna
"0001-Disable-response-files-for-MSYS-Generator.patch"
"0002-Do-not-install-Qt-bundle-in-cmake-gui.patch"
"0004-Output-line-numbers-in-callstacks.patch"
"0005-Default-to-ninja-generator.patch"
"0006-fix-clang32-crash.patch")
sha256sums=('0e998229549d7b3f368703d20e248e7ee1f853910d42704aa87918c213ea82c0'
"0005-Default-to-ninja-generator.patch")
sha256sums=('3c1c478b9650b107d452c5bd545c72e2fad4e37c09b89a1984b9a2f46df6aced'
'25793edcbac05bb6d17fa9947b52ace4a6b5ccccf7758e22ae9ae022ed089061'
'f6cf6a6f2729db2b9427679acd09520af2cd79fc26900b19a49cead05a55cd1a'
'15fdf3fb1a0f1c153c8cfbdd2b5c64035b7a04de618bfe61d7d74ced0d6a5c4b'
'426818278090704d2a12f62ef3dfd94c47b11fa2784bb842989b7f6a09ee7aa2'
'63ea33f98e93be1ffa4ef958a914f08651c5e59bc516ba0dd33f03ff345377c3')
'426818278090704d2a12f62ef3dfd94c47b11fa2784bb842989b7f6a09ee7aa2')
# Helper macros to help make tasks easier #
@@ -78,10 +76,6 @@ prepare() {
# We want cmake to default to something useful and not MSVC
apply_patch_with_msg \
0005-Default-to-ninja-generator.patch
# https://gitlab.kitware.com/cmake/cmake/-/issues/22939
apply_patch_with_msg \
0006-fix-clang32-crash.patch
}
build() {

View File

@@ -1,30 +0,0 @@
# Maintainer: Norbert Pfeiler <norbert.pfeiler+aur ät gmail.com>
_realname=cotire
pkgbase=mingw-w64-${_realname}
pkgname="$MINGW_PACKAGE_PREFIX-$_realname"
_cotirever=1.8.1
_cmakever=3.21
_cmakegooduntil=3.22
pkgver=${_cotirever}_${_cmakever}
pkgrel=1
pkgdesc='CMake module to speed up builds (automated PCH, unity builds) (mingw-w64)'
arch=(any)
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
license=('custom')
conflicts=("$MINGW_PACKAGE_PREFIX-cmake<${_cmakever}" "$MINGW_PACKAGE_PREFIX-cmake>=${_cmakegooduntil}") # the Modules dir changes every major release
url='https://github.com/sakra/cotire'
source=("https://github.com/sakra/cotire/archive/${_realname}-${_cotirever}.tar.gz")
sha256sums=('79b976b9e822941e3e2a3d82881c5fbcfbc971156640cb745e74f845e764f192')
package() {
cd "${_realname}-${_realname}-${_cotirever}"
modules_dir="${pkgdir}${MINGW_PREFIX}/share/cmake-${_cmakever}/Modules/"
mkdir -p ${modules_dir}
cp CMake/cotire.cmake ${modules_dir}
license_dir="${pkgdir}${MINGW_PREFIX}/share/licenses/cotire/"
mkdir -p ${license_dir}
cp license ${license_dir}
}

View File

@@ -3,7 +3,7 @@
_realname=cppcheck
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=2.6
pkgver=2.6.3
pkgrel=1
pkgdesc="static analysis of C/C++ code (mingw-w64)"
arch=('any')
@@ -25,7 +25,7 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-qt5-base: cppcheck-gui"
source=(${_realname}-${pkgver}.tar.gz::"https://github.com/danmar/cppcheck/archive/${pkgver}.tar.gz"
'001-cppcheck-2.2-change-language-files-path.patch'
'002-cppcheck-2.2-change-cfg-path.patch')
sha256sums=('99f0c5cf58a0072876c4deb114f3f5f798c933b8e459cddb00a061c8bb4dd765'
sha256sums=('7a49ebb7a54356ade09867f466cb41ee4020ebf3732582762669e5c8903f16c8'
'e741bfafbeb3ade454a42563a1c4617ae3dc87fd6a6f409e1ae4b735b68997d3'
'6f53ad14361717b3f994033483c14ad35c5790f703e03fe8aebaca83936ea61b')

View File

@@ -3,7 +3,7 @@ _realname=cppcoro
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=r390.a87e97f
pkgrel=1
pkgrel=2
pkgdesc=" A library of C++ coroutine abstractions for the coroutines TS (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -21,19 +21,9 @@ pkgver() {
build(){
# replace all std::experimental with std
function scan_dir(){
for file in `ls $1`
do
if [ -d $1"/"$file ]
then
scan_dir $1"/"$file
else
sed 's/std::experimental/std/g' $1"/"$file | sed 's/experimental\///g' > $1"/"$file
fi
done
}
scan_dir "${srcdir}/cppcoro/include/cppcoro/"
find "${srcdir}/cppcoro/include/cppcoro/" -type f -exec sed -e 's/std::experimental/std/g' -e 's|experimental/||g' -i \{\} \+
}
package() {
mkdir -p "${pkgdir}${MINGW_PREFIX}/"
cp -r "${srcdir}/cppcoro/include/" "${pkgdir}${MINGW_PREFIX}/include/"

View File

@@ -14,7 +14,7 @@ license=('custom')
groups=("${MINGW_PACKAGE_PREFIX}-toolchain")
depends=("${MINGW_PACKAGE_PREFIX}-headers-git")
makedepends=("git"
"${MINGW_PACKAGE_PREFIX}-gcc"
"${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-binutils"
"${MINGW_PACKAGE_PREFIX}-autotools")
provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")

View File

@@ -3,7 +3,7 @@
_realname=delta
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=0.7.1
pkgver=0.11.3
pkgrel=1
pkgdesc='A syntax-highlighting pager for git and diff output (mingw-w64)'
arch=('any')
@@ -13,27 +13,27 @@ license=('MIT')
depends=('git')
makedepends=("${MINGW_PACKAGE_PREFIX}-rust")
source=("https://github.com/dandavison/delta/archive/refs/tags/$pkgver.tar.gz")
sha256sums=('f432335361088c37f8aa4bb747ba12e1f8eddbbc3ed5c51fdd52d9b96eb22227')
sha256sums=('cf68f43d4d26c10551c0137a7e718719958e52267d83f29a8f7794af12095b9e')
prepare() {
cp -r ${_realname}-${pkgver} build-${CARCH}
cp -r ${_realname}-${pkgver} build-${MSYSTEM}
${MINGW_PREFIX}/bin/cargo fetch \
--locked \
--manifest-path build-${CARCH}/Cargo.toml
--manifest-path build-${MSYSTEM}/Cargo.toml
}
build() {
${MINGW_PREFIX}/bin/cargo build \
--release \
--frozen \
--manifest-path build-${CARCH}/Cargo.toml
--manifest-path build-${MSYSTEM}/Cargo.toml
}
check() {
${MINGW_PREFIX}/bin/cargo test \
--release \
--frozen \
--manifest-path build-${CARCH}/Cargo.toml
--manifest-path build-${MSYSTEM}/Cargo.toml
}
package() {
@@ -41,7 +41,7 @@ package() {
--frozen \
--offline \
--no-track \
--path build-${CARCH} \
--path build-${MSYSTEM} \
--root ${pkgdir}${MINGW_PREFIX}
install -Dm644 ${_realname}-${pkgver}/LICENSE "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"

View File

@@ -0,0 +1,15 @@
--- desktop-file-utils-0.26/install.py.orig 2022-01-15 09:26:40.590000000 +0100
+++ desktop-file-utils-0.26/install.py 2022-01-15 09:30:23.249712200 +0100
@@ -1,8 +1,9 @@
#!/usr/bin/env python3
import os
+import shutil
-os.symlink(
- 'desktop-file-install',
- os.getenv('MESON_INSTALL_DESTDIR_PREFIX') + '/bin/desktop-file-edit'
+shutil.copy(
+ os.getenv('MESON_INSTALL_DESTDIR_PREFIX') + '/bin/desktop-file-install.exe',
+ os.getenv('MESON_INSTALL_DESTDIR_PREFIX') + '/bin/desktop-file-edit.exe'
)

View File

@@ -4,51 +4,49 @@ _realname=desktop-file-utils
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=0.26
pkgrel=1
pkgrel=2
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
pkgdesc="Utilities for .desktop files (mingw-w64)"
depends=("${MINGW_PACKAGE_PREFIX}-glib2"
"${MINGW_PACKAGE_PREFIX}-gtk3"
"${MINGW_PACKAGE_PREFIX}-libxml2")
makedepends=("gtk-doc"
"${MINGW_PACKAGE_PREFIX}-vala"
"${MINGW_PACKAGE_PREFIX}-gobject-introspection"
"${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-autotools")
options=('!strip' 'debug' 'staticlibs')
depends=("${MINGW_PACKAGE_PREFIX}-glib2")
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-meson"
"${MINGW_PACKAGE_PREFIX}-pkg-config"
"${MINGW_PACKAGE_PREFIX}-ninja")
license=("LGPL 2.1")
url="https://www.gnome.org/"
source=(https://www.freedesktop.org/software/${_realname}/releases/desktop-file-utils-${pkgver}.tar.xz
001-win.patch)
001-win.patch
002-install.patch)
sha256sums=('b26dbde79ea72c8c84fb7f9d870ffd857381d049a86d25e0038c4cef4c747309'
'477686cf08eaf80f5ee7f474cd6fb67361539f625c88fb9483ce600c5c8a73df')
'477686cf08eaf80f5ee7f474cd6fb67361539f625c88fb9483ce600c5c8a73df'
'd0fb777a741b3fbe1b92ae8b7855bbefb229e244c2c4a3af842f180e610f2fa1')
prepare() {
cd ${_realname}-${pkgver}
patch -b -V simple -p1 -i ${srcdir}/001-win.patch
autoreconf -fi
patch -b -V simple -p1 -i ${srcdir}/002-install.patch
}
build() {
[[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
mkdir -p build-${MINGW_CHOST}
cd build-${MINGW_CHOST}
mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}
../${_realname}-${pkgver}/configure \
--host=${MINGW_CHOST} \
--target=${MINGW_CHOST} \
--build=${MINGW_CHOST} \
--prefix=${MINGW_PREFIX} \
--libexecdir=${MINGW_PREFIX}/lib
make
MSYS2_ARG_CONV_EXCL="--prefix=" \
meson \
--prefix="${MINGW_PREFIX}" \
--wrap-mode=nodownload \
--auto-features=enabled \
--buildtype=plain \
../${_realname}-${pkgver}
meson compile
}
package() {
cd "$srcdir/build-${MINGW_CHOST}"
make DESTDIR=$pkgdir install
cd "$srcdir/build-${MSYSTEM}"
DESTDIR="${pkgdir}" meson install
install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
}

View File

@@ -4,13 +4,13 @@ _realname=dosbox
_forkname=dosbox-staging
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=0.77.0
pkgver=0.78.1
pkgrel=1
pkgdesc="Emulator with builtin DOS for running DOS Games (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url='https://github.com/dosbox-staging/dosbox-staging'
license=('GPL2')
license=('spdx:GPL-2.0-or-later')
depends=(
"${MINGW_PACKAGE_PREFIX}-fluidsynth"
"${MINGW_PACKAGE_PREFIX}-libpng"
@@ -18,6 +18,7 @@ depends=(
"${MINGW_PACKAGE_PREFIX}-SDL2"
"${MINGW_PACKAGE_PREFIX}-SDL2_net"
"${MINGW_PACKAGE_PREFIX}-zlib"
"${MINGW_PACKAGE_PREFIX}-libslirp"
"${MINGW_PACKAGE_PREFIX}-munt-mt32emu"
)
makedepends=("${MINGW_PACKAGE_PREFIX}-meson"
@@ -25,7 +26,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-meson"
"${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-pkg-config")
source=("https://github.com/dosbox-staging/dosbox-staging/archive/refs/tags/v${pkgver}.tar.gz")
sha256sums=('85e1739f5dfd7d96b752b2b0e12aad6f95c7770b47fcdaf978d4128d7890d986')
sha256sums=('dcd93ce27f5f3f31e7022288f7cbbc1f1f6eb7cc7150c2c085eeff8ba76c3690')
prepare() {
cd "${srcdir}/${_forkname}-${pkgver}"

View File

@@ -3,7 +3,7 @@
_realname=dust
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=0.5.4
pkgver=0.7.5
pkgrel=1
pkgdesc="A more intuitive version of du in rust (mingw-w64)"
arch=('any')
@@ -16,7 +16,7 @@ makedepends=(
depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
options=('staticlibs' 'strip')
source=("${_realname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz")
sha256sums=('395f0d5f44d5000468dc51a195e4b8e8c0b710a1c75956fb1f9ad08f2fbbc935')
sha256sums=('f892aaf7a0a7852e12d01b2ced6c2484fb6dc5fe7562abdf0c44a2d08aa52618')
prepare() {
cp -r ${_realname}-${pkgver} build-${CARCH}
@@ -28,11 +28,13 @@ prepare() {
build() {
${MINGW_PREFIX}/bin/cargo build \
--release \
--frozen \
--manifest-path build-${CARCH}/Cargo.toml
}
package() {
${MINGW_PREFIX}/bin/cargo install \
--frozen \
--offline \
--no-track \
--path build-${CARCH} \

View File

@@ -0,0 +1,56 @@
# Maintainer: Biswapriyo Nath <nathbappai@gmail.com>
_realname=ebook-tools
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=0.2.2
pkgrel=1
pkgdesc="Tools for accessing and converting various ebook file formats (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url="https://sourceforge.net/projects/ebook-tools/"
license=('spdx:MIT')
depends=("${MINGW_PACKAGE_PREFIX}-libzip"
"${MINGW_PACKAGE_PREFIX}-libxml2")
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-ninja")
source=("https://downloads.sourceforge.net/${_realname}/${_realname}-${pkgver}.tar.gz"
crash-fix.patch)
sha256sums=('cbc35996e911144fa62925366ad6a6212d6af2588f1e39075954973bbee627ae'
'ad556ce08909727a6022c9f1632086ccb8623a81a4f39cd34722e22116e14527')
prepare() {
cd "${_realname}-${pkgver}"
# https://sourceforge.net/p/ebook-tools/bugs/8/
patch -p2 -i "${srcdir}/crash-fix.patch"
}
build() {
declare -a _extra_config
if check_option "debug" "n"; then
_extra_config+=("-DCMAKE_BUILD_TYPE=Release")
else
_extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
fi
[[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
${MINGW_PREFIX}/bin/cmake.exe \
-G "Ninja" \
"${_extra_config[@]}" \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
../${_realname}-${pkgver}
${MINGW_PREFIX}/bin/cmake.exe --build ./
}
package() {
cd "${srcdir}/build-${MSYSTEM}"
DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install ./
install -Dm644 "${srcdir}/${_realname}-${pkgver}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
}

View File

@@ -0,0 +1,51 @@
From 93ebf942a90f9c95797838f9adab94bc0378671c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Tue, 30 Apr 2019 16:36:09 +0200
Subject: [PATCH] Avoid crash on toc.ncx navPoint without navLabel
Althoug at least one navLabel is required per navPoint, there is no
guarantee it actually exists.
Avoid crashes due to invalid accesses of a null label in case the toc is
broken, and spew a warning.
Fixes #8 epub_tit_next crashes on navPoint without navLabel.
---
ebook-tools/src/libepub/epub.c | 5 +++--
ebook-tools/src/libepub/opf.c | 4 ++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ebook-tools/src/libepub/epub.c b/ebook-tools/src/libepub/epub.c
index d085503..a259d9d 100644
--- a/ebook-tools/src/libepub/epub.c
+++ b/ebook-tools/src/libepub/epub.c
@@ -469,8 +469,9 @@ int epub_tit_next(struct titerator *tit) {
case TITERATOR_NAVMAP:
case TITERATOR_PAGES:
ti = GetNodeData(curr);
- tit->cache.label =
- (char *)_opf_label_get_by_doc_lang(tit->epub->opf, ti->label);
+ if (ti->label)
+ tit->cache.label =
+ (char *)_opf_label_get_by_doc_lang(tit->epub->opf, ti->label);
if (! tit->cache.label)
tit->cache.label = (char *)ti->id;
diff --git a/ebook-tools/src/libepub/opf.c b/ebook-tools/src/libepub/opf.c
index 6851db2..09bce9e 100644
--- a/ebook-tools/src/libepub/opf.c
+++ b/ebook-tools/src/libepub/opf.c
@@ -398,6 +398,10 @@ void _opf_parse_navmap(struct opf *opf, xmlTextReaderPtr reader) {
} else if (xmlTextReaderNodeType(reader) == 15) {
if (item) {
+ if (! item->label) {
+ _epub_print_debug(opf->epub, DEBUG_WARNING,
+ "- missing navlabel for nav point element");
+ }
_epub_print_debug(opf->epub, DEBUG_INFO,
"adding nav point item->%s %s (d:%d,p:%d)",
item->id, item->src, item->depth, item->playOrder);
--
2.21.0

View File

@@ -15,7 +15,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-doxygen"
"${MINGW_PACKAGE_PREFIX}-fftw"
"${MINGW_PACKAGE_PREFIX}-boost"
"${MINGW_PACKAGE_PREFIX}-gcc"
"${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-mpfr")
source=("https://gitlab.com/libeigen/eigen/-/archive/${pkgver}/eigen-${pkgver}.tar.bz2"
'eigen-3.1.2_osversion.patch'

View File

@@ -3,12 +3,12 @@
_realname=emacs-pdf-tools-server
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=0.80.r235.ga8847b7
pkgrel=2
pkgver=0.91
pkgrel=1
pkgdesc="Emacs support library for PDF files"
_commit="a8847b75d3487d60e27762816bdbdd23b6dc1c11"
source=("${_realname}::git+https://github.com/vedang/pdf-tools.git#commit=${_commit}")
sha256sums=("SKIP")
source=("${_realname}-${pkgver}.tar.gz::https://github.com/vedang/pdf-tools/archive/refs/tags/v${pkgver}.tar.gz")
noextract=(${_realname}-${pkgver}.tar.gz)
sha256sums=("93f88d27e7910b76ffe2c506670d685b41c0b2cd3086543971d0c700c9eadee3")
arch=("any")
url="https://github.com/vedang/pdf-tools"
license=("GPL3")
@@ -22,23 +22,24 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-emacs"
"${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-autotools")
pkgver() {
cd "${srcdir}/${_realname}"
git describe --long "${_commit}" | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//g'
}
prepare() {
cd "${srcdir}/${_realname}/server"
# Workaround for symlinks in tarball and the different package and git repo
# names.
mkdir -p "${srcdir}/${_realname}-${pkgver}"
tar xzf "${srcdir}/${_realname}-${pkgver}.tar.gz" \
-C "${srcdir}/${_realname}-${pkgver}" \
--strip-components=1 \
--exclude "README*"
cd "${srcdir}/${_realname}-${pkgver}/server"
autoreconf -fvi
}
build() {
cd "${srcdir}/${_realname}"
mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"
../"${_realname}"/server/configure \
../"${_realname}-${pkgver}"/server/configure \
--prefix="${MINGW_PREFIX}" \
--build="${MINGW_CHOST}" \
--host="${MINGW_CHOST}" \

View File

@@ -13,7 +13,7 @@ license=('BSD')
depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
"${MINGW_PACKAGE_PREFIX}-armadillo"
"${MINGW_PACKAGE_PREFIX}-openblas")
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-doxygen")
source=("https://www.ensmallen.org/files/ensmallen-${pkgver}.tar.gz")

View File

@@ -1,7 +1,9 @@
# Maintainer: Biswapriyo Nath <nathbappai@gmail.com>
_realname=entt
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=3.7.1
pkgver=3.9.0
pkgrel=1
pkgdesc="A fast and reliable entity-component system"
arch=('any')
@@ -9,11 +11,12 @@ mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
url="https://github.com/skypjack/entt"
license=('MIT')
makedepends=(
"${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-ninja"
)
source=("https://github.com/skypjack/entt/archive/refs/tags/v${pkgver}.tar.gz")
sha256sums=('FE3CE773C17797C0C57FFA97F73902854FCC8E7AFC7E09BEA373E0C64FA24A23')
source=("${_realname}-${pkgver}.tar.gz::https://github.com/skypjack/entt/archive/refs/tags/v${pkgver}.tar.gz")
sha256sums=('1b06f1f6627c3702486855877bdeab6885f5d821d3dd78862126d4308c627c23')
prepare() {
cd "${srcdir}/${_realname}-${pkgver}"

View File

@@ -1,15 +0,0 @@
--- expat-2.2.1/run.sh.in.orig 2017-06-26 02:47:32.339456800 -0400
+++ expat-2.2.1/run.sh.in 2017-06-26 02:55:25.747253400 -0400
@@ -4,7 +4,11 @@
case "@host@" in
*-mingw*)
- exec wine "$@"
+ if [ "$(uname -o)"=="Msys" ]; then
+ exec "$@"
+ else
+ exec wine "$@"
+ fi
;;
*)
exec "$@"

View File

@@ -4,23 +4,23 @@
_realname=expat
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=2.4.2
pkgver=2.4.4
pkgrel=1
pkgdesc="An XML parser library (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
url="https://libexpat.github.io/"
license=(MIT)
license=('spdx:MIT')
makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools")
options=('strip' 'staticlibs')
source=("https://github.com/libexpat/libexpat/releases/download/R_${pkgver//./_}/expat-${pkgver}.tar.xz"
002-fix-tests.patch)
sha256sums=('bc2ff58f49c29aac7bff705a6c167a821f26c512079ff08ac432fd0fdc9bb199'
'abcf34b90ed801cc2810f6d333bca2997aadfe95dbedd1509bd54c14ecca1042')
source=("https://github.com/libexpat/libexpat/releases/download/R_${pkgver//./_}/expat-${pkgver}.tar.xz"{,.asc})
sha256sums=('b5d25d6e373351c2ed19b562b4732d01d2589ac8c8e9e7962d8df1207cc311b8'
'SKIP')
validpgpkeys=('3176EF7DB2367F1FCA4F306B1F9B0E909AF37285') # Sebastian Pipping
prepare() {
cd "${srcdir}/${_realname}-${pkgver}"
patch -p1 -i "${srcdir}/002-fix-tests.patch"
autoreconf -fiv
}

View File

@@ -4,21 +4,45 @@ _realname=f2cblaslapack
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=3.4.2.q4
pkgrel=1
pkgrel=2
pkgdesc="f2c BLAS/LAPACK (mingw-w64)"
provides=("${MINGW_PACKAGE_PREFIX}-lapack")
provides=($([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] && echo "${MINGW_PACKAGE_PREFIX}-lapack"))
arch=('any')
mingw_arch=('clang64' 'clang32')
url='https://www.petsc.org/' # Part of petsc
license=('2-clause BSD')
license=('spdx:BSD-2-Clause')
source=("http://ftp.mcs.anl.gov/pub/petsc/externalpackages/${_realname}-${pkgver}.tar.gz"
001-no-petsc-conf.patch)
001-no-petsc-conf.patch
libf2cblas-i686.def
libf2cblas-x86_64.def
libf2clapack-i686.def
libf2clapack-x86_64.def)
sha256sums=('41a43c6f2514ab34bf55aca5474b875882c7d4cd70c76bf4bc7ac433e6c2003e'
'7a77aa2621945d2103bb85735b0e9d08526e1943b7f055c1ee7680fd401064f1')
'7a77aa2621945d2103bb85735b0e9d08526e1943b7f055c1ee7680fd401064f1'
'75612d7dc28d0e061fb249012678e1773cae26c8f043c529a9f559eba8cdce71'
'8e3dfdb8372c22a817fbacba2279e70d7e7dd74ae72bdf43d91ac05e26b27395'
'e33ae1f3db1a8d8859b010b5cf889bf0227dcd3b458dcd3430b2f5a96fd06171'
'16718ef5fc6c7166c32984e8efe630bbda972bc81e8768c36ed0289c2118321a')
makedepends=("make"
"${MINGW_PACKAGE_PREFIX}-cc")
prepare() {
cd "${srcdir}"/${_realname}-${pkgver}
patch -p1 -i "${srcdir}"/001-no-petsc-conf.patch
# The following .def files were created in the MINGW32 or MINGW64
# environments, respectively. They have been slightly adapted for line
# endings and formatting.
# Commands used after the static libraries have been built:
# dlltool --export-all-symbols -z blas/libf2cblas.def libf2cblas.a
# dlltool --export-all-symbols -z lapack/libf2clapack.def libf2clapack.a
if [[ "${CARCH}" == "i686" ]]; then
cp "${srcdir}"/libf2cblas-i686.def "${srcdir}"/${_realname}-${pkgver}/blas/libf2cblas.def
cp "${srcdir}"/libf2clapack-i686.def "${srcdir}"/${_realname}-${pkgver}/lapack/libf2clapack.def
else
cp "${srcdir}"/libf2cblas-x86_64.def "${srcdir}"/${_realname}-${pkgver}/blas/libf2cblas.def
cp "${srcdir}"/libf2clapack-x86_64.def "${srcdir}"/${_realname}-${pkgver}/lapack/libf2clapack.def
fi
}
build() {
@@ -26,10 +50,32 @@ build() {
cp -r "${srcdir}"/${_realname}-${pkgver} "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
make
# link shared libraries
${CC} -shared \
-Wl,--export-all-symbols -Wl,--whole-archive libf2cblas.a -Wl,--no-whole-archive -Wl,blas/libf2cblas.def \
-o libf2cblas.dll -Wl,--enable-auto-image-base -Xlinker --out-implib -Xlinker libf2cblas.dll.a
${CC} -shared \
-Wl,--export-all-symbols -Wl,--whole-archive libf2clapack.a -Wl,--no-whole-archive -Wl,lapack/libf2clapack.def -L. -lf2cblas \
-o libf2clapack.dll -Wl,--enable-auto-image-base -Xlinker --out-implib -Xlinker libf2clapack.dll.a
}
package() {
cd "${srcdir}"/build-${MSYSTEM}
install -Dm644 libf2cblas.a "${pkgdir}"${MINGW_PREFIX}/lib/libblas.a
install -Dm644 libf2clapack.a "${pkgdir}"${MINGW_PREFIX}/lib/liblapack.a
install -Dm644 libf2cblas.a "${pkgdir}"${MINGW_PREFIX}/lib/libf2cblas.a
install -Dm644 libf2clapack.a "${pkgdir}"${MINGW_PREFIX}/lib/libf2clapack.a
install -Dm644 libf2cblas.dll.a "${pkgdir}"${MINGW_PREFIX}/lib/libf2cblas.dll.a
install -Dm644 libf2clapack.dll.a "${pkgdir}"${MINGW_PREFIX}/lib/libf2clapack.dll.a
install -Dm644 libf2cblas.dll "${pkgdir}"${MINGW_PREFIX}/bin/libf2cblas.dll
install -Dm644 libf2clapack.dll "${pkgdir}"${MINGW_PREFIX}/bin/libf2clapack.dll
if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then
# "pretend" to be reference BLAS/LAPACK
install -Dm644 libf2cblas.a "${pkgdir}"${MINGW_PREFIX}/lib/libblas.a
install -Dm644 libf2clapack.a "${pkgdir}"${MINGW_PREFIX}/lib/liblapack.a
install -Dm644 libf2cblas.dll.a "${pkgdir}"${MINGW_PREFIX}/lib/libblas.dll.a
install -Dm644 libf2clapack.dll.a "${pkgdir}"${MINGW_PREFIX}/lib/liblapack.dll.a
install -Dm644 libf2cblas.dll "${pkgdir}"${MINGW_PREFIX}/bin/libblas.dll
install -Dm644 libf2clapack.dll "${pkgdir}"${MINGW_PREFIX}/bin/liblapack.dll
fi
}

View File

@@ -0,0 +1,160 @@
; C:\msys64\mingw32\bin\dlltool.exe --export-all-symbols -z blas/libf2cblas.def libf2cblas.a
EXPORTS
caxpy_ @ 1
ccopy_ @ 2
cdotc_ @ 3
cdotu_ @ 4
cgbmv_ @ 5
cgemm_ @ 6
cgemv_ @ 7
cgerc_ @ 8
cgeru_ @ 9
chbmv_ @ 10
chemm_ @ 11
chemv_ @ 12
cher2_ @ 13
cher2k_ @ 14
cher_ @ 15
cherk_ @ 16
chpmv_ @ 17
chpr2_ @ 18
chpr_ @ 19
crotg_ @ 20
cscal_ @ 21
csrot_ @ 22
csscal_ @ 23
cswap_ @ 24
csymm_ @ 25
csyr2k_ @ 26
csyrk_ @ 27
ctbmv_ @ 28
ctbsv_ @ 29
ctpmv_ @ 30
ctpsv_ @ 31
ctrmm_ @ 32
ctrmv_ @ 33
ctrsm_ @ 34
ctrsv_ @ 35
dasum_ @ 36
daxpy_ @ 37
dcabs1_ @ 38
dcopy_ @ 39
ddot_ @ 40
df__cabs @ 41
dgbmv_ @ 42
dgemm_ @ 43
dgemv_ @ 44
dger_ @ 45
dmaxloc_ @ 46
dnrm2_ @ 47
dpow_ui @ 48
drot_ @ 49
drotg_ @ 50
drotm_ @ 51
drotmg_ @ 52
dsbmv_ @ 53
dscal_ @ 54
dsdot_ @ 55
dspmv_ @ 56
dspr2_ @ 57
dspr_ @ 58
dswap_ @ 59
dsymm_ @ 60
dsymv_ @ 61
dsyr2_ @ 62
dsyr2k_ @ 63
dsyr_ @ 64
dsyrk_ @ 65
dtbmv_ @ 66
dtbsv_ @ 67
dtpmv_ @ 68
dtpsv_ @ 69
dtrmm_ @ 70
dtrmv_ @ 71
dtrsm_ @ 72
dtrsv_ @ 73
dzasum_ @ 74
dznrm2_ @ 75
icamax_ @ 76
idamax_ @ 77
isamax_ @ 78
izamax_ @ 79
lsame_ @ 80
pow_ii @ 81
sasum_ @ 82
saxpy_ @ 83
scabs1_ @ 84
scasum_ @ 85
scnrm2_ @ 86
scopy_ @ 87
sdot_ @ 88
sdsdot_ @ 89
sf__cabs @ 90
sgbmv_ @ 91
sgemm_ @ 92
sgemv_ @ 93
sger_ @ 94
smaxloc_ @ 95
snrm2_ @ 96
spow_ui @ 97
srot_ @ 98
srotg_ @ 99
srotm_ @ 100
srotmg_ @ 101
ssbmv_ @ 102
sscal_ @ 103
sspmv_ @ 104
sspr2_ @ 105
sspr_ @ 106
sswap_ @ 107
ssymm_ @ 108
ssymv_ @ 109
ssyr2_ @ 110
ssyr2k_ @ 111
ssyr_ @ 112
ssyrk_ @ 113
stbmv_ @ 114
stbsv_ @ 115
stpmv_ @ 116
stpsv_ @ 117
strmm_ @ 118
strmv_ @ 119
strsm_ @ 120
strsv_ @ 121
xerbla_ @ 122
xerbla_array_ @ 123
zaxpy_ @ 124
zcopy_ @ 125
zdotc_ @ 126
zdotu_ @ 127
zdrot_ @ 128
zdscal_ @ 129
zgbmv_ @ 130
zgemm_ @ 131
zgemv_ @ 132
zgerc_ @ 133
zgeru_ @ 134
zhbmv_ @ 135
zhemm_ @ 136
zhemv_ @ 137
zher2_ @ 138
zher2k_ @ 139
zher_ @ 140
zherk_ @ 141
zhpmv_ @ 142
zhpr2_ @ 143
zhpr_ @ 144
zrotg_ @ 145
zscal_ @ 146
zswap_ @ 147
zsymm_ @ 148
zsyr2k_ @ 149
zsyrk_ @ 150
ztbmv_ @ 151
ztbsv_ @ 152
ztpmv_ @ 153
ztpsv_ @ 154
ztrmm_ @ 155
ztrmv_ @ 156
ztrsm_ @ 157
ztrsv_ @ 158

View File

@@ -0,0 +1,159 @@
EXPORTS
caxpy_
ccopy_
cdotc_
cdotu_
cgbmv_
cgemm_
cgemv_
cgerc_
cgeru_
chbmv_
chemm_
chemv_
cher2_
cher2k_
cher_
cherk_
chpmv_
chpr2_
chpr_
crotg_
cscal_
csrot_
csscal_
cswap_
csymm_
csyr2k_
csyrk_
ctbmv_
ctbsv_
ctpmv_
ctpsv_
ctrmm_
ctrmv_
ctrsm_
ctrsv_
icamax_
isamax_
sasum_
saxpy_
scabs1_
scasum_
scnrm2_
scopy_
sdot_
sgbmv_
sgemm_
sgemv_
sger_
snrm2_
srot_
srotg_
srotm_
srotmg_
ssbmv_
sscal_
sspmv_
sspr2_
sspr_
sswap_
ssymm_
ssymv_
ssyr2_
ssyr2k_
ssyr_
ssyrk_
stbmv_
stbsv_
stpmv_
stpsv_
strmm_
strmv_
strsm_
strsv_
dasum_
daxpy_
dcabs1_
dcopy_
ddot_
dgbmv_
dgemm_
dgemv_
dger_
dnrm2_
drot_
drotg_
drotm_
drotmg_
dsbmv_
dscal_
dsdot_
dspmv_
dspr2_
dspr_
dswap_
dsymm_
dsymv_
dsyr2_
dsyr2k_
dsyr_
dsyrk_
dtbmv_
dtbsv_
dtpmv_
dtpsv_
dtrmm_
dtrmv_
dtrsm_
dtrsv_
dzasum_
dznrm2_
idamax_
izamax_
sdsdot_
zaxpy_
zcopy_
zdotc_
zdotu_
zdrot_
zdscal_
zgbmv_
zgemm_
zgemv_
zgerc_
zgeru_
zhbmv_
zhemm_
zhemv_
zher2_
zher2k_
zher_
zherk_
zhpmv_
zhpr2_
zhpr_
zrotg_
zscal_
zswap_
zsymm_
zsyr2k_
zsyrk_
ztbmv_
ztbsv_
ztpmv_
ztpsv_
ztrmm_
ztrmv_
ztrsm_
ztrsv_
pow_ii
spow_ui
smaxloc_
sf__cabs
dpow_ui
dmaxloc_
df__cabs
lsame_
xerbla_array_
xerbla_

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -3,7 +3,7 @@
_realname=FAudio
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=21.05
pkgver=22.01
pkgrel=1
pkgdesc="FAudio - Accuracy-focused XAudio reimplementation for open platforms (mingw-w64)"
arch=('any')
@@ -19,7 +19,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-cc")
options=('strip' '!debug' 'staticlibs')
source=(${_realname}-${pkgver}.tar.gz::"https://github.com/FNA-XNA/FAudio/archive/${pkgver}.tar.gz")
sha256sums=('05c971c1676a9a16690d96922161a74f792ae93ea1fc076edb9ac3690c2f11fc')
sha256sums=('e6b7c0ced90f5a3e1363f95ad990a99afee6784a35320719df48af45d1f07c7d')
build() {
declare -a extra_config
@@ -37,6 +37,8 @@ build() {
${MINGW_PREFIX}/bin/cmake.exe \
-G "Ninja" \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_INSTALL_INCLUDEDIR=include \
"${extra_config[@]}" \
-DBUILD_SHARED_LIBS=OFF \
-DGSTREAMER=ON \
@@ -52,6 +54,8 @@ build() {
${MINGW_PREFIX}/bin/cmake.exe \
-G "Ninja" \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-DCMAKE_INSTALL_LIBDIR=lib \
-DCMAKE_INSTALL_INCLUDEDIR=include \
"${extra_config[@]}" \
-DBUILD_SHARED_LIBS=ON \
-DGSTREAMER=ON \

View File

@@ -7,7 +7,7 @@ _realname=ffmpeg
pkgbase="mingw-w64-${_realname}"
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=4.4.1
pkgrel=2
pkgrel=4
pkgdesc="Complete and free Internet live audio and video broadcasting solution (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -43,10 +43,12 @@ depends=("${MINGW_PACKAGE_PREFIX}-aom"
"${MINGW_PACKAGE_PREFIX}-SDL2"
"${MINGW_PACKAGE_PREFIX}-speex"
"${MINGW_PACKAGE_PREFIX}-srt"
$([[ "${CARCH}" != "x86_64" ]] || echo "${MINGW_PACKAGE_PREFIX}-svt-av1")
"${MINGW_PACKAGE_PREFIX}-vulkan"
"${MINGW_PACKAGE_PREFIX}-x264"
"${MINGW_PACKAGE_PREFIX}-x265"
"${MINGW_PACKAGE_PREFIX}-xvidcore"
"${MINGW_PACKAGE_PREFIX}-zimg"
"${MINGW_PACKAGE_PREFIX}-zlib")
makedepends=("${MINGW_PACKAGE_PREFIX}-dlfcn"
"${MINGW_PACKAGE_PREFIX}-cc"
@@ -123,6 +125,7 @@ build() {
--enable-libvpx
--enable-libwebp
--enable-libxml2
--enable-libzimg
--enable-nvenc
--enable-openal
--enable-pic
@@ -141,6 +144,12 @@ build() {
)
fi
if [[ "${CARCH}" == "x86_64" ]]; then
common_config+=(
--enable-libsvtav1
)
fi
for _variant in -static -shared; do
[[ -d "${srcdir}/build-${MINGW_CHOST}${_variant}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}${_variant}"
mkdir -p "${srcdir}/build-${MINGW_CHOST}${_variant}" && cd "${srcdir}/build-${MINGW_CHOST}${_variant}"
@@ -149,12 +158,12 @@ build() {
else
ENABLE_VARIANT=--enable-shared
fi
CC=${MINGW_PREFIX}/bin/gcc \
CXX=${MINGW_PREFIX}/bin/g++ \
../${_realname}-${pkgver}/configure \
--prefix=${MINGW_PREFIX} \
--target-os=mingw32 \
--arch=${CARCH%%-*} \
--cc=${CC} \
--cxx=${CXX} \
"${common_config[@]}" \
--logfile=config.log \
${ENABLE_VARIANT} ||

View File

@@ -3,15 +3,15 @@
_realname=ffnvcodec-headers
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=11.1.5.0
pkgver=11.1.5.1
pkgrel=1
pkgdesc='FFmpeg version of headers required to interface with Nvidias codec APIs'
pkgdesc='FFmpeg version of headers required to interface with Nvidias codec APIs (mingw-w64)'
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
url=https://git.videolan.org/?p=ffmpeg/nv-codec-headers.git
license=('MIT')
makedepends=("git")
_tag=b641a195edbe3ac9788e681e22c2e2fad8aacddb
_tag=84483da70d903239d4536763fde8c7e6c4e80784
source=(git+https://git.videolan.org/git/ffmpeg/nv-codec-headers.git#tag=${_tag})
sha256sums=(SKIP)

View File

@@ -11,7 +11,7 @@ arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64')
url="https://github.com/reinh-bader/fgsl"
license=('GPL')
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-gcc-fortran"
"${MINGW_PACKAGE_PREFIX}-autotools")
depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"

View File

@@ -2,8 +2,8 @@ _compiler=clang
_realname=flang
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=13.0.0
pkgrel=2
pkgver=13.0.1
pkgrel=1
pkgdesc="Fortran frontend for LLVM (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -12,13 +12,11 @@ license=("custom:Apache 2.0 with LLVM Exception")
depends=("${MINGW_PACKAGE_PREFIX}-clang=${pkgver}"
"${MINGW_PACKAGE_PREFIX}-llvm=${pkgver}"
"${MINGW_PACKAGE_PREFIX}-mlir=${pkgver}")
makedepends=("${MINGW_PACKAGE_PREFIX}-clang-analyzer=${pkgver}"
"${MINGW_PACKAGE_PREFIX}-clang-tools-extra=${pkgver}"
"${MINGW_PACKAGE_PREFIX}-cmake>=3.4.3"
makedepends=("${MINGW_PACKAGE_PREFIX}-clang-tools-extra=${pkgver}"
"${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-lld"
"${MINGW_PACKAGE_PREFIX}-ninja"
"${MINGW_PACKAGE_PREFIX}-pkg-config"
"${MINGW_PACKAGE_PREFIX}-polly=${pkgver}"
"gawk"
$([[ "$_compiler" == "clang" ]] && echo \
"${MINGW_PACKAGE_PREFIX}-compiler-rt" \
@@ -30,7 +28,7 @@ options=('!debug' 'strip')
source=("https://github.com/llvm/llvm-project/releases/download/llvmorg-${pkgver}/flang-${pkgver}.src.tar.xz"{,.sig}
"0001-cast-cxx11-narrowing.patch"
"0002-cmake-22162.patch")
sha256sums=('13bc580342bec32b6158c8cddeb276bd428d9fc8fd23d13179c8aa97bbba37d5'
sha256sums=('129587687253c82de1a3a5eed18c1e12f16c3ad44cb881129b10335555b90778'
'SKIP'
'f8babd240968599597cf2b906fad44b62e2d92ac7ea144530a3f9542e96e06b1'
'77fb0612217b6af7a122f586a9d0d334cd48bb201509bf72e8f8e6244616e895')

View File

@@ -3,8 +3,8 @@
_realname=fluidsynth
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=2.2.4
pkgrel=2
pkgver=2.2.5
pkgrel=1
pkgdesc="A real-time software synthesizer based on the SoundFont 2 specifications (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -22,7 +22,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-pkg-config"
options=('strip' 'staticlibs')
source=("${_realname}-${pkgver}.tar.gz::https://github.com/FluidSynth/${_realname}/archive/v${pkgver}.tar.gz"
"010-no-undefined.patch")
sha256sums=('83cb1dba04c632ede74f0c0717018b062c0e00b639722203b23f77a961afd390'
sha256sums=('9037e703617f91c4c36039a5059e0f624164799d856af715bcd8a23c07ba03b8'
'8b865ac2b0ea760f3c5fa640573793131a09cdc7af833ab6fd8f69b583e41153')
noextract=("${_realname}-${pkgver}.tar.gz")

View File

@@ -4,7 +4,7 @@
_realname=fontconfig
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=2.13.94
pkgver=2.13.96
pkgrel=1
pkgdesc="A library for configuring and customizing font access (mingw-w64)"
arch=('any')
@@ -29,7 +29,7 @@ source=("https://www.freedesktop.org/software/fontconfig/release/fontconfig-${pk
0005-fix-setenv.mingw.patch
0007-pkgconfig.mingw.patch
fontconfig.hook.in)
sha256sums=('a5f052cb73fd479ffb7b697980510903b563bbb55b8f7a2b001fcfb94026003c'
sha256sums=('d816a920384aa91bc0ebf20c3b51c59c2153fdf65de0b5564bf9e8473443d637'
'1266d4bbd8270f013fee2401c890f0251babf50a175a69d681d3a6af5003c899'
'9e5700b9c555e60cd8116fdc2e24cf0a01de01e83373dbbe78cef1e32b91da3b'
'57ff8420dbf62873b6fcb38b52fb7b37e0e278425a9125e15dccba54668c8ab9'

View File

@@ -1,13 +1,6 @@
MINGW_INSTALL=clang32
post_install() {
cat << _EOF
Fontconfig configuration is done via /${MINGW_INSTALL}/etc/fonts/conf.avail and conf.d.
Read /${MINGW_INSTALL}/etc/fonts/conf.d/README for more information.
_EOF
if [ -n "${MSYS2_FC_CACHE_SKIP}" ]; then
echo "Warning: 'MSYS2_FC_CACHE_SKIP' set, skipping font cache update"
else

View File

@@ -1,13 +1,6 @@
MINGW_INSTALL=clang64
post_install() {
cat << _EOF
Fontconfig configuration is done via /${MINGW_INSTALL}/etc/fonts/conf.avail and conf.d.
Read /${MINGW_INSTALL}/etc/fonts/conf.d/README for more information.
_EOF
if [ -n "${MSYS2_FC_CACHE_SKIP}" ]; then
echo "Warning: 'MSYS2_FC_CACHE_SKIP' set, skipping font cache update"
else

View File

@@ -1,13 +1,6 @@
MINGW_INSTALL=clangarm64
post_install() {
cat << _EOF
Fontconfig configuration is done via /${MINGW_INSTALL}/etc/fonts/conf.avail and conf.d.
Read /${MINGW_INSTALL}/etc/fonts/conf.d/README for more information.
_EOF
if [ -n "${MSYS2_FC_CACHE_SKIP}" ]; then
echo "Warning: 'MSYS2_FC_CACHE_SKIP' set, skipping font cache update"
else

View File

@@ -1,13 +1,6 @@
MINGW_INSTALL=mingw32
post_install() {
cat << _EOF
Fontconfig configuration is done via /${MINGW_INSTALL}/etc/fonts/conf.avail and conf.d.
Read /${MINGW_INSTALL}/etc/fonts/conf.d/README for more information.
_EOF
if [ -n "${MSYS2_FC_CACHE_SKIP}" ]; then
echo "Warning: 'MSYS2_FC_CACHE_SKIP' set, skipping font cache update"
else

View File

@@ -1,13 +1,6 @@
MINGW_INSTALL=mingw64
post_install() {
cat << _EOF
Fontconfig configuration is done via /${MINGW_INSTALL}/etc/fonts/conf.avail and conf.d.
Read /${MINGW_INSTALL}/etc/fonts/conf.d/README for more information.
_EOF
if [ -n "${MSYS2_FC_CACHE_SKIP}" ]; then
echo "Warning: 'MSYS2_FC_CACHE_SKIP' set, skipping font cache update"
else

View File

@@ -1,13 +1,6 @@
MINGW_INSTALL=ucrt64
post_install() {
cat << _EOF
Fontconfig configuration is done via /${MINGW_INSTALL}/etc/fonts/conf.avail and conf.d.
Read /${MINGW_INSTALL}/etc/fonts/conf.d/README for more information.
_EOF
if [ -n "${MSYS2_FC_CACHE_SKIP}" ]; then
echo "Warning: 'MSYS2_FC_CACHE_SKIP' set, skipping font cache update"
else

View File

@@ -0,0 +1,122 @@
>From 4db4e6b35be5793902d8820d2c8e4d1f1cbba80d Mon Sep 17 00:00:00 2001
From: Tomas Kalibera <tomas.kalibera@gmail.com>
Date: Thu, 13 Jan 2022 05:25:32 -0500
Subject: [PATCH] c-family: Let stdio.h override built in printf format
[PR95130,PR92292]
Mingw32 targets use ms_printf format for printf, but mingw-w64 when
configured for UCRT uses gnu_format (via stdio.h). GCC then checks both
formats, which means that one cannot print a 64-bit integer without a
warning. All these lines issue a warning:
printf("Hello %"PRIu64"\n", x);
printf("Hello %I64u\n", x);
printf("Hello %llu\n", x);
because each of them violates one of the formats. Also, one gets a warning
twice if the format string violates both formats.
Fixed by disabling the built in format in case there are additional ones.
gcc/c-family/ChangeLog:
PR c/95130
PR c/92292
* c-common.c (check_function_arguments): Pass also function
declaration to check_function_format.
* c-common.h (check_function_format): Extra argument - function
declaration.
* c-format.c (check_function_format): For builtin functions with a
built in format and at least one more, do not check the first one.
---
gcc/c-family/c-common.c | 2 +-
gcc/c-family/c-common.h | 2 +-
gcc/c-family/c-format.c | 32 ++++++++++++++++++++++++++++++--
3 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index 4a6a4edb763..00fc734d28e 100644
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@@ -6064,7 +6064,7 @@ check_function_arguments (location_t loc, const_tree fndecl, const_tree fntype,
/* Check for errors in format strings. */
if (warn_format || warn_suggest_attribute_format)
- check_function_format (fntype, TYPE_ATTRIBUTES (fntype), nargs, argarray,
+ check_function_format (fndecl, fntype, TYPE_ATTRIBUTES (fntype), nargs, argarray,
arglocs);
if (warn_format)
diff --git a/gcc/c-family/c-common.h b/gcc/c-family/c-common.h
index 8b7bf35e888..ee370eafbbc 100644
--- a/gcc/c-family/c-common.h
+++ b/gcc/c-family/c-common.h
@@ -856,7 +856,7 @@ extern void check_function_arguments_recurse (void (*)
unsigned HOST_WIDE_INT);
extern bool check_builtin_function_arguments (location_t, vec<location_t>,
tree, tree, int, tree *);
-extern void check_function_format (const_tree, tree, int, tree *,
+extern void check_function_format (const_tree, const_tree, tree, int, tree *,
vec<location_t> *);
extern bool attribute_fallthrough_p (tree);
extern tree handle_format_attribute (tree *, tree, tree, int, bool *);
diff --git a/gcc/c-family/c-format.c b/gcc/c-family/c-format.c
index afa77810a5c..bc2abee5146 100644
--- a/gcc/c-family/c-format.c
+++ b/gcc/c-family/c-format.c
@@ -1160,12 +1160,13 @@ decode_format_type (const char *s, bool *is_raw /* = NULL */)
attribute themselves. */
void
-check_function_format (const_tree fntype, tree attrs, int nargs,
+check_function_format (const_tree fndecl, const_tree fntype, tree attrs, int nargs,
tree *argarray, vec<location_t> *arglocs)
{
- tree a;
+ tree a, aa;
tree atname = get_identifier ("format");
+ bool skipped_default_format = false;
/* See if this function has any format attributes. */
for (a = attrs; a; a = TREE_CHAIN (a))
@@ -1176,6 +1177,33 @@ check_function_format (const_tree fntype, tree attrs, int nargs,
function_format_info info;
decode_format_attr (fntype, atname, TREE_VALUE (a), &info,
/*validated=*/true);
+
+ /* Mingw32 targets have traditionally used ms_printf format for the
+ printf function, and this format is built in GCC. But nowadays,
+ if mingw-w64 is configured to target UCRT, the printf function
+ uses the gnu_printf format (specified in the stdio.h header). This
+ causes GCC to check both formats, which means that there is no way
+ to e.g. print a long long unsigned without a warning (ms_printf
+ warns for %llu and gnu_printf warns for %I64u). Also, GCC would warn
+ twice about the same issue when both formats are violated, e.g.
+ for %lu used to print long long unsigned.
+
+ Hence, if there are multiple format specifiers, we skip the first
+ one. See PR 95130, PR 92292. */
+
+ if (!skipped_default_format && fndecl)
+ {
+ for(aa = TREE_CHAIN (a); aa; aa = TREE_CHAIN(aa))
+ if (is_attribute_p ("format", get_attribute_name (aa)) &&
+ fndecl && fndecl_built_in_p (fndecl, BUILT_IN_NORMAL))
+ {
+ skipped_default_format = true;
+ break;
+ }
+ if (skipped_default_format)
+ continue;
+ }
+
if (warn_format)
{
/* FIXME: Rewrite all the internal functions in this file
--
2.25.1

View File

@@ -0,0 +1,60 @@
From aef7d09baf91341540e7d468419918d58dd33601 Mon Sep 17 00:00:00 2001
From: Eric Botcazou <ebotcazou@adacore.com>
Date: Tue, 30 Nov 2021 10:17:09 +0100
Subject: [PATCH] Fix -freorder-blocks-and-partition glitch with Windows SEH
(continued)
This fixes a thinko in the fix for the -freorder-blocks-and-partition
glitch with SEH on 64-bit Windows:
https://gcc.gnu.org/pipermail/gcc-patches/2021-February/565208.html
Even if no exceptions are active, e.g. in C, we need to consider calls.
gcc/
PR target/103274
* config/i386/i386.c (ix86_output_call_insn): Beef up comment about
nops emitted with SEH.
* config/i386/winnt.c (i386_pe_seh_unwind_emit): When switching to
the cold section, emit a nop before the directive if the previous
active instruction is a call.
---
gcc/config/i386/i386.c | 6 ++++--
gcc/config/i386/winnt.c | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 1448f3609c3..8e8c8beb366 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -16149,8 +16149,10 @@ ix86_output_call_insn (rtx_insn *insn, rtx call_op)
break;
/* If we get to the epilogue note, prevent a catch region from
- being adjacent to the standard epilogue sequence. If non-
- call-exceptions, we'll have done this during epilogue emission. */
+ being adjacent to the standard epilogue sequence. Note that,
+ if non-call exceptions are enabled, we already did it during
+ epilogue expansion, or else, if the insn can throw internally,
+ we already did it during the reorg pass. */
if (NOTE_P (i) && NOTE_KIND (i) == NOTE_INSN_EPILOGUE_BEG
&& !flag_non_call_exceptions
&& !can_throw_internal (insn))
diff --git a/gcc/config/i386/winnt.c b/gcc/config/i386/winnt.c
index b66263ad243..2d1debf2dbd 100644
--- a/gcc/config/i386/winnt.c
+++ b/gcc/config/i386/winnt.c
@@ -1244,9 +1244,9 @@ i386_pe_seh_unwind_emit (FILE *asm_out_file, rtx_insn *insn)
seh = cfun->machine->seh;
if (NOTE_P (insn) && NOTE_KIND (insn) == NOTE_INSN_SWITCH_TEXT_SECTIONS)
{
- /* See ix86_seh_fixup_eh_fallthru for the rationale. */
+ /* See ix86_output_call_insn/seh_fixup_eh_fallthru for the rationale. */
rtx_insn *prev = prev_active_insn (insn);
- if (prev && !insn_nothrow_p (prev))
+ if (prev && (CALL_P (prev) || !insn_nothrow_p (prev)))
fputs ("\tnop\n", asm_out_file);
fputs ("\t.seh_endproc\n", asm_out_file);
seh->in_cold_section = true;
--
2.34.1

View File

@@ -0,0 +1,46 @@
From 27e6c84c1f14a8195a3f9fb489c240ecc7a6257d Mon Sep 17 00:00:00 2001
From: Eric Botcazou <ebotcazou@adacore.com>
Date: Mon, 10 Jan 2022 12:40:10 +0100
Subject: [PATCH] Properly enable -freorder-blocks-and-partition on 64-bit
Windows
The PR uncovered that -freorder-blocks-and-partition was working by accident
on 64-bit Windows, i.e. the middle-end was supposed to disable it with SEH.
After the change installed on mainline, the middle-end properly disables it,
which is too bad since a significant amount of work went into it for SEH.
gcc/
PR target/103465
* coretypes.h (unwind_info_type): Swap UI_SEH and UI_TARGET.
---
gcc/coretypes.h | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/gcc/coretypes.h b/gcc/coretypes.h
index 406572e947d..732c76f5cbf 100644
--- a/gcc/coretypes.h
+++ b/gcc/coretypes.h
@@ -227,15 +227,17 @@ enum stack_protector {
SPCT_FLAG_EXPLICIT = 4
};
-/* Types of unwind/exception handling info that can be generated. */
+/* Types of unwind/exception handling info that can be generated.
+ Note that a UI_TARGET (or larger) setting is considered to be
+ incompatible with -freorder-blocks-and-partition. */
enum unwind_info_type
{
UI_NONE,
UI_SJLJ,
UI_DWARF2,
- UI_TARGET,
- UI_SEH
+ UI_SEH,
+ UI_TARGET
};
/* Callgraph node profile representation. */
--
2.34.1

View File

@@ -24,7 +24,7 @@ pkgver=11.2.0
#_majorver=${pkgver:0:1}
#_sourcedir=${_realname}-${_majorver}-${_snapshot}
_sourcedir=${_realname}-${pkgver}
pkgrel=6
pkgrel=8
pkgdesc="GCC for the MinGW-w64"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64')
@@ -65,7 +65,10 @@ source=("https://ftp.gnu.org/gnu/gcc/${_realname}-${pkgver%%+*}/${_realname}-${p
0021-fix-ada-exception-propagation.patch
0140-gcc-8.2.0-diagnostic-color.patch
0150-gcc-10.2.0-libgcc-ldflags.patch
0200-add-m-no-align-vector-insn-option-for-i386.patch)
0200-add-m-no-align-vector-insn-option-for-i386.patch
0300-override-builtin-printf-format.patch
1001-Fix-freorder-blocks-and-partition-glitch-with-Window.patch
1002-Properly-enable-freorder-blocks-and-partition-on-64-.patch)
sha256sums=('d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b'
'SKIP'
'bce81824fc89e5e62cca350de4c17a27e27a18a1a1ad5ca3492aec1fc5af3234'
@@ -84,7 +87,10 @@ sha256sums=('d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b'
'bbd1374f4fccaadd641959725f222acab789f4bead9718d04f7e500885a14f30'
'5240a9e731b45c17a164066c7eb193c1fbee9fd8d9a2a5afa2edbcde9510da47'
'7f0b4e45d933e18c9d8bd2afcd83e4f52e97e2e25dd41bfa0cba755c70e591c7'
'75c4f764741a1f5ed29adbed1b7085bf4a12a3dd6fb19347f5f63c3831a51953')
'75c4f764741a1f5ed29adbed1b7085bf4a12a3dd6fb19347f5f63c3831a51953'
'b6c401790fce1f5e57a479d7820b11bd13b5711c28d263a25852cee68bcf8fd1'
'579f7f4921a085cddd23b1282adc4bc3f1bbbd027eb545c86fe3db2a81537776'
'675df5cb664e9f0171fa008426c524fe44b04e58476dd1775027cd3bc5ce625b')
validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9 # bpiotrowski@archlinux.org
86CFFCA918CF3AF47147588051E8B148A9999C34 # evangelos@foutrelis.com
13975A70E63C361C73AE69EF6EEB81F8981C74C7 # richard.guenther@gmail.com
@@ -150,6 +156,16 @@ prepare() {
apply_patch_with_msg \
0200-add-m-no-align-vector-insn-option-for-i386.patch
# Patch from https://gcc.gnu.org/pipermail/gcc-patches/2022-January/588341.html
# Related bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95130
apply_patch_with_msg \
0300-override-builtin-printf-format.patch
# https://github.com/msys2/MINGW-packages/pull/10589#issuecomment-1018478090
apply_patch_with_msg \
1001-Fix-freorder-blocks-and-partition-glitch-with-Window.patch \
1002-Properly-enable-freorder-blocks-and-partition-on-64-.patch
# do not expect ${prefix}/mingw symlink - this should be superceded by
# 0005-Windows-Don-t-ignore-native-system-header-dir.patch .. but isn't!
sed -i 's/${prefix}\/mingw\//${prefix}\//g' configure

View File

@@ -1,61 +0,0 @@
From 4f8042c7295f894124abed541abd0576f51c0e1b Mon Sep 17 00:00:00 2001
From: Tom de Vries <tdevries@suse.de>
Date: Fri, 22 Oct 2021 00:28:14 +0200
Subject: [PATCH] [gdb/tui] Fix breakpoint display functionality
In commit 81e6b8eb208 "Make tui-winsource not use breakpoint_chain", a loop
body was transformed into a lambda function body:
...
- for (bp = breakpoint_chain;
- bp != NULL;
- bp = bp->next)
+ iterate_over_breakpoints ([&] (breakpoint *bp) -> bool
...
and consequently:
- a continue was replaced by a return, and
- a final return was added.
Then in commit 240edef62f0 "gdb: remove iterate_over_breakpoints function", we
transformed back to a loop body:
...
- iterate_over_breakpoints ([&] (breakpoint *bp) -> bool
+ for (breakpoint *bp : all_breakpoints ())
...
but without reverting the changes that introduced the two returns.
Consequently, breakpoints no longer show up in the tui source window.
Fix this by reverting the changes that introduced the two returns.
Build on x86_64-linux, tested with all .exp test-cases that contain
tuiterm_env.
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=28483
---
gdb/tui/tui-winsource.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index afd51e95980..955b68901fe 100644
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -460,7 +460,7 @@ tui_source_window_base::update_breakpoint_info
for (breakpoint *bp : all_breakpoints ())
{
if (bp == being_deleted)
- return false;
+ continue;
for (bp_location *loc : bp->locations ())
{
@@ -478,7 +478,6 @@ tui_source_window_base::update_breakpoint_info
mode |= TUI_BP_HARDWARE;
}
}
- return false;
}
if (line->break_mode != mode)
--
2.33.1.windows.1

View File

@@ -5,8 +5,8 @@ _realname=gdb
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
"${MINGW_PACKAGE_PREFIX}-${_realname}-multiarch")
pkgver=11.1
pkgrel=2
pkgver=11.2
pkgrel=1
pkgdesc="GNU Debugger (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -32,16 +32,14 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gmp"
"${MINGW_PACKAGE_PREFIX}-cc")
options=('staticlibs' '!distcc' '!ccache')
source=(https://ftp.gnu.org/gnu/gdb/${_realname}-${pkgver}.tar.xz{,.sig}
'0001-gdb-tui-Fix-breakpoint-display-functionality.patch'
'0001-Workaround-performance-regression-in-info-func-var-t.patch'
'0002-Fix-using-gnu-print.patch'
'0003-configure-Disable-static-linking-with-standard-libs.patch'
'0004-Python-Configure-path-fixes.patch'
'0005-W32-Always-check-USERPROFILE-if-HOME-is-not-set.patch')
validpgpkeys=('F40ADB902B24264AA42E50BF92EDB04BFF325CF3')
sha256sums=('cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94'
sha256sums=('1497c36a71881b8671a9a84a0ee40faab788ca30d7ba19d8463c3cc787152e32'
'SKIP'
'a8001dad47e4016dbd0843356f79ba562f152e68362e73a700f644166eccbba8'
'428cda7dcc107c236225ae89704390b0f1e70c276b5ca6b1741988f384b21d62'
'c60e867fb74f7985b5ac5337a07cc697b4a4ffe19fb6e52f7c377e29c8413a4a'
'0eb291cd81f7392610d16a83f436a30d3384a99661c6b6ffd1bfb243d5aee6dd'
@@ -51,9 +49,6 @@ sha256sums=('cccfcc407b20d343fb320d4a9a2110776dd3165118ffd41f4b1b162340333f94'
prepare() {
cd ${srcdir}/${_realname}-${pkgver}
# https://sourceware.org/bugzilla/show_bug.cgi?id=28483
patch -p1 -i ${srcdir}/0001-gdb-tui-Fix-breakpoint-display-functionality.patch
# https://sourceware.org/bugzilla/show_bug.cgi?id=15412
patch -p1 -i ${srcdir}/0001-Workaround-performance-regression-in-info-func-var-t.patch

View File

@@ -5,7 +5,7 @@ _realname=gegl
pkgbase="mingw-w64-${_realname}"
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=0.4.34
pkgrel=2
pkgrel=4
pkgdesc="Generic Graphics Library (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -20,7 +20,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-asciidoc"
"${MINGW_PACKAGE_PREFIX}-ruby"
"${MINGW_PACKAGE_PREFIX}-vala"
"${MINGW_PACKAGE_PREFIX}-meson"
"${MINGW_PACKAGE_PREFIX}-ninja")
"${MINGW_PACKAGE_PREFIX}-openmp")
depends=("${MINGW_PACKAGE_PREFIX}-babl"
"${MINGW_PACKAGE_PREFIX}-cairo"
"${MINGW_PACKAGE_PREFIX}-exiv2"

View File

@@ -6,14 +6,13 @@ _pkgname=geoip-api-c
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=1.6.12
pkgrel=1
pkgrel=2
pkgdesc="Non-DNS IP-to-country resolver C library & utils (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
url="https://www.maxmind.com/app/c"
license=('LGPL')
depends=("${MINGW_PACKAGE_PREFIX}-geoip2-database"
"${MINGW_PACKAGE_PREFIX}-zlib")
depends=("${MINGW_PACKAGE_PREFIX}-zlib")
makedepends=("${MINGW_PACKAGE_PREFIX}-autotools"
"${MINGW_PACKAGE_PREFIX}-cc")
options=('!emptydirs')

View File

@@ -1,41 +0,0 @@
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
_realname=geoip2-database
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=20190624
pkgrel=1
pkgdesc="GeoLite country geolocation database compiled by MaxMind (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
url="https://dev.maxmind.com/geoip/geoip2/geolite2/"
license=('custom:Creative Commons Attribution-ShareAlike 3.0 Unported')
source=(GeoLite2-City-${pkgver}.tar.gz::https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz
GeoLite2-Country-${pkgver}.tar.gz::https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.tar.gz
GeoLite2-ASN-${pkgver}.tar.gz::https://geolite.maxmind.com/download/geoip/database/GeoLite2-ASN.tar.gz)
noextract=(GeoLite2-City-${pkgver}.tar.gz
GeoLite2-Country-${pkgver}.tar.gz
GeoLite2-ASN-${pkgver}.tar.gz)
sha256sums=('491367661ccfda918c606a140154aa10ded8c62eeb64c947dd037efdaba08d94'
'cd8640a40a8423464e7f9cad3c814bbe073c72646abb4f98b768be55f2096182'
'0fa431a8663984d87f44dbc9ceaa2602abf5a3254ac52bfde27a6f517c4ee018')
prepare() {
cd "${srcdir}"
for _db in GeoLite2-{City,Country,ASN}; do
tar --strip-components=1 -xf ${_db}-${pkgver}.tar.gz --wildcards "*/${_db}.mmdb"
done
tar --strip-components=1 -xf GeoLite2-ASN-${pkgver}.tar.gz --wildcards "*/COPYRIGHT.txt" "*/LICENSE.txt"
}
package() {
cd "${srcdir}"
install -d "${pkgdir}${MINGW_PREFIX}/share/GeoIP"
install -m644 -t "${pkgdir}${MINGW_PREFIX}/share/GeoIP" GeoLite2-{City,Country,ASN}.mmdb
install -Dm644 COPYRIGHT.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYRIGHT.txt"
install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE.txt"
}

View File

@@ -1,23 +0,0 @@
#!/bin/bash -e
# Unicode characters taken from pactree.c
UNICODE_IS_FUN="\u2514\u2500"
verbose=0
if [[ $1 == -v ]]; then
verbose=1
fi
URLS=(https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz
https://geolite.maxmind.com/download/geoip/database/GeoLite2-Country.tar.gz
https://geolite.maxmind.com/download/geoip/database/GeoLite2-ASN.tar.gz)
for url in ${URLS[@]}; do
last_mod=$(curl -sI $url | grep -i ^Last-Modified: | cut -d' ' -f2- | tr -d '\r')
echo "$last_mod (${url##*/})"
if ((verbose)); then
build_id=$(curl -s $url | gzip -cd | grep -aoE '[0-9]{8} Build [0-9]*')
echo -e "${UNICODE_IS_FUN}$build_id"
fi
done

View File

@@ -0,0 +1,21 @@
--- geoipupdate-4.8.0/cmd/geoipupdate/main.go.orig 2022-02-01 08:23:33.340000000 +0100
+++ geoipupdate-4.8.0/cmd/geoipupdate/main.go 2022-02-01 08:08:48.823592300 +0100
@@ -21,11 +21,16 @@
func main() {
log.SetFlags(0)
+ ex, err := os.Executable()
+ if err != nil {
+ panic(err)
+ }
+
if defaultConfigFile == "" {
- defaultConfigFile = geoipupdate.DefaultConfigFile
+ defaultConfigFile = filepath.Join(filepath.Dir(ex), "..", "etc", "GeoIP.conf")
}
if defaultDatabaseDirectory == "" {
- defaultDatabaseDirectory = geoipupdate.DefaultDatabaseDirectory
+ defaultDatabaseDirectory = filepath.Join(filepath.Dir(ex), "..", "var", "lib", "GeoIP")
}
args := getArgs()

View File

@@ -0,0 +1,51 @@
# Maintainer: Christoph Reiter <reiter.christoph@gmail.com>
_realname=geoipupdate
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=4.8.0
pkgrel=1
pkgdesc='Update GeoIP2 and GeoIP Legacy binary databases from MaxMind (mingw-w64)'
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
url="https://dev.maxmind.com/geoip/geoipupdate"
license=('spdx:Apache-2.0 OR MIT')
makedepends=("${MINGW_PACKAGE_PREFIX}-go")
backup=("${MINGW_PREFIX:1}/etc/GeoIP.conf")
options=('!strip')
source=("https://github.com/maxmind/geoipupdate/archive/v$pkgver/$_realname-$pkgver.tar.gz"
"001-relocate.patch")
sha256sums=('ca718c3ffcc595ef441363699888d20150f1d3a6583ac2d60bcbd34f052db09f'
'13a011e60eb044281c41420723f3854b8870c174a7876c3ecd7ccc22393c909f')
prepare() {
cd "$srcdir/$_realname-$pkgver"
sed -i 's/EditionIDs .*/EditionIDs GeoLite2-ASN GeoLite2-City GeoLite2-Country/' conf/GeoIP.conf.default
patch -Nbp1 -i "${srcdir}/001-relocate.patch"
}
build() {
cd "$srcdir/$_realname-$pkgver"
export GOROOT=${MINGW_PREFIX}/lib/go
cd cmd/geoipupdate
mkdir -p "$srcdir/build"
go build -o "$srcdir/build/geoipupdate.exe" -ldflags "-X main.version=$pkgver"
}
package() {
cd "$srcdir/$_realname-$pkgver"
install -dm755 "${pkgdir}${MINGW_PREFIX}/var/lib/GeoIP"
install -Dm600 conf/GeoIP.conf.default "${pkgdir}${MINGW_PREFIX}/etc/GeoIP.conf"
cd "$srcdir/build"
install -Dm755 geoipupdate.exe "${pkgdir}${MINGW_PREFIX}/bin/geoipupdate.exe"
cd "$srcdir/$_realname-$pkgver"
install -Dm644 LICENSE-APACHE "${pkgdir}${MINGW_PREFIX}/usr/share/licenses/$_realname/LICENSE-APACHE"
install -Dm644 LICENSE-MIT "${pkgdir}${MINGW_PREFIX}/usr/share/licenses/$_realname/LICENSE-MIT"
}

View File

@@ -3,7 +3,7 @@
_realname=gexiv2
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=0.12.3
pkgver=0.14.0
pkgrel=1
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -21,7 +21,7 @@ options=('strip' 'staticlibs')
license=("LGPL 2.1")
url="https://wiki.gnome.org/Projects/gexiv2"
source=(https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz)
sha256sums=('d23b7972a2fc6f840150bad1ed79c1cbec672951e180c1e1ec33ca6c730c59f3')
sha256sums=('e58279a6ff20b6f64fa499615da5e9b57cf65ba7850b72fafdf17221a9d6d69e')
prepare() {
cd ${_realname}-${pkgver}
@@ -40,7 +40,6 @@ build() {
${MINGW_PREFIX}/bin/meson.exe \
--prefix="${MINGW_PREFIX}" \
--buildtype plain \
-Dpython2_girdir=no \
-Dpython3_girdir="${_overrides}" \
-Dgtk_doc=true \
../${_realname}-${pkgver}

View File

@@ -14,7 +14,7 @@ url='https://www.haskell.org/ghc/'
license=('The Glasgow Haskell Compiler License')
depends=("${MINGW_PACKAGE_PREFIX}-binutils"
"${MINGW_PACKAGE_PREFIX}-crt"
"${MINGW_PACKAGE_PREFIX}-gcc"
"${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-gcc-libs"
"${MINGW_PACKAGE_PREFIX}-gmp"
"${MINGW_PACKAGE_PREFIX}-headers"

View File

@@ -1,8 +1,8 @@
_realname=ghdl
pkgbase="mingw-w64-${_realname}"
pkgname='__placeholder__'
pkgver=1.0.0.r950.g8d512a44b
pkgrel=1
pkgver=1.0.0.r964.g70f3c162b
pkgrel=2
pkgdesc='GHDL: the open-source analyzer, compiler, simulator and (experimental) synthesizer for VHDL'
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
@@ -12,7 +12,7 @@ groups=("${MINGW_PACKAGE_PREFIX}-eda")
checkdepends=("${MINGW_PACKAGE_PREFIX}-python")
provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
_commit="8d512a44"
_commit="70f3c162"
source=("${_realname}::git+https://github.com/ghdl/ghdl.git#commit=${_commit}")
sha512sums=('SKIP')
@@ -75,7 +75,12 @@ _package() {
if [ "${CARCH}" = "x86_64" ]; then
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-llvm")
makedepends=("${MINGW_PACKAGE_PREFIX}-clang" "${MINGW_PACKAGE_PREFIX}-autotools")
makedepends=(
"${MINGW_PACKAGE_PREFIX}-clang"
"${MINGW_PACKAGE_PREFIX}-autotools"
"${MINGW_PACKAGE_PREFIX}-gcc-ada"
"git"
)
package() {
pkgdesc="$pkgdesc (LLVM backend) (mingw-w64)"
depends=(
@@ -90,7 +95,12 @@ if [ "${CARCH}" = "x86_64" ]; then
fi
if [ "${CARCH}" = "i686" ]; then
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-mcode")
makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools")
makedepends=(
"${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-autotools"
"${MINGW_PACKAGE_PREFIX}-gcc-ada"
"git"
)
package() {
pkgdesc="$pkgdesc (mcode backend) (mingw-w64)"
depends=(

View File

@@ -1,15 +0,0 @@
--- ufraw-0.19.2/configure.ac.orig 2014-02-27 09:46:30.949200000 +0400
+++ ufraw-0.19.2/configure.ac 2014-02-27 09:46:52.898400000 +0400
@@ -210,10 +210,12 @@
echo cannot execute: pod2man], $PATH)
AC_FUNC_FSEEKO
+if test $ufraw_win32 = no; then
# Ensure that getopt_long is available. It is included in GNU libc and
# in at least most BSD libcs. If not found, search for it in libgnugetopt.
AC_SEARCH_LIBS(getopt_long, gnugetopt, ,
AC_MSG_ERROR(can not build UFRaw without getopt_long))
+fi
# Make sure that pow is available, trying libm if necessary.
AC_SEARCH_LIBS(pow, m)

View File

@@ -1,29 +0,0 @@
--- ufraw-0.22/dcraw.cc.orig 2014-02-27 09:46:30.949200000 +0400
+++ ufraw-0.22/dcraw.cc 2014-02-27 09:46:52.898400000 +0400
@@ -446,7 +446,7 @@
{
if (fread (pixel, 2, count, ifp) < count) derror();
if ((order == 0x4949) == (ntohs(0x1234) == 0x1234))
-#if defined(__MINGW64_VERSION_MAJOR) && __MINGW64_VERSION_MAJOR < 4
+#if defined(__MINGW64_VERSION_MAJOR)
swab ((char *) pixel, (char *) pixel, count*2);
#else
swab ((const char *) pixel, (char *) pixel, count*2);
@@ -2397,7 +2397,7 @@
DCRaw *d = (DCRaw*)cinfo->client_data;
nbytes = fread (jpeg_buffer, 1, 4096, d->ifp);
-#if defined(__MINGW64_VERSION_MAJOR) && __MINGW64_VERSION_MAJOR < 4
+#if defined(__MINGW64_VERSION_MAJOR)
swab ((char *) jpeg_buffer, (char *) jpeg_buffer, nbytes);
#else
swab ((const char *) jpeg_buffer, (char *) jpeg_buffer, nbytes);
@@ -10196,7 +10196,7 @@
FORCC ppm [col*colors+c] = curve[image[soff][c]] >> 8;
else FORCC ppm2[col*colors+c] = curve[image[soff][c]];
if (output_bps == 16 && !output_tiff && htons(0x55aa) != 0x55aa)
-#if defined(__MINGW64_VERSION_MAJOR) && __MINGW64_VERSION_MAJOR < 4
+#if defined(__MINGW64_VERSION_MAJOR)
swab ((char *) ppm2, (char *) ppm2, width*colors*2);
#else
swab ((const char *) ppm2, (char *) ppm2, width*colors*2);

View File

@@ -1,30 +0,0 @@
From 31c400d67c83ad8c9bb222f71c0250dbf600df64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Wed, 30 Jan 2019 18:19:43 +0000
Subject: [PATCH] 04_fix-abs-gcc-7.patch from Debian
Description: fix compilation in GCC 7
change some variables to int instead of unsigned so that calls to abs are no
longer ambiguous under GCC7
Author: Ken Moffat
Origin: https://sourceforge.net/p/ufraw/mailman/message/35843737/
Bug-Debian: https://bugs.debian.org/853692
---
dcraw.cc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dcraw.cc b/dcraw.cc
index e5fba53..9014b73 100644
--- a/dcraw.cc
+++ b/dcraw.cc
@@ -8866,8 +8866,8 @@ void CLASS identify()
"Nikon", "Nokia", "Olympus", "Ricoh", "Pentax", "Phase One",
"Samsung", "Sigma", "Sinar", "Sony" };
char head[32], *cp;
- unsigned fsize, i, c;
- int hlen, flen, zero_fsize=1;
+ unsigned fsize;
+ int hlen, flen, zero_fsize=1, i, c;
struct jhead jh;
tiff_flip = flip = filters = UINT_MAX; /* unknown */

View File

@@ -1,97 +0,0 @@
From ac8c74699cba65d65f918b3f4cba2de64e039ada Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Thu, 14 Feb 2019 03:26:02 +0000
Subject: [PATCH] Fix GCC 9 OpenMP issues by drop default(none)
---
dcraw_api.cc | 4 ++--
dcraw_indi.c | 4 ----
ufraw_ufraw.c | 6 +++---
3 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/dcraw_api.cc b/dcraw_api.cc
index 796e4a4..d33f030 100644
--- a/dcraw_api.cc
+++ b/dcraw_api.cc
@@ -900,7 +900,7 @@ extern "C" {
rgbWB[3] = rgbWB[1];
if (dark) {
#ifdef _OPENMP
- #pragma omp parallel for schedule(static) default(none) \
+ #pragma omp parallel for schedule(static) \
shared(h,dark,rgbWB)
#endif
for (int i = 0; i < pixels; i++) {
@@ -913,7 +913,7 @@ extern "C" {
}
} else {
#ifdef _OPENMP
- #pragma omp parallel for schedule(static) default(none) \
+ #pragma omp parallel for schedule(static) \
shared(h,dark,rgbWB)
#endif
for (int i = 0; i < pixels; i++) {
diff --git a/dcraw_indi.c b/dcraw_indi.c
index 9131eb9..a6e2a94 100644
--- a/dcraw_indi.c
+++ b/dcraw_indi.c
@@ -137,12 +137,10 @@ void CLASS wavelet_denoise_INDI(ushort(*image)[4], const int black,
#ifdef _OPENMP
#if defined(__sun) && !defined(__GNUC__) /* Fix bug #3205673 - NKBJ */
#pragma omp parallel for \
- default(none) \
shared(nc,image,size,noise) \
private(c,i,hpass,lev,lpass,row,col,thold,fimg,temp)
#else
#pragma omp parallel for \
- default(none) \
shared(nc,image,size) \
private(c,i,hpass,lev,lpass,row,col,thold,fimg,temp)
#endif
@@ -413,7 +411,6 @@ void CLASS vng_interpolate_INDI(ushort(*image)[4], const unsigned filters,
progress(PROGRESS_INTERPOLATE, -height);
#ifdef _OPENMP
#pragma omp parallel \
- default(none) \
shared(image,code,prow,pcol,h) \
private(row,col,g,brow,rowtmp,pix,ip,gval,diff,gmin,gmax,thold,sum,color,num,c,t)
#endif
@@ -496,7 +493,6 @@ void CLASS ppg_interpolate_INDI(ushort(*image)[4], const unsigned filters,
#ifdef _OPENMP
#pragma omp parallel \
- default(none) \
shared(image,dir,diff) \
private(row,col,i,d,c,pix,guess)
#endif
diff --git a/ufraw_ufraw.c b/ufraw_ufraw.c
index eee681c..516b4c7 100644
--- a/ufraw_ufraw.c
+++ b/ufraw_ufraw.c
@@ -1044,7 +1044,7 @@ static void ufraw_shave_hotpixels(ufraw_data *uf, dcraw_image_type *img,
delta = rgbMax / (uf->conf->hotpixel + 1.0);
count = 0;
#ifdef _OPENMP
- #pragma omp parallel for schedule(static) default(none) \
+ #pragma omp parallel for schedule(static) \
shared(uf,img,width,height,colors,rgbMax,delta) \
reduction(+:count) \
private(h,p,w,c,t,v,hi,i)
@@ -1366,7 +1366,7 @@ static void ufraw_convert_reverse_wb(ufraw_data *uf, UFRawPhase phase)
mul[i] = (guint64)0x10000 * 0x10000 / uf->developer->rgbWB[i];
size = img->height * img->width;
#ifdef _OPENMP
- #pragma omp parallel for schedule(static) default(none) \
+ #pragma omp parallel for schedule(static) \
shared(uf,phase,img,mul,size) \
private(i,p16,c,px)
#endif
@@ -1391,7 +1391,7 @@ static void ufraw_convert_image_tca(ufraw_data *uf, ufraw_image_data *img,
return;
int y;
#ifdef _OPENMP
- #pragma omp parallel for schedule(static) default(none) \
+ #pragma omp parallel for schedule(static) \
shared(uf,img,outimg,area)
#endif
for (y = area->y; y < area->y + area->height; y++) {

View File

@@ -1,36 +0,0 @@
From a13c0f7385ff873bd7cf8fc8aae8657c75fb20c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Thu, 14 Feb 2019 01:56:49 +0000
Subject: [PATCH] From Gentoo ufraw-0.22-exiv2-0.27.patch
---
ufraw_exiv2.cc | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/ufraw_exiv2.cc b/ufraw_exiv2.cc
index cba4c05..b0971b0 100644
--- a/ufraw_exiv2.cc
+++ b/ufraw_exiv2.cc
@@ -15,9 +15,7 @@
#include "ufraw.h"
#ifdef HAVE_EXIV2
-#include <exiv2/image.hpp>
-#include <exiv2/easyaccess.hpp>
-#include <exiv2/exif.hpp>
+#include <exiv2/exiv2.hpp>
#include <sstream>
#include <cassert>
@@ -67,7 +65,11 @@ extern "C" int ufraw_exif_read_input(ufraw_data *uf)
if (exifData.empty()) {
std::string error(uf->filename);
error += ": No Exif data found in the file";
+#if EXIV2_TEST_VERSION(0,27,0)
+ throw Exiv2::Error(Exiv2::kerErrorMessage, error);
+#else
throw Exiv2::Error(1, error);
+#endif
}
/* List of tag names taken from exiv2's printSummary() in actions.cpp */

View File

@@ -1,71 +0,0 @@
# Maintainer: Alexey Pavlov <alexpux@gmail.com>
_realname=ufraw
pkgbase=mingw-w64-gimp-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-gimp-${_realname}"
groups=("${MINGW_PACKAGE_PREFIX}-gimp-plugins")
pkgver=0.22
pkgrel=2
pkgdesc="Converter for raw files; utility and GIMP plugin (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
url="https://ufraw.sourceforge.io/"
license=("GPL")
options=('strip' 'staticlibs')
depends=("${MINGW_PACKAGE_PREFIX}-bzip2"
"${MINGW_PACKAGE_PREFIX}-cfitsio"
"${MINGW_PACKAGE_PREFIX}-exiv2"
"${MINGW_PACKAGE_PREFIX}-gtkimageview"
"${MINGW_PACKAGE_PREFIX}-lcms"
"${MINGW_PACKAGE_PREFIX}-lensfun")
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
"${MINGW_PACKAGE_PREFIX}-gimp"
"${MINGW_PACKAGE_PREFIX}-autotools")
optdepends=("${MINGW_PACKAGE_PREFIX}-gimp: to use the gimp import plugin for raw images")
source=("https://downloads.sourceforge.net/${_realname}/${_realname}-${pkgver}.tar.gz"
01-mingw-getopt-long.patch
02-mingw-w64-fixes.patch
03-fix-abs-gcc-7.patch
04-gcc-9-openmp.patch
05-exiv2-0.27.patch)
sha256sums=('f7abd28ce587db2a74b4c54149bd8a2523a7ddc09bedf4f923246ff0ae09a25e'
'41c7c530b6c8992653166ba2adb155c3ae137eb12ed7bc8675d623fd58a6bb13'
'9bbb7748bdb3bb9e085600b827a061d91e938852aae80e51da082f030901cd25'
'1cac31243d5a4e647a8263785b653cf33efb6ebccb660a22a8170a22fe0a09ff'
'1edce8bea1bd3bbf46a0d8f3eb172fdf3c646e215f829bd8a6e1fdc560646c28'
'fd9f9dab2c96c0da5c4c0be83d53672a46f3fe4d3f84b4dc635037f971c6743e')
prepare() {
cd "${srcdir}/${_realname}-${pkgver}"
patch -p1 -i ${srcdir}/01-mingw-getopt-long.patch
patch -p1 -i ${srcdir}/02-mingw-w64-fixes.patch
patch -p1 -i ${srcdir}/03-fix-abs-gcc-7.patch
patch -p1 -i ${srcdir}/04-gcc-9-openmp.patch
patch -p1 -i ${srcdir}/05-exiv2-0.27.patch
./autogen.sh
}
build() {
[[ -d build-${MINGW_CHOST} ]] && rm -rf build-${MINGW_CHOST}
mkdir -p build-${MINGW_CHOST} && cd build-${MINGW_CHOST}
MSYS2_ARG_CONV_EXCL="GIMP_LIBDIR" \
../${_realname}-${pkgver}/configure \
--prefix=${MINGW_PREFIX} \
--build=${MINGW_CHOST} \
--host=${MINGW_CHOST} \
--enable-extras \
--enable-mime \
--with-gimp \
--enable-openmp \
--enable-contrast
local wgimp_pref=$(cygpath -wm ${MINGW_PREFIX})
sed -e "s|${wgimp_pref}|${MINGW_PREFIX}|g" -i Makefile
sed -e "s|-ffast-math -fomit-frame-pointer -W -Wall -O3|${CFLAGS}|" -i Makefile
make VERBOSE=1
}
package() {
cd "${srcdir}/build-${MINGW_CHOST}"
make -j1 DESTDIR="${pkgdir}" install
}

View File

@@ -4,7 +4,7 @@ _realname=gimp
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=2.10.30
pkgrel=1
pkgrel=2
pkgdesc="GNU Image Manipulation Program (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')

View File

@@ -3,7 +3,7 @@
_realname=github-cli
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=2.4.0
pkgver=2.5.0
pkgrel=1
pkgdesc='The GitHub CLI (mingw-w64)'
arch=('any')
@@ -11,13 +11,13 @@ mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
url="https://github.com/cli/cli"
license=('MIT')
depends=("winpty")
makedepends=("${MINGW_PACKAGE_PREFIX}-go")
makedepends=("${MINGW_PACKAGE_PREFIX}-go" "${MINGW_PACKAGE_PREFIX}-cc")
checkdepends=("git")
optdepends=("git: To interact with repositories")
options=('!strip')
source=("$_realname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
"gh")
sha256sums=('3c87db4d9825a342fc55bd7f27461099dd46291aea4a4a29bb95d3c896403f94'
sha256sums=('4e9d1cbcdd2346cab5b7fc176cd57c07ed3628a0241fad8a48fe4df6a354b120'
'9ee5f2b44b7e9aa751508f02c1020e341e0212a9aa146b7428eb5ffea310be27')
build() {
cd "cli-$pkgver"

View File

@@ -6,8 +6,8 @@
_realname=glib2
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=2.70.2
pkgrel=2
pkgver=2.70.3
pkgrel=1
url="https://gitlab.gnome.org/GNOME/glib"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -35,7 +35,7 @@ source=("https://download.gnome.org/sources/glib/${pkgver%.*}/glib-${pkgver}.tar
gio-querymodules.hook.in
0002-disable_glib_compile_schemas_warning.patch
pyscript2exe.py)
sha256sums=('0551459c85cd3da3d58ddc9016fd28be5af503f5e1615a71ba5b512ac945806f'
sha256sums=('233fa4841c1e19e396db7607d58f6b75ba3313c50bf0fce07b2e3532d5eb7d46'
'92bf41b13b18314b35204a1f384fe41a6e606350cec9afcd3aee8265172edc41'
'51d02360a1ee978fd45e77b84bca9cfbcf080d91986b5c0efe0732779c6a54ec'
'5b238550c8826b0c0695b16b2689ae2c2144e8f488137b7e867b6c651f125a10'

View File

@@ -3,7 +3,7 @@
_realname=gmic
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=3.0.0
pkgver=3.0.2
pkgrel=1
pkgdesc="A Full-Featured Open-Source Framework for Image Processing (mingw-w64)"
arch=(any)
@@ -23,18 +23,14 @@ depends=("${MINGW_PACKAGE_PREFIX}-fftw"
"${MINGW_PACKAGE_PREFIX}-curl"
"${MINGW_PACKAGE_PREFIX}-openexr"
"${MINGW_PACKAGE_PREFIX}-opencv")
source=("${_realname}-${pkgver}.tar.gz::https://gmic.eu/files/source/${_realname}_${pkgver}.tar.gz"
"0002-gmic-mingw-build.patch"::https://github.com/dtschump/gmic/commit/2461be2d9582e8b83ac91989ef7c56e502f4b237.diff
"0003-gmic-clang-build.patch"::https://github.com/dtschump/gmic/commit/537ac58d7966daca86e4aa2d47a2887ae4e34d67.diff)
sha256sums=('3f056bb9e6dbf0674af4c8dce59f4198172187662f7fbb36cc63ebc8c1b71120'
'9bb9882bbd4a3f755aabcdb1a68a7ba76c7dfc11c347c31fd269dc98b140fb38'
'897e6dd45d6bab3e3ef30623f275b0fa1355b4ba8303a50bb078dfe2306f1de5')
"0004-gmic-core-cmake-build.patch"::https://github.com/dtschump/gmic/commit/7e97e786295f925256b1b1b7349aa3cb16bdfd3b.diff)
sha256sums=('68acec32c45d56fb0b0408acec4f63166171816d70722d63106787f1e7d17030'
'fb6c330e88a7ba1e1f9ba62b0598e9e1a3b5eb9cea1b60d27bdf7aca992381f6')
prepare() {
cd "${srcdir}/${_realname}-${pkgver}"
patch -p1 -i "${srcdir}/0002-gmic-mingw-build.patch"
patch -p1 -i "${srcdir}/0003-gmic-clang-build.patch"
patch -Np1 -i "${srcdir}/0004-gmic-core-cmake-build.patch"
}
build() {

View File

@@ -6,7 +6,7 @@ _realname=gnucobol
pkgbase=mingw-w64-${_realname}
pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
pkgver=3.1.2
pkgrel=1
pkgrel=2
pkgdesc="GnuCOBOL, a free and modern COBOL compiler (mingw-w64)"
conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-svn" "${MINGW_PACKAGE_PREFIX}-gnu-cobol-svn")
replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-svn" "${MINGW_PACKAGE_PREFIX}-gnu-cobol-svn")

View File

@@ -3,9 +3,9 @@
_realname=gnutls
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
_pkgver=3.7.2
_pkgver=3.7.3
pkgver=${_pkgver}
pkgrel=5
pkgrel=1
pkgdesc="A library which provides a secure layer over a reliable transport layer (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -31,7 +31,7 @@ source=(https://www.gnupg.org/ftp/gcrypt/gnutls/v${_pkgver%.*}/${_realname}-${pk
0003-gnutls-fix-external-libtasn1-detection.patch
0004-disable-broken-examples.patch
0005-remove-coverage-rules.patch)
sha256sums=('646e6c5a9a185faa4cea796d378a1ba8e1148dbb197ca6605f95986a25af2752'
sha256sums=('fc59c43bc31ab20a6977ff083029277a31935b8355ce387b634fa433f8f6c49a'
'SKIP'
'6493f69e782d60fe04de4b0040987e99851c522d0baf2fe25d10b85b63e97863'
'cbf9e59fb2432d4ac1edcb70734023e074b8058fa4c010a036a40de8449f67fb'

View File

@@ -10,7 +10,7 @@ pkgdesc="Go Lang (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64')
license=('BSD')
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc")
makedepends=("${MINGW_PACKAGE_PREFIX}-cc")
url="https://www.golang.org/"
depends=()
makedepends=("${MINGW_PACKAGE_PREFIX}-${_realname}")

View File

@@ -3,8 +3,8 @@
_realname=groonga
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=11.1.1
pkgrel=1
pkgver=11.1.3
pkgrel=2
pkgdesc="An opensource fulltext search engine (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -27,7 +27,7 @@ makedepends=("git"
"${MINGW_PACKAGE_PREFIX}-ruby"
"${MINGW_PACKAGE_PREFIX}-ninja"
"${MINGW_PACKAGE_PREFIX}-cc")
sha256sums=('f1633b31e9ba74ee7879e2e57ba15cb9c0c26dd5430d3748cec22a7bb1669c0d'
sha256sums=('ace25b3294b480a1b7806eccdc5749dfd49e233366c15883629ac4a395428ecd'
'SKIP')
validpgpkeys=('2701F317CFCCCB975CADE9C2624CF77434839225') # Groonga Key <packages@groonga.org>

View File

@@ -3,7 +3,7 @@
_realname=gst-devtools
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.18.5
pkgver=1.20.0
pkgrel=1
pkgdesc="Development and debugging tools for GStreamer (mingw-w64)"
arch=('any')
@@ -19,7 +19,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-gstreamer"
"${MINGW_PACKAGE_PREFIX}-gst-plugins-base"
"${MINGW_PACKAGE_PREFIX}-json-glib")
source=(https://gstreamer.freedesktop.org/src/${_realname}/${_realname}-${pkgver}.tar.xz)
sha256sums=('fecffc86447daf5c2a06843c757a991d745caa2069446a0d746e99b13f7cb079')
sha256sums=('69fc8756ec9d93e5c5258c99088434f203e91fdbc5af28d1f2c583fd819b7a1d')
prepare() {
cd "${srcdir}/${_realname}-${pkgver}"

View File

@@ -3,7 +3,7 @@
_realname=gst-editing-services
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.18.5
pkgver=1.20.0
pkgrel=1
pkgdesc="GStreamer Editing Services (mingw-w64)"
arch=('any')
@@ -22,7 +22,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-gst-plugins-base")
options=(!libtool strip staticlibs)
source=(${url}/src/${_realname}/${_realname}-${pkgver}.tar.xz
0001-meson-Don-t-harcode-path-to-site-packages.patch)
sha256sums=('8af4a8394d051f3e18280686db49a6efaccc95c0c59a17f0f564e32000590df5'
sha256sums=('f837adcf4073d19a5908984e879cd039f4192ca368e71d39e8ccd8a56b9feedf'
'92ffe7a8d2109d0dbca4d591af8d7a7f2aa2db3994781458f3cf313c1f8ed391')
prepare() {

View File

@@ -3,7 +3,7 @@
_realname=gst-libav
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.18.5
pkgver=1.20.0
pkgrel=1
pkgdesc="Multimedia graph framework - libav plugin (mingw-w64)"
arch=('any')
@@ -20,7 +20,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gobject-introspection"
depends=("${MINGW_PACKAGE_PREFIX}-gst-plugins-base"
"${MINGW_PACKAGE_PREFIX}-ffmpeg")
source=(${url}/src/${_realname}/${_realname}-${pkgver}.tar.xz)
sha256sums=('822e008a910e9dd13aedbdd8dc63fedef4040c0ee2e927bab3112e9de693a548')
sha256sums=('5eee5ed8d5082a31b500448e41535c722ee30cd5f8224f32982bbaba2eedef17')
prepare() {
cd "${srcdir}/${_realname}-${pkgver}"

View File

@@ -1,20 +0,0 @@
--- a/gst-libs/gst/vulkan/meson.build
+++ a/gst-libs/gst/vulkan/meson.build
@@ -109,7 +109,7 @@
# on implementing a proper Metal extension for Vulkan
# https://github.com/KhronosGroup/MoltenVK/issues/492
vulkan_dep = cc.find_library('MoltenVK', required : get_option('vulkan'))
-elif host_system == 'windows'
+elif host_system == 'windows' and cc.get_id() == 'msvc'
vulkan_root = run_command(python3, '-c', 'import os; print(os.environ.get("VK_SDK_PATH"))').stdout().strip()
if vulkan_root != '' and vulkan_root != 'None'
vulkan_lib_dir = ''
@@ -138,7 +138,7 @@
endif
endif
-if host_system != 'windows'
+if host_system != 'windows' or cc.get_id() != 'msvc'
has_vulkan_header = cc.has_header('vulkan/vulkan_core.h')
endif

View File

@@ -0,0 +1,48 @@
--- a/gst-libs/gst/vulkan/meson.build
+++ a/gst-libs/gst/vulkan/meson.build
@@ -109,7 +109,7 @@
# on implementing a proper Metal extension for Vulkan
# https://github.com/KhronosGroup/MoltenVK/issues/492
vulkan_dep = cc.find_library('MoltenVK', required : get_option('vulkan'))
-elif host_system == 'windows'
+elif host_system == 'windows' and cc.get_id() == 'msvc'
vulkan_root = run_command(python3, '-c', 'import os; print(os.environ.get("VK_SDK_PATH"))', check: false).stdout().strip()
if vulkan_root != '' and vulkan_root != 'None'
vulkan_lib_dir = ''
@@ -138,7 +138,7 @@
endif
endif
-if host_system != 'windows'
+if host_system != 'windows' or cc.get_id() != 'msvc'
has_vulkan_header = cc.has_header('vulkan/vulkan_core.h')
endif
--- ./gst-libs/gst/vulkan/meson.build.orig 2022-02-05 14:20:35.191999800 +0100
+++ ./gst-libs/gst/vulkan/meson.build 2022-02-05 14:21:13.880211400 +0100
@@ -242,8 +242,14 @@
if host_system == 'windows'
gdi_dep = cc.find_library('gdi32', required : get_option('vulkan'))
+ if vulkan_inc_dir != ''
+ has_vulkan_win32 = cc.has_header('vulkan/vulkan_win32.h', args: '-I' + vulkan_inc_dir)
+ else
+ has_vulkan_win32 = cc.has_header('vulkan/vulkan_win32.h')
+ endif
+
# Cannot use internal dependency object with cc.has_header()
- if gdi_dep.found() and cc.has_header('vulkan/vulkan_win32.h', args: '-I' + vulkan_inc_dir)
+ if gdi_dep.found() and has_vulkan_win32
vulkan_priv_sources += ['win32/gstvkwindow_win32.c']
optional_deps += [gdi_dep]
vulkan_windowing = true
--- ./gst-libs/gst/vulkan/win32/gstvkwindow_win32.c.orig 2022-02-05 14:35:25.981000000 +0100
+++ ./gst-libs/gst/vulkan/win32/gstvkwindow_win32.c 2022-02-05 14:35:34.422184800 +0100
@@ -67,6 +67,7 @@
static void gst_vulkan_window_win32_close (GstVulkanWindow * window);
static void release_parent_win_id (GstVulkanWindowWin32 * window_win32);
static void gst_vulkan_window_win32_show (GstVulkanWindowWin32 * window);
+static gboolean gst_vulkan_window_win32_create_window (GstVulkanWindowWin32 * window_win32, GError ** error);
static void
gst_vulkan_window_win32_class_init (GstVulkanWindowWin32Class * klass)

View File

@@ -1,16 +1,3 @@
--- a/sys/mediafoundation/gstmfdevice.h
+++ b/sys/mediafoundation/gstmfdevice.h
@@ -31,9 +31,6 @@
G_DECLARE_FINAL_TYPE (GstMFDeviceProvider,
gst_mf_device_provider, GST, MF_DEVICE_PROVIDER, GstDeviceProvider);
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstMFDevice, gst_object_unref)
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstMFDeviceProvider, gst_object_unref)
-
G_END_DECLS
#endif /* __GST_MF_DEVICE_H__ */
\ No newline at end of file
--- a/sys/mediafoundation/gstmfutils.h
+++ b/sys/mediafoundation/gstmfutils.h
@@ -38,6 +38,10 @@
@@ -26,7 +13,7 @@
" P010, P016, v210, v216, GRAY16_LE }"
--- a/sys/mediafoundation/meson.build
+++ b/sys/mediafoundation/meson.build
@@ -44,9 +44,9 @@
@@ -50,9 +50,9 @@
subdir_done()
endif

View File

@@ -5,7 +5,7 @@
_realname=gst-plugins-bad
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-gst-plugins-bad-libs" "${MINGW_PACKAGE_PREFIX}-gst-plugins-bad")
pkgver=1.18.5
pkgver=1.20.0
pkgrel=1
pkgdesc="GStreamer Multimedia Framework Bad Plugins (mingw-w64)"
arch=('any')
@@ -73,17 +73,17 @@ makedepends=(
)
source=(${url}/src/${_realname}/${_realname}-${pkgver}.tar.xz
"0001-meson-fix-vulkan-detection.patch"
"0001-meson-fix-vulkan.patch"
"0002-fix-vulkan-mkenum.patch"
"0003-enable-mediafoundation-plugin.patch")
sha256sums=('a164923b94f0d08578a6fcaeaac6e0c05da788a46903a1086870e9ca45ad678e'
'e038864a83bafc0e16f143f16a86215dd52621703c8272c580f43ab56d30110f'
sha256sums=('015b8d4d9a395ebf444d40876867a2034dd3304b3ad48bc3a0dd0c1ee71dc11d'
'd2e9485b1ae5d5afa764331ee97cea2ef1a6b07c7b658a373f6beef0cc98d69f'
'5ca55fdfc4c5d10d2319f83dddac8130c2ffab67b1248d2233cdcb188d5a0fd3'
'5c2c0f49c1afcee2e406078322cdac1be16bc832a92583152f9bc6aedaf526e6')
'b5d3627177942ed5027d96bdd45aa1611fa2700aee9920ef52c15c251e3fd964')
prepare() {
cd "${srcdir}/${_realname}-${pkgver}"
patch -Np1 -i "${srcdir}/0001-meson-fix-vulkan-detection.patch"
patch -Np1 -i "${srcdir}/0001-meson-fix-vulkan.patch"
patch -Np1 -i "${srcdir}/0002-fix-vulkan-mkenum.patch"
# https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1882
@@ -130,12 +130,10 @@ build() {
-Dkate=disabled \
-Dladspa=disabled \
-Dlibde265=disabled \
-Dlibmms=disabled \
-Dlv2=disabled \
-Dmpeg2enc=disabled \
-Dmplex=disabled \
-Dneon=disabled \
-Dofa=disabled \
-Dopenmpt=disabled \
-Dopenni2=disabled \
-Dsbc=disabled \
@@ -152,6 +150,15 @@ build() {
-Davtp=disabled \
-Dsvthevcenc=disabled \
-Dzxing=disabled \
-Dasio=disabled \
-Dgpl=enabled \
-Dgs=disabled \
-Disac=disabled \
-Dldac=disabled \
-Donnx=disabled \
-Dopenaptx=disabled \
-Dqroverlay=disabled \
-Dmediafoundation=disabled \
"${extra_config[@]}" \
../${_realname}-${pkgver}

View File

@@ -3,7 +3,7 @@
_realname=gst-plugins-base
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.18.5
pkgver=1.20.0
pkgrel=1
pkgdesc="GStreamer Multimedia Framework Base Plugins (mingw-w64)"
arch=('any')
@@ -30,7 +30,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-graphene"
"${MINGW_PACKAGE_PREFIX}-zlib")
conflicts=("${MINGW_PACKAGE_PREFIX}-gst-plugins-bad<1.16.0")
source=(${url}/src/${_realname}/${_realname}-${pkgver}.tar.xz)
sha256sums=('960b7af4585700db0fdd5b843554e11e2564fed9e061f591fae88a7be6446fa3')
sha256sums=('4cb66fccf730b1037e6533862c2128990912a6db4e5bbd14e0ef914450eb4c7c')
prepare() {
cd "${srcdir}/${_realname}-${pkgver}"

View File

@@ -3,8 +3,8 @@
_realname=gst-plugins-good
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.18.5
pkgrel=2
pkgver=1.20.0
pkgrel=1
pkgdesc="GStreamer Multimedia Framework Base Plugins (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -39,7 +39,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-bzip2"
conflicts=("${MINGW_PACKAGE_PREFIX}-gst-plugins-ugly<1.14.0"
"${MINGW_PACKAGE_PREFIX}-gst-plugins-bad<1.16.0")
source=(${url}/src/${_realname}/${_realname}-${pkgver}.tar.xz)
sha256sums=('3aaeeea7765fbf8801acce4a503a9b05f73f04e8a35352e9d00232cfd555796b')
sha256sums=('2d119c15ab8c9e79f8cd3c6bf582ff7a050b28ccae52ab4865e1a1464991659c')
prepare() {
cd "${srcdir}/${_realname}-${pkgver}"

View File

@@ -3,7 +3,7 @@
_realname=gst-plugins-ugly
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.18.5
pkgver=1.20.0
pkgrel=1
pkgdesc="GStreamer Multimedia Framework Ugly Plugins (mingw-w64)"
arch=('any')
@@ -25,7 +25,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-a52dec"
"${MINGW_PACKAGE_PREFIX}-opencore-amr"
"${MINGW_PACKAGE_PREFIX}-x264")
source=(${url}/src/${_realname}/${_realname}-${pkgver}.tar.xz)
sha256sums=('df32803e98f8a9979373fa2ca7e05e62f977b1097576d3a80619d9f5c69f66d9')
sha256sums=('4e8dcb5d26552f0a4937f6bc6279bd9070f55ca6ae0eaa32d72d264c44001c2e')
prepare() {
cd "${srcdir}/${_realname}-${pkgver}"
@@ -46,6 +46,7 @@ build() {
-Dtests=disabled \
-Dsidplay=disabled \
-Ddoc=disabled \
-Dgpl=enabled \
../${_realname}-${pkgver}
${MINGW_PREFIX}/bin/ninja.exe

View File

@@ -3,7 +3,7 @@
_realname=gst-python
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-gst-python")
pkgver=1.18.5
pkgver=1.20.0
pkgrel=1
pkgdesc="GStreamer GObject Introspection overrides for Python (mingw-w64)"
arch=('any')
@@ -20,7 +20,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-python"
"${MINGW_PACKAGE_PREFIX}-cc")
url='https://gstreamer.freedesktop.org/modules/gst-python.html'
source=(https://gstreamer.freedesktop.org/src/gst-python/${_realname}-${pkgver}.tar.xz)
sha256sums=('533685871305959d6db89507f3b3aa6c765c2f2b0dacdc32c5a6543e72e5bc52')
sha256sums=('8f67bdc5606ba33606c6bc896e89de7dcd8cf4fca459f71389b1b6fe075b5e54')
prepare() {
cd "${srcdir}/${_realname}-${pkgver}"

View File

@@ -3,7 +3,7 @@
_realname=gst-rtsp-server
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.18.5
pkgver=1.20.0
pkgrel=1
pkgdesc="GStreamer RTSP server library (mingw-w64)"
arch=('any')
@@ -27,7 +27,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
"${MINGW_PACKAGE_PREFIX}-gst-plugins-ugly"
"${MINGW_PACKAGE_PREFIX}-gst-plugins-bad")
source=(${url}/src/${_realname}/${_realname}-${pkgver}.tar.xz)
sha256sums=('04d63bf48816c6f41c73f6de0f912a7cef0aab39c44162a7bcece1923dfc9d1f')
sha256sums=('c209f5ed906da713fdd44a8844e909aa6c8af3dfb630259b092cfb77a7755843')
prepare() {
cd "${srcdir}/${_realname}-${pkgver}"

View File

@@ -3,8 +3,8 @@
_realname=gstreamer
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.18.5
pkgrel=2
pkgver=1.20.0
pkgrel=1
pkgdesc="GStreamer Multimedia Framework (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -26,7 +26,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
"${MINGW_PACKAGE_PREFIX}-gsl")
conflicts=("${MINGW_PACKAGE_PREFIX}-gst-plugins-bad<1.14.0")
source=("${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz")
sha256sums=('55862232a63459bbf56abebde3085ca9aec211b478e891dacea4d6df8cafe80a')
sha256sums=('edf4bffff85591d4fff7b21bb9ed7f0feabc123ac4a4eff29e73cbce454f9db7')
build() {
[[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"

Some files were not shown because too many files have changed in this diff Show More