gst-plugins-rs: update to 1.26.0

Author: ognevny

mingw-w64-gst-plugins-rs/.gitignore

@@ -0,0 +1,2 @@
+/aws-lc-rs
+/aws-lc

mingw-w64-gst-plugins-rs/PKGBUILD

@@ -3,13 +3,13 @@
 _realname=gst-plugins-rs
 pkgbase=mingw-w64-${_realname}
 pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
-pkgver=1.24.12
-_tag=gstreamer-$pkgver
-pkgrel=2
+pkgver=1.26.0
+_tag=gstreamer-${pkgver}
+pkgrel=1
 pkgdesc='GStreamer plugins written in Rust (mingw-w64)'
 arch=(any)
 mingw_arch=('mingw64' 'ucrt64' 'clang64')
-url="https://gitlab.freedesktop.org/gstreamer/$_realname"
+url='https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs'
 license=('spdx:LGPL-3.0-or-later AND Apache-2.0 AND MIT AND MPL-2.0')
 depends=(${MINGW_PACKAGE_PREFIX}-gtk4
          ${MINGW_PACKAGE_PREFIX}-libsodium
@@ -19,14 +19,44 @@ depends=(${MINGW_PACKAGE_PREFIX}-gtk4
          ${MINGW_PACKAGE_PREFIX}-libwebp)
 makedepends=(${MINGW_PACKAGE_PREFIX}-rust
              ${MINGW_PACKAGE_PREFIX}-cargo-c
-             ${MINGW_PACKAGE_PREFIX}-pkgconf)
-source=("$url/-/archive/$_tag/$_realname-gstreamer-$_tag.tar.bz2")
-sha256sums=('29ee51abe820db58338942c2c6d5fa0e94180117eb29c8f26797c3f1b6757b7d')
+             ${MINGW_PACKAGE_PREFIX}-cmake
+             ${MINGW_PACKAGE_PREFIX}-pkgconf
+             ${MINGW_PACKAGE_PREFIX}-nasm
+             ${MINGW_PACKAGE_PREFIX}-rust-bindgen
+             ${MINGW_PACKAGE_PREFIX}-cargo-edit
+             git)
+source=("${url}/-/archive/${_tag}/${_realname}-gstreamer-${_tag}.tar.bz2"
+        "git+https://github.com/aws/aws-lc-rs.git#tag=aws-lc-sys/v0.27.0"
+        "git+https://github.com/aws/aws-lc.git"
+        "aws-lc-clang-build.patch")
+sha256sums=('d1d2cd9111ff166f41f09a83e13bc397ef5c075bcca72dac9f8b506e1c93ff6c'
+            '371b865c75caa66947b3b8e4e001e4255577c8320ba8875ae5212d3dc7dcc3a1'
+            'SKIP'
+            '2e3d7ef6fdb3ef8a2ec11207e8120ea34553888116ea8a032cb425a8a6261c39')
 
 prepare() {
-  mv "$_realname-$_tag-"* "$_realname-$_tag"
-  cd $_realname-$_tag
-  cargo fetch
+  mv "${_realname}-${_tag}-"* "${_realname}-${_tag}"
+
+  (cd aws-lc-rs
+  git config submodule."aws-lc-sys/aws-lc".url "${srcdir}/aws-lc"
+  git config submodule."aws-lc-fips-sys/aws-lc".url "${srcdir}/aws-lc"
+  git -c protocol.file.allow=always submodule update --init --recursive)
+
+  if [ ${CC} = clang ]; then
+    patch -d aws-lc -p1 -i "${srcdir}/aws-lc-clang-build.patch"
+  fi
+
+  cd "${_realname}-${_tag}"
+
+  cargo update -p [email protected] --precise 1.12.6
+  cat >> Cargo.toml <<END
+
+[patch.crates-io]
+aws-lc-sys = { path = "../aws-lc-rs/aws-lc-sys" }
+END
+
+  cargo update -p aws-lc-sys
+  cargo fetch --locked
 }
 
 _cargo_opts=(--workspace
@@ -36,22 +66,24 @@ _cargo_opts=(--workspace
              --library-type=cdylib
              --prefix="${MINGW_PREFIX}"
              --exclude gst-plugin-csound
-             --exclude gst-plugin-dav1d  # not compatiple with dav1d 1.3.0 yet
-             --exclude gst-plugin-aws)
+             --exclude gst-plugin-dav1d) # not compatiple with dav1d 1.3.0 yet
 
 build() {
-  cd $_realname-$_tag
+  cd "${_realname}-${_tag}"
+
   MSYS2_ARG_CONV_EXCL="--prefix=" cargo cbuild "${_cargo_opts[@]}"
 }
 
 check() {
-  cd $_realname-$_tag
+  cd "${_realname}-${_tag}"
+
   MSYS2_ARG_CONV_EXCL="--prefix=" cargo ctest "${_cargo_opts[@]}" --target-dir=tests-build
 }
 
 package() {
-  cd $_realname-$_tag
-  MSYS2_ARG_CONV_EXCL="--prefix=" cargo cinstall "${_cargo_opts[@]}" --destdir="$pkgdir"
+  cd "${_realname}-${_tag}"
+
+  MSYS2_ARG_CONV_EXCL="--prefix=" cargo cinstall "${_cargo_opts[@]}" --destdir="${pkgdir}"
 
-  install -Dm644 -t "$pkgdir/$MINGW_PREFIX"/share/licenses/$_realname/ LICENSE*
+  install -Dm644 -t "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/" LICENSE*
 }

mingw-w64-gst-plugins-rs/aws-lc-clang-build.patch

@@ -0,0 +1,46 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fcb8c928e..d283a6ed4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -399,7 +399,7 @@ if(GCC OR CLANG)
+       set(C_CXX_FLAGS "${C_CXX_FLAGS} -Wno-deprecated-declarations")
+     else()
+       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra")
+-      set(C_CXX_FLAGS "${C_CXX_FLAGS} -Wall -fvisibility=hidden -fno-common")
++      set(C_CXX_FLAGS "${C_CXX_FLAGS} -Wall -fvisibility=hidden -fno-common -fms-extensions")
+       set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -Wno-newline-eof")
+     endif()
+     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunused -Wcomment -Wchar-subscripts -Wuninitialized -Wshadow")
+diff --git a/crypto/internal.h b/crypto/internal.h
+index 4e42bb5b5..cb74fac23 100644
+--- a/crypto/internal.h
++++ b/crypto/internal.h
+@@ -141,7 +141,7 @@
+ #endif
+ 
+ #if defined(OPENSSL_THREADS) && \
+-    (!defined(OPENSSL_WINDOWS) || defined(__MINGW32__))
++    (!defined(OPENSSL_WINDOWS) || defined(__MINGW32__) && !defined(__clang__))
+ #include <pthread.h>
+ #define OPENSSL_PTHREADS
+ #endif
+diff --git a/crypto/thread_win.c b/crypto/thread_win.c
+index 9a1f8045e..0606e6db0 100644
+--- a/crypto/thread_win.c
++++ b/crypto/thread_win.c
+@@ -146,6 +146,7 @@ static void NTAPI thread_local_destructor(PVOID module, DWORD reason,
+ // optimization from discarding the variable.
+ //
+ // Note, in the prefixed build, |p_thread_callback_boringssl| may be a macro.
++#ifdef _MSC_VER
+ #define STRINGIFY(x) #x
+ #define EXPAND_AND_STRINGIFY(x) STRINGIFY(x)
+ #ifdef _WIN64
+@@ -157,6 +158,7 @@ __pragma(comment(linker, "/INCLUDE:__tls_used"))
+ __pragma(comment(
+     linker, "/INCLUDE:_" EXPAND_AND_STRINGIFY(p_thread_callback_boringssl)))
+ #endif
++#endif
+ 
+ // .CRT$XLA to .CRT$XLZ is an array of PIMAGE_TLS_CALLBACK pointers that are
+ // called automatically by the OS loader code (not the CRT) when the module is