Gentoo Archives: gentoo-commits

From: Stephan Hartmann <sultan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/apngasm/, media-gfx/apngasm/files/
Date: Wed, 22 Dec 2021 20:25:21
Message-Id: 1640204702.e8a0601218b33c6cf81039017917e1449d415cda.sultan@gentoo
1 commit: e8a0601218b33c6cf81039017917e1449d415cda
2 Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 22 20:24:23 2021 +0000
4 Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 22 20:25:02 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8a06012
7
8 media-gfx/apngasm: bump to 3.1.10
9
10 Bug: https://bugs.gentoo.org/824830
11 Package-Manager: Portage-3.0.28, Repoman-3.0.3
12 Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>
13
14 media-gfx/apngasm/Manifest | 1 +
15 media-gfx/apngasm/apngasm-3.1.10.ebuild | 40 ++++++++++++++++
16 .../apngasm/files/apngasm-3.1.10-static.patch | 55 ++++++++++++++++++++++
17 3 files changed, 96 insertions(+)
18
19 diff --git a/media-gfx/apngasm/Manifest b/media-gfx/apngasm/Manifest
20 index 1c19c3e95c96..d29bfb20fae9 100644
21 --- a/media-gfx/apngasm/Manifest
22 +++ b/media-gfx/apngasm/Manifest
23 @@ -1 +1,2 @@
24 DIST apngasm-2.91-src.zip 597267 BLAKE2B a34a765fef49aa0ac29973b8dc450bfcdfe7aa83dffe19919f916a136db3d0bfebf3c1fac79bfb81a3900cee87afd888469e5432500d181a9539696b4573a42b SHA512 2415389a989f7a7ff7f3e1328f7920c7515c9a492c89ef216ff53db68fe2f1a674ff60d5f4bfd5a8c710f625456557ae7d5b25f486ac826e3113976cd9fc11dc
25 +DIST apngasm-3.1.10.tar.gz 620031 BLAKE2B 6885b87815e76e8b9eed58548568bf821dfdf61579f83fc1aa977638f34c2112ebbfebba3454b0a2cfc01b465e570a7976e0fb8046a0762e9d35cf30e3d3f4cd SHA512 670d75251ddc771f9b2b4a1f401066f2012a6814bec781b918f1d9e8960835654c66c3d19b4c8920d5186d85af12cdc4bba8b61c8f3d349b4fc70513d8ecb34e
26
27 diff --git a/media-gfx/apngasm/apngasm-3.1.10.ebuild b/media-gfx/apngasm/apngasm-3.1.10.ebuild
28 new file mode 100644
29 index 000000000000..15fc7a28415d
30 --- /dev/null
31 +++ b/media-gfx/apngasm/apngasm-3.1.10.ebuild
32 @@ -0,0 +1,40 @@
33 +# Copyright 1999-2021 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=8
37 +
38 +inherit cmake
39 +
40 +DESCRIPTION="create an APNG from multiple PNG files"
41 +HOMEPAGE="https://github.com/apngasm/apngasm"
42 +SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
43 +
44 +LICENSE="ZLIB"
45 +SLOT="0"
46 +KEYWORDS="~amd64 ~x86"
47 +
48 +RDEPEND="
49 + dev-libs/boost:=
50 + media-libs/libpng:0=
51 + sys-libs/zlib:=
52 +"
53 +DEPEND="${RDEPEND}"
54 +
55 +PATCHES=(
56 + "${FILESDIR}/${PN}-3.1.10-static.patch"
57 +)
58 +
59 +src_prepare() {
60 + sed -i -e 's|man/man1|share/man/man1|g' cli/CMakeLists.txt || die
61 +
62 + cmake_src_prepare
63 +}
64 +
65 +src_configure() {
66 + local mycmakeargs=(
67 + -DLIB_INSTALL_DIR=$(get_libdir)
68 + -DJAVA=OFF
69 + -DRUBY=OFF
70 + )
71 + cmake_src_configure
72 +}
73
74 diff --git a/media-gfx/apngasm/files/apngasm-3.1.10-static.patch b/media-gfx/apngasm/files/apngasm-3.1.10-static.patch
75 new file mode 100644
76 index 000000000000..a624d03278f3
77 --- /dev/null
78 +++ b/media-gfx/apngasm/files/apngasm-3.1.10-static.patch
79 @@ -0,0 +1,55 @@
80 +--- a/lib/CMakeLists.txt
81 ++++ b/lib/CMakeLists.txt
82 +@@ -55,18 +55,6 @@ set_target_properties(${APNGASM_DYNAMIC_LIB_TARGET}
83 + CXX_STANDARD 20
84 + )
85 +
86 +-# Add the static library/archive
87 +-set(APNGASM_STATIC_LIB_TARGET apngasm-static)
88 +-add_library(${APNGASM_STATIC_LIB_TARGET}
89 +- ${APNGASM_SOURCES}
90 +-)
91 +-set_target_properties(${APNGASM_STATIC_LIB_TARGET}
92 +- PROPERTIES
93 +- POSITION_INDEPENDENT_CODE TRUE
94 +- OUTPUT_NAME apngasm
95 +- CXX_STANDARD 20
96 +-)
97 +-
98 + # Add libraries/includes
99 + #target_link_libraries(${APNGASM_DYNAMIC_LIB_TARGET} stdc++fs)
100 + #target_link_libraries(${APNGASM_STATIC_LIB_TARGET} stdc++fs)
101 +@@ -74,11 +62,9 @@ set_target_properties(${APNGASM_STATIC_LIB_TARGET}
102 + find_package(PNG REQUIRED)
103 + include_directories(${PNG_INCLUDE_DIR})
104 + target_link_libraries(${APNGASM_DYNAMIC_LIB_TARGET} ${PNG_LIBRARY})
105 +-target_link_libraries(${APNGASM_STATIC_LIB_TARGET} ${PNG_LIBRARY})
106 + message(${PNG_VERSION_STRING})
107 +
108 + target_link_libraries(${APNGASM_DYNAMIC_LIB_TARGET} ${ZLIB_LIBRARIES})
109 +-target_link_libraries(${APNGASM_STATIC_LIB_TARGET} ${ZLIB_LIBRARIES})
110 +
111 + #if (APPLE OR WIN32)
112 + # set(Boost_USE_STATIC_LIBS ON)
113 +@@ -88,13 +74,10 @@ target_link_libraries(${APNGASM_STATIC_LIB_TARGET} ${ZLIB_LIBRARIES})
114 + find_package(Boost REQUIRED COMPONENTS program_options regex system)
115 + include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
116 + target_link_libraries(${APNGASM_DYNAMIC_LIB_TARGET} Boost::program_options Boost::regex Boost::system)
117 +-target_link_libraries(${APNGASM_STATIC_LIB_TARGET} Boost::program_options Boost::regex Boost::system)
118 +
119 + get_target_property(APNGASM_DYNAMIC_LIB_TARGET_NAME ${APNGASM_DYNAMIC_LIB_TARGET} OUTPUT_NAME)
120 +-get_target_property(APNGASM_STATIC_LIB_TARGET_NAME ${APNGASM_STATIC_LIB_TARGET} OUTPUT_NAME)
121 + set(APNGASM_LIBRARIES
122 + ${PROJECT_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${APNGASM_DYNAMIC_LIB_TARGET_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
123 +- ${PROJECT_BINARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${APNGASM_STATIC_LIB_TARGET_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
124 + )
125 +
126 + # Installation
127 +@@ -107,7 +90,6 @@ endif ()
128 + install(
129 + TARGETS
130 + ${APNGASM_DYNAMIC_LIB_TARGET}
131 +- ${APNGASM_STATIC_LIB_TARGET}
132 + DESTINATION ${LIB_INSTALL_DIR}
133 + )
134 +