Hello community, here is the log from the commit of package clanlib for openSUSE:Factory checked in at 2012-09-25 09:34:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/clanlib (Old) and /work/SRC/openSUSE:Factory/.clanlib.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "clanlib", Maintainer is "prus...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/clanlib/clanlib.changes 2012-08-08 11:09:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.clanlib.new/clanlib.changes 2012-09-25 09:34:11.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Sep 21 12:22:21 UTC 2012 - co...@suse.com + +- fix compilation with newer Mesa in #undefing a new symbol + ClanLib-2.3.6-fix-opengl.patch + +------------------------------------------------------------------- New: ---- ClanLib-2.3.6-fix-opengl.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clanlib.spec ++++++ --- /var/tmp/diff_new_pack.aZvaJl/_old 2012-09-25 09:34:12.000000000 +0200 +++ /var/tmp/diff_new_pack.aZvaJl/_new 2012-09-25 09:34:12.000000000 +0200 @@ -26,6 +26,8 @@ Group: System/Libraries Url: http://www.clanlib.org/ Source: ClanLib-%{version}.tgz +# PATCH-FIX-UPSTREAM -- fix compilation with new Mesa, co...@suse.de +Patch0: ClanLib-2.3.6-fix-opengl.patch BuildRequires: Mesa-devel BuildRequires: alsa-devel BuildRequires: dos2unix @@ -71,6 +73,7 @@ %prep %setup -q -n ClanLib-%{version} +%patch0 -p1 %build export CFLAGS="%{optflags}" ++++++ ClanLib-2.3.6-fix-opengl.patch ++++++ Index: ClanLib-2.3.6/Sources/API/GL1/opengl1_defines.h =================================================================== --- ClanLib-2.3.6.orig/Sources/API/GL1/opengl1_defines.h +++ ClanLib-2.3.6/Sources/API/GL1/opengl1_defines.h @@ -44,6 +44,11 @@ #ifndef CL_DISPLAYDEFINES_DEFINES #define CL_DISPLAYDEFINES_DEFINES +/* newer Mesa defines this and creates a conflict */ +#ifdef GL_TYPE +#undef GL_TYPE +#endif + #include <cstddef> #ifndef __APPLE__ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
