I have made the following changes intended for : CE:MW:Shared / plymouth-lite
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/4394 Thank You, Marko Saukko [This message was auto-generated] --- Request # 4394: Messages from BOSS: State: review at 2012-02-20T11:42:53 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:sage:branches:CE:MW:Shared / plymouth-lite -> CE:MW:Shared / plymouth-lite changes files: -------------- --- plymouth-lite.changes +++ plymouth-lite.changes @@ -0,0 +1,6 @@ +* Mon Feb 20 2012 Marko Saukko <[email protected]> - 0.6.0 +- Change PkgConfigBR from libpng12 to libpng for newer mer core. + Adjusted plymouth-fix-cflags.patch for this. +- Added plymouth-lite-0.6.0-png-set-gray.patch to fix removed + deprecated function call. + old: ---- Makefile new: ---- plymouth-lite-0.6.0-png-set-gray.patch spec files: ----------- --- plymouth-lite.spec +++ plymouth-lite.spec @@ -1,6 +1,6 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.22 +# Generated by: spectacle version 0.23 # # >> macros # << macros @@ -23,12 +23,13 @@ Patch2: plymouth-fix-build.patch Patch3: plymouth-lite-0.6.0-dont_install_splash.patch Patch4: plymouth-fix-cflags.patch +Patch5: plymouth-lite-0.6.0-png-set-gray.patch Requires: meego-desktop-backgrounds Requires: systemd Requires(preun): systemd Requires(post): systemd Requires(postun): systemd -BuildRequires: pkgconfig(libpng12) +BuildRequires: pkgconfig(libpng) %description @@ -50,6 +51,8 @@ %patch3 -p1 # plymouth-fix-cflags.patch %patch4 -p1 +# plymouth-lite-0.6.0-png-set-gray.patch +%patch5 -p1 # >> setup # << setup other changes: -------------- ++++++ plymouth-fix-cflags.patch --- plymouth-fix-cflags.patch +++ plymouth-fix-cflags.patch @@ -4,7 +4,7 @@ ply-image: ply-image.c ply-frame-buffer.c Makefile - gcc -O2 -march=core2 -mtune=generic `pkg-config --cflags libpng12` ply-image.c ply-frame-buffer.c -o ply-image -lm `pkg-config --libs libpng12` -+ gcc $(CFLAGS) `pkg-config --cflags libpng12` ply-image.c ply-frame-buffer.c -o ply-image -lm `pkg-config --libs libpng12` ++ gcc $(CFLAGS) `pkg-config --cflags libpng` ply-image.c ply-frame-buffer.c -o ply-image -lm `pkg-config --libs libpng` clean: rm -f ply-image *~ gmon.out ++++++ plymouth-lite-0.6.0-png-set-gray.patch (new) --- plymouth-lite-0.6.0-png-set-gray.patch +++ plymouth-lite-0.6.0-png-set-gray.patch @@ -0,0 +1,27 @@ +From 83368c672f6d524312a080456da06c1a4e748189 Mon Sep 17 00:00:00 2001 +From: Marko Saukko <[email protected]> +Date: Mon, 20 Feb 2012 13:42:57 +0200 +Subject: [PATCH] png_set_gray_1_2_4_to_8 is deprecated and replaced with + png_set_expand_gray_1_2_4_to_8. + +Signed-off-by: Marko Saukko <[email protected]> +--- + ply-image.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/ply-image.c b/ply-image.c +index cfe91a9..918b3e0 100644 +--- a/ply-image.c ++++ b/ply-image.c +@@ -220,7 +220,7 @@ ply_image_load (ply_image_t *image) + png_set_palette_to_rgb (png); + + if ((color_type == PNG_COLOR_TYPE_GRAY) && (bits_per_pixel < 8)) +- png_set_gray_1_2_4_to_8 (png); ++ png_set_expand_gray_1_2_4_to_8 (png); + + if (png_get_valid (png, info, PNG_INFO_tRNS)) + png_set_tRNS_to_alpha (png); +-- +1.7.6.5 + ++++++ plymouth-lite.yaml --- plymouth-lite.yaml +++ plymouth-lite.yaml @@ -17,10 +17,10 @@ - plymouth-fix-build.patch - plymouth-lite-0.6.0-dont_install_splash.patch - plymouth-fix-cflags.patch + - plymouth-lite-0.6.0-png-set-gray.patch Description: | Boot splash screen based on Fedora's Plymouth code. Requires: - meego-desktop-backgrounds PkgConfigBR: - - libpng12 -Configure: configure + - libpng ++++++ deleted files: --- Makefile
