summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /sys-apps/tuxonice-userui
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sys-apps/tuxonice-userui')
-rw-r--r--sys-apps/tuxonice-userui/Manifest2
-rw-r--r--sys-apps/tuxonice-userui/files/tuxonice-userui-1.0-Makefiles.patch45
-rw-r--r--sys-apps/tuxonice-userui/files/tuxonice-userui-1.0-libpng15.patch88
-rw-r--r--sys-apps/tuxonice-userui/files/tuxonice-userui-1.1-freetype-2.5.patch38
-rw-r--r--sys-apps/tuxonice-userui/metadata.xml12
-rw-r--r--sys-apps/tuxonice-userui/tuxonice-userui-1.1-r2.ebuild70
6 files changed, 255 insertions, 0 deletions
diff --git a/sys-apps/tuxonice-userui/Manifest b/sys-apps/tuxonice-userui/Manifest
new file mode 100644
index 00000000000..f2a9ef7aaad
--- /dev/null
+++ b/sys-apps/tuxonice-userui/Manifest
@@ -0,0 +1,2 @@
+DIST tuxonice-userui-1.1.tar 3317760 SHA256 dfbd5c9f5b07c17502a3d96df58be38d53268b088f095186d955e9bba4324d3a SHA512 b837e3302437ccfcc7e984817c52576be27c774681abc18b1ad34990eab342b5d11ec13cf48cfef07f419f425c111715843c7ca427a1d4778bd48f1d7352684a WHIRLPOOL c15bb0c0ea17bc9f34343175450919361afd22feea06a4d6e013fabff8a9aee1c1d0fe8cffb87ebc56080e823bd608fe377f81e96b916c71c06971a28722738a
+DIST tuxonice-userui_1.1-2~exp1.debian.tar.gz 7628 SHA256 042936fe036563706d9db6e04750d890706dde8d90d51dfcbf64a7328653f427 SHA512 5aebc331452f9d8cac3f3d4db9fcc04c5a68759df2236a70a9fdf5c6e03da27170b1db71031b4b9bb2939c4e5a98c4755d26b6ebf0f81362a71c35e77b688f0b WHIRLPOOL 47b3dd3c6aa310200f04902b62861f0abd98656133432ab1b160ad03e7f79838ab1adac7c9be8b6c5302267b92890f5a712cf41cf7917e480b4009b8efedbc1c
diff --git a/sys-apps/tuxonice-userui/files/tuxonice-userui-1.0-Makefiles.patch b/sys-apps/tuxonice-userui/files/tuxonice-userui-1.0-Makefiles.patch
new file mode 100644
index 00000000000..8cc315f9208
--- /dev/null
+++ b/sys-apps/tuxonice-userui/files/tuxonice-userui-1.0-Makefiles.patch
@@ -0,0 +1,45 @@
+diff -Nru tuxonice-userui-1.0.vanilla/Makefile tuxonice-userui-1.0/Makefile
+--- tuxonice-userui-1.0.vanilla/Makefile 2009-04-04 13:37:13.000000000 +0200
++++ tuxonice-userui-1.0/Makefile 2009-04-05 14:13:23.000000000 +0200
+@@ -32,15 +32,15 @@
+ all: $(TARGETS)
+
+ fbsplash:
+- make -C $@ all
++ $(MAKE) -C $@ all
+
+ usplash:
+- make -C $@ all
++ $(MAKE) -C $@ all
+
+ tuxoniceui_text: $(CORE_OBJECTS) userui_text.o
+ $(CC) $(LDFLAGS) -static $^ -o $@
+
+-tuxoniceui_fbsplash: fbsplash $(CORE_OBJECTS) fbsplash/userui_fbsplash.o
++tuxoniceui_fbsplash: fbsplash $(CORE_OBJECTS)
+ $(CC) $(LDFLAGS) -static $(CORE_OBJECTS) fbsplash/userui_fbsplash.o -o $@ $(FBSPLASH_LIBS)
+
+ tuxoniceui_usplash: usplash $(CORE_OBJECTS) usplash/userui_usplash.o
+@@ -48,8 +48,8 @@
+
+ clean:
+ $(RM) *.o $(TARGETS)
+- make -C fbsplash clean
+- make -C usplash clean
++ $(MAKE) -C fbsplash clean
++ $(MAKE) -C usplash clean
+
+ $(INSTDIR)/%: %
+ strip $<
+diff -Nru tuxonice-userui-1.0.vanilla/fbsplash/Makefile tuxonice-userui-1.0/fbsplash/Makefile
+--- tuxonice-userui-1.0.vanilla/fbsplash/Makefile 2009-04-04 13:37:13.000000000 +0200
++++ tuxonice-userui-1.0/fbsplash/Makefile 2009-04-05 14:14:53.000000000 +0200
+@@ -6,7 +6,7 @@
+ parse.o mng_callbacks.o mng_render.o render.o ttf.o
+ SOURCES = $(patsubst %.o,%.c,$(OBJECTS))
+
+-all: $(TARGET)
++all: $(TARGET) $(OBJECTS)
+
+ userui_fbsplash.o: $(OBJECTS)
+ $(CC) $(LDFLAGS) -r -nostdlib -nostartfiles $(SPLASH_LDLIBS) $^ -o $@
diff --git a/sys-apps/tuxonice-userui/files/tuxonice-userui-1.0-libpng15.patch b/sys-apps/tuxonice-userui/files/tuxonice-userui-1.0-libpng15.patch
new file mode 100644
index 00000000000..bfe6d0a5e50
--- /dev/null
+++ b/sys-apps/tuxonice-userui/files/tuxonice-userui-1.0-libpng15.patch
@@ -0,0 +1,88 @@
+--- fbsplash/image.c
++++ fbsplash/image.c
+@@ -112,29 +112,29 @@
+ png_init_io(png_ptr, fp);
+ png_read_info(png_ptr, info_ptr);
+
+- if (cmap && info_ptr->color_type != PNG_COLOR_TYPE_PALETTE) {
++ if (cmap && png_get_color_type(png_ptr, info_ptr) != PNG_COLOR_TYPE_PALETTE) {
+ printerr("Could not read file %s. Not a palette-based image.\n", filename);
+ goto failed;
+ }
+
+- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY ||
+- info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
++ if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY ||
++ png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY_ALPHA)
+ png_set_gray_to_rgb(png_ptr);
+
+- if (info_ptr->bit_depth == 16)
++ if (png_get_bit_depth(png_ptr, info_ptr) == 16)
+ png_set_strip_16(png_ptr);
+
+- if (!want_alpha && info_ptr->color_type & PNG_COLOR_MASK_ALPHA)
++ if (!want_alpha && png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_ALPHA)
+ png_set_strip_alpha(png_ptr);
+
+ #ifndef TARGET_KERNEL
+- if (!(info_ptr->color_type & PNG_COLOR_MASK_ALPHA) & want_alpha) {
++ if (!(png_get_color_type(png_ptr, info_ptr) & PNG_COLOR_MASK_ALPHA) & want_alpha) {
+ png_set_add_alpha(png_ptr, 0xff, PNG_FILLER_AFTER);
+ }
+ #endif
+ png_read_update_info(png_ptr, info_ptr);
+
+- if (!cmap && info_ptr->color_type != PNG_COLOR_TYPE_RGB && info_ptr->color_type != PNG_COLOR_TYPE_RGBA) {
++ if (!cmap && png_get_color_type(png_ptr, info_ptr) != PNG_COLOR_TYPE_RGB && png_get_color_type(png_ptr, info_ptr) != PNG_COLOR_TYPE_RGBA) {
+ printerr("Could not read file %s. Not an RGB image.\n", filename);
+ goto failed;
+ }
+@@ -150,12 +150,12 @@
+
+ rowbytes = png_get_rowbytes(png_ptr, info_ptr);
+
+- if ((width && *width && info_ptr->width != *width) || (height && *height && info_ptr->height != *height)) {
++ if ((width && *width && png_get_image_width(png_ptr, info_ptr) != *width) || (height && *height && png_get_image_height(png_ptr, info_ptr) != *height)) {
+ printerr("Image size mismatch: %s.\n", filename);
+ goto failed;
+ } else {
+- *width = info_ptr->width;
+- *height = info_ptr->height;
++ *width = png_get_image_width(png_ptr, info_ptr);
++ *height = png_get_image_height(png_ptr, info_ptr);
+ }
+
+ *data = malloc(fb_var.xres * fb_var.yres * bytespp);
+@@ -171,11 +171,11 @@
+ goto failed;
+ }
+
+- for (i = 0; i < info_ptr->height; i++) {
++ for (i = 0; i < png_get_image_height(png_ptr, info_ptr); i++) {
+ if (cmap) {
+- row_pointer = *data + info_ptr->width * i;
++ row_pointer = *data + png_get_image_width(png_ptr, info_ptr) * i;
+ } else if (want_alpha) {
+- row_pointer = *data + info_ptr->width * i * 4;
++ row_pointer = *data + png_get_image_width(png_ptr, info_ptr) * i * 4;
+ } else {
+ row_pointer = buf;
+ }
+@@ -184,7 +184,7 @@
+
+ if (cmap) {
+ int h = 256 - cmap->len;
+- t = *data + info_ptr->width * i;
++ t = *data + png_get_image_width(png_ptr, info_ptr) * i;
+
+ if (h) {
+ /* Move the colors up by 'h' offset. This is used because fbcon
+@@ -196,7 +196,7 @@
+
+ /* We only need to convert the image if we the alpha channel is not required */
+ } else if (!want_alpha) {
+- truecolor2fb((truecolor*)buf, *data + info_ptr->width * bytespp * i, info_ptr->width, i, 0);
++ truecolor2fb((truecolor*)buf, *data + png_get_image_width(png_ptr, info_ptr) * bytespp * i, png_get_image_width(png_ptr, info_ptr), i, 0);
+ }
+ }
+
diff --git a/sys-apps/tuxonice-userui/files/tuxonice-userui-1.1-freetype-2.5.patch b/sys-apps/tuxonice-userui/files/tuxonice-userui-1.1-freetype-2.5.patch
new file mode 100644
index 00000000000..f86f99a650f
--- /dev/null
+++ b/sys-apps/tuxonice-userui/files/tuxonice-userui-1.1-freetype-2.5.patch
@@ -0,0 +1,38 @@
+From ed1b73cf2f073f39200be79c633deb292cb8d4af Mon Sep 17 00:00:00 2001
+From: Damjan Georgievski <gdamjan@gmail.com>
+Date: Mon, 6 Jan 2014 03:06:18 +0100
+Subject: [PATCH] fix #includes for recent freetype versions
+
+---
+ fbsplash/ttf.c | 3 +--
+ fbsplash/ttf.h | 3 +--
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/fbsplash/ttf.c b/fbsplash/ttf.c
+index 384f400..1dd841c 100644
+--- a/fbsplash/ttf.c
++++ b/fbsplash/ttf.c
+@@ -27,8 +27,7 @@
+ #include <assert.h>
+
+ #include <ft2build.h>
+-#include <freetype/ftoutln.h>
+-#include <freetype/ttnameid.h>
++#include FT_FREETYPE_H
+
+ #include "splash.h"
+
+diff --git a/fbsplash/ttf.h b/fbsplash/ttf.h
+index 034bb9e..6a4da9d 100644
+--- a/fbsplash/ttf.h
++++ b/fbsplash/ttf.h
+@@ -1,8 +1,7 @@
+ #ifndef _TTF_H
+ #define _TTF_H
+ #include <ft2build.h>
+-#include <freetype/ftoutln.h>
+-#include <freetype/ttnameid.h>
++#include FT_FREETYPE_H
+
+ #define CACHED_METRICS 0x10
+ #define CACHED_BITMAP 0x01
diff --git a/sys-apps/tuxonice-userui/metadata.xml b/sys-apps/tuxonice-userui/metadata.xml
new file mode 100644
index 00000000000..5fdec1dea04
--- /dev/null
+++ b/sys-apps/tuxonice-userui/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>arfrever.fta@gmail.com</email>
+ <name>Arfrever Frehtes Taifersar Arahesis</name>
+ </maintainer>
+ <herd>proxy-maintainers</herd>
+ <use>
+ <flag name='fbsplash'>Add support for framebuffer splash</flag>
+ </use>
+</pkgmetadata>
diff --git a/sys-apps/tuxonice-userui/tuxonice-userui-1.1-r2.ebuild b/sys-apps/tuxonice-userui/tuxonice-userui-1.1-r2.ebuild
new file mode 100644
index 00000000000..ed0a880e02c
--- /dev/null
+++ b/sys-apps/tuxonice-userui/tuxonice-userui-1.1-r2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="User Interface for TuxOnIce"
+HOMEPAGE="http://www.tuxonice.net"
+SRC_URI="http://tuxonice.net/files/${P}.tar.gz -> ${P}.tar
+ mirror://debian/pool/main/t/${PN}/${PN}_${PV}-2~exp1.debian.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="fbsplash"
+
+DEPEND="fbsplash? (
+ >=app-arch/bzip2-1.0.6-r3[static-libs]
+ >=media-gfx/splashutils-1.5.2.1
+ media-libs/freetype[static-libs]
+ media-libs/libmng
+ >=media-libs/libpng-1.4.8[static-libs]
+ virtual/jpeg
+ )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+ local d=${WORKDIR}/debian/patches
+ EPATCH_SOURCE=${d} epatch $(<"${d}"/series)
+ epatch "${FILESDIR}"/${P}-freetype-2.5.patch
+ sed -i -e 's/make/$(MAKE)/' Makefile || die
+ sed -i -e 's/ -O3//' Makefile fbsplash/Makefile usplash/Makefile || die
+}
+
+src_compile() {
+ # Package contain binaries
+ emake clean
+
+ use fbsplash && export USE_FBSPLASH=1
+ emake CC="$(tc-getCC)" tuxoniceui
+}
+
+src_install() {
+ into /
+ dosbin tuxoniceui
+ dodoc AUTHORS ChangeLog KERNEL_API README TODO USERUI_API
+}
+
+pkg_postinst() {
+ if use fbsplash; then
+ einfo
+ elog "You must create a symlink from /etc/splash/tuxonice"
+ elog "to the theme you want tuxonice to use, e.g.:"
+ elog
+ elog " # ln -sfn /etc/splash/emergence /etc/splash/tuxonice"
+ if [[ ${REPLACING_VERSIONS} < 1.1 ]]; then
+ einfo
+ elog "You must refer to '/sbin/tuxoniceui -f' instead of /sbin/tuxoniceui_fbsplash'"
+ elog "in all places you set it."
+ fi
+ fi
+ einfo
+ einfo "Please see /usr/share/doc/${PF}/README.* for further"
+ einfo "instructions."
+ einfo
+}