angleproject: remove extra suffix on static libs

msys2 · Sep 2, 2024 · 615731b · 615731b
1 parent 21c8b2f
commit 615731b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/mingw-w64-angleproject/002-buildflags-fixes.patch b/mingw-w64-angleproject/002-buildflags-fixes.patch
@@ -1,5 +1,5 @@
 diff --git a/BUILD.gn b/BUILD.gn
-index 964d51123..37c43a2c1 100644
+index 964d51123..14bc8fb6c 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
 @@ -14,7 +14,10 @@ if (angle_has_build) {
@@ -117,6 +117,22 @@ index 964d51123..37c43a2c1 100644
    }
 
    if (angle_enable_metal) {
+@@ -1469,6 +1476,7 @@ if (angle_enable_gl_desktop_frontend) {
+
+ angle_static_library("libGLESv2_static") {
+   sources = libglesv2_sources
++  output_name = "libGLESv2"
+   if (angle_enable_gl_desktop_frontend) {
+     sources += libglesv2_gl_sources
+     defines = [ "ANGLE_ENABLE_GL_DESKTOP_FRONTEND" ]
+@@ -1614,6 +1622,7 @@ if (angle_enable_vulkan) {
+ }
+
+ libEGL_template("libEGL_static") {
++  output_name = "libEGL"
+   target_type = "angle_static_library"
+   public_configs = [ ":angle_static_config" ]
+   deps = [ ":libGLESv2_static" ]
 diff --git a/build_overrides/build.gni b/build_overrides/build.gni
 index f9d54f2b3..40c1f8e63 100644
 --- a/build_overrides/build.gni

diff --git a/mingw-w64-angleproject/PKGBUILD b/mingw-w64-angleproject/PKGBUILD
@@ -6,7 +6,7 @@ _realname=angleproject
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.1.r21358.2e285bb5
-pkgrel=5
+pkgrel=6
 pkgdesc='A conformant OpenGL ES implementation for Windows, Mac, Linux, iOS and Android (mingw-w64)'
 arch=('any')
 mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
@@ -26,7 +26,6 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-python"
              "git")
 _commit=("2e285bb591f78af3b5b1f83617e06f9ef9067924")
-options=('!buildflags')
 source=("${_realname}::git+https://chromium.googlesource.com/angle/angle.git#commit=${_commit}"
         "bare-clones/build::git+https://chromium.googlesource.com/chromium/src/build.git#commit=ccb49e801879c107ed6e96a84eb227f65ce4823b"
         "bare-clones/zlib::git+https://chromium.googlesource.com/chromium/src/third_party/zlib.git#commit=90e67ba3f8998a3532fc8e3db9539aada8060d43"
@@ -67,7 +66,7 @@ sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             '16db1feedcb5d2e8e1a9b20ac96f0be2f56d2419001de99cfd3d4508a2ec4242'
-            '1ebc64c413b774c7afca13cbff255dca2d545b3817d08af0cfe7fd3668dd83a3'
+            'c7fc66c1c0b154eb61c666f845720b576187984d139f64ef452467d5efff4509'
             '04bcb05dc2f349639bf4e62ee92d758b756e56532ceb9184c2d7dca01e67a38e'
             'c3ee4b4194c041db225bcf3f699bf1042ddc0c845b1da142ca07a8bf1f7f80f8'
             'ced98a61919f7fdb10dbff26dfbd4ea11b034eaaeb3433f0fa5c4c998519e171'
@@ -81,7 +80,6 @@ sha256sums=('SKIP'
             '4dc3baf79ba7c95b52cbbafce81b26e6d165d4ae7e0dcc2eabe0250466edf178')
 noextract=("swiftshader.zip")
 
-# Helper macros to help make tasks easier #
 apply_patch_with_msg() {
   for _patch in "$@"
   do
@@ -200,7 +198,7 @@ build() {
     export AR=ar
   fi
 
-  ${MINGW_PREFIX}/bin/gn gen out/${_target}-${MSYSTEM} --args="
+  gn gen out/${_target}-${MSYSTEM} --args="
     target_cpu=\"${_arch}\"
     is_debug=${_debug}
     is_clang=${_clang}
@@ -216,7 +214,7 @@ build() {
     use_sysroot=false
     treat_warnings_as_errors=false"
 
-  ${MINGW_PREFIX}/bin/ninja -C out/${_target}-${MSYSTEM}
+  ninja -C out/${_target}-${MSYSTEM}
 }
 
 package() {