Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: sys-boot/plymouth/files/, sys-boot/plymouth/
Date: Thu, 29 Mar 2018 17:02:49
Message-Id: 1522342956.b2c93dff564f92a88dca282de754192f4a8e4eaa.blueness@gentoo
1 commit: b2c93dff564f92a88dca282de754192f4a8e4eaa
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Thu Mar 29 17:02:36 2018 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 29 17:02:36 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=b2c93dff
7
8 sys-boot/plymouth: needs -lrpmatch
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 sys-boot/plymouth/Manifest | 2 +
13 .../plymouth/files/0.9.3-glibc-sysmacros.patch | 45 +++++++++
14 sys-boot/plymouth/metadata.xml | 28 ++++++
15 sys-boot/plymouth/plymouth-0.9.3-r1.ebuild | 108 +++++++++++++++++++++
16 4 files changed, 183 insertions(+)
17
18 diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest
19 new file mode 100644
20 index 0000000..9ddbef2
21 --- /dev/null
22 +++ b/sys-boot/plymouth/Manifest
23 @@ -0,0 +1,2 @@
24 +DIST gentoo-logo.png 14501 BLAKE2B e7236c16b96a2d35a6f062b89bc0a6c6fc696a803b7da734ff9ae255fcd65e549d9bc3d510c283e235a770f42edcbdffc1d5cc4c2fcdec9cc931eb0acf504859 SHA512 059a555931b6d2a910bcd887f5ea0cc17c6edf2d2d45c03a1fec1bdda0138ba6bca6bdf90a65c6520a3f8f1b51ecf6f7956098f45ed6c1276f29c835e729163c
25 +DIST plymouth-0.9.3.tar.xz 1102724 BLAKE2B 7ee17cc785e6197cc9488afe6ceae27541992872813a9f937211930f653207d77c1a331cb093156af5ec9502a04cf1f9e4123c42e07931eaf270fefedcc03700 SHA512 d7b9ba97485cdac7ad6bcaf5a7f1a9c84ece54b8d46d5efce4170294c0aa6571656d7d9957b53aed9c1e51d4d525714f54b7dbb08d8ec0b196a1a4419fd186ed
26
27 diff --git a/sys-boot/plymouth/files/0.9.3-glibc-sysmacros.patch b/sys-boot/plymouth/files/0.9.3-glibc-sysmacros.patch
28 new file mode 100644
29 index 0000000..8969161
30 --- /dev/null
31 +++ b/sys-boot/plymouth/files/0.9.3-glibc-sysmacros.patch
32 @@ -0,0 +1,45 @@
33 +From f8d7813b32dfe129d1e5718719ee3eff131f4fac Mon Sep 17 00:00:00 2001
34 +From: Kjell Claesson <kjell.claesson@×××××××××××××.se>
35 +Date: Fri, 18 Aug 2017 00:25:56 +0200
36 +Subject: [PATCH] Fix build with newer glibc
37 +
38 +Signed-off-by: Gilles Dartiguelongue <eva@g.o>
39 +---
40 + configure.ac | 1 +
41 + src/libply-splash-core/ply-terminal.c | 8 ++++++++
42 + 2 files changed, 9 insertions(+)
43 +
44 +diff --git a/configure.ac b/configure.ac
45 +index c32697f..8376789 100644
46 +--- a/configure.ac
47 ++++ b/configure.ac
48 +@@ -5,6 +5,7 @@ AC_CONFIG_AUX_DIR(build-tools)
49 +
50 + AC_USE_SYSTEM_EXTENSIONS
51 + AC_SYS_LARGEFILE
52 ++AC_HEADER_MAJOR
53 + AC_PROG_AWK
54 + AC_PROG_CC_STDC
55 + AM_PROG_CC_C_O
56 +diff --git a/src/libply-splash-core/ply-terminal.c b/src/libply-splash-core/ply-terminal.c
57 +index a0954f2..ef62bf8 100644
58 +--- a/src/libply-splash-core/ply-terminal.c
59 ++++ b/src/libply-splash-core/ply-terminal.c
60 +@@ -36,6 +36,14 @@
61 + #include <unistd.h>
62 + #include <wchar.h>
63 +
64 ++/* major()/minor() */
65 ++#ifdef MAJOR_IN_MKDEV
66 ++# include <sys/mkdev.h>
67 ++#endif
68 ++#ifdef MAJOR_IN_SYSMACROS
69 ++# include <sys/sysmacros.h>
70 ++#endif
71 ++
72 + #include <linux/kd.h>
73 + #include <linux/major.h>
74 + #include <linux/vt.h>
75 +--
76 +2.14.1
77 +
78
79 diff --git a/sys-boot/plymouth/metadata.xml b/sys-boot/plymouth/metadata.xml
80 new file mode 100644
81 index 0000000..22a2251
82 --- /dev/null
83 +++ b/sys-boot/plymouth/metadata.xml
84 @@ -0,0 +1,28 @@
85 +<?xml version="1.0" encoding="UTF-8"?>
86 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
87 +<pkgmetadata>
88 + <maintainer type="person">
89 + <email>prometheanfire@g.o</email>
90 + <name>Matthew Thode</name>
91 + </maintainer>
92 + <maintainer type="person">
93 + <email>eva@g.o</email>
94 + <name>Gilles Dartiguelongue</name>
95 + </maintainer>
96 + <use>
97 + <flag name="gdm">Enables smooth transition to GDM</flag>
98 + <flag name="libkms">Provides abstraction to the DRM drivers (intel,
99 + nouveau and vmwgfx at this moment)</flag>
100 + <flag name="pango">Adds support for printing text on splash screen and
101 + text prompts, e.g. for password</flag>
102 + </use>
103 + <longdescription lang="en">
104 + Plymouth is an application that runs very early in the boot process
105 + (even before the root filesystem is mounted!) that provides a graphical
106 + boot animation while the boot process happens in the background.
107 +
108 + It is designed to work on systems with DRM modesetting drivers. Ideally,
109 + the goal is to get rid of all flicker during startup. For systems that
110 + don't have DRM mode settings drivers, plymouth falls back to text mode.
111 + </longdescription>
112 +</pkgmetadata>
113
114 diff --git a/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild b/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild
115 new file mode 100644
116 index 0000000..9bd263e
117 --- /dev/null
118 +++ b/sys-boot/plymouth/plymouth-0.9.3-r1.ebuild
119 @@ -0,0 +1,108 @@
120 +# Copyright 1999-2018 Gentoo Foundation
121 +# Distributed under the terms of the GNU General Public License v2
122 +
123 +EAPI=6
124 +
125 +inherit flag-o-matic
126 +
127 +SRC_URI="https://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png"
128 +
129 +if [[ ${PV} == 9999 ]]; then
130 + EGIT_REPO_URI="git://anongit.freedesktop.org/plymouth"
131 + inherit git-r3
132 +else
133 + SRC_URI="${SRC_URI} https://www.freedesktop.org/software/plymouth/releases/${P}.tar.xz"
134 +fi
135 +
136 +inherit autotools readme.gentoo-r1 systemd toolchain-funcs
137 +
138 +DESCRIPTION="Graphical boot animation (splash) and logger"
139 +HOMEPAGE="https://cgit.freedesktop.org/plymouth/"
140 +
141 +LICENSE="GPL-2"
142 +SLOT="0"
143 +[[ ${PV} == 9999 ]] || \
144 +KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
145 +IUSE="debug gdm +gtk +libkms +pango static-libs"
146 +
147 +CDEPEND="
148 + >=media-libs/libpng-1.2.16:=
149 + gtk? (
150 + dev-libs/glib:2
151 + >=x11-libs/gtk+-3.14:3
152 + x11-libs/cairo )
153 + libkms? ( x11-libs/libdrm[libkms] )
154 + pango? ( >=x11-libs/pango-1.21 )
155 +"
156 +DEPEND="${CDEPEND}
157 + elibc_musl? ( sys-libs/rpmatch-standalone )
158 + app-text/docbook-xsl-stylesheets
159 + dev-libs/libxslt
160 + virtual/pkgconfig
161 +"
162 +# Block due bug #383067
163 +RDEPEND="${CDEPEND}
164 + virtual/udev
165 + !<sys-kernel/dracut-0.37-r3
166 +"
167 +
168 +DOC_CONTENTS="
169 + Follow the following instructions to set up Plymouth:\n
170 + https://wiki.gentoo.org/wiki/Plymouth#Configuration
171 +"
172 +
173 +PATCHES=(
174 + "${FILESDIR}"/0.9.3-glibc-sysmacros.patch
175 +)
176 +
177 +src_prepare() {
178 + use elibc_musl && append-ldflags -lrpmatch
179 + default
180 + eautoreconf
181 +}
182 +
183 +src_configure() {
184 + local myconf=(
185 + --with-system-root-install=no
186 + --localstatedir=/var
187 + --without-rhgb-compat-link
188 + --enable-documentation
189 + --enable-systemd-integration
190 + --with-systemdunitdir="$(systemd_get_systemunitdir)"
191 + $(use_enable !static-libs shared)
192 + $(use_enable static-libs static)
193 + $(use_enable debug tracing)
194 + $(use_enable gtk gtk)
195 + $(use_enable libkms drm)
196 + $(use_enable pango)
197 + $(use_enable gdm gdm-transition)
198 + )
199 + econf "${myconf[@]}"
200 +}
201 +
202 +src_install() {
203 + default
204 +
205 + insinto /usr/share/plymouth
206 + newins "${DISTDIR}"/gentoo-logo.png bizcom.png
207 +
208 + # Install compatibility symlinks as some rdeps hardcode the paths
209 + dosym /usr/bin/plymouth /bin/plymouth
210 + dosym /usr/sbin/plymouth-set-default-theme /sbin/plymouth-set-default-theme
211 + dosym /usr/sbin/plymouthd /sbin/plymouthd
212 +
213 + readme.gentoo_create_doc
214 +
215 + # looks like make install create /var/run/plymouth
216 + # this is not needed for systemd, same should hold for openrc
217 + # so remove
218 + rm -rf "${D}"/var/run
219 +}
220 +
221 +pkg_postinst() {
222 + readme.gentoo_print_elog
223 + if ! has_version "sys-kernel/dracut" && ! has_version "sys-kernel/genkernel-next[plymouth]"; then
224 + ewarn "If you want initramfs builder with plymouth support, please emerge"
225 + ewarn "sys-kernel/dracut or sys-kernel/genkernel-next[plymouth]."
226 + fi
227 +}