commit: 41fccacb21f580b97c190a2310ead9d7c35fd7d1 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Wed Mar 30 04:17:30 2016 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Wed Mar 30 04:17:30 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41fccacb
media-gfx/fbida: Old. Package-Manager: portage-2.2.28 media-gfx/fbida/Manifest | 2 - media-gfx/fbida/fbida-2.09-r4.ebuild | 122 -------------------------- media-gfx/fbida/files/fbida-2.09-giflib.patch | 97 -------------------- media-gfx/fbida/files/fbida-2.09-make.patch | 36 -------- 4 files changed, 257 deletions(-) diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest index 605eb7c..13debd5 100644 --- a/media-gfx/fbida/Manifest +++ b/media-gfx/fbida/Manifest @@ -1,4 +1,2 @@ -DIST fbida-2.09-jpeg-9a.patch.bz2 29392 SHA256 d0979bb7b33b34c2b01f0fe14825812319b0ec08f00f0de6cf9a0533a5f6dba8 SHA512 f644f464231967589a2f1ad0fdc9025d60348a9de20d468fc6abdf3dc0cbf07522e3f71a94930df3c54055fc445df035b4b007efa7e6a3f7acbec90e28dc86c8 WHIRLPOOL 372aa56e698f82ff9dd8adacb5de9347e40849653553d810e4f5c0fca731ca8e863f8a20658db071ca11ed8d6bc8794c36ec5fd8c0a2426d8e500389703f2e95 -DIST fbida-2.09.tar.gz 248086 SHA256 dd40b3572f79c6524480ac652c9b32e3867cb53e6c53db51415ddbb20f5231e6 SHA512 b939ca656fc28e3df652610821b9c11f7ab20ad1bd393c40de74f631fad0af463bfaf4f0520484edc12922b1fc288d08fae7c92789c711ce96b0caf50dde25ba WHIRLPOOL 222538f80fc7e878d142cd4dc44089d12b717ee8ae921e514bb3b85322b972cc96300594ae89d7cc1cb006868a0c75abacaa7ddff15041bc672c27d565a00a4b DIST fbida-2.10.tar.gz 283490 SHA256 7a5a3aac61b40a6a2bbf716d270a46e2f8e8d5c97e314e927d41398a4d0b6cb6 SHA512 b7371c19d68cc7219faca4bbfa464c85df2eb22c7bd737d4f0a6fb3de481497862ca22832801d29bab57285d5a8d7d0b0009e14426efdce2759d47340f5eca6d WHIRLPOOL 78c5dc34a9f050e560ada960718a9f43e6d8c95fe4c91c052a70c93350de80eebd3e8e9b6c26361ecd8361efe96824e78b2af7a2b2e27430a11e712bb9a02ee0 DIST ida.png.bz2 11928 SHA256 ce90c13f8da8d2ced4cf0e55d2f960bc236355f6e5dd60ea6c56fbe51e6cabae SHA512 cf3c1bc8d25fe75f10c0a0414b5c082348df2fa94864ec4537c36e0b357cf35b68e2eca205bbf48578a41c27317701aee621c6dd176e0bf3857c52f895d6bfd3 WHIRLPOOL 1b5e7835aa8a555a231ca58da8e249974639b29b1e15586c2d2d5a33e96908df1a3782fbe61d0c51dc888b7304c9f7541a96af4ca2b956b393909feb534ab5be diff --git a/media-gfx/fbida/fbida-2.09-r4.ebuild b/media-gfx/fbida/fbida-2.09-r4.ebuild deleted file mode 100644 index 1b2b7ac..0000000 --- a/media-gfx/fbida/fbida-2.09-r4.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils toolchain-funcs - -DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)" -HOMEPAGE="http://www.kraxel.org/blog/linux/fbida/"; -SRC_URI=" - http://www.kraxel.org/releases/${PN}/${P}.tar.gz - https://dev.gentoo.org/~jer/${P}-jpeg-9a.patch.bz2 - mirror://gentoo/ida.png.bz2 -" -LICENSE="GPL-2 IJG" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ppc ppc64 ~sh sparc x86" -IUSE="curl fbcon +gif lirc pdf +png scanner +tiff X +webp" -REQUIRED_USE=" - pdf? ( tiff ) -" - -RDEPEND=" - !media-gfx/fbi - >=media-libs/fontconfig-2.2 - >=media-libs/freetype-2.0 - media-libs/libexif - curl? ( net-misc/curl ) - gif? ( media-libs/giflib:= ) - lirc? ( app-misc/lirc ) - png? ( media-libs/libpng ) - scanner? ( media-gfx/sane-backends ) - tiff? ( media-libs/tiff ) - virtual/jpeg - virtual/ttf-fonts - webp? ( media-libs/libwebp ) - X? ( - >=x11-libs/motif-2.3:0 - x11-libs/libX11 - x11-libs/libXpm - x11-libs/libXt - ) -" - -DEPEND=" - ${RDEPEND} - X? ( x11-proto/xextproto x11-proto/xproto ) - pdf? ( app-text/ghostscript-gpl ) -" - -src_prepare() { - epatch "${FILESDIR}"/ida-desktop.patch - epatch "${FILESDIR}"/${P}-make.patch - epatch "${FILESDIR}"/${P}-giflib.patch - - pushd jpeg/ >/dev/null - epatch -p2 "${WORKDIR}"/${P}-jpeg-9a.patch - popd >/dev/null - - sed -i \ - -e 's:DGifOpenFileName,ungif:DGifOpenFileName,gif:' \ - -e 's:-lungif:-lgif:' \ - "${S}"/GNUmakefile || die - - if [[ $(gcc-major-version) -lt 4 ]]; then - sed -i-e 's:-Wno-pointer-sign::' "${S}"/GNUmakefile || die - fi - - tc-export CC CPP -} - -src_configure() { - # Let autoconf do its job and then fix things to build fbida - # according to our specifications - emake Make.config - - gentoo_fbida() { - local useflag=${1} - local config=${2} - - local option="no" - use ${useflag} && option="yes" - - sed -i \ - -e "s|HAVE_${config}.*|HAVE_${config} := ${option}|" \ - "${S}/Make.config" || die - } - - gentoo_fbida X MOTIF - gentoo_fbida curl LIBCURL - gentoo_fbida fbcon LINUX_FB_H - gentoo_fbida gif LIBUNGIF - gentoo_fbida lirc LIBLIRC - gentoo_fbida pdf LIBTIFF - gentoo_fbida png LIBPNG - gentoo_fbida scanner LIBSANE - gentoo_fbida tiff LIBTIFF - gentoo_fbida webp LIBWEBP -} - -src_compile() { - emake verbose=yes -} - -src_install() { - emake \ - DESTDIR="${D}" \ - STRIP="" \ - prefix=/usr \ - install - - dodoc README - - if use fbcon && ! use pdf; then - rm "${D}"/usr/bin/fbgs "${D}"/usr/share/man/man1/fbgs.1 || die - fi - - if use X ; then - doicon "${WORKDIR}"/ida.png - domenu desktop/ida.desktop - fi -} diff --git a/media-gfx/fbida/files/fbida-2.09-giflib.patch b/media-gfx/fbida/files/fbida-2.09-giflib.patch deleted file mode 100644 index 50c0055..0000000 --- a/media-gfx/fbida/files/fbida-2.09-giflib.patch +++ /dev/null @@ -1,97 +0,0 @@ ---- a/rd/read-gif.c -+++ b/rd/read-gif.c -@@ -25,7 +25,13 @@ - if (GIF_ERROR == DGifGetRecordType(h->gif,&RecordType)) { - if (debug) - fprintf(stderr,"gif: DGifGetRecordType failed\n"); -- PrintGifError(); -+#if GIFLIB_MAJOR >= 5 -+ GifErrorString(D_GIF_ERR_NOT_GIF_FILE); -+#elif (GIFLIB_MAJOR >= 4 && GIFLIB_MINOR >=2) -+ GifErrorString(); -+#else -+ PrintGifError(); -+#endif - return -1; - } - switch (RecordType) { -@@ -42,7 +48,13 @@ - if (rc == GIF_ERROR) { - if (debug) - fprintf(stderr,"gif: DGifGetExtension failed\n"); -+#if GIFLIB_MAJOR >= 5 -+ GifErrorString(D_GIF_ERR_NOT_GIF_FILE); -+#elif (GIFLIB_MAJOR >= 4 && GIFLIB_MINOR >=2) -+ GifErrorString(); -+#else - PrintGifError(); -+#endif - return -1; - } - if (debug) { -@@ -93,12 +105,19 @@ - struct gif_state *h; - GifRecordType RecordType; - int i, image = 0; -+#if (GIFLIB_MAJOR >=5 && GIFLIB_MINOR >= 1) -+ int ErrorCode; -+#endif - - h = malloc(sizeof(*h)); - memset(h,0,sizeof(*h)); - - h->infile = fp; -+#if GIFLIB_MAJOR >= 5 -+ h->gif = DGifOpenFileHandle(fileno(fp), NULL); -+#else - h->gif = DGifOpenFileHandle(fileno(fp)); -+#endif - h->row = malloc(h->gif->SWidth * sizeof(GifPixelType)); - - while (0 == image) { -@@ -108,7 +127,15 @@ - if (GIF_ERROR == DGifGetImageDesc(h->gif)) { - if (debug) - fprintf(stderr,"gif: DGifGetImageDesc failed\n"); -+#if (GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1) -+ GifErrorString(D_GIF_ERR_NO_IMAG_DSCR); -+#elif GIFLIB_MAJOR >= 5 -+ GifErrorString(NULL); -+#elif (GIFLIB_MAJOR >= 4 && GIFLIB_MINOR >=2) -+ GifErrorString(); -+#else - PrintGifError(); -+#endif - } - if (NULL == h->gif->SColorMap && - NULL == h->gif->Image.ColorMap) { -@@ -156,7 +183,11 @@ - oops: - if (debug) - fprintf(stderr,"gif: fatal error, aborting\n"); -+#if (GIFLIB_MAJOR >=5 && GIFLIB_MINOR >= 1) -+ DGifCloseFile(h->gif, &ErrorCode); -+#else - DGifCloseFile(h->gif); -+#endif - fclose(h->infile); - free(h->row); - free(h); -@@ -193,10 +224,17 @@ - gif_done(void *data) - { - struct gif_state *h = data; -+#if (GIFLIB_MAJOR >=5 && GIFLIB_MINOR >= 1) -+ int ErrorCode; -+#endif - - if (debug) - fprintf(stderr,"gif: done, cleaning up\n"); -+#if (GIFLIB_MAJOR >=5 && GIFLIB_MINOR >= 1) -+ DGifCloseFile(h->gif, &ErrorCode); -+#else - DGifCloseFile(h->gif); -+#endif - fclose(h->infile); - if (h->il) - free(h->il); diff --git a/media-gfx/fbida/files/fbida-2.09-make.patch b/media-gfx/fbida/files/fbida-2.09-make.patch deleted file mode 100644 index 61c19a3..0000000 --- a/media-gfx/fbida/files/fbida-2.09-make.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -30,8 +30,8 @@ - - ac_jpeg_ver = $(shell \ - $(call ac_init,for libjpeg version);\ -- $(call ac_s_cmd,echo -e '\#include <jpeglib.h>\nJPEG_LIB_VERSION' \ -- | cpp | tail -n 1);\ -+ $(call ac_s_cmd,printf '\#include <jpeglib.h>\nJPEG_LIB_VERSION' \ -+ | $(CPP) | tail -n 1);\ - $(call ac_fini)) - - define make-config ---- a/mk/Autoconf.mk -+++ b/mk/Autoconf.mk -@@ -24,7 +24,7 @@ ifneq ($(verbose),no) - ac_fini = echo "... result is $${rc}" >&2; echo >&2; echo "$${rc}" - else - # normal -- ac_init = echo -n "checking $(1) ... " >&2; rc=no -+ ac_init = printf '%s' "checking $(1) ... " >&2; rc=no - ac_b_cmd = $(1) >/dev/null 2>&1 && rc=yes - ac_s_cmd = rc=`$(1) 2>/dev/null` - ac_fini = echo "$${rc}" >&2; echo "$${rc}" -@@ -162,7 +162,7 @@ config: Make.config - @true - - Make.config: $(srcdir)/GNUmakefile -- @echo -e "$(make-config-q)" > $@ -+ @printf '%b' "$(make-config-q)" > $@ - @echo - @echo "Make.config written, edit if needed" - @echo --- -1.7.5.3 -
