From 1b5f94cbe749ac36786169ed5caca4024f88d276 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Fri, 2 Aug 2024 10:05:08 +1100 Subject: [PATCH] rebase patches --- recipe/meta.yaml | 9 +++--- .../0001-unconditionally-use-ninja.patch | 9 ++---- ...ibs.patch => 0002-build-shared-libs.patch} | 9 ++---- recipe/patches/0002-unvendor-pybind11.patch | 30 ------------------- ...patch => 0003-avoid-vcpkg-toolchain.patch} | 7 ++--- ...patch => 0004-fix-python-executable.patch} | 9 ++---- ...=> 0005-fix-installation-on-windows.patch} | 13 ++++---- 7 files changed, 20 insertions(+), 66 deletions(-) rename recipe/patches/{0003-build-shared-libs.patch => 0002-build-shared-libs.patch} (73%) delete mode 100644 recipe/patches/0002-unvendor-pybind11.patch rename recipe/patches/{0004-avoid-vcpkg-toolchain.patch => 0003-avoid-vcpkg-toolchain.patch} (89%) rename recipe/patches/{0005-fix-python-executable.patch => 0004-fix-python-executable.patch} (76%) rename recipe/patches/{0006-fix-installation-on-windows.patch => 0005-fix-installation-on-windows.patch} (85%) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1ffb5a1..fd447de 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -10,11 +10,10 @@ source: patches: # upstream avoids ninja on windows, but we don't need to - patches/0001-unconditionally-use-ninja.patch - - patches/0002-unvendor-pybind11.patch - - patches/0003-build-shared-libs.patch # [not win] - - patches/0004-avoid-vcpkg-toolchain.patch - - patches/0005-fix-python-executable.patch - - patches/0006-fix-installation-on-windows.patch + - patches/0002-build-shared-libs.patch # [not win] + - patches/0003-avoid-vcpkg-toolchain.patch + - patches/0004-fix-python-executable.patch + - patches/0005-fix-installation-on-windows.patch build: number: 0 diff --git a/recipe/patches/0001-unconditionally-use-ninja.patch b/recipe/patches/0001-unconditionally-use-ninja.patch index 47098e6..687f45e 100644 --- a/recipe/patches/0001-unconditionally-use-ninja.patch +++ b/recipe/patches/0001-unconditionally-use-ninja.patch @@ -1,14 +1,14 @@ -From 64b5954390f9c88bb13ea66446a52f9a71c97767 Mon Sep 17 00:00:00 2001 +From ced9054d41a888fabd2a03b31a9ebcc81f63a51f Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Sun, 17 Jul 2022 13:48:31 +0200 -Subject: [PATCH 1/6] unconditionally use ninja +Subject: [PATCH 1/5] unconditionally use ninja --- setup.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py -index ff1b1c5..46ca75b 100644 +index 3bd65e4..717e943 100644 --- a/setup.py +++ b/setup.py @@ -44,10 +44,11 @@ class CMakeBuild(build_ext): @@ -33,6 +33,3 @@ index ff1b1c5..46ca75b 100644 # Single config generators are handled "normally" single_config = any(x in cmake_generator for x in {"NMake", "Ninja"}) --- -2.38.1.windows.1 - diff --git a/recipe/patches/0003-build-shared-libs.patch b/recipe/patches/0002-build-shared-libs.patch similarity index 73% rename from recipe/patches/0003-build-shared-libs.patch rename to recipe/patches/0002-build-shared-libs.patch index 6e261c1..cee024b 100644 --- a/recipe/patches/0003-build-shared-libs.patch +++ b/recipe/patches/0002-build-shared-libs.patch @@ -1,14 +1,14 @@ -From d7bae0a5992ce88c44beeb5b0cd8eccd1a693de8 Mon Sep 17 00:00:00 2001 +From c5833317dda0e1970136a6b8a91f6d3e9038446b Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Tue, 6 Dec 2022 09:16:59 +1000 -Subject: [PATCH 3/6] build shared libs +Subject: [PATCH 2/5] build shared libs --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py -index 46ca75b..8d37d57 100644 +index 717e943..a7881ea 100644 --- a/setup.py +++ b/setup.py @@ -45,6 +45,7 @@ class CMakeBuild(build_ext): @@ -19,6 +19,3 @@ index 46ca75b..8d37d57 100644 ] build_args = [] --- -2.38.1.windows.1 - diff --git a/recipe/patches/0002-unvendor-pybind11.patch b/recipe/patches/0002-unvendor-pybind11.patch deleted file mode 100644 index ec51275..0000000 --- a/recipe/patches/0002-unvendor-pybind11.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0da54df2970342fb05f70ee5bb38b7e9294227d4 Mon Sep 17 00:00:00 2001 -From: Tobias Fischer -Date: Tue, 6 Dec 2022 09:16:59 +1000 -Subject: [PATCH 2/6] unvendor pybind11 - ---- - src/python/CMakeLists.txt | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt -index 911e280..6552462 100644 ---- a/src/python/CMakeLists.txt -+++ b/src/python/CMakeLists.txt -@@ -1,11 +1,7 @@ -+find_package(Python COMPONENTS Interpreter Development REQUIRED) - find_package(Python3 COMPONENTS Interpreter Development.Module REQUIRED) - --include(FetchContent) --FetchContent_Declare( -- pybind11 -- GIT_REPOSITORY https://github.com/pybind/pybind11 -- GIT_TAG v2.10.0) --FetchContent_MakeAvailable(pybind11) -+find_package(pybind11 CONFIG REQUIRED) - - add_library(ale-py MODULE ale_python_interface.cpp) - # Depend on the ALE and pybind11 module --- -2.38.1.windows.1 - diff --git a/recipe/patches/0004-avoid-vcpkg-toolchain.patch b/recipe/patches/0003-avoid-vcpkg-toolchain.patch similarity index 89% rename from recipe/patches/0004-avoid-vcpkg-toolchain.patch rename to recipe/patches/0003-avoid-vcpkg-toolchain.patch index 903a9d8..332006e 100644 --- a/recipe/patches/0004-avoid-vcpkg-toolchain.patch +++ b/recipe/patches/0003-avoid-vcpkg-toolchain.patch @@ -1,7 +1,7 @@ -From aec109d22ceb98287d290f62aa04308aac9e262a Mon Sep 17 00:00:00 2001 +From 96961526dd54206b0bc25b63c6686ff2af374579 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Wed, 7 Dec 2022 06:34:34 +1000 -Subject: [PATCH 4/6] avoid vcpkg toolchain +Subject: [PATCH 3/5] avoid vcpkg toolchain --- CMakeLists.txt | 15 --------------- @@ -33,6 +33,3 @@ index 2b2032e..cefe88c 100644 # Don't allow running cmake in root directory if (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR) message(FATAL_ERROR [=[ --- -2.38.1.windows.1 - diff --git a/recipe/patches/0005-fix-python-executable.patch b/recipe/patches/0004-fix-python-executable.patch similarity index 76% rename from recipe/patches/0005-fix-python-executable.patch rename to recipe/patches/0004-fix-python-executable.patch index 1c5927e..f0684ae 100644 --- a/recipe/patches/0005-fix-python-executable.patch +++ b/recipe/patches/0004-fix-python-executable.patch @@ -1,14 +1,14 @@ -From a32b4e288a7ca050e0ecbe7022bbcc28d5561963 Mon Sep 17 00:00:00 2001 +From f15d7662fe1c25e9a023ed24b807ef733d5733e0 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Wed, 7 Dec 2022 12:15:48 +1000 -Subject: [PATCH 5/6] fix python executable +Subject: [PATCH 4/5] fix python executable --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py -index 8d37d57..5cf8a39 100644 +index a7881ea..cb85844 100644 --- a/setup.py +++ b/setup.py @@ -38,6 +38,7 @@ class CMakeBuild(build_ext): @@ -19,6 +19,3 @@ index 8d37d57..5cf8a39 100644 f"-DPython3_EXECUTABLE={sys.executable}", f"-DCMAKE_LIBRARY_OUTPUT_DIRECTORY={extdir}", "-DSDL_SUPPORT=ON", --- -2.38.1.windows.1 - diff --git a/recipe/patches/0006-fix-installation-on-windows.patch b/recipe/patches/0005-fix-installation-on-windows.patch similarity index 85% rename from recipe/patches/0006-fix-installation-on-windows.patch rename to recipe/patches/0005-fix-installation-on-windows.patch index 1c18a58..3224301 100644 --- a/recipe/patches/0006-fix-installation-on-windows.patch +++ b/recipe/patches/0005-fix-installation-on-windows.patch @@ -1,7 +1,7 @@ -From 0db188ee2de56c99ec858e25f62b7f522919dec7 Mon Sep 17 00:00:00 2001 +From a7c9e8bf0e8db2a384674413b44b16a0cc6e85dc Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Wed, 7 Dec 2022 19:40:22 +1000 -Subject: [PATCH 6/6] fix installation on windows +Subject: [PATCH 5/5] fix installation on windows --- src/CMakeLists.txt | 2 +- @@ -9,7 +9,7 @@ Subject: [PATCH 6/6] fix installation on windows 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index a4de95c..ea89e7e 100644 +index b7bac39..77a3bc1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -66,7 +66,7 @@ if (BUILD_PYTHON_LIB) @@ -22,10 +22,10 @@ index a4de95c..ea89e7e 100644 include(CMakePackageConfigHelpers) diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt -index 6552462..c24b15f 100644 +index 337b61a..b264f68 100644 --- a/src/python/CMakeLists.txt +++ b/src/python/CMakeLists.txt -@@ -15,19 +15,6 @@ set_target_properties(ale-py PROPERTIES +@@ -26,19 +26,6 @@ set_target_properties(ale-py PROPERTIES PREFIX "${PYTHON_MODULE_PREFIX}" SUFFIX "${PYTHON_MODULE_EXTENSION}") @@ -45,6 +45,3 @@ index 6552462..c24b15f 100644 # Copy over the Python source files file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${CMAKE_CURRENT_BINARY_DIR} --- -2.38.1.windows.1 -