mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
media-libs/lib3mf: drop 2.1.1-r1
Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> Closes: https://github.com/gentoo/gentoo/pull/25166 Signed-off-by: Joonas Niilola <juippis@gentoo.org>
This commit is contained in:
Bernd Waibel
committed by
Joonas Niilola
Joonas Niilola
parent
2ca2dd6a80
commit
5a611d4020
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
}
|
||||
Reference in New Issue
Block a user