fixup

fdintino · Sep 11, 2023 · 31ecd56 · 31ecd56
1 parent ff834f4
commit 31ecd56
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 32 deletions.
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -20,30 +20,19 @@ jobs:
       matrix:
         os: [ "ubuntu-20.04", "macos-11" ]
         python: [ "2.7", "3.7", "3.8", "3.9", "3.10", "3.11" ]
-        platform: [ "x86_64", "i686" ]
-        manylinux-version: [ "1", "2010" ]
+        platform: [ "x86_64" ]
+        manylinux-version: [ "2010" ]
         macos-target: [ "10.10" ]
         mb-ml-libc: [ "manylinux" ]
         multibuild-sha: [ "34e970c4bc448b73af0127615fc4583b4f247369" ]
         exclude:
-          - os: "macos-11"
-            platform: "i686"
-          - os: "macos-11"
-            manylinux-version: "1"
-          - python: "3.10"
-            manylinux-version: "1"
-          - python: "3.11"
-            manylinux-version: "1"
           - python: "3.11"
             manylinux-version: "2010"
           - python: "3.11"
             multibuild-sha: "34e970c4bc448b73af0127615fc4583b4f247369"
         include:
           - os: "macos-11"
             os-name: "osx"
-          - os: "ubuntu-20.04"
-            manylinux-version: "1"
-            os-name: "manylinux1"
           - os: "ubuntu-20.04"
             manylinux-version: "2010"
             os-name: "manylinux2010"
@@ -136,12 +125,6 @@ jobs:
             os-name: "manylinux2014"
             manylinux-version: "2014"
             multibuild-sha: "bb32cfec4f755cb146332a0490abcf3187ce61d1"
-          - python: "3.11"
-            platform: "i686"
-            os: "ubuntu-20.04"
-            os-name: "manylinux2014"
-            manylinux-version: "2014"
-            multibuild-sha: "bb32cfec4f755cb146332a0490abcf3187ce61d1"
     env:
       BUILD_COMMIT: HEAD
       PLAT: ${{ matrix.platform }}
@@ -222,7 +205,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["2.7", "3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
         architecture: ["x64"]
         include:
           - architecture: "x64"

diff --git a/wheelbuild/aom-fix-stack-size.patch b/wheelbuild/aom-fix-stack-size.patch
@@ -68,11 +68,3 @@ index 8d04312..efbed78 100644
  typedef CRITICAL_SECTION pthread_mutex_t;
 
  #if _WIN32_WINNT < 0x0600
-@@ -147,6 +148,7 @@
- #include <sys/builtin.h>  // NOLINT
-
- #define pthread_t TID
-+#define pthread_attr_t int
- #define pthread_mutex_t HMTX
-
- typedef struct {
diff --git a/wheelbuild/config.sh b/wheelbuild/config.sh
@@ -380,10 +380,10 @@ function build_libsharpyuv {
              "${cmake_flags[@]}" \
         && ninja sharpyuv)
 
-    cp libwebp-$LIBWEBP_SHA/build/libsharpyuv.a /usr/local/lib
-    cp libwebp-$LIBWEBP_SHA/build/sharpyuv/libsharpyuv.pc /usr/local/lib/pkgconfig
-    mkdir -p /usr/local/include/webp/sharpyuv
-    cp libwebp-$LIBWEBP_SHA/sharpyuv/*.h /usr/local/include/webp/sharpyuv
+    cp libwebp-$LIBWEBP_SHA/build/libsharpyuv.a $BUILD_PREFIX/lib
+    cp libwebp-$LIBWEBP_SHA/build/sharpyuv/libsharpyuv.pc $BUILD_PREFIX/lib/pkgconfig
+    mkdir -p $BUILD_PREFIX/include/webp/sharpyuv
+    cp libwebp-$LIBWEBP_SHA/sharpyuv/*.h $BUILD_PREFIX/include/webp/sharpyuv
 
     require_package libsharpyuv
     group_end