From: "Joonas Niilola" <juippis@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/lib3mf/, media-libs/lib3mf/files/
Date: Sun, 24 Apr 2022 07:40:08 +0000 (UTC) [thread overview]
Message-ID: <1650785174.5a611d4020c6696fced33530735bc94ebb0dc5c3.juippis@gentoo> (raw)
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
-}
next reply other threads:[~2022-04-24 7:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-24 7:40 Joonas Niilola [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-01-06 1:00 [gentoo-commits] repo/gentoo:master commit in: media-libs/lib3mf/, media-libs/lib3mf/files/ Sam James
2024-08-09 14:29 Sam James
2021-10-24 4:06 Sam James
2021-05-22 18:07 John Helmert III
2021-03-07 9:03 Joonas Niilola
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1650785174.5a611d4020c6696fced33530735bc94ebb0dc5c3.juippis@gentoo \
--to=juippis@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox