From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 65A7E138E2A for ; Sun, 16 Oct 2016 08:50:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97925E0B76; Sun, 16 Oct 2016 08:50:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6F9B5E0B76 for ; Sun, 16 Oct 2016 08:50:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A666E3412F9 for ; Sun, 16 Oct 2016 08:50:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 729DF2F4 for ; Sun, 16 Oct 2016 08:50:04 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1476607785.89e22bc0633c5e0370df9e6d6223209abfa0f726.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/ziproxy/files/, net-proxy/ziproxy/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-proxy/ziproxy/files/ziproxy-3.3.1-giflib5.patch net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild X-VCS-Directories: net-proxy/ziproxy/files/ net-proxy/ziproxy/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: 89e22bc0633c5e0370df9e6d6223209abfa0f726 X-VCS-Branch: master Date: Sun, 16 Oct 2016 08:50:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 936caf09-46c2-42aa-a546-505e23c7af3c X-Archives-Hash: 9ccfd37a89c8d60b69b3c9ba78ba0956 commit: 89e22bc0633c5e0370df9e6d6223209abfa0f726 Author: Pacho Ramos gentoo org> AuthorDate: Sun Oct 16 08:27:50 2016 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Sun Oct 16 08:49:45 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89e22bc0 net-proxy/ziproxy: Support giflib-5 (#571898 by Oleg and Toralf Förster) Package-Manager: portage-2.3.1 .../ziproxy/files/ziproxy-3.3.1-giflib5.patch | 46 ++++++++++++++++++++++ net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild | 11 +++--- 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/net-proxy/ziproxy/files/ziproxy-3.3.1-giflib5.patch b/net-proxy/ziproxy/files/ziproxy-3.3.1-giflib5.patch new file mode 100644 index 00000000..e8404ec --- /dev/null +++ b/net-proxy/ziproxy/files/ziproxy-3.3.1-giflib5.patch @@ -0,0 +1,46 @@ +Description: Build using giflib5 +Forwarded: yes +Author: Marcos Talau +Author: Matthias Klose +Last-Update: 2015-11-04 + +Index: ziproxy-3.3.1/src/image.c +=================================================================== +--- ziproxy-3.3.1.orig/src/image.c ++++ ziproxy-3.3.1/src/image.c +@@ -905,7 +905,11 @@ int gif2bitmap(char *inbuf, int insize, + desc.size=insize; + desc.x.pos=0; + ++#if GIFLIB_MAJOR >= 5 ++ if ((GifFile = DGifOpen((void*)&desc, &gif_mem_input, NULL)) == NULL) ++#else + if ((GifFile = DGifOpen((void*)&desc, &gif_mem_input)) == NULL) ++#endif + return( IMG_RET_ERR_UNKNOWN + IMG_RET_FLG_WHILE_DECOMP);//more possible reasons + + bmp = new_raw_bitmap(); +@@ -1083,7 +1087,11 @@ int gif2bitmap(char *inbuf, int insize, + } + bmp->pal_bpp = bmp->bpp; + ++#if GIFLIB_MAJOR >= 5 ++ DGifCloseFile(GifFile, NULL); ++#else + DGifCloseFile(GifFile); ++#endif + return IMG_RET_OK; + } + +@@ -1738,7 +1746,11 @@ static int bitmap2jp2 (raw_bitmap *bmp, + cmptparm->width = cwidth [cmptno]; + cmptparm->height = cheight [cmptno]; + cmptparm->prec = cbitlen [cmptno]; ++#if GIFLIB_MAJOR >= 5 ++ cmptparm->sgnd = 0; // we only generate unsigned components ++#else + cmptparm->sgnd = false; // we only generate unsigned components ++#endif + + cshiftR [cmptno] = 8 - cbitlen [cmptno]; // calculate the resampling shift for this component + } diff --git a/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild b/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild index 6ebbbf4..9228a26 100644 --- a/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild +++ b/net-proxy/ziproxy/ziproxy-3.3.1-r1.ebuild @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="jpeg2k sasl xinetd" RDEPEND=" - media-libs/giflib + media-libs/giflib:0= media-libs/libpng:0= virtual/jpeg sys-libs/zlib @@ -23,9 +23,9 @@ RDEPEND=" sasl? ( dev-libs/cyrus-sasl ) xinetd? ( virtual/inetd ) " -DEPEND="${RDEPEND} - app-arch/xz-utils -" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-giflib5.patch ) pkg_setup() { enewgroup ziproxy @@ -57,7 +57,7 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install + default dodir /usr/sbin mv -vf "${D}"usr/{,s}bin/ziproxy || die @@ -67,7 +67,6 @@ src_install() { newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN} newconfd "${FILESDIR}"/${PN}.confd ${PN} - dodoc ChangeLog CREDITS README README.tools use jpeg2k && dodoc JPEG2000.txt insinto /etc