| 1 |
commit: 41fccacb21f580b97c190a2310ead9d7c35fd7d1 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Mar 30 04:17:30 2016 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Mar 30 04:17:30 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41fccacb |
| 7 |
|
| 8 |
media-gfx/fbida: Old. |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
|
| 12 |
media-gfx/fbida/Manifest | 2 - |
| 13 |
media-gfx/fbida/fbida-2.09-r4.ebuild | 122 -------------------------- |
| 14 |
media-gfx/fbida/files/fbida-2.09-giflib.patch | 97 -------------------- |
| 15 |
media-gfx/fbida/files/fbida-2.09-make.patch | 36 -------- |
| 16 |
4 files changed, 257 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest |
| 19 |
index 605eb7c..13debd5 100644 |
| 20 |
--- a/media-gfx/fbida/Manifest |
| 21 |
+++ b/media-gfx/fbida/Manifest |
| 22 |
@@ -1,4 +1,2 @@ |
| 23 |
-DIST fbida-2.09-jpeg-9a.patch.bz2 29392 SHA256 d0979bb7b33b34c2b01f0fe14825812319b0ec08f00f0de6cf9a0533a5f6dba8 SHA512 f644f464231967589a2f1ad0fdc9025d60348a9de20d468fc6abdf3dc0cbf07522e3f71a94930df3c54055fc445df035b4b007efa7e6a3f7acbec90e28dc86c8 WHIRLPOOL 372aa56e698f82ff9dd8adacb5de9347e40849653553d810e4f5c0fca731ca8e863f8a20658db071ca11ed8d6bc8794c36ec5fd8c0a2426d8e500389703f2e95 |
| 24 |
-DIST fbida-2.09.tar.gz 248086 SHA256 dd40b3572f79c6524480ac652c9b32e3867cb53e6c53db51415ddbb20f5231e6 SHA512 b939ca656fc28e3df652610821b9c11f7ab20ad1bd393c40de74f631fad0af463bfaf4f0520484edc12922b1fc288d08fae7c92789c711ce96b0caf50dde25ba WHIRLPOOL 222538f80fc7e878d142cd4dc44089d12b717ee8ae921e514bb3b85322b972cc96300594ae89d7cc1cb006868a0c75abacaa7ddff15041bc672c27d565a00a4b |
| 25 |
DIST fbida-2.10.tar.gz 283490 SHA256 7a5a3aac61b40a6a2bbf716d270a46e2f8e8d5c97e314e927d41398a4d0b6cb6 SHA512 b7371c19d68cc7219faca4bbfa464c85df2eb22c7bd737d4f0a6fb3de481497862ca22832801d29bab57285d5a8d7d0b0009e14426efdce2759d47340f5eca6d WHIRLPOOL 78c5dc34a9f050e560ada960718a9f43e6d8c95fe4c91c052a70c93350de80eebd3e8e9b6c26361ecd8361efe96824e78b2af7a2b2e27430a11e712bb9a02ee0 |
| 26 |
DIST ida.png.bz2 11928 SHA256 ce90c13f8da8d2ced4cf0e55d2f960bc236355f6e5dd60ea6c56fbe51e6cabae SHA512 cf3c1bc8d25fe75f10c0a0414b5c082348df2fa94864ec4537c36e0b357cf35b68e2eca205bbf48578a41c27317701aee621c6dd176e0bf3857c52f895d6bfd3 WHIRLPOOL 1b5e7835aa8a555a231ca58da8e249974639b29b1e15586c2d2d5a33e96908df1a3782fbe61d0c51dc888b7304c9f7541a96af4ca2b956b393909feb534ab5be |
| 27 |
|
| 28 |
diff --git a/media-gfx/fbida/fbida-2.09-r4.ebuild b/media-gfx/fbida/fbida-2.09-r4.ebuild |
| 29 |
deleted file mode 100644 |
| 30 |
index 1b2b7ac..0000000 |
| 31 |
--- a/media-gfx/fbida/fbida-2.09-r4.ebuild |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,122 +0,0 @@ |
| 34 |
-# Copyright 1999-2015 Gentoo Foundation |
| 35 |
-# Distributed under the terms of the GNU General Public License v2 |
| 36 |
-# $Id$ |
| 37 |
- |
| 38 |
-EAPI=5 |
| 39 |
-inherit eutils toolchain-funcs |
| 40 |
- |
| 41 |
-DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)" |
| 42 |
-HOMEPAGE="http://www.kraxel.org/blog/linux/fbida/" |
| 43 |
-SRC_URI=" |
| 44 |
- http://www.kraxel.org/releases/${PN}/${P}.tar.gz |
| 45 |
- https://dev.gentoo.org/~jer/${P}-jpeg-9a.patch.bz2 |
| 46 |
- mirror://gentoo/ida.png.bz2 |
| 47 |
-" |
| 48 |
-LICENSE="GPL-2 IJG" |
| 49 |
-SLOT="0" |
| 50 |
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 ~sh sparc x86" |
| 51 |
-IUSE="curl fbcon +gif lirc pdf +png scanner +tiff X +webp" |
| 52 |
-REQUIRED_USE=" |
| 53 |
- pdf? ( tiff ) |
| 54 |
-" |
| 55 |
- |
| 56 |
-RDEPEND=" |
| 57 |
- !media-gfx/fbi |
| 58 |
- >=media-libs/fontconfig-2.2 |
| 59 |
- >=media-libs/freetype-2.0 |
| 60 |
- media-libs/libexif |
| 61 |
- curl? ( net-misc/curl ) |
| 62 |
- gif? ( media-libs/giflib:= ) |
| 63 |
- lirc? ( app-misc/lirc ) |
| 64 |
- png? ( media-libs/libpng ) |
| 65 |
- scanner? ( media-gfx/sane-backends ) |
| 66 |
- tiff? ( media-libs/tiff ) |
| 67 |
- virtual/jpeg |
| 68 |
- virtual/ttf-fonts |
| 69 |
- webp? ( media-libs/libwebp ) |
| 70 |
- X? ( |
| 71 |
- >=x11-libs/motif-2.3:0 |
| 72 |
- x11-libs/libX11 |
| 73 |
- x11-libs/libXpm |
| 74 |
- x11-libs/libXt |
| 75 |
- ) |
| 76 |
-" |
| 77 |
- |
| 78 |
-DEPEND=" |
| 79 |
- ${RDEPEND} |
| 80 |
- X? ( x11-proto/xextproto x11-proto/xproto ) |
| 81 |
- pdf? ( app-text/ghostscript-gpl ) |
| 82 |
-" |
| 83 |
- |
| 84 |
-src_prepare() { |
| 85 |
- epatch "${FILESDIR}"/ida-desktop.patch |
| 86 |
- epatch "${FILESDIR}"/${P}-make.patch |
| 87 |
- epatch "${FILESDIR}"/${P}-giflib.patch |
| 88 |
- |
| 89 |
- pushd jpeg/ >/dev/null |
| 90 |
- epatch -p2 "${WORKDIR}"/${P}-jpeg-9a.patch |
| 91 |
- popd >/dev/null |
| 92 |
- |
| 93 |
- sed -i \ |
| 94 |
- -e 's:DGifOpenFileName,ungif:DGifOpenFileName,gif:' \ |
| 95 |
- -e 's:-lungif:-lgif:' \ |
| 96 |
- "${S}"/GNUmakefile || die |
| 97 |
- |
| 98 |
- if [[ $(gcc-major-version) -lt 4 ]]; then |
| 99 |
- sed -i-e 's:-Wno-pointer-sign::' "${S}"/GNUmakefile || die |
| 100 |
- fi |
| 101 |
- |
| 102 |
- tc-export CC CPP |
| 103 |
-} |
| 104 |
- |
| 105 |
-src_configure() { |
| 106 |
- # Let autoconf do its job and then fix things to build fbida |
| 107 |
- # according to our specifications |
| 108 |
- emake Make.config |
| 109 |
- |
| 110 |
- gentoo_fbida() { |
| 111 |
- local useflag=${1} |
| 112 |
- local config=${2} |
| 113 |
- |
| 114 |
- local option="no" |
| 115 |
- use ${useflag} && option="yes" |
| 116 |
- |
| 117 |
- sed -i \ |
| 118 |
- -e "s|HAVE_${config}.*|HAVE_${config} := ${option}|" \ |
| 119 |
- "${S}/Make.config" || die |
| 120 |
- } |
| 121 |
- |
| 122 |
- gentoo_fbida X MOTIF |
| 123 |
- gentoo_fbida curl LIBCURL |
| 124 |
- gentoo_fbida fbcon LINUX_FB_H |
| 125 |
- gentoo_fbida gif LIBUNGIF |
| 126 |
- gentoo_fbida lirc LIBLIRC |
| 127 |
- gentoo_fbida pdf LIBTIFF |
| 128 |
- gentoo_fbida png LIBPNG |
| 129 |
- gentoo_fbida scanner LIBSANE |
| 130 |
- gentoo_fbida tiff LIBTIFF |
| 131 |
- gentoo_fbida webp LIBWEBP |
| 132 |
-} |
| 133 |
- |
| 134 |
-src_compile() { |
| 135 |
- emake verbose=yes |
| 136 |
-} |
| 137 |
- |
| 138 |
-src_install() { |
| 139 |
- emake \ |
| 140 |
- DESTDIR="${D}" \ |
| 141 |
- STRIP="" \ |
| 142 |
- prefix=/usr \ |
| 143 |
- install |
| 144 |
- |
| 145 |
- dodoc README |
| 146 |
- |
| 147 |
- if use fbcon && ! use pdf; then |
| 148 |
- rm "${D}"/usr/bin/fbgs "${D}"/usr/share/man/man1/fbgs.1 || die |
| 149 |
- fi |
| 150 |
- |
| 151 |
- if use X ; then |
| 152 |
- doicon "${WORKDIR}"/ida.png |
| 153 |
- domenu desktop/ida.desktop |
| 154 |
- fi |
| 155 |
-} |
| 156 |
|
| 157 |
diff --git a/media-gfx/fbida/files/fbida-2.09-giflib.patch b/media-gfx/fbida/files/fbida-2.09-giflib.patch |
| 158 |
deleted file mode 100644 |
| 159 |
index 50c0055..0000000 |
| 160 |
--- a/media-gfx/fbida/files/fbida-2.09-giflib.patch |
| 161 |
+++ /dev/null |
| 162 |
@@ -1,97 +0,0 @@ |
| 163 |
---- a/rd/read-gif.c |
| 164 |
-+++ b/rd/read-gif.c |
| 165 |
-@@ -25,7 +25,13 @@ |
| 166 |
- if (GIF_ERROR == DGifGetRecordType(h->gif,&RecordType)) { |
| 167 |
- if (debug) |
| 168 |
- fprintf(stderr,"gif: DGifGetRecordType failed\n"); |
| 169 |
-- PrintGifError(); |
| 170 |
-+#if GIFLIB_MAJOR >= 5 |
| 171 |
-+ GifErrorString(D_GIF_ERR_NOT_GIF_FILE); |
| 172 |
-+#elif (GIFLIB_MAJOR >= 4 && GIFLIB_MINOR >=2) |
| 173 |
-+ GifErrorString(); |
| 174 |
-+#else |
| 175 |
-+ PrintGifError(); |
| 176 |
-+#endif |
| 177 |
- return -1; |
| 178 |
- } |
| 179 |
- switch (RecordType) { |
| 180 |
-@@ -42,7 +48,13 @@ |
| 181 |
- if (rc == GIF_ERROR) { |
| 182 |
- if (debug) |
| 183 |
- fprintf(stderr,"gif: DGifGetExtension failed\n"); |
| 184 |
-+#if GIFLIB_MAJOR >= 5 |
| 185 |
-+ GifErrorString(D_GIF_ERR_NOT_GIF_FILE); |
| 186 |
-+#elif (GIFLIB_MAJOR >= 4 && GIFLIB_MINOR >=2) |
| 187 |
-+ GifErrorString(); |
| 188 |
-+#else |
| 189 |
- PrintGifError(); |
| 190 |
-+#endif |
| 191 |
- return -1; |
| 192 |
- } |
| 193 |
- if (debug) { |
| 194 |
-@@ -93,12 +105,19 @@ |
| 195 |
- struct gif_state *h; |
| 196 |
- GifRecordType RecordType; |
| 197 |
- int i, image = 0; |
| 198 |
-+#if (GIFLIB_MAJOR >=5 && GIFLIB_MINOR >= 1) |
| 199 |
-+ int ErrorCode; |
| 200 |
-+#endif |
| 201 |
- |
| 202 |
- h = malloc(sizeof(*h)); |
| 203 |
- memset(h,0,sizeof(*h)); |
| 204 |
- |
| 205 |
- h->infile = fp; |
| 206 |
-+#if GIFLIB_MAJOR >= 5 |
| 207 |
-+ h->gif = DGifOpenFileHandle(fileno(fp), NULL); |
| 208 |
-+#else |
| 209 |
- h->gif = DGifOpenFileHandle(fileno(fp)); |
| 210 |
-+#endif |
| 211 |
- h->row = malloc(h->gif->SWidth * sizeof(GifPixelType)); |
| 212 |
- |
| 213 |
- while (0 == image) { |
| 214 |
-@@ -108,7 +127,15 @@ |
| 215 |
- if (GIF_ERROR == DGifGetImageDesc(h->gif)) { |
| 216 |
- if (debug) |
| 217 |
- fprintf(stderr,"gif: DGifGetImageDesc failed\n"); |
| 218 |
-+#if (GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1) |
| 219 |
-+ GifErrorString(D_GIF_ERR_NO_IMAG_DSCR); |
| 220 |
-+#elif GIFLIB_MAJOR >= 5 |
| 221 |
-+ GifErrorString(NULL); |
| 222 |
-+#elif (GIFLIB_MAJOR >= 4 && GIFLIB_MINOR >=2) |
| 223 |
-+ GifErrorString(); |
| 224 |
-+#else |
| 225 |
- PrintGifError(); |
| 226 |
-+#endif |
| 227 |
- } |
| 228 |
- if (NULL == h->gif->SColorMap && |
| 229 |
- NULL == h->gif->Image.ColorMap) { |
| 230 |
-@@ -156,7 +183,11 @@ |
| 231 |
- oops: |
| 232 |
- if (debug) |
| 233 |
- fprintf(stderr,"gif: fatal error, aborting\n"); |
| 234 |
-+#if (GIFLIB_MAJOR >=5 && GIFLIB_MINOR >= 1) |
| 235 |
-+ DGifCloseFile(h->gif, &ErrorCode); |
| 236 |
-+#else |
| 237 |
- DGifCloseFile(h->gif); |
| 238 |
-+#endif |
| 239 |
- fclose(h->infile); |
| 240 |
- free(h->row); |
| 241 |
- free(h); |
| 242 |
-@@ -193,10 +224,17 @@ |
| 243 |
- gif_done(void *data) |
| 244 |
- { |
| 245 |
- struct gif_state *h = data; |
| 246 |
-+#if (GIFLIB_MAJOR >=5 && GIFLIB_MINOR >= 1) |
| 247 |
-+ int ErrorCode; |
| 248 |
-+#endif |
| 249 |
- |
| 250 |
- if (debug) |
| 251 |
- fprintf(stderr,"gif: done, cleaning up\n"); |
| 252 |
-+#if (GIFLIB_MAJOR >=5 && GIFLIB_MINOR >= 1) |
| 253 |
-+ DGifCloseFile(h->gif, &ErrorCode); |
| 254 |
-+#else |
| 255 |
- DGifCloseFile(h->gif); |
| 256 |
-+#endif |
| 257 |
- fclose(h->infile); |
| 258 |
- if (h->il) |
| 259 |
- free(h->il); |
| 260 |
|
| 261 |
diff --git a/media-gfx/fbida/files/fbida-2.09-make.patch b/media-gfx/fbida/files/fbida-2.09-make.patch |
| 262 |
deleted file mode 100644 |
| 263 |
index 61c19a3..0000000 |
| 264 |
--- a/media-gfx/fbida/files/fbida-2.09-make.patch |
| 265 |
+++ /dev/null |
| 266 |
@@ -1,36 +0,0 @@ |
| 267 |
---- a/GNUmakefile |
| 268 |
-+++ b/GNUmakefile |
| 269 |
-@@ -30,8 +30,8 @@ |
| 270 |
- |
| 271 |
- ac_jpeg_ver = $(shell \ |
| 272 |
- $(call ac_init,for libjpeg version);\ |
| 273 |
-- $(call ac_s_cmd,echo -e '\#include <jpeglib.h>\nJPEG_LIB_VERSION' \ |
| 274 |
-- | cpp | tail -n 1);\ |
| 275 |
-+ $(call ac_s_cmd,printf '\#include <jpeglib.h>\nJPEG_LIB_VERSION' \ |
| 276 |
-+ | $(CPP) | tail -n 1);\ |
| 277 |
- $(call ac_fini)) |
| 278 |
- |
| 279 |
- define make-config |
| 280 |
---- a/mk/Autoconf.mk |
| 281 |
-+++ b/mk/Autoconf.mk |
| 282 |
-@@ -24,7 +24,7 @@ ifneq ($(verbose),no) |
| 283 |
- ac_fini = echo "... result is $${rc}" >&2; echo >&2; echo "$${rc}" |
| 284 |
- else |
| 285 |
- # normal |
| 286 |
-- ac_init = echo -n "checking $(1) ... " >&2; rc=no |
| 287 |
-+ ac_init = printf '%s' "checking $(1) ... " >&2; rc=no |
| 288 |
- ac_b_cmd = $(1) >/dev/null 2>&1 && rc=yes |
| 289 |
- ac_s_cmd = rc=`$(1) 2>/dev/null` |
| 290 |
- ac_fini = echo "$${rc}" >&2; echo "$${rc}" |
| 291 |
-@@ -162,7 +162,7 @@ config: Make.config |
| 292 |
- @true |
| 293 |
- |
| 294 |
- Make.config: $(srcdir)/GNUmakefile |
| 295 |
-- @echo -e "$(make-config-q)" > $@ |
| 296 |
-+ @printf '%b' "$(make-config-q)" > $@ |
| 297 |
- @echo |
| 298 |
- @echo "Make.config written, edit if needed" |
| 299 |
- @echo |
| 300 |
--- |
| 301 |
-1.7.5.3 |
| 302 |
- |
Archives