* [gentoo-commits] proj/mozilla:master commit in: media-libs/libpng/files/, media-libs/libpng/
@ 2011-04-24 8:30 Lars Wendler
0 siblings, 0 replies; 2+ messages in thread
From: Lars Wendler @ 2011-04-24 8:30 UTC (permalink / raw
To: gentoo-commits
commit: a3040a0d7bf4162c52ff37918b17a4baae6d3086
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 24 08:30:12 2011 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 08:30:12 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=a3040a0d
libpng: Version bumps. Removed old.
---
media-libs/libpng/Manifest | 9 ++++++---
media-libs/libpng/files/libpng-1.4.7-apng.patch.gz | Bin 0 -> 9724 bytes
media-libs/libpng/files/libpng-1.5.1-apng.patch.gz | Bin 9765 -> 0 bytes
media-libs/libpng/files/libpng-1.5.2-apng.patch.gz | Bin 0 -> 9732 bytes
.../{libpng-1.5.1.ebuild => libpng-1.4.7.ebuild} | 15 +++++++--------
.../{libpng-1.5.1.ebuild => libpng-1.5.2.ebuild} | 2 +-
6 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 4e4fabb..af0b481 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,6 +1,9 @@
AUX libpng-1.4.5-apng.patch.gz 9734 RMD160 925323c7dd73a123e08301007486f76046847a73 SHA1 6b3c4827bdf6f6f5a37fdb28a74087249ab49339 SHA256 aa170f664c3368181758cb82c6dcdeddfb89887919bcc270f8ea8e1924d5b3c4
-AUX libpng-1.5.1-apng.patch.gz 9765 RMD160 109ca5392bdb72182d69cf5f3f85af525227b9f9 SHA1 3d306ffd45f0d6294a1820b28d257e007a5fc5f6 SHA256 f0478e3c905d3b6702a1b72f8c2ff1ea7397bd8818b2473e3e6f033f21f209b2
+AUX libpng-1.4.7-apng.patch.gz 9724 RMD160 44410bcabc6e7e940408afd0554e4f7313fe916a SHA1 c4766c389d659c3652b2f1bd41c10d6da96f7c07 SHA256 b2ae32c3deb1ad17c89bb6dd973887db69ec61b9b8a1cb3acf1f67a27f34ac40
+AUX libpng-1.5.2-apng.patch.gz 9732 RMD160 3a038985a27171d6ed127888261989d2ba60462a SHA1 e17b45fac9bc61c66c6967d8032c3859d5f31be6 SHA256 46637619fa54e77a160843aed5344faead54d6bc8d65c38759dbdb38dd4fd64b
DIST libpng-1.4.5.tar.xz 545672 RMD160 d1ac4f99949e98ffe56dce1d199edba30285b573 SHA1 c31578e005090280203cb3a6080e44f38c3f1a51 SHA256 3e57b75d11a013918da3a7529ec0229d4a82d3b1acde5de13fa371b9c3ac4275
-DIST libpng-1.5.1.tar.xz 633264 RMD160 09c34d699fa3c324b1d69398bf8b090ac9fb1644 SHA1 fe2ec0a49a0207ba30471704b317e857f896bb09 SHA256 d230837ad959b395bf7e2937e0136e6037208a29cda83000bf8b88a3692e8c69
+DIST libpng-1.4.7.tar.xz 547660 RMD160 5bc7f8931fac08655f42890b6d5423762f2747a9 SHA1 49ed9977bf7450089d2c156db3d28f772a4c9a87 SHA256 326d226e987973a05be2ac8ab9edc6c69bf3b5ba6a7886fad55d6c38199e807f
+DIST libpng-1.5.2.tar.xz 636256 RMD160 5334e340825dc097692358660ca95d4bc6697ef2 SHA1 50243a46c4745b39e7fcda7a39f498f38e084ad6 SHA256 f2bb6be8202af630fc7615fe3ff529aeb45be6ceeb3ad459f94edbf4e01d1cae
EBUILD libpng-1.4.5.ebuild 1327 RMD160 45cc54587ac70391d435a3da4597b1f1cfd8a29c SHA1 d52d23398dfcd601328c0e47ee3effa986acc99f SHA256 7c6518d4e87560e47048fefc57605103040d9eb8e7af9b9313df1b8dd0afb9d0
-EBUILD libpng-1.5.1.ebuild 1402 RMD160 d4150001b1267270e2d2a51256a54c3b743688b3 SHA1 73819431d1769de3f06ec7c2a7fb9762269b9c23 SHA256 19ea9e7cb5868c09b9bbd38e1a8b923d44a1b18a09abe98295474ea41dc3d0e7
+EBUILD libpng-1.4.7.ebuild 1384 RMD160 181374b71113846fdf1c9fa6f7b71fa082c38dc9 SHA1 e0cd8ef592117e0e375a81469c16aad6b067a7d4 SHA256 871a038464881972ec4448d4f2d3e449e86a6de2301a05ca1702fe45613a6782
+EBUILD libpng-1.5.2.ebuild 1404 RMD160 9238ac7c546d156d340f1d20b540810fa749b671 SHA1 e17c4533a91ee40b4cdc999f4358805184550ad5 SHA256 3083022be5425f3692d7c3a7f5e59909c3f03b988c1a3e0e6b2684325be7ebfa
diff --git a/media-libs/libpng/files/libpng-1.4.7-apng.patch.gz b/media-libs/libpng/files/libpng-1.4.7-apng.patch.gz
new file mode 100644
index 0000000..6ccb028
Binary files /dev/null and b/media-libs/libpng/files/libpng-1.4.7-apng.patch.gz differ
diff --git a/media-libs/libpng/files/libpng-1.5.1-apng.patch.gz b/media-libs/libpng/files/libpng-1.5.1-apng.patch.gz
deleted file mode 100644
index bdd699d..0000000
Binary files a/media-libs/libpng/files/libpng-1.5.1-apng.patch.gz and /dev/null differ
diff --git a/media-libs/libpng/files/libpng-1.5.2-apng.patch.gz b/media-libs/libpng/files/libpng-1.5.2-apng.patch.gz
new file mode 100644
index 0000000..c4dd9a4
Binary files /dev/null and b/media-libs/libpng/files/libpng-1.5.2-apng.patch.gz differ
diff --git a/media-libs/libpng/libpng-1.5.1.ebuild b/media-libs/libpng/libpng-1.4.7.ebuild
similarity index 51%
copy from media-libs/libpng/libpng-1.5.1.ebuild
copy to media-libs/libpng/libpng-1.4.7.ebuild
index 648bfd2..1846b54 100644
--- a/media-libs/libpng/libpng-1.5.1.ebuild
+++ b/media-libs/libpng/libpng-1.4.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.1.ebuild,v 1.2 2011/02/13 08:52:18 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.4.7.ebuild,v 1.1 2011/04/23 19:06:55 ssuominen Exp $
EAPI="3"
@@ -12,8 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="as-is"
SLOT="0"
-KEYWORDS=""
-#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="apng static-libs"
RDEPEND="sys-libs/zlib"
@@ -33,17 +32,17 @@ src_configure() {
src_install() {
emake DESTDIR="${D}" install || die
- dodoc ANNOUNCE CHANGES libpng-manual.txt README TODO
+ dodoc ANNOUNCE CHANGES README TODO libpng-*.txt
find "${ED}" -name '*.la' -exec rm -f {} +
}
pkg_preinst() {
-# has_version ${CATEGORY}/${PN}:1.4 && return 0
- preserve_old_lib /usr/$(get_libdir)/libpng14$(get_libname 0)
+ has_version ${CATEGORY}/${PN}:1.2 && return 0
+ preserve_old_lib /usr/$(get_libdir)/libpng12$(get_libname 0)
}
pkg_postinst() {
-# has_version ${CATEGORY}/${PN}:1.4 && return 0
- preserve_old_lib_notify /usr/$(get_libdir)/libpng14$(get_libname 0)
+ has_version ${CATEGORY}/${PN}:1.2 && return 0
+ preserve_old_lib_notify /usr/$(get_libdir)/libpng12$(get_libname 0)
}
diff --git a/media-libs/libpng/libpng-1.5.1.ebuild b/media-libs/libpng/libpng-1.5.2.ebuild
similarity index 96%
rename from media-libs/libpng/libpng-1.5.1.ebuild
rename to media-libs/libpng/libpng-1.5.2.ebuild
index 648bfd2..148eeef 100644
--- a/media-libs/libpng/libpng-1.5.1.ebuild
+++ b/media-libs/libpng/libpng-1.5.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.1.ebuild,v 1.2 2011/02/13 08:52:18 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.2.ebuild,v 1.1 2011/04/23 19:06:55 ssuominen Exp $
EAPI="3"
^ permalink raw reply related [flat|nested] 2+ messages in thread* [gentoo-commits] proj/mozilla:master commit in: media-libs/libpng/files/, media-libs/libpng/
@ 2011-02-15 0:45 Lars Wendler
0 siblings, 0 replies; 2+ messages in thread
From: Lars Wendler @ 2011-02-15 0:45 UTC (permalink / raw
To: gentoo-commits
commit: 781db5e3a00d058127a02950cc05fef2946ef4b7
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 15 00:44:19 2011 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 00:44:19 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=781db5e3
libpng: New libpng-1.5.1. Minor tweaks in 1.4.5 ebuild.
---
media-libs/libpng/Manifest | 5 ++-
media-libs/libpng/files/libpng-1.5.1-apng.patch.gz | Bin 0 -> 9765 bytes
media-libs/libpng/libpng-1.4.5.ebuild | 8 ++--
media-libs/libpng/libpng-1.5.1.ebuild | 49 ++++++++++++++++++++
4 files changed, 57 insertions(+), 5 deletions(-)
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index 171f279..4e4fabb 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,3 +1,6 @@
AUX libpng-1.4.5-apng.patch.gz 9734 RMD160 925323c7dd73a123e08301007486f76046847a73 SHA1 6b3c4827bdf6f6f5a37fdb28a74087249ab49339 SHA256 aa170f664c3368181758cb82c6dcdeddfb89887919bcc270f8ea8e1924d5b3c4
+AUX libpng-1.5.1-apng.patch.gz 9765 RMD160 109ca5392bdb72182d69cf5f3f85af525227b9f9 SHA1 3d306ffd45f0d6294a1820b28d257e007a5fc5f6 SHA256 f0478e3c905d3b6702a1b72f8c2ff1ea7397bd8818b2473e3e6f033f21f209b2
DIST libpng-1.4.5.tar.xz 545672 RMD160 d1ac4f99949e98ffe56dce1d199edba30285b573 SHA1 c31578e005090280203cb3a6080e44f38c3f1a51 SHA256 3e57b75d11a013918da3a7529ec0229d4a82d3b1acde5de13fa371b9c3ac4275
-EBUILD libpng-1.4.5.ebuild 1313 RMD160 70fafd78fff5031cc23abc8baae8291c2999f5d2 SHA1 d6416c679fd669863737ab4afa97ea9880ac0d12 SHA256 ec0581c1803de1988a8d6373f3cb400c7da939520a3667e71eeae2cd9b77d779
+DIST libpng-1.5.1.tar.xz 633264 RMD160 09c34d699fa3c324b1d69398bf8b090ac9fb1644 SHA1 fe2ec0a49a0207ba30471704b317e857f896bb09 SHA256 d230837ad959b395bf7e2937e0136e6037208a29cda83000bf8b88a3692e8c69
+EBUILD libpng-1.4.5.ebuild 1327 RMD160 45cc54587ac70391d435a3da4597b1f1cfd8a29c SHA1 d52d23398dfcd601328c0e47ee3effa986acc99f SHA256 7c6518d4e87560e47048fefc57605103040d9eb8e7af9b9313df1b8dd0afb9d0
+EBUILD libpng-1.5.1.ebuild 1402 RMD160 d4150001b1267270e2d2a51256a54c3b743688b3 SHA1 73819431d1769de3f06ec7c2a7fb9762269b9c23 SHA256 19ea9e7cb5868c09b9bbd38e1a8b923d44a1b18a09abe98295474ea41dc3d0e7
diff --git a/media-libs/libpng/files/libpng-1.5.1-apng.patch.gz b/media-libs/libpng/files/libpng-1.5.1-apng.patch.gz
new file mode 100644
index 0000000..bdd699d
Binary files /dev/null and b/media-libs/libpng/files/libpng-1.5.1-apng.patch.gz differ
diff --git a/media-libs/libpng/libpng-1.4.5.ebuild b/media-libs/libpng/libpng-1.4.5.ebuild
index 260181a..dc3dea3 100644
--- a/media-libs/libpng/libpng-1.4.5.ebuild
+++ b/media-libs/libpng/libpng-1.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.4.5.ebuild,v 1.1 2010/12/22 15:36:51 ssuominen Exp $
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="as-is"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="apng static-libs"
RDEPEND="sys-libs/zlib"
@@ -37,10 +37,10 @@ src_install() {
pkg_preinst() {
has_version ${CATEGORY}/${PN}:1.2 && return 0
- preserve_old_lib /usr/$(get_libdir)/libpng12.so.0
+ preserve_old_lib /usr/$(get_libdir)/libpng12$(get_libname 0)
}
pkg_postinst() {
has_version ${CATEGORY}/${PN}:1.2 && return 0
- preserve_old_lib_notify /usr/$(get_libdir)/libpng12.so.0
+ preserve_old_lib_notify /usr/$(get_libdir)/libpng12$(get_libname 0)
}
diff --git a/media-libs/libpng/libpng-1.5.1.ebuild b/media-libs/libpng/libpng-1.5.1.ebuild
new file mode 100644
index 0000000..648bfd2
--- /dev/null
+++ b/media-libs/libpng/libpng-1.5.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.1.ebuild,v 1.2 2011/02/13 08:52:18 grobian Exp $
+
+EAPI="3"
+
+inherit eutils libtool multilib
+
+DESCRIPTION="Portable Network Graphics library"
+HOMEPAGE="http://www.libpng.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS=""
+#KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="apng static-libs"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils"
+
+src_prepare() {
+ use apng && epatch "${FILESDIR}"/${P}-apng.patch.gz
+ elibtoolize
+}
+
+src_configure() {
+ econf \
+ --disable-dependency-tracking \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+ dodoc ANNOUNCE CHANGES libpng-manual.txt README TODO
+
+ find "${ED}" -name '*.la' -exec rm -f {} +
+}
+
+pkg_preinst() {
+# has_version ${CATEGORY}/${PN}:1.4 && return 0
+ preserve_old_lib /usr/$(get_libdir)/libpng14$(get_libname 0)
+}
+
+pkg_postinst() {
+# has_version ${CATEGORY}/${PN}:1.4 && return 0
+ preserve_old_lib_notify /usr/$(get_libdir)/libpng14$(get_libname 0)
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-04-24 8:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-24 8:30 [gentoo-commits] proj/mozilla:master commit in: media-libs/libpng/files/, media-libs/libpng/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2011-02-15 0:45 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox