* [gentoo-commits] repo/gentoo:master commit in: media-gfx/apngdis/, media-gfx/apngdis/files/
@ 2015-08-25 3:58 Tim Harder
0 siblings, 0 replies; 3+ messages in thread
From: Tim Harder @ 2015-08-25 3:58 UTC (permalink / raw
To: gentoo-commits
commit: 84d4eca1e8f27477244751cd7844ccea0677a6b1
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 03:55:10 2015 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 03:57:26 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84d4eca1
media-gfx/apngdis: version bump
media-gfx/apngdis/Manifest | 1 +
media-gfx/apngdis/apngdis-2.8.ebuild | 33 ++++++++++++++++++++++
media-gfx/apngdis/files/apngdis-2.8-makefile.patch | 17 +++++++++++
3 files changed, 51 insertions(+)
diff --git a/media-gfx/apngdis/Manifest b/media-gfx/apngdis/Manifest
index 33461da..59ac5b7 100644
--- a/media-gfx/apngdis/Manifest
+++ b/media-gfx/apngdis/Manifest
@@ -1 +1,2 @@
DIST apngdis-2.7-src.zip 450869 SHA256 cce7470d1ec0c518655d63133931e16d01050033405b67220e94ca7b2b97920d SHA512 016c9f0fe1ed7a26f9982414ea797b7a1f1b854ea9d13d089f0fbf9886520b637dc3dd0a7968137db4055f039afb1a5015fa2d1611b48ebb2e98af1b8e3c56fb WHIRLPOOL f9b7360da201de55a86f45decb265d9b71227c4ce6441d8faeb2d6d9211dca8d3da7f76f5e6dd66e8f3f61ddd9d58cb66afddac451dad7a1ec9fbec2080687ed
+DIST apngdis-2.8-src.zip 460138 SHA256 58f5082025f3e97d9072dfe3fbd3abc43252ee118a7463209b65d05b8fd71741 SHA512 f434bb10510254ac5aa581521abe45fd2437671451a5eccba65e71c2ea3f867591aa2986f865239c2495491ee37fcc0eb43e119457dba70dc27f2087082b38e8 WHIRLPOOL 19b75a02b1a2326562dd97f139013473cbb762d5e26aff32fbd410df0f04050d8d8823c434aead695fc68d7cf7398eb6a8b445f3c9a8f33382eee55afc0093f5
diff --git a/media-gfx/apngdis/apngdis-2.8.ebuild b/media-gfx/apngdis/apngdis-2.8.ebuild
new file mode 100644
index 0000000..2fe2f33
--- /dev/null
+++ b/media-gfx/apngdis/apngdis-2.8.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="extract PNG frames from an APNG"
+HOMEPAGE="http://sourceforge.net/projects/apngdis/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-src.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-libs/zlib
+ media-libs/libpng:0="
+DEPEND="${RDEPEND}
+ app-arch/unzip"
+
+S=${WORKDIR}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-makefile.patch
+
+ tc-export CXX
+}
+
+src_install() {
+ dobin ${PN}
+ dodoc readme.txt
+}
diff --git a/media-gfx/apngdis/files/apngdis-2.8-makefile.patch b/media-gfx/apngdis/files/apngdis-2.8-makefile.patch
new file mode 100644
index 0000000..f8f6968
--- /dev/null
+++ b/media-gfx/apngdis/files/apngdis-2.8-makefile.patch
@@ -0,0 +1,17 @@
+--- apngdis-2.8-src/Makefile
++++ apngdis-2.8-src/Makefile
+@@ -1,11 +1,10 @@
+ PACKAGE = apngdis
+-CC = gcc
+-CFLAGS = -Wall -pedantic
+-CFLAGS_OPT = -O2
++CCX ?= g++
++CXXFLAGS += -Wall -pedantic
+ LIBS = -lstdc++ -lm -lpng -lz
+
+ all :
+- $(CC) $(CFLAGS) $(CFLAGS_OPT) -o $(PACKAGE) $(PACKAGE).cpp -s $(LIBS)
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(PACKAGE) $(PACKAGE).cpp $(LIBS)
+
+ .PHONY : clean
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/apngdis/, media-gfx/apngdis/files/
@ 2017-08-18 4:28 Tim Harder
0 siblings, 0 replies; 3+ messages in thread
From: Tim Harder @ 2017-08-18 4:28 UTC (permalink / raw
To: gentoo-commits
commit: 2c6f8d68003819fd326ab3a019f3e184de7e73a1
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 18 04:20:56 2017 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Fri Aug 18 04:22:00 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c6f8d68
media-gfx/apngdis: remove old
media-gfx/apngdis/Manifest | 2 --
media-gfx/apngdis/apngdis-2.7.ebuild | 34 ----------------------
media-gfx/apngdis/apngdis-2.8.ebuild | 32 --------------------
media-gfx/apngdis/files/apngdis-2.6-gcc-4.3.patch | 10 -------
media-gfx/apngdis/files/apngdis-2.6-makefile.patch | 17 -----------
media-gfx/apngdis/files/apngdis-2.8-makefile.patch | 17 -----------
6 files changed, 112 deletions(-)
diff --git a/media-gfx/apngdis/Manifest b/media-gfx/apngdis/Manifest
index d2486e57153..2ba730c3790 100644
--- a/media-gfx/apngdis/Manifest
+++ b/media-gfx/apngdis/Manifest
@@ -1,3 +1 @@
-DIST apngdis-2.7-src.zip 450869 SHA256 cce7470d1ec0c518655d63133931e16d01050033405b67220e94ca7b2b97920d SHA512 016c9f0fe1ed7a26f9982414ea797b7a1f1b854ea9d13d089f0fbf9886520b637dc3dd0a7968137db4055f039afb1a5015fa2d1611b48ebb2e98af1b8e3c56fb WHIRLPOOL f9b7360da201de55a86f45decb265d9b71227c4ce6441d8faeb2d6d9211dca8d3da7f76f5e6dd66e8f3f61ddd9d58cb66afddac451dad7a1ec9fbec2080687ed
-DIST apngdis-2.8-src.zip 460138 SHA256 58f5082025f3e97d9072dfe3fbd3abc43252ee118a7463209b65d05b8fd71741 SHA512 f434bb10510254ac5aa581521abe45fd2437671451a5eccba65e71c2ea3f867591aa2986f865239c2495491ee37fcc0eb43e119457dba70dc27f2087082b38e8 WHIRLPOOL 19b75a02b1a2326562dd97f139013473cbb762d5e26aff32fbd410df0f04050d8d8823c434aead695fc68d7cf7398eb6a8b445f3c9a8f33382eee55afc0093f5
DIST apngdis-2.9-src.zip 470989 SHA256 9d20082e770ab94b28ff5b989c5d8b7e723a23e32bc804e1638953bf5ba943f2 SHA512 4bcce5066c37ea5e4db0bfaf2f6a81e4d3ba7f5b6c952f598facff27f84cc1a3af778f4db096119cb9f4aa57c0193c90acf7bed28f283b6930f5b3121dd9cf32 WHIRLPOOL 717aab043e5c750fc1011d9ab73430157aef2dd1e0aa6cb0a464c70f57e951052304fa0161325d0207a137e4df9c18bcc34b3190d7302cce898d7bdf07565a73
diff --git a/media-gfx/apngdis/apngdis-2.7.ebuild b/media-gfx/apngdis/apngdis-2.7.ebuild
deleted file mode 100644
index 1e0c2e71c97..00000000000
--- a/media-gfx/apngdis/apngdis-2.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="extract PNG frames from an APNG"
-HOMEPAGE="https://sourceforge.net/projects/apngdis/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-src.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sys-libs/zlib
- media-libs/libpng:0="
-DEPEND="${RDEPEND}
- app-arch/unzip"
-
-S=${WORKDIR}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.6-makefile.patch
- epatch "${FILESDIR}"/${PN}-2.6-gcc-4.3.patch
-
- tc-export CXX
-}
-
-src_install() {
- dobin ${PN}
- dodoc readme.txt
-}
diff --git a/media-gfx/apngdis/apngdis-2.8.ebuild b/media-gfx/apngdis/apngdis-2.8.ebuild
deleted file mode 100644
index 88b869bfd73..00000000000
--- a/media-gfx/apngdis/apngdis-2.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="extract PNG frames from an APNG"
-HOMEPAGE="https://sourceforge.net/projects/apngdis/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-src.zip"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="sys-libs/zlib
- media-libs/libpng:0="
-DEPEND="${RDEPEND}
- app-arch/unzip"
-
-S=${WORKDIR}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-makefile.patch
-
- tc-export CXX
-}
-
-src_install() {
- dobin ${PN}
- dodoc readme.txt
-}
diff --git a/media-gfx/apngdis/files/apngdis-2.6-gcc-4.3.patch b/media-gfx/apngdis/files/apngdis-2.6-gcc-4.3.patch
deleted file mode 100644
index cabf3efed74..00000000000
--- a/media-gfx/apngdis/files/apngdis-2.6-gcc-4.3.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- apngdis-2.6-src/apngdis.cpp
-+++ apngdis-2.6-src/apngdis.cpp
-@@ -29,6 +29,7 @@
- */
- #include <stdio.h>
- #include <stdlib.h>
-+#include <cstring>
- #include <vector>
- #include "png.h" /* original (unpatched) libpng is ok */
- #include "zlib.h"
diff --git a/media-gfx/apngdis/files/apngdis-2.6-makefile.patch b/media-gfx/apngdis/files/apngdis-2.6-makefile.patch
deleted file mode 100644
index ada1cc89a23..00000000000
--- a/media-gfx/apngdis/files/apngdis-2.6-makefile.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- apngdis-2.6-src/Makefile
-+++ apngdis-2.6-src/Makefile
-@@ -1,11 +1,10 @@
- PACKAGE = apngdis
--CC = gcc
--CFLAGS = -Wall -pedantic
--CFLAGS_OPT = -O2
-+CCX ?= g++
-+CFLAGS += -Wall -pedantic
- LIBS = -lstdc++ -lm -lpng -lz
-
- all :
-- $(CC) $(CFLAGS) $(CFLAGS_OPT) -o apngdis apngdis.cpp -s $(LIBS)
-+ $(CXX) $(CFLAGS) $(LDFLAGS) -o apngdis apngdis.cpp $(LIBS)
-
- .PHONY : clean
-
diff --git a/media-gfx/apngdis/files/apngdis-2.8-makefile.patch b/media-gfx/apngdis/files/apngdis-2.8-makefile.patch
deleted file mode 100644
index f8f69689a6d..00000000000
--- a/media-gfx/apngdis/files/apngdis-2.8-makefile.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- apngdis-2.8-src/Makefile
-+++ apngdis-2.8-src/Makefile
-@@ -1,11 +1,10 @@
- PACKAGE = apngdis
--CC = gcc
--CFLAGS = -Wall -pedantic
--CFLAGS_OPT = -O2
-+CCX ?= g++
-+CXXFLAGS += -Wall -pedantic
- LIBS = -lstdc++ -lm -lpng -lz
-
- all :
-- $(CC) $(CFLAGS) $(CFLAGS_OPT) -o $(PACKAGE) $(PACKAGE).cpp -s $(LIBS)
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(PACKAGE) $(PACKAGE).cpp $(LIBS)
-
- .PHONY : clean
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/apngdis/, media-gfx/apngdis/files/
@ 2017-08-18 4:28 Tim Harder
0 siblings, 0 replies; 3+ messages in thread
From: Tim Harder @ 2017-08-18 4:28 UTC (permalink / raw
To: gentoo-commits
commit: 998cec4494f66eb008c8c9ab7c11189def7234fd
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 18 04:20:20 2017 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Fri Aug 18 04:21:58 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=998cec44
media-gfx/apngdis: version bump to 2.9
media-gfx/apngdis/Manifest | 1 +
media-gfx/apngdis/apngdis-2.9.ebuild | 39 ++++++++++++++++++++++
media-gfx/apngdis/files/apngdis-2.9-makefile.patch | 18 ++++++++++
media-gfx/apngdis/files/apngdis-2.9-zlib.patch | 12 +++++++
4 files changed, 70 insertions(+)
diff --git a/media-gfx/apngdis/Manifest b/media-gfx/apngdis/Manifest
index 59ac5b789bf..d2486e57153 100644
--- a/media-gfx/apngdis/Manifest
+++ b/media-gfx/apngdis/Manifest
@@ -1,2 +1,3 @@
DIST apngdis-2.7-src.zip 450869 SHA256 cce7470d1ec0c518655d63133931e16d01050033405b67220e94ca7b2b97920d SHA512 016c9f0fe1ed7a26f9982414ea797b7a1f1b854ea9d13d089f0fbf9886520b637dc3dd0a7968137db4055f039afb1a5015fa2d1611b48ebb2e98af1b8e3c56fb WHIRLPOOL f9b7360da201de55a86f45decb265d9b71227c4ce6441d8faeb2d6d9211dca8d3da7f76f5e6dd66e8f3f61ddd9d58cb66afddac451dad7a1ec9fbec2080687ed
DIST apngdis-2.8-src.zip 460138 SHA256 58f5082025f3e97d9072dfe3fbd3abc43252ee118a7463209b65d05b8fd71741 SHA512 f434bb10510254ac5aa581521abe45fd2437671451a5eccba65e71c2ea3f867591aa2986f865239c2495491ee37fcc0eb43e119457dba70dc27f2087082b38e8 WHIRLPOOL 19b75a02b1a2326562dd97f139013473cbb762d5e26aff32fbd410df0f04050d8d8823c434aead695fc68d7cf7398eb6a8b445f3c9a8f33382eee55afc0093f5
+DIST apngdis-2.9-src.zip 470989 SHA256 9d20082e770ab94b28ff5b989c5d8b7e723a23e32bc804e1638953bf5ba943f2 SHA512 4bcce5066c37ea5e4db0bfaf2f6a81e4d3ba7f5b6c952f598facff27f84cc1a3af778f4db096119cb9f4aa57c0193c90acf7bed28f283b6930f5b3121dd9cf32 WHIRLPOOL 717aab043e5c750fc1011d9ab73430157aef2dd1e0aa6cb0a464c70f57e951052304fa0161325d0207a137e4df9c18bcc34b3190d7302cce898d7bdf07565a73
diff --git a/media-gfx/apngdis/apngdis-2.9.ebuild b/media-gfx/apngdis/apngdis-2.9.ebuild
new file mode 100644
index 00000000000..dd459b169f4
--- /dev/null
+++ b/media-gfx/apngdis/apngdis-2.9.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="extract PNG frames from an APNG"
+HOMEPAGE="https://sourceforge.net/projects/apngdis/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}-src.zip"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="media-libs/libpng:0="
+DEPEND="${RDEPEND}
+ app-arch/unzip"
+
+S=${WORKDIR}
+
+PATCHES=(
+ "${FILESDIR}"/${P}-makefile.patch
+ "${FILESDIR}"/${P}-zlib.patch
+)
+
+src_prepare() {
+ default
+
+ # remove bundled libs
+ rm -r libpng zlib || die
+
+ tc-export CC
+}
+
+src_install() {
+ dobin ${PN}
+ dodoc readme.txt
+}
diff --git a/media-gfx/apngdis/files/apngdis-2.9-makefile.patch b/media-gfx/apngdis/files/apngdis-2.9-makefile.patch
new file mode 100644
index 00000000000..08e6b02e4fd
--- /dev/null
+++ b/media-gfx/apngdis/files/apngdis-2.9-makefile.patch
@@ -0,0 +1,18 @@
+--- apngdis-2.9-src/Makefile
++++ apngdis-2.9-src/Makefile
+@@ -1,11 +1,10 @@
+ PACKAGE = apngdis
+-CC = gcc
+-CFLAGS = -Wall -pedantic
+-CFLAGS_OPT = -O2
+-LIBS = -lstdc++ -lm -lpng -lz
++CC ?= gcc
++CFLAGS += -Wall -pedantic
++LIBS = -lstdc++ -lm -lpng
+
+ all :
+- $(CC) $(CFLAGS) $(CFLAGS_OPT) -o $(PACKAGE) $(PACKAGE).cpp -s $(LIBS)
++ $(CC) $(CFLAGS) $(LDFLAGS) -o $(PACKAGE) $(PACKAGE).cpp $(LIBS)
+
+ .PHONY : clean
+
diff --git a/media-gfx/apngdis/files/apngdis-2.9-zlib.patch b/media-gfx/apngdis/files/apngdis-2.9-zlib.patch
new file mode 100644
index 00000000000..d9ce01007cf
--- /dev/null
+++ b/media-gfx/apngdis/files/apngdis-2.9-zlib.patch
@@ -0,0 +1,12 @@
+Drop unused zlib header.
+
+--- apngdis-2.9-src/apngdis.cpp
++++ apngdis-2.9-src/apngdis.cpp
+@@ -32,7 +32,6 @@
+ #include <string.h>
+ #include <vector>
+ #include "png.h" /* original (unpatched) libpng is ok */
+-#include "zlib.h"
+
+ #define notabc(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-08-18 4:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-18 4:28 [gentoo-commits] repo/gentoo:master commit in: media-gfx/apngdis/, media-gfx/apngdis/files/ Tim Harder
-- strict thread matches above, loose matches on Subject: below --
2017-08-18 4:28 Tim Harder
2015-08-25 3:58 Tim Harder
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox