Diff updating libbgcode to the commit used in prusaslicer-2.9.1.
This version is now using Catch2 v3 for unit tests, so these patches
aren't needed anymore and must be removed:
- devel/libbgcode/patches/patch-tests_CMakeLists_txt
- devel/libbgcode/patches/patch-tests_catch_main_hpp
Also, 'make test' now works :)
diff refs/remotes/upstream/master refs/heads/master
commit - 3126761c55adba51294464e1c05e57d995196a23
commit + 150cd791ea6762a83564ab415bedb0444ac5f620
blob - 896ae15b5d8d7c997c82dd193d1abd8fcad009e7
blob + e5950126eebe281055d613ae901e426ef4b61779
--- devel/libbgcode/Makefile
+++ devel/libbgcode/Makefile
@@ -1,7 +1,7 @@
COMMENT = Prusa Block & Binary G-code reader / writer / converter
-COMMIT = d33a277a3ce2c0a7f9ba325caac6d730e0f7a412
-PKGNAME = libbgcode-20241024
+COMMIT = 5041c093b33e2748e76d6b326f2251310823f3df
+PKGNAME = libbgcode-20250220
DIST_TUPLE = github prusa3d libbgcode ${COMMIT} .
@@ -25,7 +25,6 @@ BUILD_DEPENDS = devel/catch2 \
LIB_DEPENDS = devel/boost
-CONFIGURE_ARGS += -DBUILD_SHARED_LIBS=ON \
- -DLibBGCode_BUILD_TESTS=OFF
+CONFIGURE_ARGS += -DBUILD_SHARED_LIBS=ON
.include <bsd.port.mk>
blob - 921b0f8c424a7b5386011cb6f8ae0cc30bf06e15
blob + 885b5829c24d13f5016b68c33a5735a3d8644f7f
--- devel/libbgcode/distinfo
+++ devel/libbgcode/distinfo
@@ -1,2 +1,2 @@
-SHA256 (prusa3d-libbgcode-d33a277a3ce2c0a7f9ba325caac6d730e0f7a412.tar.gz) =
ezkMAWxE8fmVkl9nDnKRFvqT7uYzSymnL5B6i83m5YQ=
-SIZE (prusa3d-libbgcode-d33a277a3ce2c0a7f9ba325caac6d730e0f7a412.tar.gz) =
529007
+SHA256 (prusa3d-libbgcode-5041c093b33e2748e76d6b326f2251310823f3df.tar.gz) =
I02ZBXJCuRTD94enM0t2HsVJvSwaVRx9yZZigyRuYe8=
+SIZE (prusa3d-libbgcode-5041c093b33e2748e76d6b326f2251310823f3df.tar.gz) =
529050
blob - 3f481f630070baeeee808649b891c4ec2c8c9c27 (mode 644)
blob + /dev/null
--- devel/libbgcode/patches/patch-tests_CMakeLists_txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: tests/CMakeLists.txt
---- tests/CMakeLists.txt.orig
-+++ tests/CMakeLists.txt
-@@ -1,4 +1,4 @@
--find_package(Catch2 2.9 REQUIRED)
-+find_package(Catch2 REQUIRED)
-
- include(Catch)
-
-@@ -16,7 +16,7 @@ file(TO_NATIVE_PATH "${TEST_DATA_DIR}" TEST_DATA_DIR)
- add_library(test_common INTERFACE)
- target_include_directories(test_common INTERFACE ${CMAKE_CURRENT_LIST_DIR})
- target_compile_definitions(test_common INTERFACE
TEST_DATA_DIR=R"\(${TEST_DATA_DIR}\)" CATCH_CONFIG_FAST_COMPILE)
--target_link_libraries(test_common INTERFACE Catch2::Catch2 Boost::nowide)
-+target_link_libraries(test_common INTERFACE Catch2::Catch2WithMain
Boost::nowide)
-
- if (EMSCRIPTEN)
- target_link_libraries(test_common INTERFACE nodefs.js noderawfs.js)
-@@ -30,4 +30,4 @@ endif()
-
- if (${PROJECT_NAME}_BUILD_COMPONENT_Convert)
- add_subdirectory(convert)
--endif ()
-\ No newline at end of file
-+endif ()
blob - 0b96bf5cceebdc069bd5426c46c40b08f477b6f2 (mode 644)
blob + /dev/null
--- devel/libbgcode/patches/patch-tests_catch_main_hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: tests/catch_main.hpp
---- tests/catch_main.hpp.orig
-+++ tests/catch_main.hpp
-@@ -1,8 +1,10 @@
- #ifndef CATCH_MAIN
- #define CATCH_MAIN
-
-+#include <iostream>
-+
- #define CATCH_CONFIG_EXTERNAL_INTERFACES
- #define CATCH_CONFIG_MAIN
--#include <catch2/catch.hpp>
-+#include <catch2/catch_all.hpp>
-
- #endif // CATCH_MAIN
