public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in media-gfx/fbida: ChangeLog fbida-2.09-r4.ebuild
@ 2014-11-27  1:53 Jeroen Roovers (jer)
  0 siblings, 0 replies; 2+ messages in thread
From: Jeroen Roovers (jer) @ 2014-11-27  1:53 UTC (permalink / raw
  To: gentoo-commits

jer         14/11/27 01:53:32

  Modified:             ChangeLog
  Added:                fbida-2.09-r4.ebuild
  Log:
  Use a single patch for every giflib version.
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)

Revision  Changes    Path
1.115                media-gfx/fbida/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fbida/ChangeLog?rev=1.115&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fbida/ChangeLog?rev=1.115&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fbida/ChangeLog?r1=1.114&r2=1.115

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- ChangeLog	25 Sep 2014 10:09:28 -0000	1.114
+++ ChangeLog	27 Nov 2014 01:53:32 -0000	1.115
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/fbida
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.114 2014/09/25 10:09:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.115 2014/11/27 01:53:32 jer Exp $
+
+*fbida-2.09-r4 (27 Nov 2014)
+
+  27 Nov 2014; Jeroen Roovers <jer@gentoo.org> +fbida-2.09-r4.ebuild,
+  +files/fbida-2.09-giflib.patch:
+  Use a single patch for every giflib version.
 
 *fbida-2.09-r3 (25 Sep 2014)
 



1.1                  media-gfx/fbida/fbida-2.09-r4.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fbida/fbida-2.09-r4.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fbida/fbida-2.09-r4.ebuild?rev=1.1&content-type=text/plain

Index: fbida-2.09-r4.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.09-r4.ebuild,v 1.1 2014/11/27 01:53:32 jer Exp $

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
	http://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 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
}





^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-gfx/fbida: ChangeLog fbida-2.09-r4.ebuild
@ 2014-12-26 18:11 Markus Meier (maekke)
  0 siblings, 0 replies; 2+ messages in thread
From: Markus Meier (maekke) @ 2014-12-26 18:11 UTC (permalink / raw
  To: gentoo-commits

maekke      14/12/26 18:11:57

  Modified:             ChangeLog fbida-2.09-r4.ebuild
  Log:
  arm stable, bug #532902
  
  (Portage version: 2.2.15/cvs/Linux x86_64, RepoMan options: --include-arches="arm", signed Manifest commit with key 072AD062)

Revision  Changes    Path
1.118                media-gfx/fbida/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fbida/ChangeLog?rev=1.118&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fbida/ChangeLog?rev=1.118&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fbida/ChangeLog?r1=1.117&r2=1.118

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- ChangeLog	20 Dec 2014 07:03:40 -0000	1.117
+++ ChangeLog	26 Dec 2014 18:11:57 -0000	1.118
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/fbida
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.117 2014/12/20 07:03:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.118 2014/12/26 18:11:57 maekke Exp $
+
+  26 Dec 2014; Markus Meier <maekke@gentoo.org> fbida-2.09-r4.ebuild:
+  arm stable, bug #532902
 
   20 Dec 2014; Jeroen Roovers <jer@gentoo.org> fbida-2.09-r4.ebuild:
   Stable for HPPA (bug #532902).



1.4                  media-gfx/fbida/fbida-2.09-r4.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fbida/fbida-2.09-r4.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fbida/fbida-2.09-r4.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fbida/fbida-2.09-r4.ebuild?r1=1.3&r2=1.4

Index: fbida-2.09-r4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.09-r4.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fbida-2.09-r4.ebuild	20 Dec 2014 07:03:40 -0000	1.3
+++ fbida-2.09-r4.ebuild	26 Dec 2014 18:11:57 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.09-r4.ebuild,v 1.3 2014/12/20 07:03:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.09-r4.ebuild,v 1.4 2014/12/26 18:11:57 maekke Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs
@@ -14,7 +14,7 @@
 "
 LICENSE="GPL-2 IJG"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
+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 )





^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-12-26 18:12 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-26 18:11 [gentoo-commits] gentoo-x86 commit in media-gfx/fbida: ChangeLog fbida-2.09-r4.ebuild Markus Meier (maekke)
  -- strict thread matches above, loose matches on Subject: below --
2014-11-27  1:53 Jeroen Roovers (jer)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox