* [gentoo-commits] repo/gentoo:master commit in: media-libs/lib3mf/, media-libs/lib3mf/files/
@ 2021-03-07 9:03 Joonas Niilola
0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2021-03-07 9:03 UTC (permalink / raw
To: gentoo-commits
commit: fac05c2690fb93de8f3e33ccf44d7cfae707e633
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sun Feb 7 15:21:57 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Mar 7 09:03:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fac05c26
media-libs/lib3mf: bump to 2.1.0
Closes: https://bugs.gentoo.org/769275
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/lib3mf/Manifest | 1 +
...ntoo-specific-avoid-pre-stripping-library.patch | 27 +++++++++
media-libs/lib3mf/lib3mf-2.1.0.ebuild | 66 ++++++++++++++++++++++
3 files changed, 94 insertions(+)
diff --git a/media-libs/lib3mf/Manifest b/media-libs/lib3mf/Manifest
index 8e5f81cdf62..af5345d038a 100644
--- a/media-libs/lib3mf/Manifest
+++ b/media-libs/lib3mf/Manifest
@@ -1 +1,2 @@
DIST lib3mf-1.8.1.tar.gz 8415939 BLAKE2B 45652aab8c84eb5d500455db211eb911c6e74decf4fbbb652976847e1b3ea16db9c626bd37cd9669aefc8dea29c424e6518e0517e8f96fa6282771e34f840290 SHA512 f7fd75bcb6472de1595a018e5add516d0d78ab0aee92462b686b77f8d2bef05270e7b737cb7e1d31fc5850815056e753874c2f9ec456a455e8461c4010fe914a
+DIST lib3mf-2.1.0.tar.gz 15882048 BLAKE2B 9466e1fd30d82600dcc52f61709c1430ae3c129358225162a343ec0d7f489e14572882a9c5239ccd63ea66ee7faec1563fa5aa0e788f28d18ad96db0ae7b9f36 SHA512 05f92da9cbbac279baf33fe3a7ce43ff7faad987c4ba08120094406e1a8f9bab2330b47822fa0a84d1558be9c829f3e805782a46ed85b706e7f85cb861d0d4f5
diff --git a/media-libs/lib3mf/files/lib3mf-2.1.0-0001-Gentoo-specific-avoid-pre-stripping-library.patch b/media-libs/lib3mf/files/lib3mf-2.1.0-0001-Gentoo-specific-avoid-pre-stripping-library.patch
new file mode 100644
index 00000000000..7c5cdd0c68f
--- /dev/null
+++ b/media-libs/lib3mf/files/lib3mf-2.1.0-0001-Gentoo-specific-avoid-pre-stripping-library.patch
@@ -0,0 +1,27 @@
+From 13f974157b178efe4c6d617f23246dde2b100f0d Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Wed, 10 Feb 2021 18:49:14 +0100
+Subject: [PATCH] [Gentoo-specific] avoid pre-stripping library
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ CMakeLists.txt | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9c8b4ba..05d493f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -182,9 +182,6 @@ if (UNIX OR MINGW)
+ # Uncomment the following to put the version info into the .so-file.
+ set_target_properties(${PROJECT_NAME} PROPERTIES VERSION "${LIB3MF_VERSION_MAJOR}.${LIB3MF_VERSION_MINOR}.${LIB3MF_VERSION_MICRO}.${BUILD_NUMBER}")
+ set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION "${LIB3MF_VERSION_MAJOR}")
+- if (NOT APPLE)
+- set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS -s)
+- endif()
+ else()
+ # wd4996 masks the deprecated-warning
+ target_compile_options(${PROJECT_NAME} PUBLIC "$<$<CONFIG:DEBUG>:/Od;/Ob0;/sdl;/W3;/WX;/FC;/wd4996>")
+--
+2.30.1
+
diff --git a/media-libs/lib3mf/lib3mf-2.1.0.ebuild b/media-libs/lib3mf/lib3mf-2.1.0.ebuild
new file mode 100644
index 00000000000..39ab6d0de47
--- /dev/null
+++ b/media-libs/lib3mf/lib3mf-2.1.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Implementation of the 3D Manufacturing Format file standard"
+HOMEPAGE="https://3mf.io/"
+SRC_URI="https://github.com/3MFConsortium/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/2"
+# the included ACT binary is a statically x86_64 built one
+# see https://github.com/3MFConsortium/lib3mf/issues/199
+# no package available for ACT yet in Gentoo.
+# Keywords x86 and arm64 can be re-added after we have a package
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-libs/libzip:=
+ sys-apps/util-linux
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ test? (
+ dev-cpp/gtest
+ dev-libs/openssl
+ dev-util/valgrind
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-0001-Gentoo-specific-avoid-pre-stripping-library.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_INCLUDEDIR="include/${PN}"
+ -DLIB3MF_TESTS=$(usex test)
+ -DUSE_INCLUDED_LIBZIP=OFF
+ -DUSE_INCLUDED_ZLIB=OFF
+ )
+
+ if use test; then
+ mycmakeargs+=(
+ -DUSE_INCLUDED_GTEST=OFF
+ # code says it uses libressl, but works with openssl too
+ -DUSE_INCLUDED_SSL=OFF
+ )
+ fi
+
+ cmake_src_configure
+}
+
+src_install() {
+ local DOCS=( CONTRIBUTING.md README.md )
+ cmake_src_install
+
+ cd "${ED}/usr/include/${PN}" || die
+ ln -sf Bindings/Cpp/${PN}_{abi,types,implicit}.hpp . || die
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/lib3mf/, media-libs/lib3mf/files/
@ 2021-05-22 18:07 John Helmert III
0 siblings, 0 replies; 5+ messages in thread
From: John Helmert III @ 2021-05-22 18:07 UTC (permalink / raw
To: gentoo-commits
commit: 597aa89b98cffb21a4d8c7f3ca4e32dc44fb44cd
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sat May 22 16:26:24 2021 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Sat May 22 18:06:53 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=597aa89b
media-libs/lib3mf: drop 1.8.1
Security cleanup
Bug: https://bugs.gentoo.org/775362
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/20931
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
media-libs/lib3mf/Manifest | 1 -
...ntoo-specific-avoid-pre-stripping-library.patch | 27 ----------
...-1.8.1-0002-Add-library-link-dependencies.patch | 59 ----------------------
....8.1-0003-Change-installation-include-dir.patch | 44 ----------------
...4-Gentoo-specific-Remove-gtest-source-dir.patch | 35 -------------
media-libs/lib3mf/lib3mf-1.8.1.ebuild | 48 ------------------
media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild | 4 --
7 files changed, 218 deletions(-)
diff --git a/media-libs/lib3mf/Manifest b/media-libs/lib3mf/Manifest
index de9e1b85980..957eb0a7970 100644
--- a/media-libs/lib3mf/Manifest
+++ b/media-libs/lib3mf/Manifest
@@ -1,2 +1 @@
-DIST lib3mf-1.8.1.tar.gz 8415939 BLAKE2B 45652aab8c84eb5d500455db211eb911c6e74decf4fbbb652976847e1b3ea16db9c626bd37cd9669aefc8dea29c424e6518e0517e8f96fa6282771e34f840290 SHA512 f7fd75bcb6472de1595a018e5add516d0d78ab0aee92462b686b77f8d2bef05270e7b737cb7e1d31fc5850815056e753874c2f9ec456a455e8461c4010fe914a
DIST lib3mf-2.1.1.tar.gz 15917671 BLAKE2B eacf066147d5c4e15f79d374a377b5ef3b4bc8b4db20ca29e95df5cded11420874ab2df8b5bc48d4a47bbbb6bcb28390e72dae422ad43d5df4d1fd0cd4ed4878 SHA512 43b1091721e994adfa8390ed6542dc207b62dee278d8747fcca044692a72123c3445d4e7795d5476d15bb535fd1a3ce1da2c2796ab8edb28eb66528778fec846
diff --git a/media-libs/lib3mf/files/lib3mf-1.8.1-0001-Gentoo-specific-avoid-pre-stripping-library.patch b/media-libs/lib3mf/files/lib3mf-1.8.1-0001-Gentoo-specific-avoid-pre-stripping-library.patch
deleted file mode 100644
index c695283cffb..00000000000
--- a/media-libs/lib3mf/files/lib3mf-1.8.1-0001-Gentoo-specific-avoid-pre-stripping-library.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d97ad4604af7998541567ec486f90dd528e839b1 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Wed, 8 Apr 2020 19:09:42 +0200
-Subject: [PATCH 1/4] [Gentoo-specific] avoid pre-stripping library
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5453440..c867224 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -104,7 +104,8 @@ if (UNIX OR MINGW)
- # Uncomment the following to but the version info into the .so-file.
- SET_TARGET_PROPERTIES(${PROJECT_NAME}_s PROPERTIES VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
- SET_TARGET_PROPERTIES(${PROJECT_NAME}_s PROPERTIES SOVERSION "${PROJECT_VERSION_MAJOR}")
-- if (NOT APPLE)
-+ # avoid pre-stripping on Gentoo, this is done by emerge
-+ if (NOT APPLE OR (UNIX AND NOT CMAKE_BUILD_TYPE MATCHES "Gentoo"))
- SET_TARGET_PROPERTIES(${PROJECT_NAME}_s PROPERTIES LINK_FLAGS -s)
- endif()
- if (NOT WIN32)
---
-2.26.0
-
diff --git a/media-libs/lib3mf/files/lib3mf-1.8.1-0002-Add-library-link-dependencies.patch b/media-libs/lib3mf/files/lib3mf-1.8.1-0002-Add-library-link-dependencies.patch
deleted file mode 100644
index de5331ae66e..00000000000
--- a/media-libs/lib3mf/files/lib3mf-1.8.1-0002-Add-library-link-dependencies.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 976f14e1ac26389dbfc04bcffd9f4e7e21197001 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Wed, 8 Apr 2020 20:05:16 +0200
-Subject: [PATCH] Add library link dependencies
-
-If USE_INCLUDED_LIBZIP and/or USE_INCLUDED_ZLIB are not set
-add them to target_link_libaries command.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- CMakeLists.txt | 10 +++++++++-
- UnitTests/CPP/CMakeLists.txt | 10 +++++++++-
- 2 files changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c867224..df87806 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -130,7 +130,15 @@ add_library(${PROJECT_NAME} SHARED ${SRCS_MAIN_PLATFORM}
- )
- set(STARTUPPROJECT ${PROJECT_NAME})
- SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES PREFIX "" IMPORT_PREFIX "")
--target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}_s)
-+if(USE_INCLUDED_LIBZIP AND USE_INCLUDED_ZLIB)
-+ target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}_s)
-+elseif(USE_INCLUDED_LIBZIP AND NOT USE_INCLUDED_ZLIB)
-+ target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}_s z)
-+elseif(USE_INCLUDED_ZLIB AND NOT USE_INCLUDED_LIBZIP)
-+ target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}_s zip)
-+else()
-+ target_link_libraries(${PROJECT_NAME} ${PROJECT_NAME}_s zip z)
-+endif()
- if (UNIX OR MINGW)
- # Uncomment the following to but the version info into the .so-file.
- SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.${BUILD_NUMBER}")
-diff --git a/UnitTests/CPP/CMakeLists.txt b/UnitTests/CPP/CMakeLists.txt
-index 2fdf85d..24d32bf 100644
---- a/UnitTests/CPP/CMakeLists.txt
-+++ b/UnitTests/CPP/CMakeLists.txt
-@@ -22,7 +22,15 @@ if (WIN32)
- endif()
-
- target_include_directories(${TESTNAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Include ${gtest_SOURCE_DIR}/include)
--target_link_libraries(${TESTNAME} ${PROJECT_NAME}_s gtest gtest_main)
-+if(USE_INCLUDED_LIBZIP AND USE_INCLUDED_ZLIB)
-+ target_link_libraries(${TESTNAME} ${PROJECT_NAME}_s gtest gtest_main)
-+elseif(USE_INCLUDED_LIBZIP AND NOT USE_INCLUDED_ZLIB)
-+ target_link_libraries(${TESTNAME} ${PROJECT_NAME}_s gtest gtest_main z)
-+elseif(USE_INCLUDED_ZLIB AND NOT USE_INCLUDED_LIBZIP)
-+ target_link_libraries(${TESTNAME} ${PROJECT_NAME}_s gtest gtest_main zip)
-+else()
-+ target_link_libraries(${TESTNAME} ${PROJECT_NAME}_s gtest gtest_main zip z)
-+endif()
- add_dependencies(${TESTNAME} ${PROJECT_NAME}_s)
- set_target_properties(${TESTNAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/")
-
---
-2.26.0
-
diff --git a/media-libs/lib3mf/files/lib3mf-1.8.1-0003-Change-installation-include-dir.patch b/media-libs/lib3mf/files/lib3mf-1.8.1-0003-Change-installation-include-dir.patch
deleted file mode 100644
index 3d79c0d4a4f..00000000000
--- a/media-libs/lib3mf/files/lib3mf-1.8.1-0003-Change-installation-include-dir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From f61a4c09977097b0d456ce9e480c2630b90cdc30 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Wed, 8 Apr 2020 19:16:07 +0200
-Subject: [PATCH 3/4] Change installation include dir to a more specific one.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- CMakeLists.txt | 6 +++---
- lib3MF.pc.in | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index df87806..3101c65 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -148,9 +148,9 @@ install(TARGETS ${PROJECT_NAME}
- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
- LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
- RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
--install(DIRECTORY Include/Model DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
--install(DIRECTORY Include/Common DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
--install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Include/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-+install(DIRECTORY Include/Model DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/lib3mf")
-+install(DIRECTORY Include/Common DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/lib3mf")
-+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Include/ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/lib3mf")
-
- #########################################################
- configure_file(lib3MF.pc.in lib3MF.pc @ONLY)
-diff --git a/lib3MF.pc.in b/lib3MF.pc.in
-index 9afb6ee..cf8cafb 100644
---- a/lib3MF.pc.in
-+++ b/lib3MF.pc.in
-@@ -1,7 +1,7 @@
- prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@
- libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
--includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/lib3mf
-
- Name: @PROJECT_NAME@
- Description: @PROJECT_DESCRIPTION@
---
-2.26.0
-
diff --git a/media-libs/lib3mf/files/lib3mf-1.8.1-0004-Gentoo-specific-Remove-gtest-source-dir.patch b/media-libs/lib3mf/files/lib3mf-1.8.1-0004-Gentoo-specific-Remove-gtest-source-dir.patch
deleted file mode 100644
index edc202e8303..00000000000
--- a/media-libs/lib3mf/files/lib3mf-1.8.1-0004-Gentoo-specific-Remove-gtest-source-dir.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From f392342f819b59449228100b7de8c14eda3cc391 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Wed, 8 Apr 2020 19:55:40 +0200
-Subject: [PATCH] [Gentoo-specific] Remove gtest source dir
-
-We use system gtest on Gentoo
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- UnitTests/CMakeLists.txt | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/UnitTests/CMakeLists.txt b/UnitTests/CMakeLists.txt
-index 59ae773..1212228 100644
---- a/UnitTests/CMakeLists.txt
-+++ b/UnitTests/CMakeLists.txt
-@@ -1,7 +1,5 @@
--ADD_SUBDIRECTORY (googletest EXCLUDE_FROM_ALL)
- enable_testing()
--
--SET(gtest_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/googletest/googletest")
-+
- add_definitions( -DTESTFILESPATH="${CMAKE_CURRENT_SOURCE_DIR}/../TestFiles")
- add_definitions( -DLTESTFILESPATH=L"${CMAKE_CURRENT_SOURCE_DIR}/../TestFiles")
- add_definitions( -DLOUTFILESPATH=L"${CMAKE_BINARY_DIR}/")
-@@ -12,4 +10,4 @@ add_subdirectory(C_Interface)
- # Tests on internal classes of the library
- add_subdirectory(CPP)
-
--set(STARTUPPROJECT ${STARTUPPROJECT} PARENT_SCOPE)
-\ No newline at end of file
-+set(STARTUPPROJECT ${STARTUPPROJECT} PARENT_SCOPE)
---
-2.26.0
-
diff --git a/media-libs/lib3mf/lib3mf-1.8.1.ebuild b/media-libs/lib3mf/lib3mf-1.8.1.ebuild
deleted file mode 100644
index a51555571c7..00000000000
--- a/media-libs/lib3mf/lib3mf-1.8.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Implementation of the 3D Manufacturing Format file standard"
-HOMEPAGE="https://3mf.io/"
-SRC_URI="https://github.com/3MFConsortium/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/libzip:=
- sys-apps/util-linux
- sys-libs/zlib
-"
-DEPEND="
- ${RDEPEND}
- test? ( >=dev-cpp/gtest-1.8.0 )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-0001-Gentoo-specific-avoid-pre-stripping-library.patch"
- "${FILESDIR}/${P}-0002-Add-library-link-dependencies.patch"
- "${FILESDIR}/${P}-0003-Change-installation-include-dir.patch"
- "${FILESDIR}/${P}-0004-Gentoo-specific-Remove-gtest-source-dir.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DLIB3MF_TESTS=$(usex test)
- -DUSE_INCLUDED_LIBZIP=OFF
- -DUSE_INCLUDED_ZLIB=OFF
- )
- cmake_src_configure
-}
-
-src_install() {
- local DOCS=( CONTRIBUTING.md README.md )
- use doc && DOCS+=( Lib3MF-1.pdf )
- cmake_src_install
-}
diff --git a/media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild b/media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild
index f2853dab0b2..bae4219d6bb 100644
--- a/media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild
+++ b/media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild
@@ -11,10 +11,6 @@ SRC_URI="https://github.com/3MFConsortium/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
LICENSE="BSD"
SLOT="0/2"
-# the included ACT binary is a statically x86_64 built one
-# see https://github.com/3MFConsortium/lib3mf/issues/199
-# Keyword arm64 can be re-added after we have dev-go/act
-# package keyworded
KEYWORDS="amd64 ~arm64 x86"
IUSE="+system-act test"
RESTRICT="!test? ( test )"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/lib3mf/, media-libs/lib3mf/files/
@ 2021-10-24 4:06 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2021-10-24 4:06 UTC (permalink / raw
To: gentoo-commits
commit: c3f5d8e908b956a30e72a6b40f2c559d24a30b1e
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Wed Aug 25 06:05:48 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 24 04:06:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3f5d8e9
media-libs/lib3mf: bump to 2.2.0
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/22640
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/lib3mf/Manifest | 1 +
...2.2.0-0001-use-system-provided-act-binary.patch | 141 +++++++++++++++++++++
...2-Gentoo-specific-remove-add_dependencies.patch | 29 +++++
media-libs/lib3mf/lib3mf-2.2.0.ebuild | 66 ++++++++++
4 files changed, 237 insertions(+)
diff --git a/media-libs/lib3mf/Manifest b/media-libs/lib3mf/Manifest
index 957eb0a7970..42f1c787d50 100644
--- a/media-libs/lib3mf/Manifest
+++ b/media-libs/lib3mf/Manifest
@@ -1 +1,2 @@
DIST lib3mf-2.1.1.tar.gz 15917671 BLAKE2B eacf066147d5c4e15f79d374a377b5ef3b4bc8b4db20ca29e95df5cded11420874ab2df8b5bc48d4a47bbbb6bcb28390e72dae422ad43d5df4d1fd0cd4ed4878 SHA512 43b1091721e994adfa8390ed6542dc207b62dee278d8747fcca044692a72123c3445d4e7795d5476d15bb535fd1a3ce1da2c2796ab8edb28eb66528778fec846
+DIST lib3mf-2.2.0.tar.gz 16439833 BLAKE2B c98f57ea99f90625f2bfbdbcde9df8dbd8aeccc655e1bd9be165c24b2d9fb74471e4b01c816d8f665e5793db77c7bcf52016f030ec1947f908d6647e9ad12745 SHA512 2a9ee92312396b8966967a7ed696c58c69a77438f94432ad071659adc8c9d12fba34a3cf3d8c8d3ad3b26c12c9a89f4d8645e6f396987dc05b04952b004a1f07
diff --git a/media-libs/lib3mf/files/lib3mf-2.2.0-0001-use-system-provided-act-binary.patch b/media-libs/lib3mf/files/lib3mf-2.2.0-0001-use-system-provided-act-binary.patch
new file mode 100644
index 00000000000..35beebf1930
--- /dev/null
+++ b/media-libs/lib3mf/files/lib3mf-2.2.0-0001-use-system-provided-act-binary.patch
@@ -0,0 +1,141 @@
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Wed, 25 Aug 2021 09:29:17 +0200
+Subject: [PATCH] use system provided act binary
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ CMakeLists.txt | 110 ++++++++++++++++++++++++++++++++-----------------
+ 1 file changed, 73 insertions(+), 37 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d70a030..9c91496 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -62,14 +62,19 @@ endif()
+
+
+ ### The API generation target
+-if(CMAKE_HOST_UNIX)
+- if(APPLE)
+- set(ACT_COMMANDENDING darwin)
+- else()
+- set(ACT_COMMANDENDING linux)
++option(USE_SYSTEM_ACT "Use system provided act binary" OFF)
++if(NOT USE_SYSTEM_ACT)
++ if(CMAKE_HOST_UNIX)
++ if(APPLE)
++ set(ACT_COMMANDENDING darwin)
++ else()
++ set(ACT_COMMANDENDING linux)
++ endif()
++ elseif(CMAKE_HOST_WIN32)
++ set(ACT_COMMANDENDING exe)
+ endif()
+-elseif(CMAKE_HOST_WIN32)
+- set(ACT_COMMANDENDING exe)
++else()
++ find_program(ACT act)
+ endif()
+
+ set(CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED ${CMAKE_CURRENT_SOURCE_DIR}/Autogenerated)
+@@ -80,36 +85,67 @@ set(ACT_GENERATED_SOURCE
+ ${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Source/lib3mf_interfacewrapper.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Source/lib3mf_interfacejournal.cpp
+ )
+-add_custom_command(
+- BYPRODUCTS
+- ${ACT_GENERATED_SOURCE}
+- OUTPUT
+- ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP
+- WORKING_DIRECTORY
+- ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit
+- COMMAND
+- cmake -E make_directory "${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}"
+- COMMAND
+- cmake -E touch "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP"
+- COMMAND
+- ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/bin/act.${ACT_COMMANDENDING} ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
+- COMMAND
+- cmake -E remove_directory "${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Source"
+- COMMAND
+- cmake -E remove_directory "${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Bindings"
+- COMMAND
+- cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Bindings" ${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Bindings
+- COMMAND
+- cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Implementations/Cpp/Interfaces" "${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Source/"
+- COMMAND
+- cmake -E remove_directory "${CMAKE_TEMP_HEADER_FOLDER}"
+- COMMENT
+- "Generating hourglass API bindings and implementation stub"
+- DEPENDS
+- ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
+- VERBATIM
+-)
+-
++if(NOT USE_SYSTEM_ACT)
++ add_custom_command(
++ BYPRODUCTS
++ ${ACT_GENERATED_SOURCE}
++ OUTPUT
++ ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP
++ WORKING_DIRECTORY
++ ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit
++ COMMAND
++ cmake -E make_directory "${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}"
++ COMMAND
++ cmake -E touch "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP"
++ COMMAND
++ ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/bin/act.${ACT_COMMANDENDING} ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
++ COMMAND
++ cmake -E remove_directory "${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Source"
++ COMMAND
++ cmake -E remove_directory "${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Bindings"
++ COMMAND
++ cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Bindings" ${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Bindings
++ COMMAND
++ cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Implementations/Cpp/Interfaces" "${CMAKE_CURRENT_SOURCE_DIR_AUTOGENERATED}/Source/"
++ COMMAND
++ cmake -E remove_directory "${CMAKE_TEMP_HEADER_FOLDER}"
++ COMMENT
++ "Generating hourglass API bindings and implementation stub"
++ DEPENDS
++ ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
++ VERBATIM
++ )
++else()
++ add_custom_command(
++ BYPRODUCTS
++ ${ACT_GENERATED_SOURCE}
++ OUTPUT
++ ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP
++ WORKING_DIRECTORY
++ ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit
++ COMMAND
++ cmake -E make_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}"
++ COMMAND
++ cmake -E touch "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP"
++ COMMAND
++ ${ACT} ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
++ COMMAND
++ cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source"
++ COMMAND
++ cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings"
++ COMMAND
++ cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Bindings" ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings
++ COMMAND
++ cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Implementations/Cpp/Interfaces" "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source/"
++ COMMAND
++ cmake -E remove_directory "${CMAKE_TEMP_HEADER_FOLDER}"
++ COMMENT
++ "Generating hourglass API bindings and implementation stub"
++ DEPENDS
++ ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
++ VERBATIM
++ )
++endif()
+ add_custom_target(lib3mfACT
+ DEPENDS
+ ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP
+--
+2.32.0
+
diff --git a/media-libs/lib3mf/files/lib3mf-2.2.0-0002-Gentoo-specific-remove-add_dependencies.patch b/media-libs/lib3mf/files/lib3mf-2.2.0-0002-Gentoo-specific-remove-add_dependencies.patch
new file mode 100644
index 00000000000..742c877e2b4
--- /dev/null
+++ b/media-libs/lib3mf/files/lib3mf-2.2.0-0002-Gentoo-specific-remove-add_dependencies.patch
@@ -0,0 +1,29 @@
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Wed, 25 Aug 2021 18:19:25 +0200
+Subject: [PATCH] [Gentoo specific] remove add_dependencies
+
+Remove the add_dependencies commands on ssl and crypto.
+We use global openssl support instead of package libressl.
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ Tests/CPP_Bindings/CMakeLists.txt | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/Tests/CPP_Bindings/CMakeLists.txt b/Tests/CPP_Bindings/CMakeLists.txt
+index 4a816a5..c26c498 100644
+--- a/Tests/CPP_Bindings/CMakeLists.txt
++++ b/Tests/CPP_Bindings/CMakeLists.txt
+@@ -47,9 +47,6 @@ if (WIN32)
+ target_compile_options(${TESTNAME} PUBLIC "$<$<CONFIG:RELEASE>:/O2;/sdl;/WX;/Oi;/Gy;/FC;/MD;/wd4996>")
+ endif()
+
+-add_dependencies(${TESTNAME} ssl)
+-add_dependencies(${TESTNAME} crypto)
+-
+ target_include_directories(${TESTNAME} PRIVATE
+ ${CMAKE_CURRENT_SOURCE_DIR}/Include
+ ${gtest_SOURCE_DIR}/include
+--
+2.32.0
+
diff --git a/media-libs/lib3mf/lib3mf-2.2.0.ebuild b/media-libs/lib3mf/lib3mf-2.2.0.ebuild
new file mode 100644
index 00000000000..d37a2212018
--- /dev/null
+++ b/media-libs/lib3mf/lib3mf-2.2.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Implementation of the 3D Manufacturing Format file standard"
+HOMEPAGE="https://3mf.io/ https://github.com/3MFConsortium/lib3mf"
+SRC_URI="https://github.com/3MFConsortium/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+system-act test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-libs/libzip:=
+ sys-apps/util-linux
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ system-act? ( dev-go/act )
+ test? (
+ dev-cpp/gtest
+ dev-libs/openssl
+ dev-util/valgrind
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.1.0-0001-Gentoo-specific-avoid-pre-stripping-library.patch
+ "${FILESDIR}"/${P}-0001-use-system-provided-act-binary.patch
+ "${FILESDIR}"/${P}-0002-Gentoo-specific-remove-add_dependencies.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_INCLUDEDIR="include/${PN}"
+ -DLIB3MF_TESTS=$(usex test)
+ -DUSE_INCLUDED_LIBZIP=OFF
+ -DUSE_INCLUDED_ZLIB=OFF
+ -DUSE_SYSTEM_ACT=$(usex system-act)
+ )
+
+ if use test; then
+ mycmakeargs+=(
+ -DUSE_INCLUDED_GTEST=OFF
+ # code says it uses libressl, but works with openssl too
+ -DUSE_INCLUDED_SSL=OFF
+ )
+ fi
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ for suf in abi types implicit; do
+ dosym -r /usr/include/${PN}/Bindings/Cpp/${PN}_${suf}.hpp /usr/include/${PN}/${PN}_${suf}.hpp
+ done
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/lib3mf/, media-libs/lib3mf/files/
@ 2022-04-24 7:40 Joonas Niilola
0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2022-04-24 7:40 UTC (permalink / raw
To: gentoo-commits
commit: 5a611d4020c6696fced33530735bc94ebb0dc5c3
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sat Apr 23 09:16:20 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 07:26:14 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a611d40
media-libs/lib3mf: drop 2.1.1-r1
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/25166
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/lib3mf/Manifest | 1 -
...1-patch-to-use-system-provided-act-binary.patch | 141 ---------------------
media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild | 65 ----------
3 files changed, 207 deletions(-)
diff --git a/media-libs/lib3mf/Manifest b/media-libs/lib3mf/Manifest
index 42f1c787d50a..be0a6fe8db35 100644
--- a/media-libs/lib3mf/Manifest
+++ b/media-libs/lib3mf/Manifest
@@ -1,2 +1 @@
-DIST lib3mf-2.1.1.tar.gz 15917671 BLAKE2B eacf066147d5c4e15f79d374a377b5ef3b4bc8b4db20ca29e95df5cded11420874ab2df8b5bc48d4a47bbbb6bcb28390e72dae422ad43d5df4d1fd0cd4ed4878 SHA512 43b1091721e994adfa8390ed6542dc207b62dee278d8747fcca044692a72123c3445d4e7795d5476d15bb535fd1a3ce1da2c2796ab8edb28eb66528778fec846
DIST lib3mf-2.2.0.tar.gz 16439833 BLAKE2B c98f57ea99f90625f2bfbdbcde9df8dbd8aeccc655e1bd9be165c24b2d9fb74471e4b01c816d8f665e5793db77c7bcf52016f030ec1947f908d6647e9ad12745 SHA512 2a9ee92312396b8966967a7ed696c58c69a77438f94432ad071659adc8c9d12fba34a3cf3d8c8d3ad3b26c12c9a89f4d8645e6f396987dc05b04952b004a1f07
diff --git a/media-libs/lib3mf/files/lib3mf-2.1.1-0001-patch-to-use-system-provided-act-binary.patch b/media-libs/lib3mf/files/lib3mf-2.1.1-0001-patch-to-use-system-provided-act-binary.patch
deleted file mode 100644
index 00089c58468f..000000000000
--- a/media-libs/lib3mf/files/lib3mf-2.1.1-0001-patch-to-use-system-provided-act-binary.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-From c4e004aa8580f799dbbb7ec6951e0826dc387811 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Tue, 6 Apr 2021 08:45:45 +0200
-Subject: [PATCH] patch to use system-provided act binary
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- CMakeLists.txt | 109 +++++++++++++++++++++++++++++++++----------------
- 1 file changed, 73 insertions(+), 36 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 64a11d9..55abdde 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -54,14 +54,19 @@ if (${MSVC})
- endif()
-
- ### The API generation target
--if(CMAKE_HOST_UNIX)
-- if(APPLE)
-- set(ACT_COMMANDENDING darwin)
-- else()
-- set(ACT_COMMANDENDING linux)
-+option(USE_SYSTEM_ACT "Use system-provided act binary" OFF)
-+if(NOT USE_SYSTEM_ACT)
-+ if(CMAKE_HOST_UNIX)
-+ if(APPLE)
-+ set(ACT_COMMANDENDING darwin)
-+ else()
-+ set(ACT_COMMANDENDING linux)
-+ endif()
-+ elseif(CMAKE_HOST_WIN32)
-+ set(ACT_COMMANDENDING exe)
- endif()
--elseif(CMAKE_HOST_WIN32)
-- set(ACT_COMMANDENDING exe)
-+else()
-+ find_program(ACT act)
- endif()
-
- set(CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED ${CMAKE_CURRENT_BINARY_DIR}/Autogenerated)
-@@ -71,35 +76,67 @@ set(ACT_GENERATED_SOURCE
- ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source/Implementation/lib3mf_interfacewrapper.cpp
- ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source/Implementation/lib3mf_interfacejournal.cpp
- )
--add_custom_command(
-- BYPRODUCTS
-- ${ACT_GENERATED_SOURCE}
-- OUTPUT
-- ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP
-- WORKING_DIRECTORY
-- ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit
-- COMMAND
-- cmake -E make_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}"
-- COMMAND
-- cmake -E touch "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP"
-- COMMAND
-- ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/bin/act.${ACT_COMMANDENDING} ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
-- COMMAND
-- cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source"
-- COMMAND
-- cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings"
-- COMMAND
-- cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Bindings" ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings
-- COMMAND
-- cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Implementations/Cpp/Interfaces" "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source/Implementation"
-- COMMAND
-- cmake -E remove_directory "${CMAKE_TEMP_HEADER_FOLDER}"
-- COMMENT
-- "Generating hourglass API bindings and implementation stub"
-- DEPENDS
-- ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
-- VERBATIM
--)
-+if(NOT USE_SYSTEM_ACT)
-+ add_custom_command(
-+ BYPRODUCTS
-+ ${ACT_GENERATED_SOURCE}
-+ OUTPUT
-+ ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP
-+ WORKING_DIRECTORY
-+ ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit
-+ COMMAND
-+ cmake -E make_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}"
-+ COMMAND
-+ cmake -E touch "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP"
-+ COMMAND
-+ ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/bin/act.${ACT_COMMANDENDING} ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
-+ COMMAND
-+ cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source"
-+ COMMAND
-+ cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings"
-+ COMMAND
-+ cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Bindings" ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings
-+ COMMAND
-+ cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Implementations/Cpp/Interfaces" "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source/Implementation"
-+ COMMAND
-+ cmake -E remove_directory "${CMAKE_TEMP_HEADER_FOLDER}"
-+ COMMENT
-+ "Generating hourglass API bindings and implementation stub"
-+ DEPENDS
-+ ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
-+ VERBATIM
-+ )
-+else()
-+ add_custom_command(
-+ BYPRODUCTS
-+ ${ACT_GENERATED_SOURCE}
-+ OUTPUT
-+ ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP
-+ WORKING_DIRECTORY
-+ ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit
-+ COMMAND
-+ cmake -E make_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}"
-+ COMMAND
-+ cmake -E touch "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/LIB3MFACTGENERATIONSTAMP"
-+ COMMAND
-+ ${ACT} ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
-+ COMMAND
-+ cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source"
-+ COMMAND
-+ cmake -E remove_directory "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings"
-+ COMMAND
-+ cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Bindings" ${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Bindings
-+ COMMAND
-+ cmake -E copy_directory "${CMAKE_TEMP_HEADER_FOLDER}/Implementations/Cpp/Interfaces" "${CMAKE_CURRENT_BINARY_DIR_AUTOGENERATED}/Source/Implementation"
-+ COMMAND
-+ cmake -E remove_directory "${CMAKE_TEMP_HEADER_FOLDER}"
-+ COMMENT
-+ "Generating hourglass API bindings and implementation stub"
-+ DEPENDS
-+ ${CMAKE_CURRENT_SOURCE_DIR}/AutomaticComponentToolkit/lib3mf.xml
-+ VERBATIM
-+ )
-+endif()
-
- add_custom_target(lib3mfACT
- DEPENDS
---
-2.31.1
-
diff --git a/media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild b/media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild
deleted file mode 100644
index bae4219d6bb8..000000000000
--- a/media-libs/lib3mf/lib3mf-2.1.1-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake eapi8-dosym
-
-DESCRIPTION="Implementation of the 3D Manufacturing Format file standard"
-HOMEPAGE="https://3mf.io/ https://github.com/3MFConsortium/lib3mf"
-SRC_URI="https://github.com/3MFConsortium/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/2"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+system-act test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/libzip:=
- sys-apps/util-linux
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
- system-act? ( dev-go/act )
- test? (
- dev-cpp/gtest
- dev-libs/openssl
- dev-util/valgrind
- )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.1.0-0001-Gentoo-specific-avoid-pre-stripping-library.patch
- "${FILESDIR}"/${P}-0001-patch-to-use-system-provided-act-binary.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DCMAKE_INSTALL_INCLUDEDIR="include/${PN}"
- -DLIB3MF_TESTS=$(usex test)
- -DUSE_INCLUDED_LIBZIP=OFF
- -DUSE_INCLUDED_ZLIB=OFF
- -DUSE_SYSTEM_ACT=$(usex system-act)
- )
-
- if use test; then
- mycmakeargs+=(
- -DUSE_INCLUDED_GTEST=OFF
- # code says it uses libressl, but works with openssl too
- -DUSE_INCLUDED_SSL=OFF
- )
- fi
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- for suf in abi types implicit; do
- dosym8 -r /usr/include/${PN}/Bindings/Cpp/${PN}_${suf}.hpp /usr/include/${PN}/${PN}_${suf}.hpp
- done
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/lib3mf/, media-libs/lib3mf/files/
@ 2024-08-09 14:29 Sam James
0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2024-08-09 14:29 UTC (permalink / raw
To: gentoo-commits
commit: 9f442ca90187f99c4812018de6d878b16947f5a2
Author: Christopher Fore <csfore <AT> posteo <DOT> net>
AuthorDate: Fri Aug 9 14:23:29 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 9 14:28:52 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f442ca9
media-libs/lib3mf: Fix compilation on GCC 15
- Tests pass
- Patched file is not an installed header
Note: Upstream PR fixes an additional file that does not error on 2.2.0
Upstream: https://github.com/3MFConsortium/lib3mf/pull/387
Closes: https://bugs.gentoo.org/937423
Signed-off-by: Christopher Fore <csfore <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/38030
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/lib3mf/files/lib3mf-2.2.0-include-cstdint.patch | 13 +++++++++++++
media-libs/lib3mf/lib3mf-2.2.0.ebuild | 1 +
2 files changed, 14 insertions(+)
diff --git a/media-libs/lib3mf/files/lib3mf-2.2.0-include-cstdint.patch b/media-libs/lib3mf/files/lib3mf-2.2.0-include-cstdint.patch
new file mode 100644
index 000000000000..36776fd02751
--- /dev/null
+++ b/media-libs/lib3mf/files/lib3mf-2.2.0-include-cstdint.patch
@@ -0,0 +1,13 @@
+diff --git a/Source/Common/Platform/NMR_ImportStream_Unique_Memory.cpp b/Source/Common/Platform/NMR_ImportStream_Unique_Memory.cpp
+index 43fd428..e966aa0 100644
+--- a/Source/Common/Platform/NMR_ImportStream_Unique_Memory.cpp
++++ b/Source/Common/Platform/NMR_ImportStream_Unique_Memory.cpp
+@@ -35,6 +35,8 @@ This is a platform independent class for keeping data in a memory stream that ow
+ #include "Common/NMR_Exception.h"
+ #include "Common/NMR_Exception_Windows.h"
+
++#include <cstdint>
++
+ namespace NMR {
+
+ CImportStream_Unique_Memory::CImportStream_Unique_Memory()
diff --git a/media-libs/lib3mf/lib3mf-2.2.0.ebuild b/media-libs/lib3mf/lib3mf-2.2.0.ebuild
index 97ec4b4b7146..d5d470010791 100644
--- a/media-libs/lib3mf/lib3mf-2.2.0.ebuild
+++ b/media-libs/lib3mf/lib3mf-2.2.0.ebuild
@@ -36,6 +36,7 @@ PATCHES=(
"${FILESDIR}"/${P}-0001-use-system-provided-act-binary.patch
"${FILESDIR}"/${P}-0002-Gentoo-specific-remove-add_dependencies.patch
"${FILESDIR}"/${P}-0001-remove-std-and-opt-flags.patch
+ "${FILESDIR}"/${P}-include-cstdint.patch
)
src_configure() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-08-09 14:29 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-24 4:06 [gentoo-commits] repo/gentoo:master commit in: media-libs/lib3mf/, media-libs/lib3mf/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-08-09 14:29 Sam James
2022-04-24 7:40 Joonas Niilola
2021-05-22 18:07 John Helmert III
2021-03-07 9:03 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox