Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/plymouth/files/
Date: Thu, 09 Feb 2017 22:37:58
Message-Id: 1486679730.958399c69d1d2094a34b8a9c596f2427a54526f0.soap@gentoo
1 commit: 958399c69d1d2094a34b8a9c596f2427a54526f0
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Thu Feb 9 19:45:43 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 9 22:35:30 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=958399c6
7
8 sys-boot/plymouth: remove unused patches
9
10 Closes: https://github.com/gentoo/gentoo/pull/3897
11
12 ...8.3-drm-reduce-minimum-build-requirements.patch | 422 ---------------------
13 sys-boot/plymouth/files/0.8.3-gentoo-fb-path.patch | 25 --
14 ...-image-replace-deprecated-libpng-function.patch | 24 --
15 3 files changed, 471 deletions(-)
16
17 diff --git a/sys-boot/plymouth/files/0.8.3-drm-reduce-minimum-build-requirements.patch b/sys-boot/plymouth/files/0.8.3-drm-reduce-minimum-build-requirements.patch
18 deleted file mode 100644
19 index 8c9bb5ab3f..0000000000
20 --- a/sys-boot/plymouth/files/0.8.3-drm-reduce-minimum-build-requirements.patch
21 +++ /dev/null
22 @@ -1,422 +0,0 @@
23 -drm: reduce minimum build requirements
24 -
25 -This patch adds the respective configure options to make it possible to disable
26 -libdrm_intel, libdrm_radeon, libdrm_nouveau independently from each other.
27 -
28 -NOTE:
29 -
30 -The patch is based on work of Lucian Muresan <lucianm@×××××××××××××××××.net>
31 -that fixes bug report:
32 -
33 - https://bugs.freedesktop.org/show_bug.cgi?id=29804
34 -
35 -This one is adjusted to version 0.8.3 which doesn't support libkms yet.
36 -
37 ----
38 -diff -Naur plymouth-0.8.3/configure.ac plymouth-0.8.3.new/configure.ac
39 ---- plymouth-0.8.3/configure.ac 2010-05-06 19:32:20.000000000 +0200
40 -+++ plymouth-0.8.3.new/configure.ac 2011-02-03 18:45:11.749557708 +0100
41 -@@ -56,49 +56,150 @@
42 - AC_SUBST(GTK_CFLAGS)
43 - AC_SUBST(GTK_LIBS)
44 -
45 --PKG_CHECK_MODULES(DRM, [libdrm libdrm_intel libdrm_radeon libdrm_nouveau])
46 -+AC_ARG_ENABLE(libdrm_intel, AS_HELP_STRING([--enable-libdrm_intel],[enable building with libdrm_intel support]),enable_libdrm_intel=$enableval,enable_libdrm_intel=yes)
47 -+AM_CONDITIONAL(ENABLE_LIBDRM_INTEL, [test "$enable_libdrm_intel" = yes])
48 -
49 --OLD_CFLAGS="$CFLAGS"
50 --CFLAGS="$CFLAGS $DRM_CFLAGS"
51 --AC_MSG_CHECKING([if i915_drm.h, radeon_drm.h and nouveau_drm.h are in include path])
52 --AC_COMPILE_IFELSE(AC_LANG_PROGRAM(
53 --[[
54 -- #include <stdint.h>
55 -- #include <stdlib.h>
56 -- #include "i915_drm.h"
57 -- #include "radeon_drm.h"
58 -- #include "nouveau_drm.h"
59 --]],[[]]),[found_drm_kernel_headers=yes],[found_drm_kernel_headers=no])
60 --
61 --if test "$found_drm_kernel_headers" = "yes"; then
62 -- AC_MSG_RESULT([yes])
63 --else
64 -- AC_MSG_RESULT([no])
65 -- AC_MSG_CHECKING([if we can find them anyway])
66 -+if test x$enable_libdrm_intel = xyes; then
67 -+ PKG_CHECK_MODULES(DRM_INTEL, [libdrm libdrm_intel])
68 -+ OLD_CFLAGS="$CFLAGS"
69 -+ CFLAGS="$CFLAGS $DRM_INTEL_CFLAGS"
70 -+ AC_MSG_CHECKING([if i915_drm.h is in include path])
71 -+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM(
72 -+ [[
73 -+ #include <stdint.h>
74 -+ #include <stdlib.h>
75 -+ #include "i915_drm.h"
76 -+ ]],[[]]),[found_drm_intel_kernel_headers=yes],[found_drm_intel_kernel_headers=no])
77 -+
78 -+ if test "$found_drm_intel_kernel_headers" = "yes"; then
79 -+ AC_MSG_RESULT([yes])
80 -+ else
81 -+ AC_MSG_RESULT([no])
82 -+ AC_MSG_CHECKING([if we can find them anyway])
83 -+
84 -+ MORE_DRM_CFLAGS="-I`$PKG_CONFIG --variable includedir libdrm`/drm"
85 -+ CFLAGS="$CFLAGS $MORE_DRM_CFLAGS"
86 -+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM(
87 -+ [[
88 -+ #include <stdint.h>
89 -+ #include <stdlib.h>
90 -+ #include "i915_drm.h"
91 -+ ]],[[]]),[found_drm_intel_kernel_headers=yes],[found_drm_intel_kernel_headers=no])
92 -+
93 -+ if test "$found_drm_intel_kernel_headers" = "yes"; then
94 -+ AC_MSG_RESULT([yes])
95 -+ DRM_INTEL_CFLAGS="$DRM_INTEL_CFLAGS $MORE_DRM_CFLAGS"
96 -+ else
97 -+ AC_MSG_RESULT([no])
98 -+ AC_MSG_ERROR([Could not find i915_drm.h])
99 -+ fi
100 -+ fi
101 -+
102 -+ AC_SUBST(DRM_INTEL_CFLAGS)
103 -+ AC_SUBST(DRM_INTEL_LIBS)
104 -+ AC_DEFINE(PLY_ENABLE_LIBDRM_INTEL, 1, [Enable support for libdrm_intel driver])
105 -+fi
106 -+
107 -+AC_ARG_ENABLE(libdrm_radeon, AS_HELP_STRING([--enable-libdrm_radeon],[enable building with libdrm_radeon support]),enable_libdrm_radeon=$enableval,enable_libdrm_radeon=yes)
108 -+AM_CONDITIONAL(ENABLE_LIBDRM_RADEON, [test "$enable_libdrm_radeon" = yes])
109 -
110 -- MORE_DRM_CFLAGS="-I`$PKG_CONFIG --variable includedir libdrm`/drm"
111 -- CFLAGS="$CFLAGS $MORE_DRM_CFLAGS"
112 -+if test x$enable_libdrm_radeon = xyes; then
113 -+ PKG_CHECK_MODULES(DRM_RADEON, [libdrm libdrm_radeon])
114 -+ OLD_CFLAGS="$CFLAGS"
115 -+ CFLAGS="$CFLAGS $DRM_RADEON_CFLAGS"
116 -+ AC_MSG_CHECKING([if radeon_drm.h is in include path])
117 - AC_COMPILE_IFELSE(AC_LANG_PROGRAM(
118 - [[
119 - #include <stdint.h>
120 - #include <stdlib.h>
121 - #include "i915_drm.h"
122 - #include "radeon_drm.h"
123 -+ ]],[[]]),[found_drm_radeon_kernel_headers=yes],[found_drm_radeon_kernel_headers=no])
124 -+
125 -+ if test "$found_drm_radeon_kernel_headers" = "yes"; then
126 -+ AC_MSG_RESULT([yes])
127 -+ else
128 -+ AC_MSG_RESULT([no])
129 -+ AC_MSG_CHECKING([if we can find them anyway])
130 -+
131 -+ MORE_DRM_CFLAGS="-I`$PKG_CONFIG --variable includedir libdrm`/drm"
132 -+ CFLAGS="$CFLAGS $MORE_DRM_RADEON_CFLAGS"
133 -+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM(
134 -+ [[
135 -+ #include <stdint.h>
136 -+ #include <stdlib.h>
137 -+ #include "radeon_drm.h"
138 -+ ]],[[]]),[found_drm_radeon_kernel_headers=yes],[found_drm_radeon_kernel_headers=no])
139 -+
140 -+ if test "$found_drm_radeon_kernel_headers" = "yes"; then
141 -+ AC_MSG_RESULT([yes])
142 -+ DRM_RADEON_CFLAGS="$DRM_RADEON_CFLAGS $MORE_DRM_CFLAGS"
143 -+ else
144 -+ AC_MSG_RESULT([no])
145 -+ AC_MSG_ERROR([Could not find radeon_drm.h])
146 -+ fi
147 -+ fi
148 -+
149 -+ AC_SUBST(DRM_RADEON_CFLAGS)
150 -+ AC_SUBST(DRM_RADEON_LIBS)
151 -+ AC_DEFINE(PLY_ENABLE_LIBDRM_RADEON, 1, [Enable support for libdrm_radeon driver])
152 -+fi
153 -+
154 -+AC_ARG_ENABLE(libdrm_nouveau, AS_HELP_STRING([--enable-libdrm_nouveau],[enable building with libdrm_nouveau support]),enable_libdrm_nouveau=$enableval,enable_libdrm_nouveau=yes)
155 -+AM_CONDITIONAL(ENABLE_LIBDRM_NOUVEAU, [test "$enable_libdrm_nouveau" = yes])
156 -+
157 -+if test x$enable_libdrm_nouveau = xyes; then
158 -+ PKG_CHECK_MODULES(DRM_NOUVEAU, [libdrm libdrm_nouveau])
159 -+ OLD_CFLAGS="$CFLAGS"
160 -+ CFLAGS="$CFLAGS $DRM_NOUVEAU_CFLAGS"
161 -+ AC_MSG_CHECKING([if nouveau_drm.h is in include path])
162 -+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM(
163 -+ [[
164 -+ #include <stdint.h>
165 -+ #include <stdlib.h>
166 - #include "nouveau_drm.h"
167 -- ]],[[]]),[found_drm_kernel_headers=yes],[found_drm_kernel_headers=no])
168 -+ ]],[[]]),[found_drm_nouveau_kernel_headers=yes],[found_drm_nouveau_kernel_headers=no])
169 -
170 -- if test "$found_drm_kernel_headers" = "yes"; then
171 -+ if test "$found_drm_nouveau_kernel_headers" = "yes"; then
172 - AC_MSG_RESULT([yes])
173 - DRM_CFLAGS="$DRM_CFLAGS $MORE_DRM_CFLAGS"
174 - else
175 - AC_MSG_RESULT([no])
176 -- AC_MSG_ERROR([Could not find i915_drm.h, radeon_drm.h and/or nouveau_drm.h])
177 -+ AC_MSG_CHECKING([if we can find them anyway])
178 -+
179 -+ MORE_DRM_CFLAGS="-I`$PKG_CONFIG --variable includedir libdrm`/drm"
180 -+ CFLAGS="$CFLAGS $MORE_DRM_CFLAGS"
181 -+ AC_COMPILE_IFELSE(AC_LANG_PROGRAM(
182 -+ [[
183 -+ #include <stdint.h>
184 -+ #include <stdlib.h>
185 -+ #include "nouveau_drm.h"
186 -+ ]],[[]]),[found_drm_nouveau_kernel_headers=yes],[found_drm_nouveau_kernel_headers=no])
187 -+
188 -+ if test "$found_drm_nouveau_kernel_headers" = "yes"; then
189 -+ AC_MSG_RESULT([yes])
190 -+ DRM_NOUVEAU_CFLAGS="$DRM_NOUVEAU_CFLAGS $MORE_DRM_CFLAGS"
191 -+ else
192 -+ AC_MSG_RESULT([no])
193 -+ AC_MSG_ERROR([Could not find nouveau_drm.h])
194 -+ fi
195 - fi
196 -+
197 -+ AC_SUBST(DRM_NOUVEAU_CFLAGS)
198 -+ AC_SUBST(DRM_NOUVEAU_LIBS)
199 -+ AC_DEFINE(PLY_ENABLE_LIBDRM_NOUVEAU, 1, [Enable support for libdrm_nouveau driver])
200 - fi
201 --CFLAGS="$OLD_CFLAGS"
202 -+
203 -+DRM_CFLAGS="$DRM_INTEL_CFLAGS $DRM_RADEON_CFLAGS $DRM_NOUVEAU_CFLAGS"
204 -+DRM_LIBS="$DRM_INTEL_LIBS $DRM_RADEON_LIBS $DRM_NOUVEAU_LIBS"
205 - AC_SUBST(DRM_CFLAGS)
206 - AC_SUBST(DRM_LIBS)
207 -
208 -+AM_CONDITIONAL(ENABLE_DRM_RENDERER,
209 -+ [test x$enable_libdrm_intel = xyes \
210 -+ -o x$enable_libdrm_radeon = xyes \
211 -+ -o x$enable_libdrm_nouveau = xyes])
212 -+
213 - AC_ARG_ENABLE(tracing, AS_HELP_STRING([--enable-tracing],[enable verbose tracing code]),enable_tracing=$enableval,enable_tracing=yes)
214 -
215 - if test x$enable_tracing = xyes; then
216 -diff -Naur plymouth-0.8.3/scripts/plymouth-populate-initrd.in plymouth-0.8.3.new/scripts/plymouth-populate-initrd.in
217 ---- plymouth-0.8.3/scripts/plymouth-populate-initrd.in 2010-05-06 19:32:20.000000000 +0200
218 -+++ plymouth-0.8.3.new/scripts/plymouth-populate-initrd.in 2011-02-03 19:14:06.316946754 +0100
219 -@@ -97,7 +97,7 @@
220 -
221 - inst ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so $INITRDDIR
222 -
223 --inst ${PLYMOUTH_PLUGIN_PATH}/renderers/drm.so $INITRDDIR
224 -+[ -f "${PLYMOUTH_PLUGIN_PATH}/renderers/drm.so" ] && inst ${PLYMOUTH_PLUGIN_PATH}/renderers/drm.so $INITRDDIR
225 - inst ${PLYMOUTH_PLUGIN_PATH}/renderers/frame-buffer.so $INITRDDIR
226 -
227 - if [ -d ${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME} ]; then
228 -diff -Naur plymouth-0.8.3/scripts/plymouth-populate-initrd.in.orig plymouth-0.8.3.new/scripts/plymouth-populate-initrd.in.orig
229 ---- plymouth-0.8.3/scripts/plymouth-populate-initrd.in.orig 1970-01-01 01:00:00.000000000 +0100
230 -+++ plymouth-0.8.3.new/scripts/plymouth-populate-initrd.in.orig 2010-05-06 19:32:20.000000000 +0200
231 -@@ -0,0 +1,114 @@
232 -+#!/bin/bash
233 -+
234 -+[ -z "$DESTDIR" ] || exit 0
235 -+
236 -+[ -z "$PLYMOUTH_LIBEXECDIR" ] && PLYMOUTH_LIBEXECDIR="@PLYMOUTH_LIBEXECDIR@"
237 -+[ -z "$PLYMOUTH_DATADIR" ] && PLYMOUTH_DATADIR="@PLYMOUTH_DATADIR@"
238 -+[ -z "$PLYMOUTH_PLUGIN_PATH" ] && PLYMOUTH_PLUGIN_PATH="$(plymouth --get-splash-plugin-path)"
239 -+[ -z "$PLYMOUTH_LOGO_FILE" ] && PLYMOUTH_LOGO_FILE="@logofile@"
240 -+[ -z "$PLYMOUTH_THEME_NAME" ] && PLYMOUTH_THEME_NAME=$(plymouth-set-default-theme)
241 -+[ -z "$PLYMOUTH_CONFDIR" ] && PLYMOUTH_CONFDIR="@PLYMOUTH_CONF_DIR@"
242 -+[ -z "$PLYMOUTH_POLICYDIR" ] && PLYMOUTH_POLICYDIR="@PLYMOUTH_POLICY_DIR@"
243 -+
244 -+if [ -z "$PLYMOUTH_POPULATE_SOURCE_FUNCTIONS" ]; then
245 -+
246 -+ if [ -f "${PLYMOUTH_LIBEXECDIR}/initrd-functions" ]; then
247 -+ PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="${PLYMOUTH_LIBEXECDIR}/initrd-functions"
248 -+ fi
249 -+
250 -+ if [ -f "${PLYMOUTH_DATADIR}/dracut/dracut-functions" ]; then
251 -+ PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="${PLYMOUTH_DATADIR}/dracut/dracut-functions"
252 -+ fi
253 -+fi
254 -+
255 -+if [ -n "$PLYMOUTH_POPULATE_SOURCE_FUNCTIONS" ]; then
256 -+ source $PLYMOUTH_POPULATE_SOURCE_FUNCTIONS
257 -+fi
258 -+
259 -+if [ " $(type -t inst) " != " function " ]; then
260 -+ echo "Need 'inst' function, try setting PLYMOUTH_POPULATE_SOURCE_FUNCTIONS to a file that defines it" 1>&2
261 -+ exit 1
262 -+fi
263 -+
264 -+if [ " $(type -t set_verbose) " != " function " ]; then
265 -+ function set_verbose { true; }
266 -+fi
267 -+
268 -+function usage() {
269 -+ local output="/dev/stdout"
270 -+ local rc=0
271 -+ if [ "$1" == "error" ]; then
272 -+ output="/dev/stderr"
273 -+ rc=1
274 -+ fi
275 -+
276 -+ echo "usage: plymouth [ --verbose | -v ] { --targetdir | -t } <initrd_directory>" > $output
277 -+ exit $rc
278 -+}
279 -+
280 -+verbose=false
281 -+INITRDDIR=""
282 -+while [ $# -gt 0 ]; do
283 -+ case $1 in
284 -+ --verbose|-v)
285 -+ verbose=true
286 -+ ;;
287 -+ --targetdir|-t)
288 -+ shift
289 -+ INITRDDIR="$1"
290 -+ ;;
291 -+ --help|-h)
292 -+ usage normal
293 -+ ;;
294 -+ *)
295 -+ usage error
296 -+ break
297 -+ ;;
298 -+ esac
299 -+ shift
300 -+done
301 -+set_verbose $verbose || :
302 -+
303 -+[ -z "$INITRDDIR" ] && usage error
304 -+
305 -+mkdir -p ${INITRDDIR}${PLYMOUTH_DATADIR}/plymouth/themes
306 -+inst /sbin/plymouthd $INITRDDIR /bin/plymouthd
307 -+inst /bin/plymouth $INITRDDIR
308 -+inst ${PLYMOUTH_DATADIR}/plymouth/themes/text/text.plymouth $INITRDDIR
309 -+inst ${PLYMOUTH_PLUGIN_PATH}/text.so $INITRDDIR
310 -+inst ${PLYMOUTH_DATADIR}/plymouth/themes/details/details.plymouth $INITRDDIR
311 -+inst ${PLYMOUTH_PLUGIN_PATH}/details.so $INITRDDIR
312 -+inst ${PLYMOUTH_LOGO_FILE} $INITRDDIR
313 -+inst @RELEASE_FILE@ $INITRDDIR
314 -+inst ${PLYMOUTH_POLICYDIR}/plymouthd.defaults $INITRDDIR
315 -+inst ${PLYMOUTH_CONFDIR}/plymouthd.conf $INITRDDIR
316 -+
317 -+if [ -z "$PLYMOUTH_THEME_NAME" ]; then
318 -+ echo "No default plymouth plugin is set" > /dev/stderr
319 -+ exit 1
320 -+fi
321 -+
322 -+PLYMOUTH_MODULE_NAME=$(grep "ModuleName *= *" ${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ModuleName *= *//')
323 -+
324 -+if [ ! -f ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so ]; then
325 -+ echo "The default plymouth plugin (${PLYMOUTH_MODULE_NAME}) doesn't exist" > /dev/stderr
326 -+ exit 1
327 -+fi
328 -+
329 -+inst ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so $INITRDDIR
330 -+
331 -+inst ${PLYMOUTH_PLUGIN_PATH}/renderers/drm.so $INITRDDIR
332 -+inst ${PLYMOUTH_PLUGIN_PATH}/renderers/frame-buffer.so $INITRDDIR
333 -+
334 -+if [ -d ${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME} ]; then
335 -+ for x in ${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/* ; do
336 -+ [ ! -f "$x" ] && break
337 -+ inst $x $INITRDDIR
338 -+ done
339 -+fi
340 -+
341 -+if [ -L ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth ]; then
342 -+ cp -a ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth $INITRDDIR${PLYMOUTH_DATADIR}/plymouth/themes
343 -+fi
344 -+
345 -+# vim:ts=8:sw=4:sts=4:et
346 -diff -Naur plymouth-0.8.3/src/plugins/renderers/drm/Makefile.am plymouth-0.8.3.new/src/plugins/renderers/drm/Makefile.am
347 ---- plymouth-0.8.3/src/plugins/renderers/drm/Makefile.am 2010-05-06 19:32:20.000000000 +0200
348 -+++ plymouth-0.8.3.new/src/plugins/renderers/drm/Makefile.am 2011-02-03 19:07:04.811686193 +0100
349 -@@ -1,3 +1,4 @@
350 -+if ENABLE_DRM_RENDERER
351 - INCLUDES = -I$(top_srcdir) \
352 - -I$(srcdir)/../../../libply \
353 - -I$(srcdir)/../../../libply-splash-core \
354 -@@ -16,12 +17,22 @@
355 - ../../../libply/libply.la \
356 - ../../../libply-splash-core/libply-splash-core.la
357 - drm_la_SOURCES = $(srcdir)/plugin.c \
358 -- $(srcdir)/ply-renderer-driver.h \
359 -- $(srcdir)/ply-renderer-i915-driver.h \
360 -- $(srcdir)/ply-renderer-i915-driver.c \
361 -- $(srcdir)/ply-renderer-radeon-driver.h \
362 -- $(srcdir)/ply-renderer-radeon-driver.c \
363 -- $(srcdir)/ply-renderer-nouveau-driver.h \
364 -- $(srcdir)/ply-renderer-nouveau-driver.c
365 -+ $(srcdir)/ply-renderer-driver.h
366 -+if ENABLE_LIBDRM_INTEL
367 -+drm_la_SOURCES += $(srcdir)/ply-renderer-i915-driver.h \
368 -+ $(srcdir)/ply-renderer-i915-driver.c
369 -+endif
370 -+
371 -+if ENABLE_LIBDRM_RADEON
372 -+drm_la_SOURCES += $(srcdir)/ply-renderer-radeon-driver.h \
373 -+ $(srcdir)/ply-renderer-radeon-driver.c
374 -+endif
375 -+
376 -+if ENABLE_LIBDRM_NOUVEAU
377 -+drm_la_SOURCES += $(srcdir)/ply-renderer-nouveau-driver.h \
378 -+ $(srcdir)/ply-renderer-nouveau-driver.c
379 -+endif
380 -+
381 -+endif
382 -
383 - MAINTAINERCLEANFILES = Makefile.in
384 -diff -Naur plymouth-0.8.3/src/plugins/renderers/drm/plugin.c plymouth-0.8.3.new/src/plugins/renderers/drm/plugin.c
385 ---- plymouth-0.8.3/src/plugins/renderers/drm/plugin.c 2010-05-06 19:32:20.000000000 +0200
386 -+++ plymouth-0.8.3.new/src/plugins/renderers/drm/plugin.c 2011-02-03 19:13:35.083078444 +0100
387 -@@ -57,9 +57,15 @@
388 - #include "ply-renderer.h"
389 - #include "ply-renderer-plugin.h"
390 - #include "ply-renderer-driver.h"
391 -+#ifdef PLY_ENABLE_LIBDRM_INTEL
392 - #include "ply-renderer-i915-driver.h"
393 -+#endif
394 -+#ifdef PLY_ENABLE_LIBDRM_RADEON
395 - #include "ply-renderer-radeon-driver.h"
396 -+#endif
397 -+#ifdef PLY_ENABLE_LIBDRM_NOUVEAU
398 - #include "ply-renderer-nouveau-driver.h"
399 -+#endif
400 -
401 - #define BYTES_PER_PIXEL (4)
402 -
403 -@@ -443,22 +449,29 @@
404 - free (driver_name);
405 - return false;
406 - }
407 --
408 -- if (strcmp (driver_name, "i915") == 0)
409 -+ backend->driver_interface = NULL;
410 -+#ifdef PLY_ENABLE_LIBDRM_INTEL
411 -+ if (backend->driver_interface == NULL && strcmp (driver_name, "i915") == 0)
412 - {
413 - backend->driver_interface = ply_renderer_i915_driver_get_interface ();
414 - backend->driver_supports_mapping_console = true;
415 - }
416 -- else if (strcmp (driver_name, "radeon") == 0)
417 -+#endif
418 -+#ifdef PLY_ENABLE_LIBDRM_RADEON
419 -+ if (backend->driver_interface == NULL && strcmp (driver_name, "radeon") == 0)
420 - {
421 - backend->driver_interface = ply_renderer_radeon_driver_get_interface ();
422 - backend->driver_supports_mapping_console = false;
423 - }
424 -- else if (strcmp (driver_name, "nouveau") == 0)
425 -+#endif
426 -+#ifdef PLY_ENABLE_LIBDRM_NOUVEAU
427 -+ if (backend->driver_interface == NULL && strcmp (driver_name, "nouveau") == 0)
428 - {
429 - backend->driver_interface = ply_renderer_nouveau_driver_get_interface ();
430 - backend->driver_supports_mapping_console = false;
431 - }
432 -+#endif
433 -+
434 - free (driver_name);
435 -
436 - if (backend->driver_interface == NULL)
437 -diff -Naur plymouth-0.8.3/src/plugins/renderers/Makefile.am plymouth-0.8.3.new/src/plugins/renderers/Makefile.am
438 ---- plymouth-0.8.3/src/plugins/renderers/Makefile.am 2010-05-06 19:32:20.000000000 +0200
439 -+++ plymouth-0.8.3.new/src/plugins/renderers/Makefile.am 2011-02-03 19:14:06.316946754 +0100
440 -@@ -1,2 +1,3 @@
441 --SUBDIRS = frame-buffer drm x11
442 -+SUBDIRS = frame-buffer x11 drm
443 -+
444 - MAINTAINERCLEANFILES = Makefile.in
445
446 diff --git a/sys-boot/plymouth/files/0.8.3-gentoo-fb-path.patch b/sys-boot/plymouth/files/0.8.3-gentoo-fb-path.patch
447 deleted file mode 100644
448 index cb0f0d5af3..0000000000
449 --- a/sys-boot/plymouth/files/0.8.3-gentoo-fb-path.patch
450 +++ /dev/null
451 @@ -1,25 +0,0 @@
452 -From 5fd3ed5a1f661eb1d99e1d4df5edad8410cc54e3 Mon Sep 17 00:00:00 2001
453 -From: root <root@×××××××××××××××.lan>
454 -Date: Sun, 25 Oct 2009 03:55:54 +0100
455 -Subject: [PATCH] Gentoo does not have /dev/fb, but /dev/fb0 (at least on i915 KMS)
456 -
457 ----
458 - src/plugins/renderers/frame-buffer/plugin.c | 2 +-
459 - 1 files changed, 1 insertions(+), 1 deletions(-)
460 -
461 -diff --git a/src/libply/ply-frame-buffer.c b/src/libply/ply-frame-buffer.c
462 -index a1e4fcd..19aab4b 100644
463 ---- a/src/plugins/renderers/frame-buffer/plugin.c
464 -+++ b/src/plugins/renderers/frame-buffer/plugin.c
465 -@@ -46,7 +46,7 @@
466 - #include <linux/fb.h>
467 -
468 - #ifndef PLY_FRAME_BUFFER_DEFAULT_FB_DEVICE_NAME
469 --#define PLY_FRAME_BUFFER_DEFAULT_FB_DEVICE_NAME "/dev/fb"
470 -+#define PLY_FRAME_BUFFER_DEFAULT_FB_DEVICE_NAME "/dev/fb0"
471 - #endif
472 -
473 - struct _ply_frame_buffer
474 ---
475 -1.6.5
476 -
477
478 diff --git a/sys-boot/plymouth/files/0.8.3-image-replace-deprecated-libpng-function.patch b/sys-boot/plymouth/files/0.8.3-image-replace-deprecated-libpng-function.patch
479 deleted file mode 100644
480 index 42985c5b04..0000000000
481 --- a/sys-boot/plymouth/files/0.8.3-image-replace-deprecated-libpng-function.patch
482 +++ /dev/null
483 @@ -1,24 +0,0 @@
484 -From 07329b72687ccc7a9015de4a48fae297d6d5ff96 Mon Sep 17 00:00:00 2001
485 -From: Brett Witherspoon <spoonb@×××××××××.com>
486 -Date: Tue, 12 Oct 2010 03:23:47 +0000
487 -Subject: image: replace deprecated libpng function
488 -
489 -The png_set_gray_1_2_4_to_8 function is deprecated and has been removed
490 -from libpng14. Now png_set_expand_gray_1_2_4_to_8 is used instead which
491 -is compatible with libpng-1.2.9 and greater.
492 ----
493 -diff --git a/src/libply-splash-graphics/ply-image.c b/src/libply-splash-graphics/ply-image.c
494 -index 9369242..4b16783 100644
495 ---- a/src/libply-splash-graphics/ply-image.c
496 -+++ b/src/libply-splash-graphics/ply-image.c
497 -@@ -151,7 +151,7 @@ ply_image_load (ply_image_t *image)
498 - png_set_palette_to_rgb (png);
499 -
500 - if ((color_type == PNG_COLOR_TYPE_GRAY) && (bits_per_pixel < 8))
501 -- png_set_gray_1_2_4_to_8 (png);
502 -+ png_set_expand_gray_1_2_4_to_8 (png);
503 -
504 - if (png_get_valid (png, info, PNG_INFO_tRNS))
505 - png_set_tRNS_to_alpha (png);
506 ---
507 -cgit v0.8.3-6-g21f6