Skip to content

Commit

Permalink
apply musl aom patch
Browse files Browse the repository at this point in the history
  • Loading branch information
fdintino committed Nov 8, 2023
1 parent ae81bb8 commit 19a8cde
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 14 deletions.
12 changes: 0 additions & 12 deletions wheelbuild/aom-fix-stack-size.patch
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,3 @@ index a749a22..8411569 100644
Error:
aom_free(worker->impl_);
worker->impl_ = NULL;
diff --git a/aom_util/aom_thread.h b/aom_util/aom_thread.h
index 8d04312..efbed78 100644
--- a/aom_util/aom_thread.h
+++ b/aom_util/aom_thread.h
@@ -32,6 +32,7 @@
#include <process.h> // NOLINT
#include <windows.h> // NOLINT
typedef HANDLE pthread_t;
+typedef int pthread_attr_t;
typedef CRITICAL_SECTION pthread_mutex_t;

#if _WIN32_WINNT < 0x0600
8 changes: 6 additions & 2 deletions wheelbuild/config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,12 @@ EOF
-DAVIF_CODEC_AOM=ON -DAVIF_LOCAL_AOM=ON \
-DAVIF_CODEC_DAV1D=ON -DAVIF_LOCAL_DAV1D=ON \
-DENABLE_NASM=ON \
"${LIBAVIF_CMAKE_FLAGS[@]}" \
&& ninja -v install/strip)
"${LIBAVIF_CMAKE_FLAGS[@]}")
if [ -n "$IS_ALPINE" ]; then
(cd libavif-$LIBAVIF_VERSION/ext/aom \
&& patch -p1 -i $CONFIG_DIR/aom-fix-stack-size.patch)
fi
(cd libavif-$LIBAVIF_VERSION/build && ninja -v install/strip)

group_end
}
Expand Down

0 comments on commit 19a8cde

Please sign in to comment.