rpms/ClanLib06/devel ClanLib-0.6.5-suse.patch, 1.1, 1.2 ClanLib-0.6.5-tolua++.patch, 1.1, 1.2 ClanLib06.spec, 1.12, 1.13
Hans de Goede
jwrdegoede at fedoraproject.org
Sun Sep 7 12:12:32 UTC 2008
Author: jwrdegoede
Update of /cvs/pkgs/rpms/ClanLib06/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30439
Modified Files:
ClanLib-0.6.5-suse.patch ClanLib-0.6.5-tolua++.patch
ClanLib06.spec
Log Message:
* Sun Sep 7 2008 Hans de Goede <hdegoede at redhat.com> 0.6.5-13
- Fix patch fuzz build failure
ClanLib-0.6.5-suse.patch:
Index: ClanLib-0.6.5-suse.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ClanLib06/devel/ClanLib-0.6.5-suse.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ClanLib-0.6.5-suse.patch 24 Jul 2006 14:03:00 -0000 1.1
+++ ClanLib-0.6.5-suse.patch 7 Sep 2008 12:12:32 -0000 1.2
@@ -1,67 +1,33 @@
---- ClanLib-0.6.5/configure.in.suse 2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/configure.in 2006-07-20 12:41:47.000000000 +0200
-@@ -217,7 +217,7 @@
-
- CHECK_LIB(GL,Setup/Tests/opengl.cpp, OPENGL=enabled, OPENGL=disabled, [$x_libraries -lGL -lGLU -lpthread])
- CHECK_LIB(mikmod,Setup/Tests/mikmod.cpp, mikmod=enabled, mikmod=disabled, [$x_libraries -lmikmod])
--CHECK_LIB(png,Setup/Tests/png.cpp, png=enabled, png=disabled, [$x_libraries -lpng])
-+CHECK_LIB(png,Setup/Tests/png.cpp, png=enabled, png=disabled, [$x_libraries -lpng -lz])
- CHECK_LIB(jpeg,Setup/Tests/jpeg.cpp, jpeg=enabled, jpeg=disabled, [$x_libraries -ljpeg])
- dnl hack force lua
- lua=enabled
---- ClanLib-0.6.5/Setup/Unix/Makefile.smalljpeg.in.suse 2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.smalljpeg.in 2006-07-20 12:41:38.000000000 +0200
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.app.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.app.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.app.in.foo 2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.app.in 2008-09-07 13:39:37.000000000 +0200
@@ -5,14 +5,14 @@
- clanSmallJPEG: Libs/libclanSmallJPEG.so Libs/libclanSmallJPEG.a
+ clanApp: Libs/libclanApp.so Libs/libclanApp.a
- installSmallJPEG: clanSmallJPEG
-- @for i in `find Sources/API/SmallJPEG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
-- @for i in `find Sources/API/SmallJPEG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
-- @install -m 0644 Sources/API/jpeg.h $(INC_PREFIX)/ClanLib/jpeg.h
+ installApp: clanApp
+- @for i in `find Sources/API/Application -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
+- @for i in `find Sources/API/Application -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
+- @install -m 0644 Sources/API/application.h $(INC_PREFIX)/ClanLib/application.h
- @install -d $(LIB_PREFIX)
-- @install Libs/libclanSmallJPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
-- @install Libs/libclanSmallJPEG.a $(LIB_PREFIX)
-- @ln -s -f libclanSmallJPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanSmallJPEG.so.$(D_VERSION_MAJOR)
-- @ln -s -f libclanSmallJPEG.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanSmallJPEG.so
-+ @for i in `find Sources/API/SmallJPEG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+ @for i in `find Sources/API/SmallJPEG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+ @install -m 0644 Sources/API/jpeg.h $(DESTDIR)$(INC_PREFIX)/ClanLib/jpeg.h
+- @install Libs/libclanApp.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
+- @install Libs/libclanApp.a $(LIB_PREFIX)
+- @ln -s -f libclanApp.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanApp.so.$(D_VERSION_MAJOR)
+- @ln -s -f libclanApp.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanApp.so
++ @for i in `find Sources/API/Application -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++ @for i in `find Sources/API/Application -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++ @install -m 0644 Sources/API/application.h $(DESTDIR)$(INC_PREFIX)/ClanLib/application.h
+ @install -d $(DESTDIR)$(LIB_PREFIX)
-+ @install Libs/libclanSmallJPEG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
-+ @install Libs/libclanSmallJPEG.a $(DESTDIR)$(LIB_PREFIX)
-+ @ln -s -f libclanSmallJPEG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanSmallJPEG.so.$(D_VERSION_MAJOR)
-+ @ln -s -f libclanSmallJPEG.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanSmallJPEG.so
-
-
- OBJF_LIB_SMALLJPEG = \
---- ClanLib-0.6.5/Setup/Unix/Makefile.gui.in.suse 2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.gui.in 2006-07-20 12:41:38.000000000 +0200
-@@ -5,14 +5,14 @@
- clanGUI: Libs/libclanGUI.so Libs/libclanGUI.a
++ @install Libs/libclanApp.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
++ @install Libs/libclanApp.a $(DESTDIR)$(LIB_PREFIX)
++ @ln -s -f libclanApp.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanApp.so.$(D_VERSION_MAJOR)
++ @ln -s -f libclanApp.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanApp.so
- installGUI: clanGUI
-- @for i in `find Sources/API/GUI -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
-- @for i in `find Sources/API/GUI -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
-- @install -m 0644 Sources/API/gui.h $(INC_PREFIX)/ClanLib/gui.h
-- @install -d $(LIB_PREFIX)
-- @install Libs/libclanGUI.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
-- @install Libs/libclanGUI.a $(LIB_PREFIX)
-- @ln -s -f libclanGUI.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanGUI.so.$(D_VERSION_MAJOR)
-- @ln -s -f libclanGUI.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanGUI.so
-+ @for i in `find Sources/API/GUI -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+ @for i in `find Sources/API/GUI -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+ @install -m 0644 Sources/API/gui.h $(DESTDIR)$(INC_PREFIX)/ClanLib/gui.h
-+ @install -d $(DESTDIR)$(LIB_PREFIX)
-+ @install Libs/libclanGUI.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
-+ @install Libs/libclanGUI.a $(DESTDIR)$(LIB_PREFIX)
-+ @ln -s -f libclanGUI.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanGUI.so.$(D_VERSION_MAJOR)
-+ @ln -s -f libclanGUI.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanGUI.so
- OBJF_LIB_GUI = \
- Libs/Intermediate/button.o \
---- ClanLib-0.6.5/Setup/Unix/Makefile.conf.in.suse 2006-07-20 12:41:38.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.conf.in 2006-07-20 12:48:21.000000000 +0200
-@@ -13,7 +13,7 @@
+ OBJF_LIB_App = Libs/Intermediate/clanapp.o
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.conf.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.conf.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.conf.in.foo 2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.conf.in 2008-09-07 13:39:37.000000000 +0200
+@@ -13,7 +13,7 @@ INC_PREFIX = @includedir@
BIN_PREFIX = @bindir@
TARGET_PREFIX = @libdir@/ClanLib
MAN_PREFIX = @mandir@
@@ -70,7 +36,7 @@
INCLUDE_DIRS = -I Sources @x_includes@ @extra_includes@
COMP_OPTIONS = -Wall $(INCLUDE_DIRS) -fPIC -DNOCONTROLS -D__int64=int64_t @DEFS@ @comp_mode@ @directfb_cflags@
-@@ -34,19 +34,19 @@
+@@ -34,19 +34,19 @@ Libs/Intermediate/%.o : %.cpp
@echo "Compiling $<"
- at if [ ! -d Libs ]; then mkdir Libs; fi
- at if [ ! -d Libs/Intermediate ]; then mkdir Libs/Intermediate; fi
@@ -93,8 +59,9 @@
build_info:
@echo Compile command .cpp = $(CXX_COMMAND)
---- ClanLib-0.6.5/Setup/Unix/Makefile.core.in.suse 2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.core.in 2006-07-20 12:47:40.000000000 +0200
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.core.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.core.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.core.in.foo 2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.core.in 2008-09-07 13:39:37.000000000 +0200
@@ -5,21 +5,21 @@
clanCore: build_info Libs/libclanCore.so Libs/libclanCore.a
@@ -132,83 +99,9 @@
OBJF_CORE_GENERIC = \
Libs/Intermediate/cl_assert.o \
---- ClanLib-0.6.5/Setup/Unix/Makefile.sound.in.suse 2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.sound.in 2006-07-20 12:41:38.000000000 +0200
-@@ -4,14 +4,14 @@
- clanSound: Libs/libclanSound.so Libs/libclanSound.a
-
- installSound: clanSound
-- @for i in `find Sources/API/Sound -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
-- @for i in `find Sources/API/Sound -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
-- @install -m 0644 Sources/API/sound.h $(INC_PREFIX)/ClanLib/sound.h
-- @install -d $(LIB_PREFIX)
-- @install Libs/libclanSound.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
-- @install Libs/libclanSound.a $(LIB_PREFIX)
-- @ln -s -f libclanSound.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanSound.so.$(D_VERSION_MAJOR)
-- @ln -s -f libclanSound.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanSound.so
-+ @for i in `find Sources/API/Sound -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+ @for i in `find Sources/API/Sound -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+ @install -m 0644 Sources/API/sound.h $(DESTDIR)$(INC_PREFIX)/ClanLib/sound.h
-+ @install -d $(DESTDIR)$(LIB_PREFIX)
-+ @install Libs/libclanSound.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
-+ @install Libs/libclanSound.a $(DESTDIR)$(LIB_PREFIX)
-+ @ln -s -f libclanSound.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanSound.so.$(D_VERSION_MAJOR)
-+ @ln -s -f libclanSound.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanSound.so
-
- OBJF_SOUND_GENERIC = \
- Libs/Intermediate/sound.o \
---- ClanLib-0.6.5/Setup/Unix/Makefile.app.in.suse 2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.app.in 2006-07-20 12:41:38.000000000 +0200
-@@ -5,14 +5,14 @@
- clanApp: Libs/libclanApp.so Libs/libclanApp.a
-
- installApp: clanApp
-- @for i in `find Sources/API/Application -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
-- @for i in `find Sources/API/Application -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
-- @install -m 0644 Sources/API/application.h $(INC_PREFIX)/ClanLib/application.h
-- @install -d $(LIB_PREFIX)
-- @install Libs/libclanApp.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
-- @install Libs/libclanApp.a $(LIB_PREFIX)
-- @ln -s -f libclanApp.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanApp.so.$(D_VERSION_MAJOR)
-- @ln -s -f libclanApp.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanApp.so
-+ @for i in `find Sources/API/Application -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+ @for i in `find Sources/API/Application -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+ @install -m 0644 Sources/API/application.h $(DESTDIR)$(INC_PREFIX)/ClanLib/application.h
-+ @install -d $(DESTDIR)$(LIB_PREFIX)
-+ @install Libs/libclanApp.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
-+ @install Libs/libclanApp.a $(DESTDIR)$(LIB_PREFIX)
-+ @ln -s -f libclanApp.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanApp.so.$(D_VERSION_MAJOR)
-+ @ln -s -f libclanApp.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanApp.so
-
-
- OBJF_LIB_App = Libs/Intermediate/clanapp.o
---- ClanLib-0.6.5/Setup/Unix/Makefile.ttf.in.suse 2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.ttf.in 2006-07-20 12:41:38.000000000 +0200
-@@ -5,14 +5,14 @@
- clanTTF: Libs/libclanTTF.so Libs/libclanTTF.a
-
- installTTF: clanTTF
-- @for i in `find Sources/API/TTF -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
-- @for i in `find Sources/API/TTF -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
-- @install -m 0644 Sources/API/ttf.h $(INC_PREFIX)/ClanLib/ttf.h
-- @install -d $(LIB_PREFIX)
-- @install Libs/libclanTTF.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
-- @install Libs/libclanTTF.a $(LIB_PREFIX)
-- @ln -s -f libclanTTF.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanTTF.so.$(D_VERSION_MAJOR)
-- @ln -s -f libclanTTF.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanTTF.so
-+ @for i in `find Sources/API/TTF -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+ @for i in `find Sources/API/TTF -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+ @install -m 0644 Sources/API/ttf.h $(DESTDIR)$(INC_PREFIX)/ClanLib/ttf.h
-+ @install -d $(DESTDIR)$(LIB_PREFIX)
-+ @install Libs/libclanTTF.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
-+ @install Libs/libclanTTF.a $(DESTDIR)$(LIB_PREFIX)
-+ @ln -s -f libclanTTF.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanTTF.so.$(D_VERSION_MAJOR)
-+ @ln -s -f libclanTTF.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanTTF.so
-
-
- OBJF_LIB_TTF = \
---- ClanLib-0.6.5/Setup/Unix/Makefile.display.in.suse 2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.display.in 2006-07-20 12:41:38.000000000 +0200
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.display.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.display.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.display.in.foo 2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.display.in 2008-09-07 13:39:37.000000000 +0200
@@ -4,14 +4,14 @@
clanDisplay: Libs/libclanDisplay.so Libs/libclanDisplay.a
@@ -232,8 +125,9 @@
OBJF_DISP_GENERIC = \
---- ClanLib-0.6.5/Setup/Unix/Makefile.gl.in.suse 2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.gl.in 2006-07-20 12:41:38.000000000 +0200
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.gl.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.gl.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.gl.in.foo 2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.gl.in 2008-09-07 13:39:37.000000000 +0200
@@ -5,14 +5,14 @@
clanGL: Libs/libclanGL.so Libs/libclanGL.a
@@ -257,33 +151,61 @@
OBJF_LIB_GL = Libs/Intermediate/texture_gl.o \
Libs/Intermediate/opengl.o \
---- ClanLib-0.6.5/Setup/Unix/Makefile.network.in.suse 2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.network.in 2006-07-20 12:41:38.000000000 +0200
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.gui.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.gui.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.gui.in.foo 2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.gui.in 2008-09-07 13:39:37.000000000 +0200
@@ -5,14 +5,14 @@
- clanNetwork: Libs/libclanNetwork.so Libs/libclanNetwork.a
+ clanGUI: Libs/libclanGUI.so Libs/libclanGUI.a
- installNetwork: clanNetwork
-- @for i in `find Sources/API/Network -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
-- @for i in `find Sources/API/Network -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
-- @install -m 0644 Sources/API/network.h $(INC_PREFIX)/ClanLib/network.h
+ installGUI: clanGUI
+- @for i in `find Sources/API/GUI -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
+- @for i in `find Sources/API/GUI -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
+- @install -m 0644 Sources/API/gui.h $(INC_PREFIX)/ClanLib/gui.h
- @install -d $(LIB_PREFIX)
-- @install Libs/libclanNetwork.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
-- @install Libs/libclanNetwork.a $(LIB_PREFIX)
-- @ln -s -f libclanNetwork.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanNetwork.so.$(D_VERSION_MAJOR)
-- @ln -s -f libclanNetwork.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanNetwork.so
-+ @for i in `find Sources/API/Network -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+ @for i in `find Sources/API/Network -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+ @install -m 0644 Sources/API/network.h $(DESTDIR)$(INC_PREFIX)/ClanLib/network.h
+- @install Libs/libclanGUI.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
+- @install Libs/libclanGUI.a $(LIB_PREFIX)
+- @ln -s -f libclanGUI.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanGUI.so.$(D_VERSION_MAJOR)
+- @ln -s -f libclanGUI.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanGUI.so
++ @for i in `find Sources/API/GUI -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++ @for i in `find Sources/API/GUI -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++ @install -m 0644 Sources/API/gui.h $(DESTDIR)$(INC_PREFIX)/ClanLib/gui.h
+ @install -d $(DESTDIR)$(LIB_PREFIX)
-+ @install Libs/libclanNetwork.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
-+ @install Libs/libclanNetwork.a $(DESTDIR)$(LIB_PREFIX)
-+ @ln -s -f libclanNetwork.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanNetwork.so.$(D_VERSION_MAJOR)
-+ @ln -s -f libclanNetwork.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanNetwork.so
++ @install Libs/libclanGUI.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
++ @install Libs/libclanGUI.a $(DESTDIR)$(LIB_PREFIX)
++ @ln -s -f libclanGUI.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanGUI.so.$(D_VERSION_MAJOR)
++ @ln -s -f libclanGUI.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanGUI.so
- OBJF_LIB_NETWORK = Libs/Intermediate/netcomputer.o \
- Libs/Intermediate/browse_client.o \
---- ClanLib-0.6.5/Setup/Unix/Makefile.lua.in.suse 2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.lua.in 2006-07-20 12:41:38.000000000 +0200
+ OBJF_LIB_GUI = \
+ Libs/Intermediate/button.o \
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.jpeg.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.jpeg.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.jpeg.in.foo 2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.jpeg.in 2008-09-07 13:39:37.000000000 +0200
+@@ -5,14 +5,14 @@
+ clanJPEG: Libs/libclanJPEG.so Libs/libclanJPEG.a
+
+ installJPEG: clanJPEG
+- @for i in `find Sources/API/JPEG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
+- @for i in `find Sources/API/JPEG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
+- @install -m 0644 Sources/API/jpeg.h $(INC_PREFIX)/ClanLib/jpeg.h
+- @install -d $(LIB_PREFIX)
+- @install Libs/libclanJPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
+- @install Libs/libclanJPEG.a $(LIB_PREFIX)
+- @ln -s -f libclanJPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanJPEG.so.$(D_VERSION_MAJOR)
+- @ln -s -f libclanJPEG.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanJPEG.so
++ @for i in `find Sources/API/JPEG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++ @for i in `find Sources/API/JPEG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++ @install -m 0644 Sources/API/jpeg.h $(DESTDIR)$(INC_PREFIX)/ClanLib/jpeg.h
++ @install -d $(DESTDIR)$(LIB_PREFIX)
++ @install Libs/libclanJPEG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
++ @install Libs/libclanJPEG.a $(DESTDIR)$(LIB_PREFIX)
++ @ln -s -f libclanJPEG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanJPEG.so.$(D_VERSION_MAJOR)
++ @ln -s -f libclanJPEG.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanJPEG.so
+
+
+ OBJF_LIB_JPEG = \
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.lua.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.lua.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.lua.in.foo 2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.lua.in 2008-09-07 13:39:37.000000000 +0200
@@ -5,14 +5,14 @@
clanLua: Libs/libclanLua.so Libs/libclanLua.a
@@ -307,33 +229,9 @@
OBJF_LIB_LUA = \
Libs/Intermediate/clanbindings.o
---- ClanLib-0.6.5/Setup/Unix/Makefile.png.in.suse 2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.png.in 2006-07-20 12:41:38.000000000 +0200
-@@ -5,14 +5,14 @@
- clanPNG: Libs/libclanPNG.so Libs/libclanPNG.a
-
- installPNG: clanPNG
-- @for i in `find Sources/API/PNG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
-- @for i in `find Sources/API/PNG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
-- @install -m 0644 Sources/API/png.h $(INC_PREFIX)/ClanLib/png.h
-- @install -d $(LIB_PREFIX)
-- @install Libs/libclanPNG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
-- @install Libs/libclanPNG.a $(LIB_PREFIX)
-- @ln -s -f libclanPNG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanPNG.so.$(D_VERSION_MAJOR)
-- @ln -s -f libclanPNG.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanPNG.so
-+ @for i in `find Sources/API/PNG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+ @for i in `find Sources/API/PNG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+ @install -m 0644 Sources/API/png.h $(DESTDIR)$(INC_PREFIX)/ClanLib/png.h
-+ @install -d $(DESTDIR)$(LIB_PREFIX)
-+ @install Libs/libclanPNG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
-+ @install Libs/libclanPNG.a $(DESTDIR)$(LIB_PREFIX)
-+ @ln -s -f libclanPNG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanPNG.so.$(D_VERSION_MAJOR)
-+ @ln -s -f libclanPNG.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanPNG.so
-
-
- OBJF_LIB_PNG = \
---- ClanLib-0.6.5/Setup/Unix/Makefile.mikmod.in.suse 2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.mikmod.in 2006-07-20 12:41:38.000000000 +0200
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.mikmod.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.mikmod.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.mikmod.in.foo 2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.mikmod.in 2008-09-07 13:39:37.000000000 +0200
@@ -5,14 +5,14 @@
clanMikMod: Libs/libclanMikMod.so Libs/libclanMikMod.a
@@ -357,8 +255,9 @@
OBJF_LIB_MIKMOD = \
Libs/Intermediate/resourcetype_module.o \
---- ClanLib-0.6.5/Setup/Unix/Makefile.mpeg.in.suse 2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.mpeg.in 2006-07-20 12:41:38.000000000 +0200
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.mpeg.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.mpeg.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.mpeg.in.foo 2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.mpeg.in 2008-09-07 13:39:37.000000000 +0200
@@ -5,14 +5,14 @@
clanMPEG: Libs/libclanMPEG.so Libs/libclanMPEG.a
@@ -382,262 +281,270 @@
OBJF_LIB_MPEG = \
Libs/Intermediate/mpeg_soundprovider.o
---- ClanLib-0.6.5/Setup/Unix/Makefile.signals.in.suse 2001-03-17 00:56:33.000000000 +0100
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.signals.in 2006-07-20 12:41:38.000000000 +0200
-@@ -5,6 +5,6 @@
- clanSignals:
-
- installSignals: clanSignals
-- @for i in `find Sources/API/Signals -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
-- @for i in `find Sources/API/Signals -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
-- @install -m 0644 Sources/API/signals.h $(INC_PREFIX)/ClanLib/signals.h
-+ @for i in `find Sources/API/Signals -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+ @for i in `find Sources/API/Signals -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+ @install -m 0644 Sources/API/signals.h $(DESTDIR)$(INC_PREFIX)/ClanLib/signals.h
---- ClanLib-0.6.5/Setup/Unix/Makefile.vorbis.in.suse 2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.vorbis.in 2006-07-20 12:41:38.000000000 +0200
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.network.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.network.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.network.in.foo 2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.network.in 2008-09-07 13:39:37.000000000 +0200
@@ -5,14 +5,14 @@
- clanVorbis: Libs/libclanVorbis.so Libs/libclanVorbis.a
+ clanNetwork: Libs/libclanNetwork.so Libs/libclanNetwork.a
- installVorbis: clanVorbis
-- @for i in `find Sources/API/Vorbis -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
-- @for i in `find Sources/API/Vorbis -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
-- @install -m 0644 Sources/API/vorbis.h $(INC_PREFIX)/ClanLib/vorbis.h
+ installNetwork: clanNetwork
+- @for i in `find Sources/API/Network -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
+- @for i in `find Sources/API/Network -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
+- @install -m 0644 Sources/API/network.h $(INC_PREFIX)/ClanLib/network.h
- @install -d $(LIB_PREFIX)
-- @install Libs/libclanVorbis.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
-- @install Libs/libclanVorbis.a $(LIB_PREFIX)
-- @ln -s -f libclanVorbis.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanVorbis.so.$(D_VERSION_MAJOR)
-- @ln -s -f libclanVorbis.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanVorbis.so
-+ @for i in `find Sources/API/Vorbis -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+ @for i in `find Sources/API/Vorbis -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+ @install -m 0644 Sources/API/vorbis.h $(DESTDIR)$(INC_PREFIX)/ClanLib/vorbis.h
+- @install Libs/libclanNetwork.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
+- @install Libs/libclanNetwork.a $(LIB_PREFIX)
+- @ln -s -f libclanNetwork.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanNetwork.so.$(D_VERSION_MAJOR)
+- @ln -s -f libclanNetwork.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanNetwork.so
++ @for i in `find Sources/API/Network -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++ @for i in `find Sources/API/Network -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++ @install -m 0644 Sources/API/network.h $(DESTDIR)$(INC_PREFIX)/ClanLib/network.h
+ @install -d $(DESTDIR)$(LIB_PREFIX)
-+ @install Libs/libclanVorbis.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
-+ @install Libs/libclanVorbis.a $(DESTDIR)$(LIB_PREFIX)
-+ @ln -s -f libclanVorbis.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanVorbis.so.$(D_VERSION_MAJOR)
-+ @ln -s -f libclanVorbis.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanVorbis.so
++ @install Libs/libclanNetwork.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
++ @install Libs/libclanNetwork.a $(DESTDIR)$(LIB_PREFIX)
++ @ln -s -f libclanNetwork.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanNetwork.so.$(D_VERSION_MAJOR)
++ @ln -s -f libclanNetwork.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanNetwork.so
- OBJF_LIB_VORBIS = \
- Libs/Intermediate/vorbis_soundprovider_generic.o \
---- ClanLib-0.6.5/Setup/Unix/Makefile.jpeg.in.suse 2006-07-20 12:40:16.000000000 +0200
-+++ ClanLib-0.6.5/Setup/Unix/Makefile.jpeg.in 2006-07-20 12:41:38.000000000 +0200
+ OBJF_LIB_NETWORK = Libs/Intermediate/netcomputer.o \
+ Libs/Intermediate/browse_client.o \
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.png.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.png.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.png.in.foo 2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.png.in 2008-09-07 13:39:37.000000000 +0200
@@ -5,14 +5,14 @@
- clanJPEG: Libs/libclanJPEG.so Libs/libclanJPEG.a
+ clanPNG: Libs/libclanPNG.so Libs/libclanPNG.a
- installJPEG: clanJPEG
-- @for i in `find Sources/API/JPEG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
-- @for i in `find Sources/API/JPEG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
+ installPNG: clanPNG
+- @for i in `find Sources/API/PNG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
+- @for i in `find Sources/API/PNG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
+- @install -m 0644 Sources/API/png.h $(INC_PREFIX)/ClanLib/png.h
+- @install -d $(LIB_PREFIX)
+- @install Libs/libclanPNG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
+- @install Libs/libclanPNG.a $(LIB_PREFIX)
+- @ln -s -f libclanPNG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanPNG.so.$(D_VERSION_MAJOR)
+- @ln -s -f libclanPNG.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanPNG.so
++ @for i in `find Sources/API/PNG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++ @for i in `find Sources/API/PNG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++ @install -m 0644 Sources/API/png.h $(DESTDIR)$(INC_PREFIX)/ClanLib/png.h
++ @install -d $(DESTDIR)$(LIB_PREFIX)
++ @install Libs/libclanPNG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
++ @install Libs/libclanPNG.a $(DESTDIR)$(LIB_PREFIX)
++ @ln -s -f libclanPNG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanPNG.so.$(D_VERSION_MAJOR)
++ @ln -s -f libclanPNG.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanPNG.so
+
+
+ OBJF_LIB_PNG = \
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.signals.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.signals.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.signals.in.foo 2001-03-17 00:56:33.000000000 +0100
++++ ClanLib-0.6.5/Setup/Unix/Makefile.signals.in 2008-09-07 13:39:37.000000000 +0200
+@@ -5,6 +5,6 @@
+ clanSignals:
+
+ installSignals: clanSignals
+- @for i in `find Sources/API/Signals -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
+- @for i in `find Sources/API/Signals -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
+- @install -m 0644 Sources/API/signals.h $(INC_PREFIX)/ClanLib/signals.h
++ @for i in `find Sources/API/Signals -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++ @for i in `find Sources/API/Signals -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++ @install -m 0644 Sources/API/signals.h $(DESTDIR)$(INC_PREFIX)/ClanLib/signals.h
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.smalljpeg.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.smalljpeg.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.smalljpeg.in.foo 2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.smalljpeg.in 2008-09-07 13:39:37.000000000 +0200
+@@ -5,14 +5,14 @@
+ clanSmallJPEG: Libs/libclanSmallJPEG.so Libs/libclanSmallJPEG.a
+
+ installSmallJPEG: clanSmallJPEG
+- @for i in `find Sources/API/SmallJPEG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
+- @for i in `find Sources/API/SmallJPEG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
- @install -m 0644 Sources/API/jpeg.h $(INC_PREFIX)/ClanLib/jpeg.h
- @install -d $(LIB_PREFIX)
-- @install Libs/libclanJPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
-- @install Libs/libclanJPEG.a $(LIB_PREFIX)
-- @ln -s -f libclanJPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanJPEG.so.$(D_VERSION_MAJOR)
-- @ln -s -f libclanJPEG.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanJPEG.so
-+ @for i in `find Sources/API/JPEG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
-+ @for i in `find Sources/API/JPEG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
+- @install Libs/libclanSmallJPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
+- @install Libs/libclanSmallJPEG.a $(LIB_PREFIX)
+- @ln -s -f libclanSmallJPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanSmallJPEG.so.$(D_VERSION_MAJOR)
+- @ln -s -f libclanSmallJPEG.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanSmallJPEG.so
++ @for i in `find Sources/API/SmallJPEG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++ @for i in `find Sources/API/SmallJPEG -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
+ @install -m 0644 Sources/API/jpeg.h $(DESTDIR)$(INC_PREFIX)/ClanLib/jpeg.h
+ @install -d $(DESTDIR)$(LIB_PREFIX)
-+ @install Libs/libclanJPEG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
-+ @install Libs/libclanJPEG.a $(DESTDIR)$(LIB_PREFIX)
-+ @ln -s -f libclanJPEG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanJPEG.so.$(D_VERSION_MAJOR)
-+ @ln -s -f libclanJPEG.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanJPEG.so
++ @install Libs/libclanSmallJPEG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
++ @install Libs/libclanSmallJPEG.a $(DESTDIR)$(LIB_PREFIX)
++ @ln -s -f libclanSmallJPEG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanSmallJPEG.so.$(D_VERSION_MAJOR)
++ @ln -s -f libclanSmallJPEG.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanSmallJPEG.so
- OBJF_LIB_JPEG = \
---- ClanLib-0.6.5/Sources/Network/Unix/unix_pipe_connection.h.suse 2001-09-08 21:24:20.000000000 +0200
-+++ ClanLib-0.6.5/Sources/Network/Unix/unix_pipe_connection.h 2006-07-20 12:41:47.000000000 +0200
-@@ -20,14 +20,20 @@
- #ifndef header_network_delivery_pipe
- #define header_network_delivery_pipe
+ OBJF_LIB_SMALLJPEG = \
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.sound.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.sound.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.sound.in.foo 2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.sound.in 2008-09-07 13:39:37.000000000 +0200
+@@ -4,14 +4,14 @@
+ clanSound: Libs/libclanSound.so Libs/libclanSound.a
-+#ifndef WIN32
-+#include <cerrno>
-+#include <cstring>
-+#else
-+#include <errno.h>
-+#include <string.h>
-+#endif
-+
- #include <sys/time.h>
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <arpa/inet.h>
- #include <netinet/in.h>
- #include <unistd.h>
--#include <errno.h>
--#include <string.h>
- #include <list>
+ installSound: clanSound
+- @for i in `find Sources/API/Sound -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
+- @for i in `find Sources/API/Sound -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
+- @install -m 0644 Sources/API/sound.h $(INC_PREFIX)/ClanLib/sound.h
+- @install -d $(LIB_PREFIX)
+- @install Libs/libclanSound.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
+- @install Libs/libclanSound.a $(LIB_PREFIX)
+- @ln -s -f libclanSound.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanSound.so.$(D_VERSION_MAJOR)
+- @ln -s -f libclanSound.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanSound.so
++ @for i in `find Sources/API/Sound -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++ @for i in `find Sources/API/Sound -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++ @install -m 0644 Sources/API/sound.h $(DESTDIR)$(INC_PREFIX)/ClanLib/sound.h
++ @install -d $(DESTDIR)$(LIB_PREFIX)
++ @install Libs/libclanSound.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
++ @install Libs/libclanSound.a $(DESTDIR)$(LIB_PREFIX)
++ @ln -s -f libclanSound.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanSound.so.$(D_VERSION_MAJOR)
++ @ln -s -f libclanSound.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanSound.so
- #include "Network/Generic/network_delivery_impl.h"
---- ClanLib-0.6.5/Sources/Network/Generic/network_delivery_socket.h.suse 2001-11-01 21:27:57.000000000 +0100
-+++ ClanLib-0.6.5/Sources/Network/Generic/network_delivery_socket.h 2006-07-20 12:41:47.000000000 +0200
-@@ -20,18 +20,19 @@
+ OBJF_SOUND_GENERIC = \
+ Libs/Intermediate/sound.o \
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.ttf.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.ttf.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.ttf.in.foo 2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.ttf.in 2008-09-07 13:39:37.000000000 +0200
+@@ -5,14 +5,14 @@
+ clanTTF: Libs/libclanTTF.so Libs/libclanTTF.a
- #ifdef WIN32
- #include <windows.h>
-+ #include <string.h>
- #else
-+ #include <cstring>
-+ #include <cerrno>
- #include <sys/time.h>
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <arpa/inet.h>
- #include <netinet/in.h>
- #include <unistd.h>
-- #include <errno.h>
- #include <fcntl.h>
- #endif
+ installTTF: clanTTF
+- @for i in `find Sources/API/TTF -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
+- @for i in `find Sources/API/TTF -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
+- @install -m 0644 Sources/API/ttf.h $(INC_PREFIX)/ClanLib/ttf.h
+- @install -d $(LIB_PREFIX)
+- @install Libs/libclanTTF.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
+- @install Libs/libclanTTF.a $(LIB_PREFIX)
+- @ln -s -f libclanTTF.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanTTF.so.$(D_VERSION_MAJOR)
+- @ln -s -f libclanTTF.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanTTF.so
++ @for i in `find Sources/API/TTF -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++ @for i in `find Sources/API/TTF -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++ @install -m 0644 Sources/API/ttf.h $(DESTDIR)$(INC_PREFIX)/ClanLib/ttf.h
++ @install -d $(DESTDIR)$(LIB_PREFIX)
++ @install Libs/libclanTTF.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
++ @install Libs/libclanTTF.a $(DESTDIR)$(LIB_PREFIX)
++ @ln -s -f libclanTTF.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanTTF.so.$(D_VERSION_MAJOR)
++ @ln -s -f libclanTTF.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanTTF.so
--#include <string.h>
- #include <list>
- #include <queue>
---- ClanLib-0.6.5/Sources/JPEG/provider_jpeg_generic.h.suse 2001-09-08 21:12:52.000000000 +0200
-+++ ClanLib-0.6.5/Sources/JPEG/provider_jpeg_generic.h 2006-07-20 12:41:47.000000000 +0200
-@@ -23,7 +23,12 @@
- #define XMD_H
- #endif
+ OBJF_LIB_TTF = \
+diff -up ClanLib-0.6.5/Setup/Unix/Makefile.vorbis.in.foo ClanLib-0.6.5/Setup/Unix/Makefile.vorbis.in
+--- ClanLib-0.6.5/Setup/Unix/Makefile.vorbis.in.foo 2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/Setup/Unix/Makefile.vorbis.in 2008-09-07 13:39:37.000000000 +0200
+@@ -5,14 +5,14 @@
+ clanVorbis: Libs/libclanVorbis.so Libs/libclanVorbis.a
+
+ installVorbis: clanVorbis
+- @for i in `find Sources/API/Vorbis -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
+- @for i in `find Sources/API/Vorbis -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
+- @install -m 0644 Sources/API/vorbis.h $(INC_PREFIX)/ClanLib/vorbis.h
+- @install -d $(LIB_PREFIX)
+- @install Libs/libclanVorbis.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
+- @install Libs/libclanVorbis.a $(LIB_PREFIX)
+- @ln -s -f libclanVorbis.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanVorbis.so.$(D_VERSION_MAJOR)
+- @ln -s -f libclanVorbis.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanVorbis.so
++ @for i in `find Sources/API/Vorbis -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++ @for i in `find Sources/API/Vorbis -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
++ @install -m 0644 Sources/API/vorbis.h $(DESTDIR)$(INC_PREFIX)/ClanLib/vorbis.h
++ @install -d $(DESTDIR)$(LIB_PREFIX)
++ @install Libs/libclanVorbis.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
++ @install Libs/libclanVorbis.a $(DESTDIR)$(LIB_PREFIX)
++ @ln -s -f libclanVorbis.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanVorbis.so.$(D_VERSION_MAJOR)
++ @ln -s -f libclanVorbis.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanVorbis.so
+
+ OBJF_LIB_VORBIS = \
+ Libs/Intermediate/vorbis_soundprovider_generic.o \
+diff -up ClanLib-0.6.5/Sources/API/Core/IOData/inputsource_file.h.foo ClanLib-0.6.5/Sources/API/Core/IOData/inputsource_file.h
+--- ClanLib-0.6.5/Sources/API/Core/IOData/inputsource_file.h.foo 2001-12-11 21:44:18.000000000 +0100
++++ ClanLib-0.6.5/Sources/API/Core/IOData/inputsource_file.h 2008-09-07 13:39:37.000000000 +0200
+@@ -23,7 +23,11 @@
-+#ifndef WIN32
-+#include <cstdio>
-+#else
- #include <stdio.h>
-+#endif
-+
- extern "C"
- {
- #include <jpeglib.h>
---- ClanLib-0.6.5/Sources/GUI/component_manager_generic.h.suse 2002-01-08 11:17:25.000000000 +0100
-+++ ClanLib-0.6.5/Sources/GUI/component_manager_generic.h 2006-07-20 12:41:47.000000000 +0200
-@@ -14,7 +14,11 @@
#include <string>
#include <stack>
- #include <vector>
+#ifndef WIN32
+#include <cstdio>
+#else
#include <stdio.h>
+#endif
- #include "API/GUI/component_manager.h"
- #include "API/GUI/stylemanager.h"
---- ClanLib-0.6.5/Sources/API/MikMod/streamed_mikmod_sample.h.suse 2001-12-11 21:44:20.000000000 +0100
-+++ ClanLib-0.6.5/Sources/API/MikMod/streamed_mikmod_sample.h 2006-07-20 12:41:47.000000000 +0200
-@@ -22,7 +22,12 @@
- #ifndef header_streamed_mikmod_sample
- #define header_streamed_mikmod_sample
+ //: Inputsource reading from file.
+ class CL_InputSource_File : public CL_InputSource
+diff -up ClanLib-0.6.5/Sources/API/Core/IOData/outputsource_file.h.foo ClanLib-0.6.5/Sources/API/Core/IOData/outputsource_file.h
+--- ClanLib-0.6.5/Sources/API/Core/IOData/outputsource_file.h.foo 2001-12-11 21:44:18.000000000 +0100
++++ ClanLib-0.6.5/Sources/API/Core/IOData/outputsource_file.h 2008-09-07 13:39:37.000000000 +0200
+@@ -22,7 +22,11 @@
+ #include "outputsource.h"
-+#ifndef WIN32
-+#include <cstdlib>
-+#else
- #include <stdlib.h>
-+#endif
-+
- #include "../core.h"
- #include "../Sound/stream_soundprovider.h"
- #include "../Sound/soundbuffer.h"
---- ClanLib-0.6.5/Sources/API/GUI/component_options.h.suse 2002-02-20 08:47:11.000000000 +0100
-+++ ClanLib-0.6.5/Sources/API/GUI/component_options.h 2006-07-20 12:41:47.000000000 +0200
-@@ -23,7 +23,12 @@
- #include "../Core/System/error.h"
- #include <map>
#include <string>
-+
+#ifndef WIN32
+#include <cstdio>
+#else
#include <stdio.h>
+#endif
- #ifdef WIN32
- #define snprintf _snprintf
---- ClanLib-0.6.5/Sources/API/GUI/gui_manager.h.suse 2002-01-30 14:17:16.000000000 +0100
-+++ ClanLib-0.6.5/Sources/API/GUI/gui_manager.h 2006-07-20 12:41:47.000000000 +0200
-@@ -19,7 +19,11 @@
- #ifndef header_gui_manager
- #define header_gui_manager
+ //: Outputsource writing to file.
+ class CL_OutputSource_File : public CL_OutputSource
+diff -up ClanLib-0.6.5/Sources/API/Core/Math/math.h.foo ClanLib-0.6.5/Sources/API/Core/Math/math.h
+--- ClanLib-0.6.5/Sources/API/Core/Math/math.h.foo 2001-09-06 20:52:05.000000000 +0200
++++ ClanLib-0.6.5/Sources/API/Core/Math/math.h 2008-09-07 13:39:37.000000000 +0200
+@@ -16,7 +16,11 @@
+ #ifndef header_math
+ #define header_math
+#ifndef WIN32
-+#include <cstddef>
++#include <cmath>
+#else
- #include <stddef.h>
+ #include <math.h>
+#endif
- #include "component.h"
-
---- ClanLib-0.6.5/Sources/API/Sound/soundbuffer_session.h.suse 2001-09-22 17:52:18.000000000 +0200
-+++ ClanLib-0.6.5/Sources/API/Sound/soundbuffer_session.h 2006-07-20 12:41:47.000000000 +0200
-@@ -19,7 +19,11 @@
- #ifndef header_soundbuffer_session
- #define header_soundbuffer_session
+ #ifndef PI
+ #ifndef M_PI
+diff -up ClanLib-0.6.5/Sources/API/Core/System/cl_assert.h.foo ClanLib-0.6.5/Sources/API/Core/System/cl_assert.h
+--- ClanLib-0.6.5/Sources/API/Core/System/cl_assert.h.foo 2001-09-22 17:52:11.000000000 +0200
++++ ClanLib-0.6.5/Sources/API/Core/System/cl_assert.h 2008-09-07 13:39:37.000000000 +0200
+@@ -81,7 +81,7 @@ public:
+ static void die(bool a, const char *file, int line, const char *func, const char *assert_str);
-+#ifndef WIN32
-+#include <cstdlib>
-+#else
- #include <stdlib.h>
-+#endif
+ //: Writes an info statements on the specified channel.
+- //: <p>Don't callthis one directly, instead use the cl_info macro.
++ //: <p>Don't call this one directly, instead use the cl_info macro.
+ //: For example: cl_info(info_network, "MyClass::my_funx - Hello World.");</p>
+ //- channel - Channel to use. (Use the ErrorChannels enum's)
+ //- text - text to print.
+diff -up ClanLib-0.6.5/Sources/API/Core/System/clanstring.h.foo ClanLib-0.6.5/Sources/API/Core/System/clanstring.h
+--- ClanLib-0.6.5/Sources/API/Core/System/clanstring.h.foo 2002-02-20 09:06:28.000000000 +0100
++++ ClanLib-0.6.5/Sources/API/Core/System/clanstring.h 2008-09-07 13:39:37.000000000 +0200
+@@ -21,11 +21,19 @@
- class CL_SoundCard;
- class CL_SoundPlayBackDesc;
---- ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_wave.h.suse 2001-12-11 21:44:21.000000000 +0100
-+++ ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_wave.h 2006-07-20 12:41:47.000000000 +0200
-@@ -22,7 +22,12 @@
- #ifndef header_streamed_wave_sample
- #define header_streamed_wave_sample
+ #include <string>
+#ifndef WIN32
++#include <cstdio>
+#include <cstdlib>
++#include <cstring>
++#include <cstdio>
+#else
+ #include <stdio.h>
#include <stdlib.h>
+ #include <string.h>
+-#include <iostream>
+ #include <stdio.h>
+#endif
+
- #include "../../Core/IOData/inputsource.h"
- #include "../stream_soundprovider.h"
- #include "../soundbuffer.h"
---- ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_raw.h.suse 2001-12-11 21:44:21.000000000 +0100
-+++ ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_raw.h 2006-07-20 12:41:47.000000000 +0200
-@@ -22,7 +22,12 @@
- #ifndef header_streamed_raw_sample
- #define header_streamed_raw_sample
-
-+#ifndef WIN32
-+#include <cstdlib>
-+#else
- #include <stdlib.h>
-+#endif
-+
- #include "../stream_soundprovider.h"
- #include "../soundbuffer.h"
-
---- ClanLib-0.6.5/Sources/API/Sound/sound.h.suse 2002-06-13 16:43:17.000000000 +0200
-+++ ClanLib-0.6.5/Sources/API/Sound/sound.h 2006-07-20 12:41:47.000000000 +0200
-@@ -20,7 +20,11 @@
- #define header_sound
-
- #include <vector>
-+#ifndef WIN32
-+#include <cstdlib>
-+#else
- #include <stdlib.h>
-+#endif
- #include "soundbuffer.h"
- #include "../Core/System/cl_assert.h"
-
---- ClanLib-0.6.5/Sources/API/efence.h.suse 2001-09-06 20:52:04.000000000 +0200
-+++ ClanLib-0.6.5/Sources/API/efence.h 2006-07-20 12:41:47.000000000 +0200
-@@ -23,7 +23,7 @@
++#include <iostream>
#ifndef WIN32
+ #include <cctype>
+@@ -53,7 +61,8 @@ extern char *fcvt (double, int, int *, i
+ #include "../Resources/resource_manager.h"
+ #include "error.h"
--#include <stdlib.h>
-+#include <cstdlib>
+-using namespace std;
++//this should *never* appear in a header
++//using namespace std;
- void *operator new(size_t size)
- {
---- ClanLib-0.6.5/Sources/API/Display/Display/pixeldata.h.suse 2001-11-01 14:56:50.000000000 +0100
-+++ ClanLib-0.6.5/Sources/API/Display/Display/pixeldata.h 2006-07-20 12:41:38.000000000 +0200
-@@ -167,24 +167,24 @@
+ //: Clan String Class
+ class CL_String
+diff -up ClanLib-0.6.5/Sources/API/Display/Display/pixeldata.h.foo ClanLib-0.6.5/Sources/API/Display/Display/pixeldata.h
+--- ClanLib-0.6.5/Sources/API/Display/Display/pixeldata.h.foo 2001-11-01 14:56:50.000000000 +0100
++++ ClanLib-0.6.5/Sources/API/Display/Display/pixeldata.h 2008-09-07 13:39:37.000000000 +0200
+@@ -167,24 +167,24 @@ public:
case 15:
case 16:
{
@@ -668,94 +575,56 @@
}
}
return;
---- ClanLib-0.6.5/Sources/API/Core/System/cl_assert.h.suse 2001-09-22 17:52:11.000000000 +0200
-+++ ClanLib-0.6.5/Sources/API/Core/System/cl_assert.h 2006-07-20 12:41:47.000000000 +0200
-@@ -81,7 +81,7 @@
- static void die(bool a, const char *file, int line, const char *func, const char *assert_str);
-
- //: Writes an info statements on the specified channel.
-- //: <p>Don't callthis one directly, instead use the cl_info macro.
-+ //: <p>Don't call this one directly, instead use the cl_info macro.
- //: For example: cl_info(info_network, "MyClass::my_funx - Hello World.");</p>
- //- channel - Channel to use. (Use the ErrorChannels enum's)
- //- text - text to print.
---- ClanLib-0.6.5/Sources/API/Core/System/clanstring.h.suse 2002-02-20 09:06:28.000000000 +0100
-+++ ClanLib-0.6.5/Sources/API/Core/System/clanstring.h 2006-07-20 12:41:47.000000000 +0200
-@@ -21,11 +21,19 @@
-
+diff -up ClanLib-0.6.5/Sources/API/GUI/component_options.h.foo ClanLib-0.6.5/Sources/API/GUI/component_options.h
+--- ClanLib-0.6.5/Sources/API/GUI/component_options.h.foo 2002-02-20 08:47:11.000000000 +0100
++++ ClanLib-0.6.5/Sources/API/GUI/component_options.h 2008-09-07 13:39:37.000000000 +0200
+@@ -23,7 +23,12 @@
+ #include "../Core/System/error.h"
+ #include <map>
#include <string>
-
++
+#ifndef WIN32
+#include <cstdio>
-+#include <cstdlib>
-+#include <cstring>
-+#include <cstdio>
+#else
#include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <iostream>
- #include <stdio.h>
+#endif
-+
-+#include <iostream>
-
- #ifndef WIN32
- #include <cctype>
-@@ -53,7 +61,8 @@
- #include "../Resources/resource_manager.h"
- #include "error.h"
-
--using namespace std;
-+//this should *never* appear in a header
-+//using namespace std;
- //: Clan String Class
- class CL_String
---- ClanLib-0.6.5/Sources/API/Core/Math/math.h.suse 2001-09-06 20:52:05.000000000 +0200
-+++ ClanLib-0.6.5/Sources/API/Core/Math/math.h 2006-07-20 12:41:47.000000000 +0200
-@@ -16,7 +16,11 @@
- #ifndef header_math
- #define header_math
+ #ifdef WIN32
+ #define snprintf _snprintf
+diff -up ClanLib-0.6.5/Sources/API/GUI/gui_manager.h.foo ClanLib-0.6.5/Sources/API/GUI/gui_manager.h
+--- ClanLib-0.6.5/Sources/API/GUI/gui_manager.h.foo 2002-01-30 14:17:16.000000000 +0100
++++ ClanLib-0.6.5/Sources/API/GUI/gui_manager.h 2008-09-07 13:39:37.000000000 +0200
+@@ -19,7 +19,11 @@
+ #ifndef header_gui_manager
+ #define header_gui_manager
+#ifndef WIN32
-+#include <cmath>
++#include <cstddef>
+#else
- #include <math.h>
+ #include <stddef.h>
+#endif
- #ifndef PI
- #ifndef M_PI
---- ClanLib-0.6.5/Sources/API/Core/IOData/outputsource_file.h.suse 2001-12-11 21:44:18.000000000 +0100
-+++ ClanLib-0.6.5/Sources/API/Core/IOData/outputsource_file.h 2006-07-20 12:41:47.000000000 +0200
-@@ -22,7 +22,11 @@
- #include "outputsource.h"
-
- #include <string>
-+#ifndef WIN32
-+#include <cstdio>
-+#else
- #include <stdio.h>
-+#endif
+ #include "component.h"
- //: Outputsource writing to file.
- class CL_OutputSource_File : public CL_OutputSource
---- ClanLib-0.6.5/Sources/API/Core/IOData/inputsource_file.h.suse 2001-12-11 21:44:18.000000000 +0100
-+++ ClanLib-0.6.5/Sources/API/Core/IOData/inputsource_file.h 2006-07-20 12:41:47.000000000 +0200
-@@ -23,7 +23,11 @@
+diff -up ClanLib-0.6.5/Sources/API/MikMod/streamed_mikmod_sample.h.foo ClanLib-0.6.5/Sources/API/MikMod/streamed_mikmod_sample.h
+--- ClanLib-0.6.5/Sources/API/MikMod/streamed_mikmod_sample.h.foo 2001-12-11 21:44:20.000000000 +0100
++++ ClanLib-0.6.5/Sources/API/MikMod/streamed_mikmod_sample.h 2008-09-07 13:39:37.000000000 +0200
+@@ -22,7 +22,12 @@
+ #ifndef header_streamed_mikmod_sample
+ #define header_streamed_mikmod_sample
- #include <string>
- #include <stack>
+#ifndef WIN32
-+#include <cstdio>
++#include <cstdlib>
+#else
- #include <stdio.h>
+ #include <stdlib.h>
+#endif
-
- //: Inputsource reading from file.
- class CL_InputSource_File : public CL_InputSource
---- ClanLib-0.6.5/Sources/API/Signals/slot.h.suse 2001-09-22 17:52:17.000000000 +0200
-+++ ClanLib-0.6.5/Sources/API/Signals/slot.h 2006-07-20 12:41:47.000000000 +0200
++
+ #include "../core.h"
+ #include "../Sound/stream_soundprovider.h"
+ #include "../Sound/soundbuffer.h"
+diff -up ClanLib-0.6.5/Sources/API/Signals/slot.h.foo ClanLib-0.6.5/Sources/API/Signals/slot.h
+--- ClanLib-0.6.5/Sources/API/Signals/slot.h.foo 2001-09-22 17:52:17.000000000 +0200
++++ ClanLib-0.6.5/Sources/API/Signals/slot.h 2008-09-07 13:39:37.000000000 +0200
@@ -20,7 +20,11 @@
#define header_slot
@@ -768,235 +637,160 @@
//: Slot class
class CL_Slot
---- ClanLib-0.6.5/Sources/GL/GLX/displaycard_glx.cpp.suse 2002-02-16 17:10:41.000000000 +0100
-+++ ClanLib-0.6.5/Sources/GL/GLX/displaycard_glx.cpp 2006-07-20 12:41:47.000000000 +0200
-@@ -363,7 +363,8 @@
-
- void (*CL_GLX_DisplayCard::get_proc_address(const std::string& function_name))()
- {
-- return glXGetProcAddressARB((GLubyte*)function_name.c_str());
-+ return glXGetProcAddress(reinterpret_cast<GLubyte*>(
-+ const_cast<char *>(function_name.c_str())));
- }
-
-
---- ClanLib-0.6.5/Sources/Sound/SoundProviders/static_provider_wave.cpp.suse 2002-08-14 15:58:29.000000000 +0200
-+++ ClanLib-0.6.5/Sources/Sound/SoundProviders/static_provider_wave.cpp 2006-07-20 12:41:38.000000000 +0200
-@@ -27,6 +27,7 @@
- #include "API/Core/System/error.h"
- #include "API/Sound/SoundProviders/static_provider_raw.h"
- #include "API/Sound/SoundProviders/static_provider_wave.h"
-+#include "API/Core/IOData/cl_endian.h"
+diff -up ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_raw.h.foo ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_raw.h
+--- ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_raw.h.foo 2001-12-11 21:44:21.000000000 +0100
++++ ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_raw.h 2008-09-07 13:39:37.000000000 +0200
+@@ -22,7 +22,12 @@
+ #ifndef header_streamed_raw_sample
+ #define header_streamed_raw_sample
- CL_SoundBuffer *CL_Sample::create(const std::string &sample_id, CL_InputSourceProvider *provider)
- {
---- ClanLib-0.6.5/Sources/Sound/SoundProviders/stream_provider_wave.cpp.suse 2002-08-14 16:00:13.000000000 +0200
-+++ ClanLib-0.6.5/Sources/Sound/SoundProviders/stream_provider_wave.cpp 2006-07-20 12:41:38.000000000 +0200
-@@ -22,6 +22,7 @@
++#ifndef WIN32
++#include <cstdlib>
++#else
+ #include <stdlib.h>
++#endif
++
+ #include "../stream_soundprovider.h"
+ #include "../soundbuffer.h"
- #include "API/Core/System/cl_assert.h"
- #include "API/Core/System/error.h"
-+#include "API/Core/IOData/cl_endian.h"
- #include "API/Core/IOData/inputsource.h"
- #include "API/Core/IOData/inputsource_provider.h"
- #include "API/Sound/SoundProviders/stream_provider_wave.h"
-@@ -118,10 +119,13 @@
- // cl_assert(!(memcmp(temp, "data", 4)));
+diff -up ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_wave.h.foo ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_wave.h
+--- ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_wave.h.foo 2001-12-11 21:44:21.000000000 +0100
++++ ClanLib-0.6.5/Sources/API/Sound/SoundProviders/stream_provider_wave.h 2008-09-07 13:39:37.000000000 +0200
+@@ -22,7 +22,12 @@
+ #ifndef header_streamed_wave_sample
+ #define header_streamed_wave_sample
- sample_size = input->read_uint32();
-+ SWAP_IF_BIG(format.nSamplesPerSec);
- sample_freq = format.nSamplesPerSec;
++#ifndef WIN32
++#include <cstdlib>
++#else
+ #include <stdlib.h>
++#endif
++
+ #include "../../Core/IOData/inputsource.h"
+ #include "../stream_soundprovider.h"
+ #include "../soundbuffer.h"
+diff -up ClanLib-0.6.5/Sources/API/Sound/sound.h.foo ClanLib-0.6.5/Sources/API/Sound/sound.h
+--- ClanLib-0.6.5/Sources/API/Sound/sound.h.foo 2002-06-13 16:43:17.000000000 +0200
++++ ClanLib-0.6.5/Sources/API/Sound/sound.h 2008-09-07 13:39:37.000000000 +0200
+@@ -20,7 +20,11 @@
+ #define header_sound
-+ SWAP_IF_BIG(format.nAvgBytesPerSec);
- int bytes_per_sample = format.nAvgBytesPerSec / format.nSamplesPerSec;
+ #include <vector>
++#ifndef WIN32
++#include <cstdlib>
++#else
+ #include <stdlib.h>
++#endif
+ #include "soundbuffer.h"
+ #include "../Core/System/cl_assert.h"
-+ SWAP_IF_BIG(format.nChannels);
- if (format.nChannels == 2 && bytes_per_sample == 4) sample_format = sf_16bit_signed_stereo;
- else if (format.nChannels == 2 && bytes_per_sample == 2) sample_format = sf_8bit_signed_stereo;
- else if (format.nChannels == 1 && bytes_per_sample == 2) sample_format = sf_16bit_signed;
---- ClanLib-0.6.5/Sources/SmallJPEG/jpgd/main.h.suse 2001-04-20 14:54:18.000000000 +0200
-+++ ClanLib-0.6.5/Sources/SmallJPEG/jpgd/main.h 2006-07-20 12:41:47.000000000 +0200
-@@ -22,6 +22,15 @@
- #ifndef MAIN_H
- #define MAIN_H
+diff -up ClanLib-0.6.5/Sources/API/Sound/soundbuffer_session.h.foo ClanLib-0.6.5/Sources/API/Sound/soundbuffer_session.h
+--- ClanLib-0.6.5/Sources/API/Sound/soundbuffer_session.h.foo 2001-09-22 17:52:18.000000000 +0200
++++ ClanLib-0.6.5/Sources/API/Sound/soundbuffer_session.h 2008-09-07 13:39:37.000000000 +0200
+@@ -19,7 +19,11 @@
+ #ifndef header_soundbuffer_session
+ #define header_soundbuffer_session
+#ifndef WIN32
+#include <cstdlib>
-+#include <cstdio>
-+#include <cmath>
-+#include <cstring>
-+#include <cctype>
-+#include <csetjmp>
-+#include <cassert>
+#else
#include <stdlib.h>
- #include <stdio.h>
- #include <math.h>
-@@ -29,6 +38,7 @@
- #include <ctype.h>
- #include <setjmp.h>
- #include <assert.h>
+#endif
- typedef signed char schar; /* 8 bits */
- typedef unsigned char uchar; /* 8 bits */
---- ClanLib-0.6.5/Sources/Display/Display/X11/target_ximage_std.cpp.suse 2001-03-06 16:09:19.000000000 +0100
-+++ ClanLib-0.6.5/Sources/Display/Display/X11/target_ximage_std.cpp 2006-07-20 12:41:38.000000000 +0200
-@@ -153,15 +153,12 @@
+ class CL_SoundCard;
+ class CL_SoundPlayBackDesc;
+diff -up ClanLib-0.6.5/Sources/API/efence.h.foo ClanLib-0.6.5/Sources/API/efence.h
+--- ClanLib-0.6.5/Sources/API/efence.h.foo 2001-09-06 20:52:04.000000000 +0200
++++ ClanLib-0.6.5/Sources/API/efence.h 2008-09-07 13:39:37.000000000 +0200
+@@ -23,7 +23,7 @@
- unsigned int CL_Target_XImage_Std::get_pitch() const
- {
-- int bytes_per_pixel = (get_depth()+7)/8;
--
-- return m_width*bytes_per_pixel;
-+ return m_pitch;
- }
-
- unsigned int CL_Target_XImage_Std::get_depth() const
+ #ifndef WIN32
+
+-#include <stdlib.h>
++#include <cstdlib>
+
+ void *operator new(size_t size)
{
-- int hack = (m_visual_info.bits_per_rgb+7)/8;
-- return hack*8;
-+ return m_depth;
- }
+diff -up ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.cpp.foo ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.cpp
+--- ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.cpp.foo 2002-01-10 11:23:30.000000000 +0100
++++ ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.cpp 2008-09-07 13:39:37.000000000 +0200
+@@ -13,6 +13,7 @@
+ ------------------------------------------------------------------------
+ */
- unsigned int CL_Target_XImage_Std::get_red_mask() const
---- ClanLib-0.6.5/Sources/Display/Display/X11/x11_resolution.cpp.suse 2002-04-04 03:16:11.000000000 +0200
-+++ ClanLib-0.6.5/Sources/Display/Display/X11/x11_resolution.cpp 2006-07-20 12:41:38.000000000 +0200
-@@ -51,12 +51,32 @@
++#include <cassert>
+ #include <API/Core/System/error.h>
+ #include <iostream>
+ #include <libgen.h>
+diff -up ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.h.foo ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.h
+--- ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.h.foo 2002-01-10 00:45:16.000000000 +0100
++++ ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.h 2008-09-07 13:39:37.000000000 +0200
+@@ -21,7 +21,11 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <dirent.h>
+-#include <stdio.h>
++#ifndef WIN32
++#include <cstdio>
++#else
++#include <cstdio>
++#endif
+ #include <unistd.h>
- if (!mode_set) // save original mode
- {
-+ XF86VidModeModeLine l;
- memset(&orig_mode, 0, sizeof(orig_mode));
- memset(&orig_view, 0, sizeof(orig_view));
-+ memset(&l, 0, sizeof(l));
+ class CL_DirectoryScanner_Unix : public CL_DirectoryScanner_Generic
+diff -up ClanLib-0.6.5/Sources/Core/System/Unix/appconf.h.foo ClanLib-0.6.5/Sources/Core/System/Unix/appconf.h
+--- ClanLib-0.6.5/Sources/Core/System/Unix/appconf.h.foo 2000-05-03 20:29:00.000000000 +0200
++++ ClanLib-0.6.5/Sources/Core/System/Unix/appconf.h 2008-09-07 13:39:37.000000000 +0200
+@@ -435,6 +435,7 @@ private:
- // Get mode info. (missing XF86VidModeGetModeInfo)
-- XF86VidModeModeLine *l = (XF86VidModeModeLine*)((char*) &orig_mode + sizeof orig_mode.dotclock);
-- cl_assert(XF86VidModeGetModeLine(dpy, scr, (int*) &orig_mode.dotclock, l) == True);
-+ // XF86VidModeModeLine *l = (XF86VidModeModeLine*)((char*) &orig_mode + sizeof orig_mode.dotclock);
-+ // there is a problem with alignment on 64bit platforms
-+
-+
-+ cl_assert(XF86VidModeGetModeLine(dpy, scr, (int*) &orig_mode.dotclock, &l) == True);
-+
-+
-+ // this should be ok on all platforms
-+ orig_mode.hdisplay = l.hdisplay;
-+ orig_mode.hsyncstart = l.hsyncstart;
-+ orig_mode.hsyncend = l.hsyncend;
-+ orig_mode.htotal = l.htotal;
-+ orig_mode.hskew = l.hskew;
-+ orig_mode.vdisplay = l.vdisplay;
-+ orig_mode.vsyncstart = l.vsyncstart;
-+ orig_mode.vsyncend = l.vsyncend;
-+ orig_mode.vtotal = l.vtotal;
-+ orig_mode.flags = l.flags;
-+ orig_mode.privsize = l.privsize;
-+ orig_mode.c_private = l.c_private;
-
- // Get the viewport position.
- cl_assert(XF86VidModeGetViewPort(dpy, scr, &orig_view.x, &orig_view.y) == True);
---- ClanLib-0.6.5/Sources/Display/Display/Generic/target_generic.cpp.suse 2002-02-18 23:47:37.000000000 +0100
-+++ ClanLib-0.6.5/Sources/Display/Display/Generic/target_generic.cpp 2006-07-20 12:41:38.000000000 +0200
-@@ -713,13 +713,13 @@
- }
- }
- }
--
-+ break;
- case 2:
- {
- register unsigned short _color = (unsigned short) color;
- int skip = dest_pitch - delta_x * 2;
- // the blitter probes if it can perform a memset (when hi and lo byte of _color are equal)
-- if ((_color & 0x00FF) != (_color & 0xFF00))
-+ if ((_color & 0x00FF) != ((_color & 0xFF00) >> 8))
- {
- for (unsigned int y = 0; y < delta_y; y++)
- {
-@@ -758,8 +758,8 @@
- for (unsigned int x = 0; x < delta_x; x++)
- {
- *(dest++) = color & 0x0000FF;
-- *(dest++) = color & 0x00FF00;
-- *(dest++) = color & 0xFF0000;
-+ *(dest++) = (color & 0x00FF00) >> 8;
-+ *(dest++) = (color & 0xFF0000) >> 16;
- }
- dest += skip;
- }
---- ClanLib-0.6.5/Sources/Display/Display/Generic/blit_alphamask_rle.h.suse 2001-09-02 19:33:37.000000000 +0200
-+++ ClanLib-0.6.5/Sources/Display/Display/Generic/blit_alphamask_rle.h 2006-07-20 12:41:47.000000000 +0200
-@@ -107,14 +107,14 @@
- {
- T a = alpha_data[x];
- T destval = dst_data[x];
-- T r = lookup_r[(((destval&rmask)>>rstart)<<8)+a]; //(((destval&rmask)>>rstart)*a)>>8;
-- T g = lookup_g[(((destval&gmask)>>gstart)<<8)+a]; //(((destval&gmask)>>gstart)*a)>>8;
-- T b = lookup_b[(((destval&bmask)>>bstart)<<8)+a]; //(((destval&bmask)>>bstart)*a)>>8;
-+ T r = this->lookup_r[(((destval&this->rmask)>>this->rstart)<<8)+a]; //(((destval&rmask)>>rstart)*a)>>8;
-+ T g = this->lookup_g[(((destval&this->gmask)>>this->gstart)<<8)+a]; //(((destval&gmask)>>gstart)*a)>>8;
-+ T b = this->lookup_b[(((destval&this->bmask)>>this->bstart)<<8)+a]; //(((destval&bmask)>>bstart)*a)>>8;
+ class FileConfig : public BaseConfig
+ {
++protected: class ConfigGroup; /* prototype for later definition */
+ public:
+ /** @name Constructors and destructor */
+ //@{
+@@ -527,7 +528,6 @@ public:
- T amix =
-- (r<<rstart) +
-- (g<<gstart) +
-- (b<<bstart);
-+ (r<<this->rstart) +
-+ (g<<this->gstart) +
-+ (b<<this->bstart);
+ //protected: --- if FileConfig::ConfigEntry is not public, functions in
+ // ConfigGroup such as Find/AddEntry can't return ConfigEntry*!
+- class ConfigGroup;
+ class ConfigEntry
+ {
+ private:
+diff -up ClanLib-0.6.5/Sources/Display/Display/DirectFB/display_directfb.cpp.foo ClanLib-0.6.5/Sources/Display/Display/DirectFB/display_directfb.cpp
+--- ClanLib-0.6.5/Sources/Display/Display/DirectFB/display_directfb.cpp.foo 2002-02-26 21:38:11.000000000 +0100
++++ ClanLib-0.6.5/Sources/Display/Display/DirectFB/display_directfb.cpp 2008-09-07 13:39:37.000000000 +0200
+@@ -17,12 +17,12 @@
+ #ifdef USE_DIRECTFB
- dst_data[x] = amix + *(src_data++);
- }
-@@ -151,13 +151,13 @@
- {
- T a = alpha_data[x];
- T destval = dst_buf[x];
-- T r = lookup_r[(((destval&rmask)>>rstart)<<8)+a];
-- T g = lookup_g[(((destval&gmask)>>gstart)<<8)+a];
-- T b = lookup_b[(((destval&bmask)>>bstart)<<8)+a];
-+ T r = this->lookup_r[(((destval&this->rmask)>>this->rstart)<<8)+a];
-+ T g = this->lookup_g[(((destval&this->gmask)>>this->gstart)<<8)+a];
-+ T b = this->lookup_b[(((destval&this->bmask)>>this->bstart)<<8)+a];
- T amix =
-- (r<<rstart) +
-- (g<<gstart) +
-- (b<<bstart);
-+ (r<<this->rstart) +
-+ (g<<this->gstart) +
-+ (b<<this->bstart);
- dst_buf[x] = amix + *(src_data++);
- }
- memcpy(dst_data, dst_buf, sizeof(T)*rep);
---- ClanLib-0.6.5/Sources/Display/Display/Generic/blitters.h.suse 2001-04-12 21:58:17.000000000 +0200
-+++ ClanLib-0.6.5/Sources/Display/Display/Generic/blitters.h 2006-07-20 12:41:47.000000000 +0200
-@@ -20,7 +20,11 @@
- #define header_blitters
- class CL_Target;
-+#ifndef WIN32
+-#include <stdlib.h>
+-#include <stdio.h>
+-#include <string.h>
+-#include <iostream>
+#include <cstdlib>
-+#else
- #include <stdlib.h>
-+#endif
- #include "API/Display/Display/cliprect.h"
- /*
- #include "API/Display/Display/surfaceprovider.h"
---- ClanLib-0.6.5/Sources/Display/Display/Generic/blit_transparent.cpp.suse 2001-09-02 04:24:43.000000000 +0200
-+++ ClanLib-0.6.5/Sources/Display/Display/Generic/blit_transparent.cpp 2006-07-20 12:41:38.000000000 +0200
-@@ -278,7 +278,7 @@
- unsigned int dest_pitch = target->get_pitch();
++#include <cstdio>
++#include <cstring>
++#include <cmath>
- unsigned char *dest = (unsigned char *) target->get_data();
-- dest += x*sizeof(T) + (y-1)*dest_pitch;
-+ dest += x*sizeof(T) + y*dest_pitch - dest_pitch;
+-#include <math.h>
++#include <iostream>
- // T *dd;
-
---- ClanLib-0.6.5/Sources/Display/Display/DirectFB/target_directfb.cpp.suse 2002-02-26 21:38:11.000000000 +0100
-+++ ClanLib-0.6.5/Sources/Display/Display/DirectFB/target_directfb.cpp 2006-07-20 12:41:38.000000000 +0200
-@@ -104,7 +104,7 @@
+ #include <API/Display/Display/mousecursor.h>
+ #include <API/Display/Display/cliprect.h>
+@@ -177,7 +177,7 @@ void CL_DirectFB_DisplayCard::set_videom
+
+ if (fullscreen)
+ {
+- cerr << "CL_DirectFB_DisplayCard: Falling back to DFSCL_NORMAL" << endl;
++ std::cerr << "CL_DirectFB_DisplayCard: Falling back to DFSCL_NORMAL" << std::endl;
+ dfb->SetCooperativeLevel (dfb, DFSCL_NORMAL);
+ ret = dfb->SetVideoMode (dfb, get_width(), get_height(), bpp);
+ }
+diff -up ClanLib-0.6.5/Sources/Display/Display/DirectFB/target_directfb.cpp.foo ClanLib-0.6.5/Sources/Display/Display/DirectFB/target_directfb.cpp
+--- ClanLib-0.6.5/Sources/Display/Display/DirectFB/target_directfb.cpp.foo 2002-02-26 21:38:11.000000000 +0100
++++ ClanLib-0.6.5/Sources/Display/Display/DirectFB/target_directfb.cpp 2008-09-07 13:39:37.000000000 +0200
+@@ -104,7 +104,7 @@ unsigned int CL_Target_DirectFB::get_num
unsigned int CL_Target_DirectFB::get_width() const
{
@@ -1005,7 +799,7 @@
surface->GetSize (surface, &width, NULL);
-@@ -113,7 +113,7 @@
+@@ -113,7 +113,7 @@ unsigned int CL_Target_DirectFB::get_wid
unsigned int CL_Target_DirectFB::get_height() const
{
@@ -1014,7 +808,7 @@
surface->GetSize (surface, NULL, &height);
-@@ -147,7 +147,7 @@
+@@ -147,7 +147,7 @@ unsigned int CL_Target_DirectFB::get_red
{
case DSPF_A8:
return 0;
@@ -1023,7 +817,7 @@
return 0x007c00;
case DSPF_RGB16:
return 0x00f800;
-@@ -170,7 +170,7 @@
+@@ -170,7 +170,7 @@ unsigned int CL_Target_DirectFB::get_gre
{
case DSPF_A8:
return 0;
@@ -1032,7 +826,7 @@
return 0x0003e0;
case DSPF_RGB16:
return 0x0007e0;
-@@ -193,7 +193,7 @@
+@@ -193,7 +193,7 @@ unsigned int CL_Target_DirectFB::get_blu
{
case DSPF_A8:
return 0;
@@ -1041,7 +835,7 @@
case DSPF_RGB16:
return 0x00001f;
case DSPF_RGB24:
-@@ -215,7 +215,7 @@
+@@ -215,7 +215,7 @@ unsigned int CL_Target_DirectFB::get_alp
{
case DSPF_A8:
return 0xff;
@@ -1050,7 +844,7 @@
case DSPF_RGB16:
case DSPF_RGB24:
case DSPF_RGB32:
-@@ -263,7 +263,7 @@
+@@ -263,7 +263,7 @@ void CL_Target_DirectFB::Flip (DFBRegion
void CL_Target_DirectFB::Clear (float r, float g, float b, float a)
{
@@ -1059,75 +853,333 @@
surface->GetSize (surface, &width, &height);
---- ClanLib-0.6.5/Sources/Display/Display/DirectFB/display_directfb.cpp.suse 2002-02-26 21:38:11.000000000 +0100
-+++ ClanLib-0.6.5/Sources/Display/Display/DirectFB/display_directfb.cpp 2006-07-20 12:41:47.000000000 +0200
-@@ -17,12 +17,12 @@
- #ifdef USE_DIRECTFB
+diff -up ClanLib-0.6.5/Sources/Display/Display/Generic/blit_alphamask_rle.h.foo ClanLib-0.6.5/Sources/Display/Display/Generic/blit_alphamask_rle.h
+--- ClanLib-0.6.5/Sources/Display/Display/Generic/blit_alphamask_rle.h.foo 2001-09-02 19:33:37.000000000 +0200
++++ ClanLib-0.6.5/Sources/Display/Display/Generic/blit_alphamask_rle.h 2008-09-07 13:39:37.000000000 +0200
+@@ -107,14 +107,14 @@ public:
+ {
+ T a = alpha_data[x];
+ T destval = dst_data[x];
+- T r = lookup_r[(((destval&rmask)>>rstart)<<8)+a]; //(((destval&rmask)>>rstart)*a)>>8;
+- T g = lookup_g[(((destval&gmask)>>gstart)<<8)+a]; //(((destval&gmask)>>gstart)*a)>>8;
+- T b = lookup_b[(((destval&bmask)>>bstart)<<8)+a]; //(((destval&bmask)>>bstart)*a)>>8;
++ T r = this->lookup_r[(((destval&this->rmask)>>this->rstart)<<8)+a]; //(((destval&rmask)>>rstart)*a)>>8;
++ T g = this->lookup_g[(((destval&this->gmask)>>this->gstart)<<8)+a]; //(((destval&gmask)>>gstart)*a)>>8;
++ T b = this->lookup_b[(((destval&this->bmask)>>this->bstart)<<8)+a]; //(((destval&bmask)>>bstart)*a)>>8;
+ T amix =
+- (r<<rstart) +
+- (g<<gstart) +
+- (b<<bstart);
++ (r<<this->rstart) +
++ (g<<this->gstart) +
++ (b<<this->bstart);
--#include <stdlib.h>
--#include <stdio.h>
--#include <string.h>
--#include <iostream>
+ dst_data[x] = amix + *(src_data++);
+ }
+@@ -151,13 +151,13 @@ public:
+ {
+ T a = alpha_data[x];
+ T destval = dst_buf[x];
+- T r = lookup_r[(((destval&rmask)>>rstart)<<8)+a];
+- T g = lookup_g[(((destval&gmask)>>gstart)<<8)+a];
+- T b = lookup_b[(((destval&bmask)>>bstart)<<8)+a];
++ T r = this->lookup_r[(((destval&this->rmask)>>this->rstart)<<8)+a];
++ T g = this->lookup_g[(((destval&this->gmask)>>this->gstart)<<8)+a];
++ T b = this->lookup_b[(((destval&this->bmask)>>this->bstart)<<8)+a];
+ T amix =
+- (r<<rstart) +
+- (g<<gstart) +
+- (b<<bstart);
++ (r<<this->rstart) +
++ (g<<this->gstart) +
++ (b<<this->bstart);
+ dst_buf[x] = amix + *(src_data++);
+ }
+ memcpy(dst_data, dst_buf, sizeof(T)*rep);
+diff -up ClanLib-0.6.5/Sources/Display/Display/Generic/blit_transparent.cpp.foo ClanLib-0.6.5/Sources/Display/Display/Generic/blit_transparent.cpp
+--- ClanLib-0.6.5/Sources/Display/Display/Generic/blit_transparent.cpp.foo 2001-09-02 04:24:43.000000000 +0200
++++ ClanLib-0.6.5/Sources/Display/Display/Generic/blit_transparent.cpp 2008-09-07 13:39:37.000000000 +0200
+@@ -278,7 +278,7 @@ void SubBlitter_Transparent<T>::blt_nocl
+ unsigned int dest_pitch = target->get_pitch();
+
+ unsigned char *dest = (unsigned char *) target->get_data();
+- dest += x*sizeof(T) + (y-1)*dest_pitch;
++ dest += x*sizeof(T) + y*dest_pitch - dest_pitch;
+
+ // T *dd;
+
+diff -up ClanLib-0.6.5/Sources/Display/Display/Generic/blitters.h.foo ClanLib-0.6.5/Sources/Display/Display/Generic/blitters.h
+--- ClanLib-0.6.5/Sources/Display/Display/Generic/blitters.h.foo 2001-04-12 21:58:17.000000000 +0200
++++ ClanLib-0.6.5/Sources/Display/Display/Generic/blitters.h 2008-09-07 13:39:37.000000000 +0200
+@@ -20,7 +20,11 @@
+ #define header_blitters
+
+ class CL_Target;
++#ifndef WIN32
+#include <cstdlib>
-+#include <cstdio>
-+#include <cstring>
-+#include <cmath>
++#else
+ #include <stdlib.h>
++#endif
+ #include "API/Display/Display/cliprect.h"
+ /*
+ #include "API/Display/Display/surfaceprovider.h"
+diff -up ClanLib-0.6.5/Sources/Display/Display/Generic/target_generic.cpp.foo ClanLib-0.6.5/Sources/Display/Display/Generic/target_generic.cpp
+--- ClanLib-0.6.5/Sources/Display/Display/Generic/target_generic.cpp.foo 2002-02-18 23:47:37.000000000 +0100
++++ ClanLib-0.6.5/Sources/Display/Display/Generic/target_generic.cpp 2008-09-07 13:39:37.000000000 +0200
+@@ -713,13 +713,13 @@ void cl_fill_rect_opaque(
+ }
+ }
+ }
+-
++ break;
+ case 2:
+ {
+ register unsigned short _color = (unsigned short) color;
+ int skip = dest_pitch - delta_x * 2;
+ // the blitter probes if it can perform a memset (when hi and lo byte of _color are equal)
+- if ((_color & 0x00FF) != (_color & 0xFF00))
++ if ((_color & 0x00FF) != ((_color & 0xFF00) >> 8))
+ {
+ for (unsigned int y = 0; y < delta_y; y++)
+ {
+@@ -758,8 +758,8 @@ void cl_fill_rect_opaque(
+ for (unsigned int x = 0; x < delta_x; x++)
+ {
+ *(dest++) = color & 0x0000FF;
+- *(dest++) = color & 0x00FF00;
+- *(dest++) = color & 0xFF0000;
++ *(dest++) = (color & 0x00FF00) >> 8;
++ *(dest++) = (color & 0xFF0000) >> 16;
+ }
+ dest += skip;
+ }
+diff -up ClanLib-0.6.5/Sources/Display/Display/X11/target_ximage_std.cpp.foo ClanLib-0.6.5/Sources/Display/Display/X11/target_ximage_std.cpp
+--- ClanLib-0.6.5/Sources/Display/Display/X11/target_ximage_std.cpp.foo 2001-03-06 16:09:19.000000000 +0100
++++ ClanLib-0.6.5/Sources/Display/Display/X11/target_ximage_std.cpp 2008-09-07 13:39:37.000000000 +0200
+@@ -153,15 +153,12 @@ unsigned int CL_Target_XImage_Std::get_h
--#include <math.h>
-+#include <iostream>
+ unsigned int CL_Target_XImage_Std::get_pitch() const
+ {
+- int bytes_per_pixel = (get_depth()+7)/8;
+-
+- return m_width*bytes_per_pixel;
++ return m_pitch;
+ }
+
+ unsigned int CL_Target_XImage_Std::get_depth() const
+ {
+- int hack = (m_visual_info.bits_per_rgb+7)/8;
+- return hack*8;
++ return m_depth;
+ }
- #include <API/Display/Display/mousecursor.h>
- #include <API/Display/Display/cliprect.h>
-@@ -177,7 +177,7 @@
+ unsigned int CL_Target_XImage_Std::get_red_mask() const
+diff -up ClanLib-0.6.5/Sources/Display/Display/X11/x11_resolution.cpp.foo ClanLib-0.6.5/Sources/Display/Display/X11/x11_resolution.cpp
+--- ClanLib-0.6.5/Sources/Display/Display/X11/x11_resolution.cpp.foo 2002-04-04 03:16:11.000000000 +0200
++++ ClanLib-0.6.5/Sources/Display/Display/X11/x11_resolution.cpp 2008-09-07 13:39:37.000000000 +0200
+@@ -51,12 +51,32 @@ void CL_X11Resolution::set_mode(int widt
- if (fullscreen)
+ if (!mode_set) // save original mode
{
-- cerr << "CL_DirectFB_DisplayCard: Falling back to DFSCL_NORMAL" << endl;
-+ std::cerr << "CL_DirectFB_DisplayCard: Falling back to DFSCL_NORMAL" << std::endl;
- dfb->SetCooperativeLevel (dfb, DFSCL_NORMAL);
- ret = dfb->SetVideoMode (dfb, get_width(), get_height(), bpp);
- }
---- ClanLib-0.6.5/Sources/Core/System/Unix/appconf.h.suse 2000-05-03 20:29:00.000000000 +0200
-+++ ClanLib-0.6.5/Sources/Core/System/Unix/appconf.h 2006-07-20 12:41:47.000000000 +0200
-@@ -435,6 +435,7 @@
++ XF86VidModeModeLine l;
+ memset(&orig_mode, 0, sizeof(orig_mode));
+ memset(&orig_view, 0, sizeof(orig_view));
++ memset(&l, 0, sizeof(l));
- class FileConfig : public BaseConfig
+ // Get mode info. (missing XF86VidModeGetModeInfo)
+- XF86VidModeModeLine *l = (XF86VidModeModeLine*)((char*) &orig_mode + sizeof orig_mode.dotclock);
+- cl_assert(XF86VidModeGetModeLine(dpy, scr, (int*) &orig_mode.dotclock, l) == True);
++ // XF86VidModeModeLine *l = (XF86VidModeModeLine*)((char*) &orig_mode + sizeof orig_mode.dotclock);
++ // there is a problem with alignment on 64bit platforms
++
++
++ cl_assert(XF86VidModeGetModeLine(dpy, scr, (int*) &orig_mode.dotclock, &l) == True);
++
++
++ // this should be ok on all platforms
++ orig_mode.hdisplay = l.hdisplay;
++ orig_mode.hsyncstart = l.hsyncstart;
++ orig_mode.hsyncend = l.hsyncend;
++ orig_mode.htotal = l.htotal;
++ orig_mode.hskew = l.hskew;
++ orig_mode.vdisplay = l.vdisplay;
++ orig_mode.vsyncstart = l.vsyncstart;
++ orig_mode.vsyncend = l.vsyncend;
++ orig_mode.vtotal = l.vtotal;
++ orig_mode.flags = l.flags;
++ orig_mode.privsize = l.privsize;
++ orig_mode.c_private = l.c_private;
+
+ // Get the viewport position.
+ cl_assert(XF86VidModeGetViewPort(dpy, scr, &orig_view.x, &orig_view.y) == True);
+diff -up ClanLib-0.6.5/Sources/GL/GLX/displaycard_glx.cpp.foo ClanLib-0.6.5/Sources/GL/GLX/displaycard_glx.cpp
+--- ClanLib-0.6.5/Sources/GL/GLX/displaycard_glx.cpp.foo 2002-02-16 17:10:41.000000000 +0100
++++ ClanLib-0.6.5/Sources/GL/GLX/displaycard_glx.cpp 2008-09-07 13:39:37.000000000 +0200
+@@ -363,7 +363,8 @@ void CL_GLX_DisplayCard::keep_alive()
+
+ void (*CL_GLX_DisplayCard::get_proc_address(const std::string& function_name))()
{
-+protected: class ConfigGroup; /* prototype for later definition */
- public:
- /** @name Constructors and destructor */
- //@{
-@@ -527,7 +528,6 @@
+- return glXGetProcAddressARB((GLubyte*)function_name.c_str());
++ return glXGetProcAddress(reinterpret_cast<GLubyte*>(
++ const_cast<char *>(function_name.c_str())));
+ }
- //protected: --- if FileConfig::ConfigEntry is not public, functions in
- // ConfigGroup such as Find/AddEntry can't return ConfigEntry*!
-- class ConfigGroup;
- class ConfigEntry
- {
- private:
---- ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.cpp.suse 2002-01-10 11:23:30.000000000 +0100
-+++ ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.cpp 2006-07-20 12:41:57.000000000 +0200
-@@ -13,6 +13,7 @@
- ------------------------------------------------------------------------
- */
-+#include <cassert>
- #include <API/Core/System/error.h>
- #include <iostream>
- #include <libgen.h>
---- ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.h.suse 2002-01-10 00:45:16.000000000 +0100
-+++ ClanLib-0.6.5/Sources/Core/IOData/Unix/directory_scanner_unix.h 2006-07-20 12:41:47.000000000 +0200
-@@ -21,7 +21,11 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <dirent.h>
--#include <stdio.h>
+diff -up ClanLib-0.6.5/Sources/GUI/component_manager_generic.h.foo ClanLib-0.6.5/Sources/GUI/component_manager_generic.h
+--- ClanLib-0.6.5/Sources/GUI/component_manager_generic.h.foo 2002-01-08 11:17:25.000000000 +0100
++++ ClanLib-0.6.5/Sources/GUI/component_manager_generic.h 2008-09-07 13:39:37.000000000 +0200
+@@ -14,7 +14,11 @@
+ #include <string>
+ #include <stack>
+ #include <vector>
+#ifndef WIN32
+#include <cstdio>
+#else
+ #include <stdio.h>
++#endif
+
+ #include "API/GUI/component_manager.h"
+ #include "API/GUI/stylemanager.h"
+diff -up ClanLib-0.6.5/Sources/JPEG/provider_jpeg_generic.h.foo ClanLib-0.6.5/Sources/JPEG/provider_jpeg_generic.h
+--- ClanLib-0.6.5/Sources/JPEG/provider_jpeg_generic.h.foo 2001-09-08 21:12:52.000000000 +0200
++++ ClanLib-0.6.5/Sources/JPEG/provider_jpeg_generic.h 2008-09-07 13:39:37.000000000 +0200
+@@ -23,7 +23,12 @@
+ #define XMD_H
+ #endif
+
++#ifndef WIN32
+#include <cstdio>
++#else
+ #include <stdio.h>
++#endif
++
+ extern "C"
+ {
+ #include <jpeglib.h>
+diff -up ClanLib-0.6.5/Sources/Network/Generic/network_delivery_socket.h.foo ClanLib-0.6.5/Sources/Network/Generic/network_delivery_socket.h
+--- ClanLib-0.6.5/Sources/Network/Generic/network_delivery_socket.h.foo 2001-11-01 21:27:57.000000000 +0100
++++ ClanLib-0.6.5/Sources/Network/Generic/network_delivery_socket.h 2008-09-07 13:39:37.000000000 +0200
+@@ -20,18 +20,19 @@
+
+ #ifdef WIN32
+ #include <windows.h>
++ #include <string.h>
+ #else
++ #include <cstring>
++ #include <cerrno>
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
+ #include <netinet/in.h>
+ #include <unistd.h>
+- #include <errno.h>
+ #include <fcntl.h>
+ #endif
+
+-#include <string.h>
+ #include <list>
+ #include <queue>
+
+diff -up ClanLib-0.6.5/Sources/Network/Unix/unix_pipe_connection.h.foo ClanLib-0.6.5/Sources/Network/Unix/unix_pipe_connection.h
+--- ClanLib-0.6.5/Sources/Network/Unix/unix_pipe_connection.h.foo 2001-09-08 21:24:20.000000000 +0200
++++ ClanLib-0.6.5/Sources/Network/Unix/unix_pipe_connection.h 2008-09-07 13:39:37.000000000 +0200
+@@ -20,14 +20,20 @@
+ #ifndef header_network_delivery_pipe
+ #define header_network_delivery_pipe
+
++#ifndef WIN32
++#include <cerrno>
++#include <cstring>
++#else
++#include <errno.h>
++#include <string.h>
+#endif
++
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
+ #include <netinet/in.h>
#include <unistd.h>
+-#include <errno.h>
+-#include <string.h>
+ #include <list>
- class CL_DirectoryScanner_Unix : public CL_DirectoryScanner_Generic
+ #include "Network/Generic/network_delivery_impl.h"
+diff -up ClanLib-0.6.5/Sources/SmallJPEG/jpgd/main.h.foo ClanLib-0.6.5/Sources/SmallJPEG/jpgd/main.h
+--- ClanLib-0.6.5/Sources/SmallJPEG/jpgd/main.h.foo 2001-04-20 14:54:18.000000000 +0200
++++ ClanLib-0.6.5/Sources/SmallJPEG/jpgd/main.h 2008-09-07 13:39:37.000000000 +0200
+@@ -22,6 +22,15 @@
+ #ifndef MAIN_H
+ #define MAIN_H
+
++#ifndef WIN32
++#include <cstdlib>
++#include <cstdio>
++#include <cmath>
++#include <cstring>
++#include <cctype>
++#include <csetjmp>
++#include <cassert>
++#else
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <math.h>
+@@ -29,6 +38,7 @@
+ #include <ctype.h>
+ #include <setjmp.h>
+ #include <assert.h>
++#endif
+
+ typedef signed char schar; /* 8 bits */
+ typedef unsigned char uchar; /* 8 bits */
+diff -up ClanLib-0.6.5/Sources/Sound/SoundProviders/static_provider_wave.cpp.foo ClanLib-0.6.5/Sources/Sound/SoundProviders/static_provider_wave.cpp
+--- ClanLib-0.6.5/Sources/Sound/SoundProviders/static_provider_wave.cpp.foo 2002-08-14 15:58:29.000000000 +0200
++++ ClanLib-0.6.5/Sources/Sound/SoundProviders/static_provider_wave.cpp 2008-09-07 13:39:37.000000000 +0200
+@@ -27,6 +27,7 @@
+ #include "API/Core/System/error.h"
+ #include "API/Sound/SoundProviders/static_provider_raw.h"
+ #include "API/Sound/SoundProviders/static_provider_wave.h"
++#include "API/Core/IOData/cl_endian.h"
+
+ CL_SoundBuffer *CL_Sample::create(const std::string &sample_id, CL_InputSourceProvider *provider)
+ {
+diff -up ClanLib-0.6.5/Sources/Sound/SoundProviders/stream_provider_wave.cpp.foo ClanLib-0.6.5/Sources/Sound/SoundProviders/stream_provider_wave.cpp
+--- ClanLib-0.6.5/Sources/Sound/SoundProviders/stream_provider_wave.cpp.foo 2002-08-14 16:00:13.000000000 +0200
++++ ClanLib-0.6.5/Sources/Sound/SoundProviders/stream_provider_wave.cpp 2008-09-07 13:39:37.000000000 +0200
+@@ -22,6 +22,7 @@
+
+ #include "API/Core/System/cl_assert.h"
+ #include "API/Core/System/error.h"
++#include "API/Core/IOData/cl_endian.h"
+ #include "API/Core/IOData/inputsource.h"
+ #include "API/Core/IOData/inputsource_provider.h"
+ #include "API/Sound/SoundProviders/stream_provider_wave.h"
+@@ -118,10 +119,13 @@ CL_Streamed_WaveSample_Session::CL_Strea
+ // cl_assert(!(memcmp(temp, "data", 4)));
+
+ sample_size = input->read_uint32();
++ SWAP_IF_BIG(format.nSamplesPerSec);
+ sample_freq = format.nSamplesPerSec;
+
++ SWAP_IF_BIG(format.nAvgBytesPerSec);
+ int bytes_per_sample = format.nAvgBytesPerSec / format.nSamplesPerSec;
+
++ SWAP_IF_BIG(format.nChannels);
+ if (format.nChannels == 2 && bytes_per_sample == 4) sample_format = sf_16bit_signed_stereo;
+ else if (format.nChannels == 2 && bytes_per_sample == 2) sample_format = sf_8bit_signed_stereo;
+ else if (format.nChannels == 1 && bytes_per_sample == 2) sample_format = sf_16bit_signed;
+diff -up ClanLib-0.6.5/configure.in.foo ClanLib-0.6.5/configure.in
+--- ClanLib-0.6.5/configure.in.foo 2008-09-07 13:39:25.000000000 +0200
++++ ClanLib-0.6.5/configure.in 2008-09-07 13:39:37.000000000 +0200
+@@ -217,7 +217,7 @@ dnl CHECK_LIB(ggi,Setup/Tests/ggi.cpp, G
+
+ CHECK_LIB(GL,Setup/Tests/opengl.cpp, OPENGL=enabled, OPENGL=disabled, [$x_libraries -lGL -lGLU -lpthread])
+ CHECK_LIB(mikmod,Setup/Tests/mikmod.cpp, mikmod=enabled, mikmod=disabled, [$x_libraries -lmikmod])
+-CHECK_LIB(png,Setup/Tests/png.cpp, png=enabled, png=disabled, [$x_libraries -lpng])
++CHECK_LIB(png,Setup/Tests/png.cpp, png=enabled, png=disabled, [$x_libraries -lpng -lz])
+ CHECK_LIB(jpeg,Setup/Tests/jpeg.cpp, jpeg=enabled, jpeg=disabled, [$x_libraries -ljpeg])
+ for lib in lua40 lua; do
+ dnl setting back OLDLIBS is needed because of the break
ClanLib-0.6.5-tolua++.patch:
Index: ClanLib-0.6.5-tolua++.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ClanLib06/devel/ClanLib-0.6.5-tolua++.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ClanLib-0.6.5-tolua++.patch 24 Jul 2006 14:03:00 -0000 1.1
+++ ClanLib-0.6.5-tolua++.patch 7 Sep 2008 12:12:32 -0000 1.2
@@ -1,21 +1,7 @@
---- ClanLib-0.6.5/configure.in~ 2006-07-19 22:01:47.000000000 +0200
-+++ ClanLib-0.6.5/configure.in 2006-07-19 22:01:47.000000000 +0200
-@@ -219,10 +219,8 @@
- CHECK_LIB(mikmod,Setup/Tests/mikmod.cpp, mikmod=enabled, mikmod=disabled, [$x_libraries -lmikmod])
- CHECK_LIB(png,Setup/Tests/png.cpp, png=enabled, png=disabled, [$x_libraries -lpng])
- CHECK_LIB(jpeg,Setup/Tests/jpeg.cpp, jpeg=enabled, jpeg=disabled, [$x_libraries -ljpeg])
--for lib in lua40 lua; do
-- dnl setting back OLDLIBS is needed because of the break
-- CHECK_LIB($lib, Setup/Tests/lua.cpp, [ lua=enabled; LIBS="$OLDLIBS"; break ], lua=disabled, [ $x_libraries ])
--done
-+dnl hack force lua
-+lua=enabled
- CHECK_LIB(vorbis,Setup/Tests/vorbis.cpp, VORBIS=enabled, VORBIS=disabled, [$x_libraries -lvorbis])
- for lib in Xxf86vm_pic Xxf86vm; do
- dnl setting back OLDLIBS is needed because of the break
---- ClanLib-0.6.5.orig/Sources/API/Lua/lua.h 2001-09-22 17:52:16.000000000 +0200
-+++ ClanLib-0.6.5/Sources/API/Lua/lua.h 2006-07-19 22:34:06.000000000 +0200
-@@ -47,9 +47,9 @@
+diff -up ClanLib-0.6.5/Sources/API/Lua/lua.h.bar ClanLib-0.6.5/Sources/API/Lua/lua.h
+--- ClanLib-0.6.5/Sources/API/Lua/lua.h.bar 2001-09-22 17:52:16.000000000 +0200
++++ ClanLib-0.6.5/Sources/API/Lua/lua.h 2008-09-07 13:42:06.000000000 +0200
+@@ -47,9 +47,9 @@ public:
//: Init
static void init()
{
@@ -27,7 +13,7 @@
initialized=true;
}
-@@ -65,32 +65,32 @@
+@@ -65,32 +65,32 @@ public:
static int dofile (char *filename)
{
cl_assert(initialized);
@@ -65,3 +51,19 @@
}
};
#endif
+diff -up ClanLib-0.6.5/configure.in.bar ClanLib-0.6.5/configure.in
+--- ClanLib-0.6.5/configure.in.bar 2008-09-07 13:39:37.000000000 +0200
++++ ClanLib-0.6.5/configure.in 2008-09-07 13:42:06.000000000 +0200
+@@ -219,10 +219,8 @@ CHECK_LIB(GL,Setup/Tests/opengl.cpp, OPE
+ CHECK_LIB(mikmod,Setup/Tests/mikmod.cpp, mikmod=enabled, mikmod=disabled, [$x_libraries -lmikmod])
+ CHECK_LIB(png,Setup/Tests/png.cpp, png=enabled, png=disabled, [$x_libraries -lpng -lz])
+ CHECK_LIB(jpeg,Setup/Tests/jpeg.cpp, jpeg=enabled, jpeg=disabled, [$x_libraries -ljpeg])
+-for lib in lua40 lua; do
+- dnl setting back OLDLIBS is needed because of the break
+- CHECK_LIB($lib, Setup/Tests/lua.cpp, [ lua=enabled; LIBS="$OLDLIBS"; break ], lua=disabled, [ $x_libraries ])
+-done
++dnl hack force lua
++lua=enabled
+ CHECK_LIB(vorbis,Setup/Tests/vorbis.cpp, VORBIS=enabled, VORBIS=disabled, [$x_libraries -lvorbis])
+ for lib in Xxf86vm_pic Xxf86vm; do
+ dnl setting back OLDLIBS is needed because of the break
Index: ClanLib06.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ClanLib06/devel/ClanLib06.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ClanLib06.spec 2 Mar 2008 21:51:03 -0000 1.12
+++ ClanLib06.spec 7 Sep 2008 12:12:32 -0000 1.13
@@ -1,7 +1,7 @@
Summary: Version 0.6 of this Cross platform C++ game library
Name: ClanLib06
Version: 0.6.5
-Release: 12%{?dist}
+Release: 13%{?dist}
Group: System Environment/Libraries
License: LGPLv2
URL: http://www.clanlib.org/
@@ -98,6 +98,9 @@
%changelog
+* Sun Sep 7 2008 Hans de Goede <hdegoede at redhat.com> 0.6.5-13
+- Fix patch fuzz build failure
+
* Sun Mar 2 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 0.6.5-12
- Add support for audio output through alsa (original ClanLib only supports
OSS??), this also adds support for using pulseaudio through alsa
More information about the fedora-extras-commits
mailing list