* [gentoo-commits] repo/gentoo:master commit in: media-gfx/apngasm/, media-gfx/apngasm/files/
@ 2020-02-06 3:46 Tim Harder
0 siblings, 0 replies; 3+ messages in thread
From: Tim Harder @ 2020-02-06 3:46 UTC (permalink / raw
To: gentoo-commits
commit: b0d7d89d8d55947a35583e246f07825a740cbf74
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 6 03:27:30 2020 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Thu Feb 6 03:45:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0d7d89d
media-gfx/apngasm: remove old
Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>
media-gfx/apngasm/Manifest | 1 -
media-gfx/apngasm/apngasm-2.7.ebuild | 36 ----------------------
media-gfx/apngasm/files/apngasm-2.7-string_h.patch | 16 ----------
3 files changed, 53 deletions(-)
diff --git a/media-gfx/apngasm/Manifest b/media-gfx/apngasm/Manifest
index bae411f61e7..1c19c3e95c9 100644
--- a/media-gfx/apngasm/Manifest
+++ b/media-gfx/apngasm/Manifest
@@ -1,2 +1 @@
-DIST apngasm-2.7-src.zip 11448 BLAKE2B 848a5c9be65bacb3297c9f0b54235f2143be91840c5f0730c0c7bd1c6d273855d730eb9722860f7543eb6e57e8ace5b775f73f5789ee6814f5d62fec02bd2b14 SHA512 28ec70a4ac02021ff85390ad6863aaca5451937209345128ecd5baf76bef9495168c3c4ee5d823afbeb569ca673328673a81b807e7985c3d5d1843c056af7810
DIST apngasm-2.91-src.zip 597267 BLAKE2B a34a765fef49aa0ac29973b8dc450bfcdfe7aa83dffe19919f916a136db3d0bfebf3c1fac79bfb81a3900cee87afd888469e5432500d181a9539696b4573a42b SHA512 2415389a989f7a7ff7f3e1328f7920c7515c9a492c89ef216ff53db68fe2f1a674ff60d5f4bfd5a8c710f625456557ae7d5b25f486ac826e3113976cd9fc11dc
diff --git a/media-gfx/apngasm/apngasm-2.7.ebuild b/media-gfx/apngasm/apngasm-2.7.ebuild
deleted file mode 100644
index 49660f693fc..00000000000
--- a/media-gfx/apngasm/apngasm-2.7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="create an APNG from multiple PNG files"
-HOMEPAGE="https://sourceforge.net/projects/apngasm/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-src.zip"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="media-libs/libpng:0=[apng]
- sys-libs/zlib:="
-DEPEND="${RDEPEND}
- app-arch/unzip
- virtual/pkgconfig"
-
-S=${WORKDIR}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-string_h.patch #465780
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" LDLIBS="$($(tc-getPKG_CONFIG) --libs libpng --libs zlib)" ${PN}
-}
-
-src_install() {
- dobin ${PN}
- dodoc readme.txt
-}
diff --git a/media-gfx/apngasm/files/apngasm-2.7-string_h.patch b/media-gfx/apngasm/files/apngasm-2.7-string_h.patch
deleted file mode 100644
index 303e832b37c..00000000000
--- a/media-gfx/apngasm/files/apngasm-2.7-string_h.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://bugs.gentoo.org/465780
-
-Same for all of memcpy(), memset(), strlen() and strcpy():
-
-apngasm.c:141:11: warning: incompatible implicit declaration of built-in function ‘memcpy’ [enabled by default]
-
---- apngasm.c
-+++ apngasm.c
-@@ -29,6 +29,7 @@
- */
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include "png.h" /* original (unpatched) libpng is ok */
- #include "zlib.h"
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/apngasm/, media-gfx/apngasm/files/
@ 2021-12-22 20:25 Stephan Hartmann
0 siblings, 0 replies; 3+ messages in thread
From: Stephan Hartmann @ 2021-12-22 20:25 UTC (permalink / raw
To: gentoo-commits
commit: e8a0601218b33c6cf81039017917e1449d415cda
Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 22 20:24:23 2021 +0000
Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Wed Dec 22 20:25:02 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8a06012
media-gfx/apngasm: bump to 3.1.10
Bug: https://bugs.gentoo.org/824830
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>
media-gfx/apngasm/Manifest | 1 +
media-gfx/apngasm/apngasm-3.1.10.ebuild | 40 ++++++++++++++++
.../apngasm/files/apngasm-3.1.10-static.patch | 55 ++++++++++++++++++++++
3 files changed, 96 insertions(+)
diff --git a/media-gfx/apngasm/Manifest b/media-gfx/apngasm/Manifest
index 1c19c3e95c96..d29bfb20fae9 100644
--- a/media-gfx/apngasm/Manifest
+++ b/media-gfx/apngasm/Manifest
@@ -1 +1,2 @@
DIST apngasm-2.91-src.zip 597267 BLAKE2B a34a765fef49aa0ac29973b8dc450bfcdfe7aa83dffe19919f916a136db3d0bfebf3c1fac79bfb81a3900cee87afd888469e5432500d181a9539696b4573a42b SHA512 2415389a989f7a7ff7f3e1328f7920c7515c9a492c89ef216ff53db68fe2f1a674ff60d5f4bfd5a8c710f625456557ae7d5b25f486ac826e3113976cd9fc11dc
+DIST apngasm-3.1.10.tar.gz 620031 BLAKE2B 6885b87815e76e8b9eed58548568bf821dfdf61579f83fc1aa977638f34c2112ebbfebba3454b0a2cfc01b465e570a7976e0fb8046a0762e9d35cf30e3d3f4cd SHA512 670d75251ddc771f9b2b4a1f401066f2012a6814bec781b918f1d9e8960835654c66c3d19b4c8920d5186d85af12cdc4bba8b61c8f3d349b4fc70513d8ecb34e
diff --git a/media-gfx/apngasm/apngasm-3.1.10.ebuild b/media-gfx/apngasm/apngasm-3.1.10.ebuild
new file mode 100644
index 000000000000..15fc7a28415d
--- /dev/null
+++ b/media-gfx/apngasm/apngasm-3.1.10.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="create an APNG from multiple PNG files"
+HOMEPAGE="https://github.com/apngasm/apngasm"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-libs/boost:=
+ media-libs/libpng:0=
+ sys-libs/zlib:=
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.1.10-static.patch"
+)
+
+src_prepare() {
+ sed -i -e 's|man/man1|share/man/man1|g' cli/CMakeLists.txt || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DLIB_INSTALL_DIR=$(get_libdir)
+ -DJAVA=OFF
+ -DRUBY=OFF
+ )
+ cmake_src_configure
+}
diff --git a/media-gfx/apngasm/files/apngasm-3.1.10-static.patch b/media-gfx/apngasm/files/apngasm-3.1.10-static.patch
new file mode 100644
index 000000000000..a624d03278f3
--- /dev/null
+++ b/media-gfx/apngasm/files/apngasm-3.1.10-static.patch
@@ -0,0 +1,55 @@
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -55,18 +55,6 @@ set_target_properties(${APNGASM_DYNAMIC_LIB_TARGET}
+ CXX_STANDARD 20
+ )
+
+-# Add the static library/archive
+-set(APNGASM_STATIC_LIB_TARGET apngasm-static)
+-add_library(${APNGASM_STATIC_LIB_TARGET}
+- ${APNGASM_SOURCES}
+-)
+-set_target_properties(${APNGASM_STATIC_LIB_TARGET}
+- PROPERTIES
+- POSITION_INDEPENDENT_CODE TRUE
+- OUTPUT_NAME apngasm
+- CXX_STANDARD 20
+-)
+-
+ # Add libraries/includes
+ #target_link_libraries(${APNGASM_DYNAMIC_LIB_TARGET} stdc++fs)
+ #target_link_libraries(${APNGASM_STATIC_LIB_TARGET} stdc++fs)
+@@ -74,11 +62,9 @@ set_target_properties(${APNGASM_STATIC_LIB_TARGET}
+ find_package(PNG REQUIRED)
+ include_directories(${PNG_INCLUDE_DIR})
+ target_link_libraries(${APNGASM_DYNAMIC_LIB_TARGET} ${PNG_LIBRARY})
+-target_link_libraries(${APNGASM_STATIC_LIB_TARGET} ${PNG_LIBRARY})
+ message(${PNG_VERSION_STRING})
+
+ target_link_libraries(${APNGASM_DYNAMIC_LIB_TARGET} ${ZLIB_LIBRARIES})
+-target_link_libraries(${APNGASM_STATIC_LIB_TARGET} ${ZLIB_LIBRARIES})
+
+ #if (APPLE OR WIN32)
+ # set(Boost_USE_STATIC_LIBS ON)
+@@ -88,13 +74,10 @@ target_link_libraries(${APNGASM_STATIC_LIB_TARGET} ${ZLIB_LIBRARIES})
+ find_package(Boost REQUIRED COMPONENTS program_options regex system)
+ include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
+ target_link_libraries(${APNGASM_DYNAMIC_LIB_TARGET} Boost::program_options Boost::regex Boost::system)
+-target_link_libraries(${APNGASM_STATIC_LIB_TARGET} Boost::program_options Boost::regex Boost::system)
+
+ get_target_property(APNGASM_DYNAMIC_LIB_TARGET_NAME ${APNGASM_DYNAMIC_LIB_TARGET} OUTPUT_NAME)
+-get_target_property(APNGASM_STATIC_LIB_TARGET_NAME ${APNGASM_STATIC_LIB_TARGET} OUTPUT_NAME)
+ set(APNGASM_LIBRARIES
+ ${PROJECT_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${APNGASM_DYNAMIC_LIB_TARGET_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
+- ${PROJECT_BINARY_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${APNGASM_STATIC_LIB_TARGET_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
+ )
+
+ # Installation
+@@ -107,7 +90,6 @@ endif ()
+ install(
+ TARGETS
+ ${APNGASM_DYNAMIC_LIB_TARGET}
+- ${APNGASM_STATIC_LIB_TARGET}
+ DESTINATION ${LIB_INSTALL_DIR}
+ )
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/apngasm/, media-gfx/apngasm/files/
@ 2022-02-20 5:27 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-02-20 5:27 UTC (permalink / raw
To: gentoo-commits
commit: 659acda4b77ece747c4d3d54f34ec9a4657d0a37
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 20 05:11:02 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 20 05:25:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=659acda4
media-gfx/apngasm: drop 2.91-r1
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/apngasm/Manifest | 1 -
media-gfx/apngasm/apngasm-2.91-r1.ebuild | 52 ----------------------
.../apngasm/files/apngasm-2.91-makefile.patch | 22 ---------
media-gfx/apngasm/metadata.xml | 4 --
4 files changed, 79 deletions(-)
diff --git a/media-gfx/apngasm/Manifest b/media-gfx/apngasm/Manifest
index d29bfb20fae9..0cecabb76b20 100644
--- a/media-gfx/apngasm/Manifest
+++ b/media-gfx/apngasm/Manifest
@@ -1,2 +1 @@
-DIST apngasm-2.91-src.zip 597267 BLAKE2B a34a765fef49aa0ac29973b8dc450bfcdfe7aa83dffe19919f916a136db3d0bfebf3c1fac79bfb81a3900cee87afd888469e5432500d181a9539696b4573a42b SHA512 2415389a989f7a7ff7f3e1328f7920c7515c9a492c89ef216ff53db68fe2f1a674ff60d5f4bfd5a8c710f625456557ae7d5b25f486ac826e3113976cd9fc11dc
DIST apngasm-3.1.10.tar.gz 620031 BLAKE2B 6885b87815e76e8b9eed58548568bf821dfdf61579f83fc1aa977638f34c2112ebbfebba3454b0a2cfc01b465e570a7976e0fb8046a0762e9d35cf30e3d3f4cd SHA512 670d75251ddc771f9b2b4a1f401066f2012a6814bec781b918f1d9e8960835654c66c3d19b4c8920d5186d85af12cdc4bba8b61c8f3d349b4fc70513d8ecb34e
diff --git a/media-gfx/apngasm/apngasm-2.91-r1.ebuild b/media-gfx/apngasm/apngasm-2.91-r1.ebuild
deleted file mode 100644
index ef084fbd4c98..000000000000
--- a/media-gfx/apngasm/apngasm-2.91-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="create an APNG from multiple PNG files"
-HOMEPAGE="https://sourceforge.net/projects/apngasm/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-src.zip"
-
-LICENSE="ZLIB 7z? ( LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="7z zopfli"
-
-RDEPEND="media-libs/libpng:0=
- sys-libs/zlib
- zopfli? ( app-arch/zopfli:= )"
-DEPEND="${RDEPEND}
- app-arch/unzip"
-
-S=${WORKDIR}
-
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-
-src_prepare() {
- default
-
- # remove bundled libs
- rm -r zopfli zlib libpng || die
-
- if use 7z; then
- append-cflags -DFEATURE_7ZIP
- else
- sed -i '/^SRC_DIRS\s\+=/s/7z//' Makefile || die
- fi
-
- if use zopfli; then
- append-cflags -DFEATURE_ZOPFLI
- sed -i '/^LIBS\s\+=/s/$/ -lzopfli/' Makefile || die
- fi
-}
-
-src_compile() {
- emake CC="$(tc-getCC)"
-}
-
-src_install() {
- dobin ${PN}
- dodoc readme.txt
-}
diff --git a/media-gfx/apngasm/files/apngasm-2.91-makefile.patch b/media-gfx/apngasm/files/apngasm-2.91-makefile.patch
deleted file mode 100644
index b9fb9c20ee89..000000000000
--- a/media-gfx/apngasm/files/apngasm-2.91-makefile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- apngasm-2.91-src/Makefile
-+++ apngasm-2.91-src/Makefile
-@@ -1,8 +1,7 @@
- PACKAGE = apngasm
- CC = gcc
--SRC_DIRS = . 7z zopfli
--CFLAGS = -Wall -pedantic -DFEATURE_7ZIP -DFEATURE_ZOPFLI
--CFLAGS_OPT = -O2
-+SRC_DIRS = . 7z
-+CFLAGS += -Wall -pedantic
- CFLAGS_7Z = -Wno-sign-compare -Wno-reorder -Wno-maybe-uninitialized -Wno-parentheses
- LIBS = -lstdc++ -lm -lpng -lz
-
-@@ -16,7 +15,7 @@
- all : $(PACKAGE)
-
- $(PACKAGE) : objdirs $(OBJECTS)
-- $(CC) -o $@ $(OBJECTS) -s $(LIBS)
-+ $(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(LIBS)
-
- objdirs :
- mkdir -p $(OBJ_DIRS)
diff --git a/media-gfx/apngasm/metadata.xml b/media-gfx/apngasm/metadata.xml
index d31bd859a4ec..cff2266b257f 100644
--- a/media-gfx/apngasm/metadata.xml
+++ b/media-gfx/apngasm/metadata.xml
@@ -2,10 +2,6 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
- <use>
- <flag name="7z">Enable support for 7zip compression</flag>
- <flag name="zopfli">Enable support for Zopfli compression</flag>
- </use>
<upstream>
<remote-id type="sourceforge">apngasm</remote-id>
</upstream>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-02-20 5:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-20 5:27 [gentoo-commits] repo/gentoo:master commit in: media-gfx/apngasm/, media-gfx/apngasm/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-12-22 20:25 Stephan Hartmann
2020-02-06 3:46 Tim Harder
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox