public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in media-gfx/splashutils: ChangeLog splashutils-1.5.4.4.ebuild
@ 2011-06-12 22:40 Michael Januszewski (spock)
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Januszewski (spock) @ 2011-06-12 22:40 UTC (permalink / raw
  To: gentoo-commits

spock       11/06/12 22:40:01

  Modified:             ChangeLog
  Added:                splashutils-1.5.4.4.ebuild
  Log:
  Version bump.  This fixes issues from bug #366107 and drops numerous patches from the 1.5.4.3-r3 ebuild.
  
  (Portage version: 2.1.10.2/cvs/Linux x86_64)

Revision  Changes    Path
1.191                media-gfx/splashutils/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- ChangeLog	8 Jun 2011 13:25:52 -0000	1.190
+++ ChangeLog	12 Jun 2011 22:40:01 -0000	1.191
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.190 2011/06/08 13:25:52 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.191 2011/06/12 22:40:01 spock Exp $
+
+*splashutils-1.5.4.4 (12 Jun 2011)
+
+  12 Jun 2011; Michał Januszewski <spock@gentoo.org>
+  +splashutils-1.5.4.4.ebuild:
+  Version bump. This fixes issues from bug #366107 and drops numerous patches
+  from the 1.5.4.3-r3 ebuild.
 
   08 May 2011; Michał Januszewski <spock@gentoo.org>
   splashutils-1.5.4.3-r3.ebuild,



1.1                  media-gfx/splashutils/splashutils-1.5.4.4.ebuild

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

Index: splashutils-1.5.4.4.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4.ebuild,v 1.1 2011/06/12 22:40:01 spock Exp $

EAPI="2"

inherit autotools eutils multilib toolchain-funcs

MISCSPLASH="miscsplashutils-0.1.8"
GENTOOSPLASH="splashutils-gentoo-1.0.17"
V_JPEG="8a"
V_PNG="1.4.3"
V_ZLIB="1.2.3"
V_FT="2.3.12"

ZLIBSRC="libs/zlib-${V_ZLIB}"
LPNGSRC="libs/libpng-${V_PNG}"
JPEGSRC="libs/jpeg-${V_JPEG}"
FT2SRC="libs/freetype-${V_FT}"

RESTRICT="test"
IUSE="hardened +png +truetype +mng gpm fbcondecor"

DESCRIPTION="Framebuffer splash utilities."
HOMEPAGE="http://fbsplash.berlios.de"
SRC_URI="mirror://berlios/fbsplash/${PN}-lite-${PV}.tar.bz2
	mirror://berlios/fbsplash/${GENTOOSPLASH}.tar.bz2
	mirror://gentoo/${MISCSPLASH}.tar.bz2
	mirror://sourceforge/libpng/libpng-${V_PNG}.tar.bz2
	ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v${V_JPEG}.tar.gz
	mirror://sourceforge/freetype/freetype-${V_FT}.tar.bz2
	http://www.gzip.org/zlib/zlib-${V_ZLIB}.tar.bz2"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
RDEPEND="gpm? ( sys-libs/gpm )
	truetype? ( >=media-libs/freetype-2 )
	png? ( >=media-libs/libpng-1.4.3[static-libs] )
	mng? (
		media-libs/lcms:0[static-libs]
		|| ( media-libs/libmng[static-libs] <media-libs/libmng-1.0.10-r1 )
		)
	virtual/jpeg[static-libs]
	>=sys-apps/baselayout-1.9.4-r5
	app-arch/cpio
	media-gfx/fbgrab
	!sys-apps/lcdsplash"
DEPEND="${RDEPEND}
	>=dev-libs/klibc-1.5
	dev-util/pkgconfig"

S="${WORKDIR}/${P/_/-}"
SG="${WORKDIR}/${GENTOOSPLASH}"
SM="${WORKDIR}/${MISCSPLASH}"

pkg_setup() {
	if use hardened; then
		ewarn "Due to problems with klibc, it is currently impossible to compile splashutils"
		ewarn "with 'hardened' GCC flags. As a workaround, the package will be compiled with"
		ewarn "-fno-stack-protector. Hardened GCC features will not be used while building"
		ewarn "the splash kernel helper."
	fi
}

src_prepare() {
	mv "${WORKDIR}"/{libpng-${V_PNG},jpeg-${V_JPEG},zlib-${V_ZLIB},freetype-${V_FT}} "${S}/libs"
	# We need to delete the Makefile and let it be rebuilt when splashutils
	# is being configured. Either that, or we end up with a segfaulting kernel
	# helper.
	rm "${S}/libs/zlib-${V_ZLIB}/Makefile"

	cd "${S}"
	ln -sf "${S}/src" "${WORKDIR}/core"

	if ! tc-is-cross-compiler && \
	   has_version "sys-devel/gcc:$(gcc-version)[vanilla]" ; then
		ewarn "Your GCC was built with the 'vanilla' flag set. If you can't compile"
		ewarn "splashutils, you're on your own, as this configuration is not supported."
	else
		# This should make splashutils compile on systems with hardened GCC.
		sed -e 's@K_CFLAGS =@K_CFLAGS = -fno-stack-protector@' -i "${S}/Makefile.in"
	fi

	if ! use truetype ; then
		sed -i -e 's/fbtruetype kbd/kbd/' "${SM}/Makefile"
	fi

	# Latest version of klibc defined its own version of ferror, so there is
	# not need for the hack in klibc_compat.h
	if has_version ">=dev-libs/klibc-1.5.20"; then
		echo > "libs/klibc_compat.h"
	fi

	rm -f m4/*
	eautoreconf
}

src_configure() {
	tc-export CC
	cd "${SM}"
	emake CC="${CC}" LIB=$(get_libdir) STRIP=true || die "failed to build miscsplashutils"

	cd "${S}"
	econf \
		$(use_with png) \
		$(use_with mng) \
		$(use_with gpm) \
		$(use_with truetype ttf) \
		$(use_with truetype ttf-kernel) \
		$(use_enable fbcondecor) \
		--docdir=/usr/share/doc/${PF} \
		--with-freetype2-src=${FT2SRC} \
		--with-jpeg-src=${JPEGSRC} \
		--with-lpng-src=${LPNGSRC} \
		--with-zlib-src=${ZLIBSRC} \
		--with-essential-libdir=/$(get_libdir) || die "failed to configure splashutils"
}

src_compile() {
	emake CC="${CC}" STRIP="true" || die "failed to build splashutils"

	if has_version ">=sys-apps/baselayout-1.13.99"; then
		cd "${SG}"
		emake LIB=$(get_libdir) || die "failed to build the splash plugin"
	fi
}

src_install() {
	local LIB=$(get_libdir)

	cd "${SM}"
	make DESTDIR="${D}" LIB=${LIB} install || die

	cd "${S}"
	make DESTDIR="${D}" STRIP="true" install || die

	mv "${D}"/usr/${LIB}/libfbsplash.so* "${D}"/${LIB}/
	gen_usr_ldscript libfbsplash.so

	echo 'CONFIG_PROTECT_MASK="/etc/splash"' > 99splash
	doenvd 99splash

	if use fbcondecor ; then
		newinitd "${SG}"/init-fbcondecor fbcondecor
		newconfd "${SG}"/fbcondecor.conf fbcondecor
	fi
	newconfd "${SG}"/splash.conf splash

	insinto /usr/share/${PN}
	doins "${SG}"/initrd.splash

	insinto /etc/splash
	doins "${SM}"/fbtruetype/luxisri.ttf

	if has_version ">=sys-apps/baselayout-1.13.99"; then
		cd "${SG}"
		make DESTDIR="${D}" LIB=${LIB} install || die "failed to install the splash plugin"
	else
		cp "${SG}"/splash-functions-bl1.sh "${D}"/sbin/
	fi

	sed -i -e "s#/lib/splash#/${LIB}/splash#" "${D}"/sbin/splash-functions.sh
	keepdir /${LIB}/splash/{tmp,cache,bin,sys}
	dosym /${LIB}/splash/bin/fbres /sbin/fbres
}

pkg_preinst() {
	has_version "<${CATEGORY}/${PN}-1.0"
	previous_less_than_1_0=$?

	has_version "<${CATEGORY}/${PN}-1.5.3"
	previous_less_than_1_5_3=$?
}

pkg_postinst() {
	if has_version sys-fs/devfsd || ! has_version sys-fs/udev ; then
		elog "This package has been designed with udev in mind. Other solutions, such as"
		elog "devfs or a static /dev tree might work, but are generally discouraged and"
		elog "not supported. If you decide to switch to udev, you might want to have a"
		elog "look at 'The Gentoo udev Guide', which can be found at"
		elog "  http://www.gentoo.org/doc/en/udev-guide.xml"
		elog ""
	fi

	if [[ $previous_less_than_1_0 = 0 ]] ; then
		elog "Since you are upgrading from a pre-1.0 version, please make sure that you"
		elog "rebuild your initrds. You can use the splash_geninitramfs script to do that."
		elog ""
	fi

	if [[ $previous_less_than_1_5_3 = 0 ]] && ! use fbcondecor ; then
		elog "Starting with splashutils-1.5.3, support for the fbcondecor kernel patch"
		elog "is optional and dependent on the the 'fbcondecor' USE flag.  If you wish"
		elog "to use fbcondecor, run:"
		elog "  echo \"media-gfx/splashutils fbcondecor\" >> /etc/portage/package.use"
		elog "and re-emerge splashutils."
	fi

	if ! test -f /proc/cmdline ||
		! egrep -q '(console=tty1|CONSOLE=/dev/tty1)' /proc/cmdline ; then
		elog "It is required that you add 'console=tty1' to your kernel"
		elog "command line parameters."
		elog ""
		elog "After these modifications, the relevant part of the kernel command"
		elog "line might look like:"
		elog "  splash=silent,fadein,theme:emergence console=tty1"
		elog ""
	fi

	if ! has_version 'media-gfx/splash-themes-livecd' &&
		! has_version 'media-gfx/splash-themes-gentoo'; then
		elog "The sample Gentoo themes (emergence, gentoo) have been removed from the"
		elog "core splashutils package. To get some themes you might want to emerge:"
		elog "  media-gfx/splash-themes-livecd"
		elog "  media-gfx/splash-themes-gentoo"
	fi

	elog "Please note that the 'fbsplash' kernel patch has now been renamed to"
	elog "'fbcondecor'.  Accordingly, the old 'splash' initscript is now called"
	elog "'fbcondecor'.  Make sure you update your system.  See:"
	elog "    http://dev.gentoo.org/~spock/projects/fbcondecor/#history"
	elog "for further info about the name changes."
	elog ""
	elog "Also note that splash_util has now been split into splash_util, fbsplashd"
	elog "and fbcondecor_ctl."
}






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

* [gentoo-commits] gentoo-x86 commit in media-gfx/splashutils: ChangeLog splashutils-1.5.4.4.ebuild
@ 2011-06-14 21:33 Michael Januszewski (spock)
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Januszewski (spock) @ 2011-06-14 21:33 UTC (permalink / raw
  To: gentoo-commits

spock       11/06/14 21:33:32

  Modified:             ChangeLog splashutils-1.5.4.4.ebuild
  Log:
  Fix a typo in the Gentoo initscript.
  
  (Portage version: 2.1.10.3/cvs/Linux x86_64)

Revision  Changes    Path
1.192                media-gfx/splashutils/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- ChangeLog	12 Jun 2011 22:40:01 -0000	1.191
+++ ChangeLog	14 Jun 2011 21:33:32 -0000	1.192
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.191 2011/06/12 22:40:01 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.192 2011/06/14 21:33:32 spock Exp $
+
+  14 Jun 2011; Michał Januszewski <spock@gentoo.org>
+  splashutils-1.5.4.4.ebuild, +files/splashutils-1.5.4.4-gentoo-typo-fix.patch:
+  Fix a typo in the Gentoo initscript.
 
 *splashutils-1.5.4.4 (12 Jun 2011)
 



1.2                  media-gfx/splashutils/splashutils-1.5.4.4.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4.ebuild?r1=1.1&r2=1.2

Index: splashutils-1.5.4.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- splashutils-1.5.4.4.ebuild	12 Jun 2011 22:40:01 -0000	1.1
+++ splashutils-1.5.4.4.ebuild	14 Jun 2011 21:33:32 -0000	1.2
@@ -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-gfx/splashutils/splashutils-1.5.4.4.ebuild,v 1.1 2011/06/12 22:40:01 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4.ebuild,v 1.2 2011/06/14 21:33:32 spock Exp $
 
 EAPI="2"
 
@@ -70,6 +70,9 @@
 	# helper.
 	rm "${S}/libs/zlib-${V_ZLIB}/Makefile"
 
+	cd "${SG}"
+	epatch "${FILESDIR}/splashutils-1.5.4.4-gentoo-typo-fix.patch"
+
 	cd "${S}"
 	ln -sf "${S}/src" "${WORKDIR}/core"
 






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

* [gentoo-commits] gentoo-x86 commit in media-gfx/splashutils: ChangeLog splashutils-1.5.4.4.ebuild
@ 2011-07-23 22:36 Michael Januszewski (spock)
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Januszewski (spock) @ 2011-07-23 22:36 UTC (permalink / raw
  To: gentoo-commits

spock       11/07/23 22:36:21

  Modified:             ChangeLog splashutils-1.5.4.4.ebuild
  Log:
  Fix bug #374203 (patch by Theofilos Intzoglou).
  
  (Portage version: 2.1.10.7/cvs/Linux x86_64)

Revision  Changes    Path
1.193                media-gfx/splashutils/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- ChangeLog	14 Jun 2011 21:33:32 -0000	1.192
+++ ChangeLog	23 Jul 2011 22:36:21 -0000	1.193
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.192 2011/06/14 21:33:32 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.193 2011/07/23 22:36:21 spock Exp $
+
+  23 Jul 2011; Michał Januszewski <spock@gentoo.org>
+  splashutils-1.5.4.4.ebuild, +files/splashutils-1.5.4.4-freetype-bz2.patch:
+  Fix bug #374203 (patch by Theofilos Intzoglou).
 
   14 Jun 2011; Michał Januszewski <spock@gentoo.org>
   splashutils-1.5.4.4.ebuild, +files/splashutils-1.5.4.4-gentoo-typo-fix.patch:



1.3                  media-gfx/splashutils/splashutils-1.5.4.4.ebuild

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

Index: splashutils-1.5.4.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- splashutils-1.5.4.4.ebuild	14 Jun 2011 21:33:32 -0000	1.2
+++ splashutils-1.5.4.4.ebuild	23 Jul 2011 22:36:21 -0000	1.3
@@ -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-gfx/splashutils/splashutils-1.5.4.4.ebuild,v 1.2 2011/06/14 21:33:32 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4.ebuild,v 1.3 2011/07/23 22:36:21 spock Exp $
 
 EAPI="2"
 
@@ -35,7 +35,7 @@
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 RDEPEND="gpm? ( sys-libs/gpm )
-	truetype? ( >=media-libs/freetype-2 )
+	truetype? ( >=media-libs/freetype-2[static-libs] )
 	png? ( >=media-libs/libpng-1.4.3[static-libs] )
 	mng? (
 		media-libs/lcms:0[static-libs]
@@ -73,6 +73,13 @@
 	cd "${SG}"
 	epatch "${FILESDIR}/splashutils-1.5.4.4-gentoo-typo-fix.patch"
 
+	if use truetype ; then
+		if [[ "`freetype-config --ftversion`" > "2.4.4" ]]; then
+			cd "${SM}"
+			epatch "${FILESDIR}/splashutils-1.5.4.4-freetype-bz2.patch"
+		fi
+	fi
+
 	cd "${S}"
 	ln -sf "${S}/src" "${WORKDIR}/core"
 






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

* [gentoo-commits] gentoo-x86 commit in media-gfx/splashutils: ChangeLog splashutils-1.5.4.4.ebuild
@ 2011-08-28 17:48 Michael Januszewski (spock)
  0 siblings, 0 replies; 7+ messages in thread
From: Michael Januszewski (spock) @ 2011-08-28 17:48 UTC (permalink / raw
  To: gentoo-commits

spock       11/08/28 17:48:30

  Modified:             ChangeLog splashutils-1.5.4.4.ebuild
  Log:
  Fix bug #380281.
  
  (Portage version: 2.1.10.11/cvs/Linux x86_64)

Revision  Changes    Path
1.194                media-gfx/splashutils/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- ChangeLog	23 Jul 2011 22:36:21 -0000	1.193
+++ ChangeLog	28 Aug 2011 17:48:30 -0000	1.194
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.193 2011/07/23 22:36:21 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.194 2011/08/28 17:48:30 spock Exp $
+
+  28 Aug 2011; Michał Januszewski <spock@gentoo.org>
+  splashutils-1.5.4.4.ebuild:
+  Fix bug #380281.
 
   23 Jul 2011; Michał Januszewski <spock@gentoo.org>
   splashutils-1.5.4.4.ebuild, +files/splashutils-1.5.4.4-freetype-bz2.patch:



1.4                  media-gfx/splashutils/splashutils-1.5.4.4.ebuild

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

Index: splashutils-1.5.4.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- splashutils-1.5.4.4.ebuild	23 Jul 2011 22:36:21 -0000	1.3
+++ splashutils-1.5.4.4.ebuild	28 Aug 2011 17:48:30 -0000	1.4
@@ -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-gfx/splashutils/splashutils-1.5.4.4.ebuild,v 1.3 2011/07/23 22:36:21 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4.ebuild,v 1.4 2011/08/28 17:48:30 spock Exp $
 
 EAPI="2"
 
@@ -35,7 +35,8 @@
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 RDEPEND="gpm? ( sys-libs/gpm )
-	truetype? ( >=media-libs/freetype-2[static-libs] )
+	truetype? ( >=media-libs/freetype-2[static-libs]
+		|| ( <app-arch/bzip2-1.0.6-r3 app-arch/bzip2[static-libs] ) )
 	png? ( >=media-libs/libpng-1.4.3[static-libs] )
 	mng? (
 		media-libs/lcms:0[static-libs]






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

* [gentoo-commits] gentoo-x86 commit in media-gfx/splashutils: ChangeLog splashutils-1.5.4.4.ebuild
@ 2011-10-18 12:59 Peter Volkov (pva)
  0 siblings, 0 replies; 7+ messages in thread
From: Peter Volkov (pva) @ 2011-10-18 12:59 UTC (permalink / raw
  To: gentoo-commits

pva         11/10/18 12:59:32

  Modified:             ChangeLog splashutils-1.5.4.4.ebuild
  Log:
  Fixed build failure reported in bug 384131 wrt Robin Johnson.
  
  (Portage version: 2.1.10.27/cvs/Linux x86_64)

Revision  Changes    Path
1.196                media-gfx/splashutils/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- ChangeLog	4 Sep 2011 14:13:19 -0000	1.195
+++ ChangeLog	18 Oct 2011 12:59:32 -0000	1.196
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.195 2011/09/04 14:13:19 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.196 2011/10/18 12:59:32 pva Exp $
+
+  18 Oct 2011; Peter Volkov <pva@gentoo.org> splashutils-1.5.4.4.ebuild,
+  files/splashutils-1.5.4.4-freetype-bz2.patch:
+  Fixed build failure reported in bug 384131 wrt Robin Johnson.
 
   04 Sep 2011; Michał Januszewski <spock@gentoo.org>
   splashutils-1.5.4.3-r3.ebuild:



1.5                  media-gfx/splashutils/splashutils-1.5.4.4.ebuild

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

Index: splashutils-1.5.4.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- splashutils-1.5.4.4.ebuild	28 Aug 2011 17:48:30 -0000	1.4
+++ splashutils-1.5.4.4.ebuild	18 Oct 2011 12:59:32 -0000	1.5
@@ -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-gfx/splashutils/splashutils-1.5.4.4.ebuild,v 1.4 2011/08/28 17:48:30 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4.ebuild,v 1.5 2011/10/18 12:59:32 pva Exp $
 
 EAPI="2"
 
@@ -36,7 +36,8 @@
 KEYWORDS="~amd64 ~ppc ~x86"
 RDEPEND="gpm? ( sys-libs/gpm )
 	truetype? ( >=media-libs/freetype-2[static-libs]
-		|| ( <app-arch/bzip2-1.0.6-r3 app-arch/bzip2[static-libs] ) )
+		|| ( <app-arch/bzip2-1.0.6-r3 app-arch/bzip2[static-libs] )
+		|| ( <sys-libs/zlib-1.2.5.1-r2 sys-libs/zlib[static-libs] ) )
 	png? ( >=media-libs/libpng-1.4.3[static-libs] )
 	mng? (
 		media-libs/lcms:0[static-libs]
@@ -75,10 +76,8 @@
 	epatch "${FILESDIR}/splashutils-1.5.4.4-gentoo-typo-fix.patch"
 
 	if use truetype ; then
-		if [[ "`freetype-config --ftversion`" > "2.4.4" ]]; then
-			cd "${SM}"
-			epatch "${FILESDIR}/splashutils-1.5.4.4-freetype-bz2.patch"
-		fi
+		cd "${SM}"
+		epatch "${FILESDIR}/splashutils-1.5.4.4-freetype-bz2.patch"
 	fi
 
 	cd "${S}"






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

* [gentoo-commits] gentoo-x86 commit in media-gfx/splashutils: ChangeLog splashutils-1.5.4.4.ebuild
@ 2011-11-13 14:53 Markus Meier (maekke)
  0 siblings, 0 replies; 7+ messages in thread
From: Markus Meier (maekke) @ 2011-11-13 14:53 UTC (permalink / raw
  To: gentoo-commits

maekke      11/11/13 14:53:58

  Modified:             ChangeLog splashutils-1.5.4.4.ebuild
  Log:
  x86 stable, bug #387633
  
  (Portage version: 2.1.10.34/cvs/Linux x86_64)

Revision  Changes    Path
1.199                media-gfx/splashutils/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- ChangeLog	12 Nov 2011 09:14:28 -0000	1.198
+++ ChangeLog	13 Nov 2011 14:53:58 -0000	1.199
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.198 2011/11/12 09:14:28 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.199 2011/11/13 14:53:58 maekke Exp $
+
+  13 Nov 2011; Markus Meier <maekke@gentoo.org> splashutils-1.5.4.4.ebuild:
+  x86 stable, bug #387633
 
   12 Nov 2011; Markos Chandras <hwoarang@gentoo.org> splashutils-1.5.4.4.ebuild:
   Stable on amd64 wrt bug #387633



1.7                  media-gfx/splashutils/splashutils-1.5.4.4.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4.ebuild?r1=1.6&r2=1.7

Index: splashutils-1.5.4.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- splashutils-1.5.4.4.ebuild	12 Nov 2011 09:14:28 -0000	1.6
+++ splashutils-1.5.4.4.ebuild	13 Nov 2011 14:53:58 -0000	1.7
@@ -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-gfx/splashutils/splashutils-1.5.4.4.ebuild,v 1.6 2011/11/12 09:14:28 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4.ebuild,v 1.7 2011/11/13 14:53:58 maekke Exp $
 
 EAPI="2"
 
@@ -33,7 +33,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 RDEPEND="gpm? ( sys-libs/gpm )
 	truetype? ( >=media-libs/freetype-2[static-libs]
 		|| ( <app-arch/bzip2-1.0.6-r3 app-arch/bzip2[static-libs] )






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

* [gentoo-commits] gentoo-x86 commit in media-gfx/splashutils: ChangeLog splashutils-1.5.4.4.ebuild
@ 2012-03-01 23:34 Brent Baude (ranger)
  0 siblings, 0 replies; 7+ messages in thread
From: Brent Baude (ranger) @ 2012-03-01 23:34 UTC (permalink / raw
  To: gentoo-commits

ranger      12/03/01 23:34:40

  Modified:             ChangeLog splashutils-1.5.4.4.ebuild
  Log:
  Marking splashutils-1.5.4.4 ppc for bug 387633
  
  (Portage version: 2.1.10.11/cvs/Linux ppc64)

Revision  Changes    Path
1.200                media-gfx/splashutils/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- ChangeLog	13 Nov 2011 14:53:58 -0000	1.199
+++ ChangeLog	1 Mar 2012 23:34:40 -0000	1.200
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/splashutils
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.199 2011/11/13 14:53:58 maekke Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.200 2012/03/01 23:34:40 ranger Exp $
+
+  01 Mar 2012; Brent Baude <ranger@gentoo.org> splashutils-1.5.4.4.ebuild:
+  Marking splashutils-1.5.4.4 ppc for bug 387633
 
   13 Nov 2011; Markus Meier <maekke@gentoo.org> splashutils-1.5.4.4.ebuild:
   x86 stable, bug #387633



1.8                  media-gfx/splashutils/splashutils-1.5.4.4.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4.ebuild?r1=1.7&r2=1.8

Index: splashutils-1.5.4.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- splashutils-1.5.4.4.ebuild	13 Nov 2011 14:53:58 -0000	1.7
+++ splashutils-1.5.4.4.ebuild	1 Mar 2012 23:34:40 -0000	1.8
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4.ebuild,v 1.7 2011/11/13 14:53:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4.ebuild,v 1.8 2012/03/01 23:34:40 ranger Exp $
 
 EAPI="2"
 
@@ -33,7 +33,7 @@
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 RDEPEND="gpm? ( sys-libs/gpm )
 	truetype? ( >=media-libs/freetype-2[static-libs]
 		|| ( <app-arch/bzip2-1.0.6-r3 app-arch/bzip2[static-libs] )






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

end of thread, other threads:[~2012-03-01 23:34 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-23 22:36 [gentoo-commits] gentoo-x86 commit in media-gfx/splashutils: ChangeLog splashutils-1.5.4.4.ebuild Michael Januszewski (spock)
  -- strict thread matches above, loose matches on Subject: below --
2012-03-01 23:34 Brent Baude (ranger)
2011-11-13 14:53 Markus Meier (maekke)
2011-10-18 12:59 Peter Volkov (pva)
2011-08-28 17:48 Michael Januszewski (spock)
2011-06-14 21:33 Michael Januszewski (spock)
2011-06-12 22:40 Michael Januszewski (spock)

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