Hello community, here is the log from the commit of package xine-ui for openSUSE:Factory checked in at 2012-01-25 11:09:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xine-ui (Old) and /work/SRC/openSUSE:Factory/.xine-ui.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xine-ui", Maintainer is "mh...@novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/xine-ui/xine-ui.changes 2011-10-02 11:18:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xine-ui.new/xine-ui.changes 2012-01-25 11:09:39.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Jan 9 15:17:30 UTC 2012 - pgaj...@suse.com + +- build also against libpng15 + * libpng15.patch + +------------------------------------------------------------------- New: ---- xine-ui-libpng15.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xine-ui.spec ++++++ --- /var/tmp/diff_new_pack.chh90s/_old 2012-01-25 11:09:40.000000000 +0100 +++ /var/tmp/diff_new_pack.chh90s/_new 2012-01-25 11:09:40.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xine-ui # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,17 +15,20 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: xine-ui -BuildRequires: aalib-devel curl-devel libpng-devel lirc-devel readline-devel -BuildRequires: update-desktop-files xine-devel xorg-x11-devel +BuildRequires: aalib-devel +BuildRequires: curl-devel +BuildRequires: libpng-devel +BuildRequires: lirc-devel +BuildRequires: readline-devel +BuildRequires: update-desktop-files +BuildRequires: xine-devel +BuildRequires: xorg-x11-devel Summary: Video player with plugins -Version: 0.99.5 -Release: 236 License: GPL-2.0+ ; SUSE-Public-Domain Group: Productivity/Multimedia/Video/Players +Version: 0.99.5 +Release: 0 Url: http://xine.sourceforge.net BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: xine:/usr/bin/xine @@ -44,6 +47,9 @@ Patch21: locale_fix.diff Patch22: xine-ui-libs.diff Patch23: xine-ui-array-overflow.diff +# PATCH-FIX-UPSTREAM xine-ui-libpng15.patch -- pgaj...@suse.com; build with libpng15; sent today to f1...@users.sourceforge.net +# build against libpng14 should not be affected, otherwise please let me know +Patch24: xine-ui-libpng15.diff # *** SUSE only changes Patch50: xine-ui-crippled-LOCAL.diff Patch60: xine-ui-AUTOMAKE.diff @@ -71,6 +77,7 @@ %patch21 %patch22 -p1 %patch23 -p1 +%patch24 -p1 %patch50 %patch60 %patch61 ++++++ xine-ui-libpng15.diff ++++++ Index: xine-ui-0.99.5/src/xitk/Imlib-light/load.c =================================================================== --- xine-ui-0.99.5.orig/src/xitk/Imlib-light/load.c +++ xine-ui-0.99.5/src/xitk/Imlib-light/load.c @@ -58,7 +58,18 @@ unsigned char *_LoadPNG(ImlibData * id, png_destroy_read_struct(&png_ptr, NULL, NULL); return NULL; } - if (info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA) + /* Not sure why is following check here. As far as I can see, + memory, which is info_ptr pointing to, is zeroed in + png_create_info_struct(). In png.h: + #define PNG_COLOR_MASK_COLOR 2 + #define PNG_COLOR_MASK_ALPHA 4 + #define PNG_COLOR_TYPE_RGB_ALPHA (PNG_COLOR_MASK_COLOR | PNG_COLOR_MASK_ALPHA) + So following condition is never true? + Nevertheless: + */ + png_get_IHDR(png_ptr, info_ptr, &ww, &hh, &bit_depth, &color_type, + NULL, NULL, NULL); + if (color_type == PNG_COLOR_TYPE_RGB_ALPHA) { png_destroy_read_struct(&png_ptr, &info_ptr, NULL); return NULL; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
