rpms/ClanLib06/devel ClanLib-0.6.5-debian.patch, NONE, 1.1 ClanLib-0.6.5-smalljpg.patch, NONE, 1.1 ClanLib-0.6.5-suse.patch, NONE, 1.1 ClanLib-0.6.5-tolua++.patch, NONE, 1.1 ClanLib06.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Mon Jul 24 14:03:00 UTC 2006
Author: jwrdegoede
Update of /cvs/extras/rpms/ClanLib06/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15774/devel
Modified Files:
.cvsignore sources
Added Files:
ClanLib-0.6.5-debian.patch ClanLib-0.6.5-smalljpg.patch
ClanLib-0.6.5-suse.patch ClanLib-0.6.5-tolua++.patch
ClanLib06.spec
Log Message:
auto-import ClanLib06-0.6.5-3 on branch devel from ClanLib06-0.6.5-3.src.rpm
ClanLib-0.6.5-debian.patch:
--- NEW FILE ClanLib-0.6.5-debian.patch ---
diff -ur ClanLib-0.6.5.orig/Makefile.in ClanLib-0.6.5/Makefile.in
--- ClanLib-0.6.5.orig/Makefile.in 2002-03-29 01:45:30.000000000 +0100
+++ ClanLib-0.6.5/Makefile.in 2006-07-19 20:19:36.000000000 +0200
@@ -118,8 +118,8 @@
clean:
@echo "Cleaning project..."
@if [ -d "Libs" ]; then rm -rf Libs; fi
- @find . -name '*.3' -exec rm "{}" \;
- @find . -name '*.1' -exec rm "{}" \;
+ @#find . -name '*.3' -exec rm "{}" \;
+ @#find . -name '*.1' -exec rm "{}" \;
distclean: clean
@echo "Cleaning configure output, etc..."
diff -ur ClanLib-0.6.5.orig/Setup/Tests/lua.cpp ClanLib-0.6.5/Setup/Tests/lua.cpp
--- ClanLib-0.6.5.orig/Setup/Tests/lua.cpp 2001-12-05 13:57:18.000000000 +0100
+++ ClanLib-0.6.5/Setup/Tests/lua.cpp 2006-07-19 20:19:36.000000000 +0200
@@ -17,7 +17,8 @@
#include <lua.h>
#include <stdio.h>
-#include <tolua.h>
+#include <tolua++.h>
+#include <string.h>
#undef class
int main(int, char**)
diff -ur ClanLib-0.6.5.orig/Setup/Tests/ttf.cpp ClanLib-0.6.5/Setup/Tests/ttf.cpp
--- ClanLib-0.6.5.orig/Setup/Tests/ttf.cpp 2001-09-08 21:24:17.000000000 +0200
+++ ClanLib-0.6.5/Setup/Tests/ttf.cpp 2006-07-19 20:19:36.000000000 +0200
@@ -11,7 +11,9 @@
------------------------------------------------------------------------
*/
-#include <freetype2/freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
int main() {
return 0;
diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.app.in ClanLib-0.6.5/Setup/Unix/Makefile.app.in
--- ClanLib-0.6.5.orig/Setup/Unix/Makefile.app.in 2001-12-24 17:12:59.000000000 +0100
+++ ClanLib-0.6.5/Setup/Unix/Makefile.app.in 2006-07-19 20:19:36.000000000 +0200
@@ -19,6 +19,7 @@
Libs/libclanApp.so: Libs/libclanCore.so $(OBJF_LIB_App)
@echo "Building Libs/libclanApp.so"
+ @echo $(LINK_COMMAND) -Wl,-soname=libclanApp.so.$(D_VERSION_MAJOR) -o Libs/libclanApp.so.$(D_VERSION_MINOR) $(OBJF_LIB_App) -L Libs -lclanCore
@$(LINK_COMMAND) -Wl,-soname=libclanApp.so.$(D_VERSION_MAJOR) -o Libs/libclanApp.so.$(D_VERSION_MINOR) $(OBJF_LIB_App) -L Libs -lclanCore
@ln -s -f libclanApp.so.$(D_VERSION_MINOR) Libs/libclanApp.so.$(D_VERSION_MAJOR)
@ln -s -f libclanApp.so.$(D_VERSION_MAJOR) Libs/libclanApp.so
@@ -26,4 +27,5 @@
Libs/libclanApp.a: $(OBJF_LIB_App)
@echo "Building Libs/libclanApp.a"
- at if [ -e Libs/libclanApp.a ]; then rm -f Libs/libclanApp.a; fi
+ @echo ar qc Libs/libclanApp.a $(OBJF_LIB_App)
@ar qc Libs/libclanApp.a $(OBJF_LIB_App)
diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.conf.in ClanLib-0.6.5/Setup/Unix/Makefile.conf.in
--- ClanLib-0.6.5.orig/Setup/Unix/Makefile.conf.in 2002-04-06 14:54:58.000000000 +0200
+++ ClanLib-0.6.5/Setup/Unix/Makefile.conf.in 2006-07-19 20:19:36.000000000 +0200
@@ -12,6 +12,7 @@
INC_PREFIX = @includedir@
BIN_PREFIX = @bindir@
TARGET_PREFIX = @libdir@/ClanLib
+MAN_PREFIX = @mandir@
INCLUDE_DIRS = -I Sources @x_includes@ @extra_includes@
diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.core.in ClanLib-0.6.5/Setup/Unix/Makefile.core.in
--- ClanLib-0.6.5.orig/Setup/Unix/Makefile.core.in 2002-01-08 22:58:35.000000000 +0100
+++ ClanLib-0.6.5/Setup/Unix/Makefile.core.in 2006-07-19 20:19:36.000000000 +0200
@@ -17,8 +17,9 @@
@install Libs/libclanCore.a $(LIB_PREFIX)
@ln -s -f libclanCore.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanCore.so.$(D_VERSION_MAJOR)
@ln -s -f libclanCore.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanCore.so
- @install -d $(BIN_PREFIX)
+ @install -d $(BIN_PREFIX) $(MAN_PREFIX)/man1/
@install Setup/Unix/clanlib-config $(BIN_PREFIX)
+ @install Setup/Unix/clanlib-config.1 $(MAN_PREFIX)/man1/
OBJF_CORE_GENERIC = \
Libs/Intermediate/cl_assert.o \
@@ -92,6 +93,7 @@
Libs/libclanCore.so: $(OBJF_CORE_ALL)
@echo "Building Libs/libclanCore.so"
+ @echo $(LINK_COMMAND) -Wl,-soname=libclanCore.so.$(D_VERSION_MAJOR) -o Libs/libclanCore.so.$(D_VERSION_MINOR) $(OBJF_CORE_ALL) $(LINK_CORE)
@$(LINK_COMMAND) -Wl,-soname=libclanCore.so.$(D_VERSION_MAJOR) -o Libs/libclanCore.so.$(D_VERSION_MINOR) $(OBJF_CORE_ALL) $(LINK_CORE)
@ln -s -f libclanCore.so.$(D_VERSION_MINOR) Libs/libclanCore.so.$(D_VERSION_MAJOR)
@ln -s -f libclanCore.so.$(D_VERSION_MAJOR) Libs/libclanCore.so
@@ -99,5 +101,6 @@
Libs/libclanCore.a: $(OBJF_CORE_ALL)
@echo "Building Libs/libclanCore.a"
- at if [ -e Libs/libclanCore.a ]; then rm -f Libs/libclanCore.a; fi
+ @echo ar qc Libs/libclanCore.a $(OBJF_CORE_ALL)
@ar qc Libs/libclanCore.a $(OBJF_CORE_ALL)
diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.display.in ClanLib-0.6.5/Setup/Unix/Makefile.display.in
--- ClanLib-0.6.5.orig/Setup/Unix/Makefile.display.in 2001-12-24 17:12:59.000000000 +0100
+++ ClanLib-0.6.5/Setup/Unix/Makefile.display.in 2006-07-19 20:19:36.000000000 +0200
@@ -114,10 +114,11 @@
# $(OBJF_DISP_X11) $(OBJF_DISP_FBDEV)
-LINK_DISP = -L Libs -lclanCore @x_libraries@ -lHermes @directfb_libs@
+LINK_DISP = -L Libs -lclanCore -lclanApp @x_libraries@ -lHermes @directfb_libs@
Libs/libclanDisplay.so: Libs/libclanCore.so $(OBJF_DISP_ALL)
@echo "Building Libs/libclanDisplay.so"
+ @echo $(LINK_COMMAND) -Wl,-soname=libclanDisplay.so.$(D_VERSION_MAJOR) -o Libs/libclanDisplay.so.$(D_VERSION_MINOR) $(OBJF_DISP_ALL) $(LINK_DISP)
@$(LINK_COMMAND) -Wl,-soname=libclanDisplay.so.$(D_VERSION_MAJOR) -o Libs/libclanDisplay.so.$(D_VERSION_MINOR) $(OBJF_DISP_ALL) $(LINK_DISP)
@ln -s -f libclanDisplay.so.$(D_VERSION_MINOR) Libs/libclanDisplay.so.$(D_VERSION_MAJOR)
@ln -s -f libclanDisplay.so.$(D_VERSION_MAJOR) Libs/libclanDisplay.so
@@ -125,4 +126,5 @@
Libs/libclanDisplay.a: $(OBJF_DISP_ALL)
@echo "Building Libs/libclanDisplay.a"
- at if [ -e Libs/libclanDisplay.a ]; then rm -f Libs/libclanDisplay.a; fi
+ @echo ar qc Libs/libclanDisplay.a $(OBJF_DISP_ALL)
@ar qc Libs/libclanDisplay.a $(OBJF_DISP_ALL)
diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.gl.in ClanLib-0.6.5/Setup/Unix/Makefile.gl.in
--- ClanLib-0.6.5.orig/Setup/Unix/Makefile.gl.in 2001-12-24 17:12:59.000000000 +0100
+++ ClanLib-0.6.5/Setup/Unix/Makefile.gl.in 2006-07-19 20:19:36.000000000 +0200
@@ -25,11 +25,13 @@
Libs/libclanGL.so: Libs/libclanCore.so $(OBJF_LIB_GL)
@echo "Building Libs/libclanGL.so"
- @$(LINK_COMMAND) -Wl,-soname=libclanGL.so.$(D_VERSION_MAJOR) -o Libs/libclanGL.so.$(D_VERSION_MINOR) $(OBJF_LIB_GL) -L Libs -lclanDisplay -lGL -lGLU @x_libraries@
+ @echo $(LINK_COMMAND) -Wl,-soname=libclanGL.so.$(D_VERSION_MAJOR) -o Libs/libclanGL.so.$(D_VERSION_MINOR) $(OBJF_LIB_GL) -L Libs -lclanDisplay -lclanApp -lGL -lGLU @x_libraries@
+ @$(LINK_COMMAND) -Wl,-soname=libclanGL.so.$(D_VERSION_MAJOR) -o Libs/libclanGL.so.$(D_VERSION_MINOR) $(OBJF_LIB_GL) -L Libs -lclanDisplay -lclanApp -lGL -lGLU @x_libraries@
@ln -s -f libclanGL.so.$(D_VERSION_MINOR) Libs/libclanGL.so.$(D_VERSION_MAJOR)
@ln -s -f libclanGL.so.$(D_VERSION_MAJOR) Libs/libclanGL.so
Libs/libclanGL.a: Libs/libclanCore.a $(OBJF_LIB_GL)
@echo "Building Libs/libclanGL.a"
- at if [ -e Libs/libclanGL.a ]; then rm -f Libs/libclanGL.a; fi
+ @echo ar qc Libs/libclanGL.a $(OBJF_LIB_GL)
@ar qc Libs/libclanGL.a $(OBJF_LIB_GL)
diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.gui.in ClanLib-0.6.5/Setup/Unix/Makefile.gui.in
--- ClanLib-0.6.5.orig/Setup/Unix/Makefile.gui.in 2002-03-16 18:28:44.000000000 +0100
+++ ClanLib-0.6.5/Setup/Unix/Makefile.gui.in 2006-07-19 20:19:36.000000000 +0200
@@ -84,10 +84,12 @@
Libs/libclanGUI.so: Libs/libclanCore.so $(OBJF_LIB_GUI)
@echo "Building Libs/libclanGUI.so"
- @$(LINK_COMMAND) -Wl,-soname=libclanGUI.so.$(D_VERSION_MAJOR) -o Libs/libclanGUI.so.$(D_VERSION_MINOR) $(OBJF_LIB_GUI) -L Libs -lclanCore
+ @echo $(LINK_COMMAND) -Wl,-soname=libclanGUI.so.$(D_VERSION_MAJOR) -o Libs/libclanGUI.so.$(D_VERSION_MINOR) $(OBJF_LIB_GUI) -L Libs -lclanCore -lclanDisplay
+ @$(LINK_COMMAND) -Wl,-soname=libclanGUI.so.$(D_VERSION_MAJOR) -o Libs/libclanGUI.so.$(D_VERSION_MINOR) $(OBJF_LIB_GUI) -L Libs -lclanCore -lclanDisplay
@ln -s -f libclanGUI.so.$(D_VERSION_MINOR) Libs/libclanGUI.so.$(D_VERSION_MAJOR)
@ln -s -f libclanGUI.so.$(D_VERSION_MAJOR) Libs/libclanGUI.so
Libs/libclanGUI.a: $(OBJF_LIB_GUI)
@echo "Building Libs/libclanGUI.a"
+ @echo ar qc Libs/libclanGUI.a $(OBJF_LIB_GUI)
@ar qc Libs/libclanGUI.a $(OBJF_LIB_GUI)
diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.jpeg.in ClanLib-0.6.5/Setup/Unix/Makefile.jpeg.in
--- ClanLib-0.6.5.orig/Setup/Unix/Makefile.jpeg.in 2001-12-24 17:12:59.000000000 +0100
+++ ClanLib-0.6.5/Setup/Unix/Makefile.jpeg.in 2006-07-19 20:19:36.000000000 +0200
@@ -21,11 +21,13 @@
Libs/libclanJPEG.so: Libs/libclanCore.so $(OBJF_LIB_JPEG)
@echo "Building Libs/libclanJPEG.so"
- @$(LINK_COMMAND) -Wl,-soname=libclanJPEG.so.$(D_VERSION_MAJOR) -o Libs/libclanJPEG.so.$(D_VERSION_MINOR) $(OBJF_LIB_JPEG) -L Libs -lclanCore -ljpeg
+ @echo $(LINK_COMMAND) -Wl,-soname=libclanJPEG.so.$(D_VERSION_MAJOR) -o Libs/libclanJPEG.so.$(D_VERSION_MINOR) $(OBJF_LIB_JPEG) -L Libs -lclanCore -lclanDisplay -ljpeg
+ @$(LINK_COMMAND) -Wl,-soname=libclanJPEG.so.$(D_VERSION_MAJOR) -o Libs/libclanJPEG.so.$(D_VERSION_MINOR) $(OBJF_LIB_JPEG) -L Libs -lclanCore -lclanDisplay -ljpeg
@ln -s -f libclanJPEG.so.$(D_VERSION_MINOR) Libs/libclanJPEG.so.$(D_VERSION_MAJOR)
@ln -s -f libclanJPEG.so.$(D_VERSION_MAJOR) Libs/libclanJPEG.so
Libs/libclanJPEG.a: $(OBJF_LIB_JPEG)
@echo "Building Libs/libclanJPEG.a"
- at if [ -e Libs/libclanJPEG.a ]; then rm -f Libs/libclanJPEG.a; fi
+ @echo ar qc Libs/libclanJPEG.a $(OBJF_LIB_JPEG)
@ar qc Libs/libclanJPEG.a $(OBJF_LIB_JPEG)
diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.lua.in ClanLib-0.6.5/Setup/Unix/Makefile.lua.in
--- ClanLib-0.6.5.orig/Setup/Unix/Makefile.lua.in 2001-12-24 17:12:59.000000000 +0100
+++ ClanLib-0.6.5/Setup/Unix/Makefile.lua.in 2006-07-19 20:22:17.000000000 +0200
@@ -19,12 +19,14 @@
Libs/libclanLua.so: Libs/libclanCore.so $(OBJF_LIB_LUA)
@echo "Building Libs/libclanLua.so"
- @$(LINK_COMMAND) -Wl,-soname=libclanLua.so.$(D_VERSION_MAJOR) -o Libs/libclanLua.so.$(D_VERSION_MINOR) $(OBJF_LIB_LUA) -L Libs -lclanCore -llua -llualib -ltolua
+ @echo $(LINK_COMMAND) -Wl,-soname=libclanLua.so.$(D_VERSION_MAJOR) -o Libs/libclanLua.so.$(D_VERSION_MINOR) $(OBJF_LIB_LUA) -L Libs -lclanCore -lclanDisplay -llua -ltolua++
+ @$(LINK_COMMAND) -Wl,-soname=libclanLua.so.$(D_VERSION_MAJOR) -o Libs/libclanLua.so.$(D_VERSION_MINOR) $(OBJF_LIB_LUA) -L Libs -lclanCore -lclanDisplay -llua -ltolua++
@ln -s -f libclanLua.so.$(D_VERSION_MINOR) Libs/libclanLua.so.$(D_VERSION_MAJOR)
@ln -s -f libclanLua.so.$(D_VERSION_MAJOR) Libs/libclanLua.so
Libs/libclanLua.a: $(OBJF_LIB_LUA)
@echo "Building Libs/libclanLua.a"
- at if [ -e Libs/libclanLua.a ]; then rm -f Libs/libclanLua.a; fi
+ @echo ar qc Libs/libclanLua.a $(OBJF_LIB_LUA)
@ar qc Libs/libclanLua.a $(OBJF_LIB_LUA)
diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.mikmod.in ClanLib-0.6.5/Setup/Unix/Makefile.mikmod.in
--- ClanLib-0.6.5.orig/Setup/Unix/Makefile.mikmod.in 2001-12-24 17:12:59.000000000 +0100
+++ ClanLib-0.6.5/Setup/Unix/Makefile.mikmod.in 2006-07-19 20:19:36.000000000 +0200
@@ -22,11 +22,13 @@
Libs/libclanMikMod.so: Libs/libclanCore.so $(OBJF_LIB_MIKMOD)
@echo "Building Libs/libclanMikMod.so"
- @$(LINK_COMMAND) -Wl,-soname=libclanMikMod.so.$(D_VERSION_MAJOR) -o Libs/libclanMikMod.so.$(D_VERSION_MINOR) $(OBJF_LIB_MIKMOD) -L Libs -lclanCore -lmikmod
+ @echo $(LINK_COMMAND) -Wl,-soname=libclanMikMod.so.$(D_VERSION_MAJOR) -o Libs/libclanMikMod.so.$(D_VERSION_MINOR) $(OBJF_LIB_MIKMOD) -L Libs -lclanCore -lclanSound -lmikmod
+ @$(LINK_COMMAND) -Wl,-soname=libclanMikMod.so.$(D_VERSION_MAJOR) -o Libs/libclanMikMod.so.$(D_VERSION_MINOR) $(OBJF_LIB_MIKMOD) -L Libs -lclanCore -lclanSound -lmikmod
@ln -s -f libclanMikMod.so.$(D_VERSION_MINOR) Libs/libclanMikMod.so.$(D_VERSION_MAJOR)
@ln -s -f libclanMikMod.so.$(D_VERSION_MAJOR) Libs/libclanMikMod.so
Libs/libclanMikMod.a: $(OBJF_LIB_MIKMOD)
@echo "Building Libs/libclanMikMod.a"
- at if [ -e Libs/libclanMikMod.a ]; then rm -f Libs/libclanMikMod.a; fi
+ @echo ar qc Libs/libclanMikMod.a $(OBJF_LIB_MIKMOD)
@ar qc Libs/libclanMikMod.a $(OBJF_LIB_MIKMOD)
diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.mpeg.in ClanLib-0.6.5/Setup/Unix/Makefile.mpeg.in
--- ClanLib-0.6.5.orig/Setup/Unix/Makefile.mpeg.in 2001-12-24 17:12:59.000000000 +0100
+++ ClanLib-0.6.5/Setup/Unix/Makefile.mpeg.in 2006-07-19 20:19:36.000000000 +0200
@@ -19,6 +19,7 @@
Libs/libclanMPEG.so: Libs/libclanCore.so $(OBJF_LIB_MPEG)
@echo "Building Libs/libclanMPEG.so"
+ @echo $(LINK_COMMAND) -Wl,-soname=libclanMPEG.so.$(D_VERSION_MAJOR) -o Libs/libclanMPEG.so.$(D_VERSION_MINOR) $(OBJF_LIB_MPEG) -L Libs -lclanCore
@$(LINK_COMMAND) -Wl,-soname=libclanMPEG.so.$(D_VERSION_MAJOR) -o Libs/libclanMPEG.so.$(D_VERSION_MINOR) $(OBJF_LIB_MPEG) -L Libs -lclanCore
@ln -s -f libclanMPEG.so.$(D_VERSION_MINOR) Libs/libclanMPEG.so.$(D_VERSION_MAJOR)
@ln -s -f libclanMPEG.so.$(D_VERSION_MAJOR) Libs/libclanMPEG.so
@@ -26,4 +27,5 @@
Libs/libclanMPEG.a: $(OBJF_LIB_MPEG)
@echo "Building Libs/libclanMPEG.a"
- at if [ -e Libs/libclanMPEG.a ]; then rm -f Libs/libclanMPEG.a; fi
+ @echo ar qc Libs/libclanMPEG.a $(OBJF_LIB_MPEG)
@ar qc Libs/libclanMPEG.a $(OBJF_LIB_MPEG)
diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.network.in ClanLib-0.6.5/Setup/Unix/Makefile.network.in
--- ClanLib-0.6.5.orig/Setup/Unix/Makefile.network.in 2001-12-24 17:12:59.000000000 +0100
+++ ClanLib-0.6.5/Setup/Unix/Makefile.network.in 2006-07-19 20:19:36.000000000 +0200
@@ -52,6 +52,7 @@
Libs/libclanNetwork.so: Libs/libclanCore.so $(OBJF_LIB_NETWORK)
@echo "Building Libs/libclanNetwork.so"
+ @echo $(LINK_COMMAND) -Wl,-soname=libclanNetwork.so.$(D_VERSION_MAJOR) -o Libs/libclanNetwork.so.$(D_VERSION_MINOR) $(OBJF_LIB_NETWORK) -L Libs -lclanCore
@$(LINK_COMMAND) -Wl,-soname=libclanNetwork.so.$(D_VERSION_MAJOR) -o Libs/libclanNetwork.so.$(D_VERSION_MINOR) $(OBJF_LIB_NETWORK) -L Libs -lclanCore
@ln -s -f libclanNetwork.so.$(D_VERSION_MINOR) Libs/libclanNetwork.so.$(D_VERSION_MAJOR)
@ln -s -f libclanNetwork.so.$(D_VERSION_MAJOR) Libs/libclanNetwork.so
@@ -59,4 +60,5 @@
Libs/libclanNetwork.a: $(OBJF_LIB_NETWORK)
@echo "Building Libs/libclanNetwork.a"
- at if [ -e Libs/libclanNetwork.a ]; then rm -f Libs/libclanNetwork.a; fi
+ @echo ar qc Libs/libclanNetwork.a $(OBJF_LIB_NETWORK)
@ar qc Libs/libclanNetwork.a $(OBJF_LIB_NETWORK)
diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.png.in ClanLib-0.6.5/Setup/Unix/Makefile.png.in
--- ClanLib-0.6.5.orig/Setup/Unix/Makefile.png.in 2002-01-10 21:17:13.000000000 +0100
+++ ClanLib-0.6.5/Setup/Unix/Makefile.png.in 2006-07-19 20:19:36.000000000 +0200
@@ -20,11 +20,13 @@
Libs/libclanPNG.so: Libs/libclanCore.so $(OBJF_LIB_PNG)
@echo "Building Libs/libclanPNG.so"
- @$(LINK_COMMAND) -Wl,-soname=libclanPNG.so.$(D_VERSION_MAJOR) -o Libs/libclanPNG.so.$(D_VERSION_MINOR) $(OBJF_LIB_PNG) -L Libs -lclanCore -lpng
+ @echo $(LINK_COMMAND) -Wl,-soname=libclanPNG.so.$(D_VERSION_MAJOR) -o Libs/libclanPNG.so.$(D_VERSION_MINOR) $(OBJF_LIB_PNG) -L Libs -lclanCore -lclanDisplay -lpng
+ @$(LINK_COMMAND) -Wl,-soname=libclanPNG.so.$(D_VERSION_MAJOR) -o Libs/libclanPNG.so.$(D_VERSION_MINOR) $(OBJF_LIB_PNG) -L Libs -lclanCore -lclanDisplay -lpng
@ln -s -f libclanPNG.so.$(D_VERSION_MINOR) Libs/libclanPNG.so.$(D_VERSION_MAJOR)
@ln -s -f libclanPNG.so.$(D_VERSION_MAJOR) Libs/libclanPNG.so
Libs/libclanPNG.a: $(OBJF_LIB_PNG)
@echo "Building Libs/libclanPNG.a"
- at if [ -e Libs/libclanPNG.a ]; then rm -f Libs/libclanPNG.a; fi
+ @echo ar qc Libs/libclanPNG.a $(OBJF_LIB_PNG)
@ar qc Libs/libclanPNG.a $(OBJF_LIB_PNG)
diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.smalljpeg.in ClanLib-0.6.5/Setup/Unix/Makefile.smalljpeg.in
--- ClanLib-0.6.5.orig/Setup/Unix/Makefile.smalljpeg.in 2002-02-14 06:54:15.000000000 +0100
+++ ClanLib-0.6.5/Setup/Unix/Makefile.smalljpeg.in 2006-07-19 20:19:36.000000000 +0200
@@ -27,6 +27,7 @@
Libs/libclanSmallJPEG.so: Libs/libclanCore.so Libs/libclanDisplay.so $(OBJF_LIB_SMALLJPEG) @small_jpeg_assembly@
@echo "Building Libs/libclanSmallJPEG.so"
+ @echo $(LINK_COMMAND) -Wl,-soname=libclanSmallJPEG.so.$(D_VERSION_MAJOR) -o Libs/libclanSmallJPEG.so.$(D_VERSION_MINOR) $(OBJF_LIB_SMALLJPEG) -L Libs -lclanCore -lclanDisplay
@$(LINK_COMMAND) -Wl,-soname=libclanSmallJPEG.so.$(D_VERSION_MAJOR) -o Libs/libclanSmallJPEG.so.$(D_VERSION_MINOR) $(OBJF_LIB_SMALLJPEG) -L Libs -lclanCore -lclanDisplay
@ln -s -f libclanSmallJPEG.so.$(D_VERSION_MINOR) Libs/libclanSmallJPEG.so.$(D_VERSION_MAJOR)
@ln -s -f libclanSmallJPEG.so.$(D_VERSION_MAJOR) Libs/libclanSmallJPEG.so
@@ -34,4 +35,5 @@
Libs/libclanSmallJPEG.a: $(OBJF_LIB_SMALLJPEG)
@echo "Building Libs/libclanSmallJPEG.a"
- at if [ -e Libs/libclanSmallJPEG.a ]; then rm -f Libs/libclanSmallJPEG.a; fi
+ @echo ar qc Libs/libclanSmallJPEG.a $(OBJF_LIB_SMALLJPEG)
@ar qc Libs/libclanSmallJPEG.a $(OBJF_LIB_SMALLJPEG)
diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.sound.in ClanLib-0.6.5/Setup/Unix/Makefile.sound.in
--- ClanLib-0.6.5.orig/Setup/Unix/Makefile.sound.in 2001-12-24 17:12:59.000000000 +0100
+++ ClanLib-0.6.5/Setup/Unix/Makefile.sound.in 2006-07-19 20:19:36.000000000 +0200
@@ -51,6 +51,7 @@
Libs/libclanSound.so: Libs/libclanCore.so $(OBJF_SOUND_ALL)
@echo "Building Libs/libclanSound.so"
+ @echo $(LINK_COMMAND) -Wl,-soname=libclanSound.so.$(D_VERSION_MAJOR) -o Libs/libclanSound.so.$(D_VERSION_MINOR) $(OBJF_SOUND_ALL) -L Libs -lclanCore
@$(LINK_COMMAND) -Wl,-soname=libclanSound.so.$(D_VERSION_MAJOR) -o Libs/libclanSound.so.$(D_VERSION_MINOR) $(OBJF_SOUND_ALL) -L Libs -lclanCore
@ln -s -f libclanSound.so.$(D_VERSION_MINOR) Libs/libclanSound.so.$(D_VERSION_MAJOR)
@ln -s -f libclanSound.so.$(D_VERSION_MAJOR) Libs/libclanSound.so
@@ -58,4 +59,5 @@
Libs/libclanSound.a: $(OBJF_SOUND_ALL)
@echo "Building Libs/libclanSound.a"
- at if [ -e Libs/libclanSound.a ]; then rm -f Libs/libclanSound.a; fi
+ @echo ar qc Libs/libclanSound.a $(OBJF_SOUND_ALL)
@ar qc Libs/libclanSound.a $(OBJF_SOUND_ALL)
diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.ttf.in ClanLib-0.6.5/Setup/Unix/Makefile.ttf.in
--- ClanLib-0.6.5.orig/Setup/Unix/Makefile.ttf.in 2001-12-24 17:12:59.000000000 +0100
+++ ClanLib-0.6.5/Setup/Unix/Makefile.ttf.in 2006-07-19 20:19:36.000000000 +0200
@@ -22,11 +22,13 @@
Libs/libclanTTF.so: Libs/libclanCore.so $(OBJF_LIB_TTF)
@echo "Building Libs/libclanTTF.so"
- @$(LINK_COMMAND) -Wl,-soname=libclanTTF.so.$(D_VERSION_MAJOR) -o Libs/libclanTTF.so.$(D_VERSION_MINOR) $(OBJF_LIB_TTF) -L Libs -lclanCore -lfreetype
+ @echo $(LINK_COMMAND) -Wl,-soname=libclanTTF.so.$(D_VERSION_MAJOR) -o Libs/libclanTTF.so.$(D_VERSION_MINOR) $(OBJF_LIB_TTF) -L Libs -lclanCore -lclanDisplay -lfreetype
+ @$(LINK_COMMAND) -Wl,-soname=libclanTTF.so.$(D_VERSION_MAJOR) -o Libs/libclanTTF.so.$(D_VERSION_MINOR) $(OBJF_LIB_TTF) -L Libs -lclanCore -lclanDisplay -lfreetype
@ln -s -f libclanTTF.so.$(D_VERSION_MINOR) Libs/libclanTTF.so.$(D_VERSION_MAJOR)
@ln -s -f libclanTTF.so.$(D_VERSION_MAJOR) Libs/libclanTTF.so
Libs/libclanTTF.a: $(OBJF_LIB_TTF)
@echo "Building Libs/libclanTTF.a"
- at if [ -e Libs/libclanTTF.a ]; then rm -f Libs/libclanTTF.a; fi
+ @echo ar qc Libs/libclanTTF.a $(OBJF_LIB_TTF)
@ar qc Libs/libclanTTF.a $(OBJF_LIB_TTF)
diff -ur ClanLib-0.6.5.orig/Setup/Unix/Makefile.vorbis.in ClanLib-0.6.5/Setup/Unix/Makefile.vorbis.in
--- ClanLib-0.6.5.orig/Setup/Unix/Makefile.vorbis.in 2001-12-24 17:12:59.000000000 +0100
+++ ClanLib-0.6.5/Setup/Unix/Makefile.vorbis.in 2006-07-19 20:19:36.000000000 +0200
@@ -20,6 +20,7 @@
Libs/libclanVorbis.so: Libs/libclanCore.so $(OBJF_LIB_VORBIS)
@echo "Building Libs/libclanVorbis.so"
+ @echo $(LINK_COMMAND) -Wl,-soname=libclanVorbis.so.$(D_VERSION_MAJOR) -o Libs/libclanVorbis.so.$(D_VERSION_MINOR) $(OBJF_LIB_VORBIS) -L Libs -lclanCore -lvorbis
@$(LINK_COMMAND) -Wl,-soname=libclanVorbis.so.$(D_VERSION_MAJOR) -o Libs/libclanVorbis.so.$(D_VERSION_MINOR) $(OBJF_LIB_VORBIS) -L Libs -lclanCore -lvorbis
@ln -s -f libclanVorbis.so.$(D_VERSION_MINOR) Libs/libclanVorbis.so.$(D_VERSION_MAJOR)
@ln -s -f libclanVorbis.so.$(D_VERSION_MAJOR) Libs/libclanVorbis.so
@@ -27,4 +28,5 @@
Libs/libclanVorbis.a: $(OBJF_LIB_VORBIS)
@echo "Building Libs/libclanVorbis.a"
- at if [ -e Libs/libclanVorbis.a ]; then rm -f Libs/libclanVorbis.a; fi
+ @echo ar qc Libs/libclanVorbis.a $(OBJF_LIB_VORBIS)
@ar qc Libs/libclanVorbis.a $(OBJF_LIB_VORBIS)
diff -ur ClanLib-0.6.5.orig/Sources/Core/DatafileCompiler/datafile_writer.cpp ClanLib-0.6.5/Sources/Core/DatafileCompiler/datafile_writer.cpp
--- ClanLib-0.6.5.orig/Sources/Core/DatafileCompiler/datafile_writer.cpp 2002-04-06 21:50:45.000000000 +0200
+++ ClanLib-0.6.5/Sources/Core/DatafileCompiler/datafile_writer.cpp 2006-07-19 20:19:36.000000000 +0200
@@ -34,6 +34,7 @@
#endif
#include "datafile_writer.h"
+#include "API/Core/IOData/cl_endian.h"
#ifndef WIN32
#define OPEN_FLAGS O_RDWR | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH
@@ -53,6 +54,7 @@
int index_pos = -1;
write(datafile_fd, datafile_id, strlen(datafile_id));
+ SWAP_IF_BIG(index_pos);
write(datafile_fd, &index_pos, sizeof(int));
}
@@ -60,7 +62,9 @@
{
int index_pos = lseek(datafile_fd, 0, SEEK_CUR);
int num_indexes = indexes.size();
+ int sh, in;
+ SWAP_IF_BIG(num_indexes);
write(datafile_fd, &num_indexes, sizeof(int));
for (
@@ -69,14 +73,21 @@
it++)
{
short name_len = (*it)->name.get_length()+1;
- write(datafile_fd, &name_len, sizeof(short));
+ sh = name_len;
+ SWAP_IF_BIG(sh);
+ write(datafile_fd, &sh, sizeof(short));
write(datafile_fd, (*it)->name, name_len);
- write(datafile_fd, &(*it)->pos, sizeof(int));
- write(datafile_fd, &(*it)->size, sizeof(int));
+ in=(*it)->pos;
+ SWAP_IF_BIG(in);
+ write(datafile_fd, &in, sizeof(int));
+ in=(*it)->size;
+ SWAP_IF_BIG(in);
+ write(datafile_fd, &in, sizeof(int));
delete *it;
}
lseek(datafile_fd, strlen(datafile_id), SEEK_SET);
+ SWAP_IF_BIG(index_pos);
write(datafile_fd, &index_pos, sizeof(int));
close(datafile_fd);
diff -ur ClanLib-0.6.5.orig/Sources/Core/IOData/Generic/datafile_inputprovider.cpp ClanLib-0.6.5/Sources/Core/IOData/Generic/datafile_inputprovider.cpp
--- ClanLib-0.6.5.orig/Sources/Core/IOData/Generic/datafile_inputprovider.cpp 2002-02-28 23:12:56.000000000 +0100
+++ ClanLib-0.6.5/Sources/Core/IOData/Generic/datafile_inputprovider.cpp 2006-07-19 20:19:36.000000000 +0200
@@ -15,6 +15,7 @@
#include "Core/precomp.h"
#include "datafile_inputprovider.h"
#include "API/Core/System/cl_assert.h"
+#include "API/Core/IOData/cl_endian.h"
#ifndef WIN32
#include <unistd.h>
@@ -111,6 +112,7 @@
lseek(datafile_handle, strlen(datafile_id), SEEK_SET); // Skip file ID
int index_pos;
::read(datafile_handle, &index_pos, sizeof(int));
+ SWAP_IF_BIG(index_pos);
lseek(datafile_handle, index_pos, SEEK_SET);
int num_indexes = 0;
@@ -119,6 +121,7 @@
{
short length;
::read(datafile_handle, &length,sizeof(short));
+ SWAP_IF_BIG(length);
char *objname = new char[length];
int objpos;
@@ -126,7 +129,9 @@
::read(datafile_handle, objname, length);
::read(datafile_handle, &objpos, sizeof(int));
+ SWAP_IF_BIG(objpos);
::read(datafile_handle, &objsize, sizeof(int));
+ SWAP_IF_BIG(objsize);
resource_cache->insert(objname, objpos, objsize);
diff -ur ClanLib-0.6.5.orig/Sources/Core/IOData/Generic/inputsource.cpp ClanLib-0.6.5/Sources/Core/IOData/Generic/inputsource.cpp
--- ClanLib-0.6.5.orig/Sources/Core/IOData/Generic/inputsource.cpp 2001-09-10 05:40:32.000000000 +0200
+++ ClanLib-0.6.5/Sources/Core/IOData/Generic/inputsource.cpp 2006-07-19 20:19:36.000000000 +0200
@@ -21,7 +21,7 @@
void CL_InputSource::set_system_mode()
{
- little_endian_mode = true; // fix me: should use whatever endianess the system uses.
+ little_endian_mode = ! CL_Endian::is_system_big();
}
void CL_InputSource::set_big_endian_mode()
@@ -105,6 +105,7 @@
{
bool answer;
if (read(&answer, sizeof(bool)) != sizeof(bool)) throw CL_Error("CL_InputSource_Datafile::read_bool8() failed");
+ SWAP_IF_BIG(answer);
// todo: do endianess converting here, if needed.
return answer;
}
diff -ur ClanLib-0.6.5.orig/Sources/Core/IOData/Generic/outputsource.cpp ClanLib-0.6.5/Sources/Core/IOData/Generic/outputsource.cpp
--- ClanLib-0.6.5.orig/Sources/Core/IOData/Generic/outputsource.cpp 2001-09-08 21:12:44.000000000 +0200
+++ ClanLib-0.6.5/Sources/Core/IOData/Generic/outputsource.cpp 2006-07-19 20:19:36.000000000 +0200
@@ -14,13 +14,14 @@
#include "Core/precomp.h"
#include "API/Core/IOData/outputsource.h"
+#include "API/Core/IOData/cl_endian.h"
/////////////////////////////////////////////////////////////////////////////
// CL_OutputSource operations:
void CL_OutputSource::set_system_mode()
{
- little_endian_mode = true;
+ little_endian_mode = ! CL_Endian::is_system_big();
}
void CL_OutputSource::set_big_endian_mode()
@@ -35,21 +36,25 @@
void CL_OutputSource::write_int32(int data)
{
+ SWAP_IF_BIG(data);
write(&data, sizeof(int));
}
void CL_OutputSource::write_uint32(unsigned int data)
{
+ SWAP_IF_BIG(data);
write(&data, sizeof(unsigned int));
}
void CL_OutputSource::write_short16(short data)
{
+ SWAP_IF_BIG(data);
write(&data, sizeof(short));
}
void CL_OutputSource::write_ushort16(unsigned short data)
{
+ SWAP_IF_BIG(data);
write(&data, sizeof(unsigned short));
}
@@ -65,11 +70,13 @@
void CL_OutputSource::write_float32(float data)
{
+ SWAP_IF_BIG(data);
write(&data, sizeof(float));
}
void CL_OutputSource::write_bool8(bool data)
{
+ SWAP_IF_BIG(data);
write(&data, sizeof(bool));
}
diff -ur ClanLib-0.6.5.orig/Sources/Display/SurfaceProviders/provider_targa.cpp ClanLib-0.6.5/Sources/Display/SurfaceProviders/provider_targa.cpp
--- ClanLib-0.6.5.orig/Sources/Display/SurfaceProviders/provider_targa.cpp 2001-05-13 18:48:58.000000000 +0200
+++ ClanLib-0.6.5/Sources/Display/SurfaceProviders/provider_targa.cpp 2006-07-19 20:19:36.000000000 +0200
@@ -191,8 +191,7 @@
// read or skip the colormap (rgb-palette)
if (colormaptype == 1)
{
- map_length = *((unsigned short *) &file[5]);
- SWAP_IF_BIG(map_length);
+ map_length = file[6] << 8 | file[5];
unsigned char map_size = file[7]>>3;
if (!read_colormap)
@@ -240,13 +239,11 @@
}
// read pitch, height and bits-pr-pixel
- pitch = *((unsigned short *) &file[12]);
- SWAP_IF_BIG(pitch);
+ pitch = file[13] << 8 | file[12];
bounding_left = pitch;
bounding_right = 0;
- height = *((unsigned short *) &file[14]);
- SWAP_IF_BIG(height);
+ height = file[15] << 8 | file[14];
bounding_top = height;
bounding_bottom = 0;
@@ -542,8 +539,7 @@
}
else
{
- entry = *((unsigned short *) &file[pos]);
- SWAP_IF_BIG(entry);
+ entry = file[pos+1] << 8 | file[pos];
pos += 2;
}
diff -ur ClanLib-0.6.5.orig/Sources/GL/GLX/displaycard_glx.h ClanLib-0.6.5/Sources/GL/GLX/displaycard_glx.h
--- ClanLib-0.6.5.orig/Sources/GL/GLX/displaycard_glx.h 2002-02-16 17:10:41.000000000 +0100
+++ ClanLib-0.6.5/Sources/GL/GLX/displaycard_glx.h 2006-07-19 20:19:36.000000000 +0200
@@ -20,6 +20,7 @@
#include "Display/Display/X11/display_xwindow.h"
#include "Display/Display/X11/x11_resolution.h"
#include "GL/Generic/displaycard_gl_generic.h"
+#define GLX_GLXEXT_PROTOTYPES
#include <GL/glx.h>
#include <iostream>
diff -ur ClanLib-0.6.5.orig/Sources/GUI/messagebox_generic.h ClanLib-0.6.5/Sources/GUI/messagebox_generic.h
--- ClanLib-0.6.5.orig/Sources/GUI/messagebox_generic.h 2002-01-16 20:16:51.000000000 +0100
+++ ClanLib-0.6.5/Sources/GUI/messagebox_generic.h 2006-07-19 20:19:36.000000000 +0200
@@ -26,7 +26,7 @@
const std::string &button2,
const std::string &button3);
- CL_MessageBox_Generic::~CL_MessageBox_Generic();
+ ~CL_MessageBox_Generic();
void set_text(const std::string &text);
diff -ur ClanLib-0.6.5.orig/Sources/JPEG/provider_jpeg.cpp ClanLib-0.6.5/Sources/JPEG/provider_jpeg.cpp
--- ClanLib-0.6.5.orig/Sources/JPEG/provider_jpeg.cpp 2002-01-22 11:29:33.000000000 +0100
+++ ClanLib-0.6.5/Sources/JPEG/provider_jpeg.cpp 2006-07-19 20:19:36.000000000 +0200
@@ -17,6 +17,7 @@
#include "API/JPEG/provider_jpeg.h"
#include "provider_jpeg_generic.h"
#include "API/Display/Display/surface.h"
+#include "API/Core/IOData/cl_endian.h"
#include "API/Display/Display/res_surface.h"
CL_Surface *CL_JPEGProvider::create(
diff -ur ClanLib-0.6.5.orig/Sources/JPEG/provider_jpeg_generic.cpp ClanLib-0.6.5/Sources/JPEG/provider_jpeg_generic.cpp
--- ClanLib-0.6.5.orig/Sources/JPEG/provider_jpeg_generic.cpp 2001-11-01 14:56:51.000000000 +0100
+++ ClanLib-0.6.5/Sources/JPEG/provider_jpeg_generic.cpp 2006-07-19 20:19:36.000000000 +0200
@@ -120,12 +120,24 @@
{
jpeg_read_scanlines(&cinfo, buffer, 1);
- for(unsigned int i=0; i < get_pitch(); i += 3)
- {
- image[pitch * (cinfo.output_scanline - 1) + i + 0] = buffer[0][i + 2];
- image[pitch * (cinfo.output_scanline - 1) + i + 1] = buffer[0][i + 1];
- image[pitch * (cinfo.output_scanline - 1) + i + 2] = buffer[0][i + 0];
- }
+ if (CL_Endian::is_system_big())
+ {
+ for(unsigned int i=0; i < get_pitch(); i += 3)
+ {
+ image[pitch * (cinfo.output_scanline - 1) + i + 2] = buffer[0][i + 2];
+ image[pitch * (cinfo.output_scanline - 1) + i + 1] = buffer[0][i + 1];
+ image[pitch * (cinfo.output_scanline - 1) + i + 0] = buffer[0][i + 0];
+ }
+ }
+ else
+ {
+ for(unsigned int i=0; i < get_pitch(); i += 3)
+ {
+ image[pitch * (cinfo.output_scanline - 1) + i + 0] = buffer[0][i + 2];
+ image[pitch * (cinfo.output_scanline - 1) + i + 1] = buffer[0][i + 1];
+ image[pitch * (cinfo.output_scanline - 1) + i + 2] = buffer[0][i + 0];
+ }
+ }
}
}
// Greyscale Image
@@ -135,12 +147,24 @@
{
jpeg_read_scanlines(&cinfo, buffer, 1);
- for(int i=0; i < width; i += 1)
- {
- image[pitch * (cinfo.output_scanline - 1) + 3*i + 0] = buffer[0][i];
- image[pitch * (cinfo.output_scanline - 1) + 3*i + 1] = buffer[0][i];
- image[pitch * (cinfo.output_scanline - 1) + 3*i + 2] = buffer[0][i];
- }
+ if (CL_Endian::is_system_big())
+ {
+ for(int i=0; i < width; i += 1)
+ {
+ image[pitch * (cinfo.output_scanline - 1) + 3*i + 2] = buffer[0][i];
+ image[pitch * (cinfo.output_scanline - 1) + 3*i + 1] = buffer[0][i];
+ image[pitch * (cinfo.output_scanline - 1) + 3*i + 0] = buffer[0][i];
+ }
+ }
+ else
+ {
+ for(int i=0; i < width; i += 1)
+ {
+ image[pitch * (cinfo.output_scanline - 1) + 3*i + 0] = buffer[0][i];
+ image[pitch * (cinfo.output_scanline - 1) + 3*i + 1] = buffer[0][i];
+ image[pitch * (cinfo.output_scanline - 1) + 3*i + 2] = buffer[0][i];
+ }
+ }
}
}
else
diff -ur ClanLib-0.6.5.orig/Sources/PNG/provider_png.cpp ClanLib-0.6.5/Sources/PNG/provider_png.cpp
--- ClanLib-0.6.5.orig/Sources/PNG/provider_png.cpp 2002-03-23 08:09:26.000000000 +0100
+++ ClanLib-0.6.5/Sources/PNG/provider_png.cpp 2006-07-19 20:19:36.000000000 +0200
@@ -26,6 +26,7 @@
#include "API/Display/Display/res_surface.h"
#include "API/Core/Resources/resourceoptions.h"
#include "API/Core/System/error.h"
+#include "API/Core/IOData/cl_endian.h"
#include "API/PNG/provider_png.h"
// Workaround for a VC bug
@@ -220,23 +221,49 @@
if (!ignore_alphachannel)
{
- for (int i = 0; i < pitch * height; i += 4)
- {
- image[i + 0] = tmp_image[i + 3];
- image[i + 1] = tmp_image[i + 2];
- image[i + 2] = tmp_image[i + 1];
- image[i + 3] = tmp_image[i + 0];
- }
+ if (CL_Endian::is_system_big())
+ {
+ for (int i = 0; i < pitch * height; i += 4)
+ {
+ image[i + 3] = tmp_image[i + 3];
+ image[i + 2] = tmp_image[i + 2];
+ image[i + 1] = tmp_image[i + 1];
+ image[i + 0] = tmp_image[i + 0];
+ }
+ }
+ else
+ {
+ for (int i = 0; i < pitch * height; i += 4)
+ {
+ image[i + 0] = tmp_image[i + 3];
+ image[i + 1] = tmp_image[i + 2];
+ image[i + 2] = tmp_image[i + 1];
+ image[i + 3] = tmp_image[i + 0];
+ }
+ }
}
else
{
- for (int i = 0; i < pitch * height; i += 4)
- {
- image[i + 0] = 255;
- image[i + 1] = tmp_image[i + 2];
- image[i + 2] = tmp_image[i + 1];
- image[i + 3] = tmp_image[i + 0];
- }
+ if (CL_Endian::is_system_big())
+ {
+ for (int i = 0; i < pitch * height; i += 4)
+ {
+ image[i + 3] = 255;
+ image[i + 2] = tmp_image[i + 2];
+ image[i + 1] = tmp_image[i + 1];
+ image[i + 0] = tmp_image[i + 0];
+ }
+ }
+ else
+ {
+ for (int i = 0; i < pitch * height; i += 4)
+ {
+ image[i + 0] = 255;
+ image[i + 1] = tmp_image[i + 2];
+ image[i + 2] = tmp_image[i + 1];
+ image[i + 3] = tmp_image[i + 0];
+ }
+ }
}
delete[] tmp_image;
@@ -265,13 +292,26 @@
delete[] row_pointers;
image = new unsigned char[height * pitch];
- // Coverting the data in the tmp buffer to our final data
- for (int i = 0; i < rowbytes * height; i++)
- {
- image[3*i + 0] = tmp_image[i];
- image[3*i + 1] = tmp_image[i];
- image[3*i + 2] = tmp_image[i];
- }
+
+ if (CL_Endian::is_system_big())
+ {
+ // Coverting the data in the tmp buffer to our final data
+ for (int i = 0; i < rowbytes * height; i++)
+ {
+ image[3*i + 2] = tmp_image[i];
+ image[3*i + 1] = tmp_image[i];
+ image[3*i + 0] = tmp_image[i];
+ }
+ }
+ else
+ {
+ for (int i = 0; i < rowbytes * height; i++)
+ {
+ image[3*i + 0] = tmp_image[i];
+ image[3*i + 1] = tmp_image[i];
+ image[3*i + 2] = tmp_image[i];
+ }
+ }
delete[] tmp_image;
}
@@ -298,25 +338,52 @@
// Creating the final image out of tmp_image
image = new unsigned char[width * pitch];
+
if (!ignore_alphachannel)
{
- for (int i = 0; i < rowbytes * height; i += 2)
- {
- image[2*i + 0] = tmp_image[i + 1];
- image[2*i + 1] = tmp_image[i + 0];
- image[2*i + 2] = tmp_image[i + 0];
- image[2*i + 3] = tmp_image[i + 0];
- }
+ if (CL_Endian::is_system_big())
+ {
+ for (int i = 0; i < rowbytes * height; i += 2)
+ {
+ image[2*i + 3] = tmp_image[i + 1];
+ image[2*i + 2] = tmp_image[i + 0];
+ image[2*i + 1] = tmp_image[i + 0];
+ image[2*i + 0] = tmp_image[i + 0];
+ }
+ }
+ else
+ {
+ for (int i = 0; i < rowbytes * height; i += 2)
+ {
+ image[2*i + 0] = tmp_image[i + 1];
+ image[2*i + 1] = tmp_image[i + 0];
+ image[2*i + 2] = tmp_image[i + 0];
+ image[2*i + 3] = tmp_image[i + 0];
+ }
+ }
}
else
{
- for (int i = 0; i < rowbytes * height; i += 2)
- {
- image[2*i + 0] = 255;
- image[2*i + 1] = tmp_image[i + 0];
- image[2*i + 2] = tmp_image[i + 0];
- image[2*i + 3] = tmp_image[i + 0];
- }
+ if (CL_Endian::is_system_big())
+ {
+ for (int i = 0; i < rowbytes * height; i += 2)
+ {
+ image[2*i + 3] = 255;
+ image[2*i + 2] = tmp_image[i + 0];
+ image[2*i + 1] = tmp_image[i + 0];
+ image[2*i + 0] = tmp_image[i + 0];
+ }
+ }
+ else
+ {
+ for (int i = 0; i < rowbytes * height; i += 2)
+ {
+ image[2*i + 0] = 255;
+ image[2*i + 1] = tmp_image[i + 0];
+ image[2*i + 2] = tmp_image[i + 0];
+ image[2*i + 3] = tmp_image[i + 0];
+ }
+ }
}
delete[] tmp_image;
diff -ur ClanLib-0.6.5.orig/Sources/TTF/font_ttf.cpp ClanLib-0.6.5/Sources/TTF/font_ttf.cpp
--- ClanLib-0.6.5.orig/Sources/TTF/font_ttf.cpp 2002-01-15 17:18:48.000000000 +0100
+++ ClanLib-0.6.5/Sources/TTF/font_ttf.cpp 2006-07-19 20:19:36.000000000 +0200
@@ -21,7 +21,8 @@
#include <malloc.h>
#include "Display/Font/font_generic.h"
-#include <freetype/freetype.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
#include "font_ttf.h"
diff -ur ClanLib-0.6.5.orig/configure.in ClanLib-0.6.5/configure.in
--- ClanLib-0.6.5.orig/configure.in 2002-08-05 20:00:03.000000000 +0200
+++ ClanLib-0.6.5/configure.in 2006-07-19 20:19:36.000000000 +0200
@@ -72,8 +72,8 @@
dnl Check system endianess: (note: ClanLib is _not_ endian clean right now)
dnl -----------------------------------------------------------------------
-dnl AC_C_BIGENDIAN
-dnl AC_CHECK_SIZEOF(int, 4)
+AC_C_BIGENDIAN
+AC_CHECK_SIZEOF(int, 4)
if test "$ac_cv_sizeof_int" = "8"; then
AC_DEFINE(USE_64BIT)
--- ClanLib-0.6.2/Setup/Unix/clanlib-config.1.orig
+++ ClanLib-0.6.2/Setup/Unix/clanlib-config.1
@@ -0,0 +1,33 @@
+.\" Hey, Emacs! This is an -*- nroff -*- source file.
+.\"
+.\" This manpage is in the public domain.
+.\"
+
+.TH clanlib-config 1 "12 Aug 2001" "" "ClanLib Game SDK"
+
+.SH NAME
+clanlib\-config \- clanlib development helper script
+
+.SH SYNOPSIS
+clanlib-config
+[ \fB--cflags\fP ]
+[ \fB--libs\fP ]
+[ \fB--version\fP ]
+
+.SH DESCRIPTION
+.I clanlib\-config
+is a script to help in building applications using the ClanLib Game SDK.
+It can be used to automatically set build flags such as directory where
+ClanLib headers are located or the exact name of the ClanLib library your
+application should link with.
+
+.SH AUTHOR
+Filip Van Raemdonck (mechanix at debian.org) wrote this manpage for the Debian
+prepackaged version of ClanLib, but it may be used by others.
+
+.SH SEE ALSO
+.BR libmikmod-config
+(1),
+.BR trophy
+(6)
+
ClanLib-0.6.5-smalljpg.patch:
--- NEW FILE ClanLib-0.6.5-smalljpg.patch ---
diff -ur ClanLib-0.6.5.orig/Sources/SmallJPEG/jpgd/jpegdecoder.cpp ClanLib-0.6.5/Sources/SmallJPEG/jpgd/jpegdecoder.cpp
--- ClanLib-0.6.5.orig/Sources/SmallJPEG/jpgd/jpegdecoder.cpp 2001-04-25 18:14:41.000000000 +0200
+++ ClanLib-0.6.5/Sources/SmallJPEG/jpgd/jpegdecoder.cpp 2006-07-20 12:25:34.000000000 +0200
@@ -102,7 +102,7 @@
blocks[i] = q;
// Round to qword boundry, to avoid misaligned accesses with MMX code
- return ((void *)(((uint)q + 7) & ~7));
+ return ((void *)(((unsigned long)q + 7) & ~7));
}
//------------------------------------------------------------------------------
// Clear buffer to word values.
@@ -1870,7 +1870,7 @@
q = (uchar *)alloc(max_blocks_per_row * 64 * sizeof(BLOCK_TYPE) + 8);
// Align to 8-byte boundry, for MMX code
- q = (uchar *)(((uint)q + 7) & ~7);
+ q = (uchar *)(((unsigned long)q + 7) & ~7);
// The block_seg[] array's name dates back to the
// 16-bit assembler implementation. "seg" stood for "segment".
@@ -1880,7 +1880,7 @@
for (i = 0; i < max_blocks_per_row; i++)
block_max_zag_set[i] = 64;
- Psample_buf = (uchar *)(((uint)alloc(max_blocks_per_row * 64 + 8) + 7) & ~7);
+ Psample_buf = (uchar *)(((unsigned long)alloc(max_blocks_per_row * 64 + 8) + 7) & ~7);
total_lines_left = image_y_size;
diff -ur ClanLib-0.6.5.orig/Sources/SmallJPEG/jpgd/jpegdecoder.h ClanLib-0.6.5/Sources/SmallJPEG/jpgd/jpegdecoder.h
--- ClanLib-0.6.5.orig/Sources/SmallJPEG/jpgd/jpegdecoder.h 2001-05-07 10:36:59.000000000 +0200
+++ ClanLib-0.6.5/Sources/SmallJPEG/jpgd/jpegdecoder.h 2006-07-20 12:24:08.000000000 +0200
@@ -493,26 +493,26 @@
void find_eoi(void);
//------------------
- /*inline*/ uint jpeg_decoder::rol(uint i, uchar j);
- /*inline*/ uint jpeg_decoder::get_char(void);
- /*inline*/ uint jpeg_decoder::get_char(bool *Ppadding_flag);
- /*inline*/ void jpeg_decoder::stuff_char(uchar q);
- /*inline*/ uchar jpeg_decoder::get_octet(void);
- /*inline*/ uint jpeg_decoder::get_bits_1(int num_bits);
- /*inline*/ uint jpeg_decoder::get_bits_2(int numbits);
- /*inline*/ int jpeg_decoder::huff_decode(Phuff_tables_t Ph);
+ /*inline*/ uint rol(uint i, uchar j);
+ /*inline*/ uint get_char(void);
+ /*inline*/ uint get_char(bool *Ppadding_flag);
+ /*inline*/ void stuff_char(uchar q);
+ /*inline*/ uchar get_octet(void);
+ /*inline*/ uint get_bits_1(int num_bits);
+ /*inline*/ uint get_bits_2(int numbits);
+ /*inline*/ int huff_decode(Phuff_tables_t Ph);
#ifdef SUPPORT_X86ASM
- /*inline*/ uint jpeg_decoder::huff_extend(uint i, int c);
+ /*inline*/ uint huff_extend(uint i, int c);
#endif
- /*inline*/ uchar jpeg_decoder::clamp(int i);
+ /*inline*/ uchar clamp(int i);
#ifdef SUPPORT_MMX
- /*inline*/ uint jpeg_decoder::get_high_byte_mmx(void);
- /*inline*/ uint jpeg_decoder::get_high_word_mmx(void);
- /*inline*/ void jpeg_decoder::get_bits_2_mmx_init(void);
- /*inline*/ void jpeg_decoder::get_bits_2_mmx_deinit(void);
- /*inline*/ uint jpeg_decoder::get_bits_2_mmx(int numbits);
- /*inline*/ int jpeg_decoder::huff_decode_mmx(Phuff_tables_t Ph);
+ /*inline*/ uint get_high_byte_mmx(void);
+ /*inline*/ uint get_high_word_mmx(void);
+ /*inline*/ void get_bits_2_mmx_init(void);
+ /*inline*/ void get_bits_2_mmx_deinit(void);
+ /*inline*/ uint get_bits_2_mmx(int numbits);
+ /*inline*/ int huff_decode_mmx(Phuff_tables_t Ph);
#endif
//------------------
int image_x_size;
ClanLib-0.6.5-suse.patch:
--- NEW FILE ClanLib-0.6.5-suse.patch ---
--- 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
@@ -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/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/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
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 @@
BIN_PREFIX = @bindir@
TARGET_PREFIX = @libdir@/ClanLib
MAN_PREFIX = @mandir@
-
+DESTDIR =
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 @@
@echo "Compiling $<"
- at if [ ! -d Libs ]; then mkdir Libs; fi
- at if [ ! -d Libs/Intermediate ]; then mkdir Libs/Intermediate; fi
- @$(CXX_COMMAND) $< -o $@
+ $(CXX_COMMAND) $< -o $@
Libs/Intermediate/%.o : %.c
@echo "Compiling $<"
- at if [ ! -d Libs ]; then mkdir Libs; fi
- at if [ ! -d Libs/Intermediate ]; then mkdir Libs/Intermediate; fi
- @$(CC_COMMAND) -c $< -o $@
+ $(CC_COMMAND) -c $< -o $@
Libs/Intermediate/%.o : %.s
@echo "Assembling $<"
- at if [ ! -d Libs ]; then mkdir Libs; fi
- at if [ ! -d Libs/Intermediate ]; then mkdir Libs/Intermediate; fi
- @$(AS_COMMAND) $< -o $@
+ $(AS_COMMAND) $< -o $@
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
@@ -5,21 +5,21 @@
clanCore: build_info Libs/libclanCore.so Libs/libclanCore.a
installCore: clanCore
- @for i in `find Sources/API/Core -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
- @for i in `find Sources/API/Core -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(INC_PREFIX)/ClanLib/$$i; done
- @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/core.h $(INC_PREFIX)/ClanLib/core.h
- @install -m 0644 Sources/API/sound.h $(INC_PREFIX)/ClanLib/sound.h
- @install -m 0644 Sources/API/efence.h $(INC_PREFIX)/ClanLib/efence.h
- @install -d $(LIB_PREFIX)
- @install Libs/libclanCore.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
- @install Libs/libclanCore.a $(LIB_PREFIX)
- @ln -s -f libclanCore.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanCore.so.$(D_VERSION_MAJOR)
- @ln -s -f libclanCore.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanCore.so
- @install -d $(BIN_PREFIX) $(MAN_PREFIX)/man1/
- @install Setup/Unix/clanlib-config $(BIN_PREFIX)
- @install Setup/Unix/clanlib-config.1 $(MAN_PREFIX)/man1/
+ @for i in `find Sources/API/Core -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
+ @for i in `find Sources/API/Core -type f | grep -v CVS | sed "s/Sources\/API\///;"`; do install -m 0644 Sources/API/$$i $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
+ @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/core.h $(DESTDIR)$(INC_PREFIX)/ClanLib/core.h
+ @install -m 0644 Sources/API/sound.h $(DESTDIR)$(INC_PREFIX)/ClanLib/sound.h
+ @install -m 0644 Sources/API/efence.h $(DESTDIR)$(INC_PREFIX)/ClanLib/efence.h
+ @install -d $(DESTDIR)$(LIB_PREFIX)
+ @install Libs/libclanCore.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
+ @install Libs/libclanCore.a $(DESTDIR)$(LIB_PREFIX)
+ @ln -s -f libclanCore.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanCore.so.$(D_VERSION_MAJOR)
+ @ln -s -f libclanCore.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanCore.so
+ @install -d $(DESTDIR)$(BIN_PREFIX) $(DESTDIR)$(MAN_PREFIX)/man1/
+ @install Setup/Unix/clanlib-config $(DESTDIR)$(BIN_PREFIX)
+ @install Setup/Unix/clanlib-config.1 $(DESTDIR)$(MAN_PREFIX)/man1/
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
@@ -4,14 +4,14 @@
clanDisplay: Libs/libclanDisplay.so Libs/libclanDisplay.a
installDisplay: clanDisplay
- @for i in `find Sources/API/Display -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
- @for i in `find Sources/API/Display -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/display.h $(INC_PREFIX)/ClanLib/display.h
- @install -d $(LIB_PREFIX)
- @install Libs/libclanDisplay.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
- @install Libs/libclanDisplay.a $(LIB_PREFIX)
- @ln -s -f libclanDisplay.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanDisplay.so.$(D_VERSION_MAJOR)
- @ln -s -f libclanDisplay.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanDisplay.so
+ @for i in `find Sources/API/Display -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
+ @for i in `find Sources/API/Display -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/display.h $(DESTDIR)$(INC_PREFIX)/ClanLib/display.h
+ @install -d $(DESTDIR)$(LIB_PREFIX)
+ @install Libs/libclanDisplay.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
+ @install Libs/libclanDisplay.a $(DESTDIR)$(LIB_PREFIX)
+ @ln -s -f libclanDisplay.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanDisplay.so.$(D_VERSION_MAJOR)
+ @ln -s -f libclanDisplay.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanDisplay.so
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
@@ -5,14 +5,14 @@
clanGL: Libs/libclanGL.so Libs/libclanGL.a
installGL: clanGL
- @for i in `find Sources/API/GL -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
- @for i in `find Sources/API/GL -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/gl.h $(INC_PREFIX)/ClanLib/gl.h
- @install -d $(LIB_PREFIX)
- @install Libs/libclanGL.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
- @install Libs/libclanGL.a $(LIB_PREFIX)
- @ln -s -f libclanGL.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanGL.so.$(D_VERSION_MAJOR)
- @ln -s -f libclanGL.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanGL.so
+ @for i in `find Sources/API/GL -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
+ @for i in `find Sources/API/GL -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/gl.h $(DESTDIR)$(INC_PREFIX)/ClanLib/gl.h
+ @install -d $(DESTDIR)$(LIB_PREFIX)
+ @install Libs/libclanGL.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
+ @install Libs/libclanGL.a $(DESTDIR)$(LIB_PREFIX)
+ @ln -s -f libclanGL.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanGL.so.$(D_VERSION_MAJOR)
+ @ln -s -f libclanGL.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanGL.so
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
@@ -5,14 +5,14 @@
clanNetwork: Libs/libclanNetwork.so Libs/libclanNetwork.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
- @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 -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
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
@@ -5,14 +5,14 @@
clanLua: Libs/libclanLua.so Libs/libclanLua.a
installLua: clanLua
- @for i in `find Sources/API/Lua -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
- @for i in `find Sources/API/Lua -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/lua.h $(INC_PREFIX)/ClanLib/lua.h
- @install -d $(LIB_PREFIX)
- @install Libs/libclanLua.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
- @install Libs/libclanLua.a $(LIB_PREFIX)
- @ln -s -f libclanLua.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanLua.so.$(D_VERSION_MAJOR)
- @ln -s -f libclanLua.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanLua.so
+ @for i in `find Sources/API/Lua -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
+ @for i in `find Sources/API/Lua -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/lua.h $(DESTDIR)$(INC_PREFIX)/ClanLib/lua.h
+ @install -d $(DESTDIR)$(LIB_PREFIX)
+ @install Libs/libclanLua.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
+ @install Libs/libclanLua.a $(DESTDIR)$(LIB_PREFIX)
+ @ln -s -f libclanLua.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanLua.so.$(D_VERSION_MAJOR)
+ @ln -s -f libclanLua.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanLua.so
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
@@ -5,14 +5,14 @@
clanMikMod: Libs/libclanMikMod.so Libs/libclanMikMod.a
installMikMod: clanMikMod
- @for i in `find Sources/API/MikMod -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
- @for i in `find Sources/API/MikMod -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/mikmod.h $(INC_PREFIX)/ClanLib/mikmod.h
- @install -d $(LIB_PREFIX)
- @install Libs/libclanMikMod.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
- @install Libs/libclanMikMod.a $(LIB_PREFIX)
- @ln -s -f libclanMikMod.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanMikMod.so.$(D_VERSION_MAJOR)
- @ln -s -f libclanMikMod.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanMikMod.so
+ @for i in `find Sources/API/MikMod -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
+ @for i in `find Sources/API/MikMod -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/mikmod.h $(DESTDIR)$(INC_PREFIX)/ClanLib/mikmod.h
+ @install -d $(DESTDIR)$(LIB_PREFIX)
+ @install Libs/libclanMikMod.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
+ @install Libs/libclanMikMod.a $(DESTDIR)$(LIB_PREFIX)
+ @ln -s -f libclanMikMod.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanMikMod.so.$(D_VERSION_MAJOR)
+ @ln -s -f libclanMikMod.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanMikMod.so
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
@@ -5,14 +5,14 @@
clanMPEG: Libs/libclanMPEG.so Libs/libclanMPEG.a
installMPEG: clanMPEG
- @for i in `find Sources/API/MPEG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(INC_PREFIX)/ClanLib/$$i; done
- @for i in `find Sources/API/MPEG -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/mpeg.h $(INC_PREFIX)/ClanLib/mpeg.h
- @install -d $(LIB_PREFIX)
- @install Libs/libclanMPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)
- @install Libs/libclanMPEG.a $(LIB_PREFIX)
- @ln -s -f libclanMPEG.so.$(D_VERSION_MINOR) $(LIB_PREFIX)/libclanMPEG.so.$(D_VERSION_MAJOR)
- @ln -s -f libclanMPEG.so.$(D_VERSION_MAJOR) $(LIB_PREFIX)/libclanMPEG.so
+ @for i in `find Sources/API/MPEG -type d | grep -v CVS | sed "s/Sources\/API\///;"`; do install -d $(DESTDIR)$(INC_PREFIX)/ClanLib/$$i; done
+ @for i in `find Sources/API/MPEG -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/mpeg.h $(DESTDIR)$(INC_PREFIX)/ClanLib/mpeg.h
+ @install -d $(DESTDIR)$(LIB_PREFIX)
+ @install Libs/libclanMPEG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)
+ @install Libs/libclanMPEG.a $(DESTDIR)$(LIB_PREFIX)
+ @ln -s -f libclanMPEG.so.$(D_VERSION_MINOR) $(DESTDIR)$(LIB_PREFIX)/libclanMPEG.so.$(D_VERSION_MAJOR)
+ @ln -s -f libclanMPEG.so.$(D_VERSION_MAJOR) $(DESTDIR)$(LIB_PREFIX)/libclanMPEG.so
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
@@ -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 \
--- 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
@@ -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 = \
--- 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
+#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>
#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 @@
#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>
--- 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
+#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
+#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
+#ifndef WIN32
+#include <cstddef>
+#else
#include <stddef.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 WIN32
+#include <cstdlib>
+#else
#include <stdlib.h>
+#endif
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
+#ifndef WIN32
+#include <cstdlib>
+#else
#include <stdlib.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 @@
#ifndef WIN32
-#include <stdlib.h>
+#include <cstdlib>
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 @@
case 15:
case 16:
{
- unsigned short *ptr =
- (unsigned short *) m_provider->get_data();
+ unsigned char *ptr =
+ (unsigned char *) m_provider->get_data();
for (int x=0; x<width; x++)
{
- dest[x] = (unsigned char) (ptr[x+y*width]&255);
+ dest[x] = ptr[(x+y*width)*2];
}
}
return;
case 32:
{
- unsigned int *ptr =
- (unsigned int *) m_provider->get_data();
+ unsigned char *ptr =
+ (unsigned char *) m_provider->get_data();
for (int x=0; x<width; x++)
{
- dest[x] = (unsigned char) (ptr[x+y*width]&255);
+ dest[x] = ptr[(x+y*width)*4];
}
}
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 @@
#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
+#ifndef WIN32
+#include <cmath>
+#else
#include <math.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
//: 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 @@
#include <string>
#include <stack>
+#ifndef WIN32
+#include <cstdio>
+#else
#include <stdio.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
@@ -20,7 +20,11 @@
#define header_slot
#include "slot_generic.h"
+#ifndef WIN32
+#include <cstdlib>
+#else
#include <stdlib.h>
+#endif
//: 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"
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 @@
#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)));
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;
--- 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
+#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 @@
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;
}
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 @@
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));
// 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;
T amix =
- (r<<rstart) +
- (g<<gstart) +
- (b<<bstart);
+ (r<<this->rstart) +
+ (g<<this->gstart) +
+ (b<<this->bstart);
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 <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();
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;
--- 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 @@
unsigned int CL_Target_DirectFB::get_width() const
{
- unsigned int width = 0;
+ int width = 0;
surface->GetSize (surface, &width, NULL);
@@ -113,7 +113,7 @@
unsigned int CL_Target_DirectFB::get_height() const
{
- unsigned int height = 0;
+ int height = 0;
surface->GetSize (surface, NULL, &height);
@@ -147,7 +147,7 @@
{
case DSPF_A8:
return 0;
- case DSPF_RGB15:
+ case DSPF_ARGB1555:
return 0x007c00;
case DSPF_RGB16:
return 0x00f800;
@@ -170,7 +170,7 @@
{
case DSPF_A8:
return 0;
- case DSPF_RGB15:
+ case DSPF_ARGB1555:
return 0x0003e0;
case DSPF_RGB16:
return 0x0007e0;
@@ -193,7 +193,7 @@
{
case DSPF_A8:
return 0;
- case DSPF_RGB15:
+ case DSPF_ARGB1555:
case DSPF_RGB16:
return 0x00001f;
case DSPF_RGB24:
@@ -215,7 +215,7 @@
{
case DSPF_A8:
return 0xff;
- case DSPF_RGB15:
+ case DSPF_ARGB1555:
case DSPF_RGB16:
case DSPF_RGB24:
case DSPF_RGB32:
@@ -263,7 +263,7 @@
void CL_Target_DirectFB::Clear (float r, float g, float b, float a)
{
- unsigned int width, height;
+ int width, height;
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
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <iostream>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
+#include <cmath>
-#include <math.h>
+#include <iostream>
#include <API/Display/Display/mousecursor.h>
#include <API/Display/Display/cliprect.h>
@@ -177,7 +177,7 @@
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);
}
--- 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 @@
class FileConfig : public BaseConfig
{
+protected: class ConfigGroup; /* prototype for later definition */
public:
/** @name Constructors and destructor */
//@{
@@ -527,7 +528,6 @@
//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>
+#ifndef WIN32
+#include <cstdio>
+#else
+#include <cstdio>
+#endif
#include <unistd.h>
class CL_DirectoryScanner_Unix : public CL_DirectoryScanner_Generic
ClanLib-0.6.5-tolua++.patch:
--- NEW FILE ClanLib-0.6.5-tolua++.patch ---
--- 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 @@
//: Init
static void init()
{
- state=lua_open(0);
+ state=lua_open();
tolua_clanbindings_open(state);
- lua_baselibopen(state);
+ luaopen_base(state);
initialized=true;
}
@@ -65,32 +65,32 @@
static int dofile (char *filename)
{
cl_assert(initialized);
- return lua_dofile(state,filename);
+ return luaL_dofile(state,filename);
}
//: Open the IO library
- static void iolibopen(void) { lua_iolibopen(state); }
+ static void iolibopen(void) { luaopen_io(state); }
//: Open the string library
static void strlibopen(void)
{
cl_assert(initialized);
- lua_strlibopen(state);
+ luaopen_string(state);
}
//: Open the math library
static void mathlibopen(void)
{
cl_assert(initialized);
- lua_mathlibopen(state);
+ luaopen_math(state);
}
//: Open the db library
static void dblibopen(void)
{
cl_assert(initialized);
- lua_dblibopen(state);
+ luaopen_debug(state);
}
};
#endif
--- NEW FILE ClanLib06.spec ---
Summary: Version 0.6 of this Cross platform C++ game library
Name: ClanLib06
Version: 0.6.5
Release: 3%{?dist}
Group: System Environment/Libraries
License: LGPL
URL: http://www.clanlib.org/
Source0: http://www.clanlib.org/download/legacy/ClanLib-%{version}-1.tar.gz
Patch0: ClanLib-0.6.5-debian.patch
Patch1: ClanLib-0.6.5-suse.patch
Patch2: ClanLib-0.6.5-tolua++.patch
Patch3: ClanLib-0.6.5-smalljpg.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libvorbis-devel libpng-devel libjpeg-devel mikmod-devel perl
BuildRequires: tolua++-devel Hermes-devel libX11-devel libXext-devel
BuildRequires: libICE-devel libXxf86vm-devel xorg-x11-proto-devel autoconf
Provides: clanlib06 = %{version}-%{release}
%description
Version 0.6 of this cross platform C++ game library, which is still used
by many games.
%package devel
Summary: Development Libraries and Headers for ClanLib 0.6
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Provides: clanlib06-devel = %{version}-%{release}
%description devel
ClanLib 0.6 development headers and libraries
%prep
%setup -q -n ClanLib-%{version}
%patch0 -p1 -z .deb
%patch1 -p1 -z .suse
%patch2 -p1 -z .tolua++
%patch3 -p1 -z .smalljpg
# mark asm files as NOT needing execstack
for i in `find Sources -name '*.s'`; do
echo '.section .note.GNU-stack,"", at progbits' >> $i
done
autoconf
%build
%ifarch %{ix86}
ARCH_CONFIG_FLAGS=--enable-asm386
%endif
%configure --disable-dependency-tracking --disable-debug --enable-dyn \
$ARCH_CONFIG_FLAGS
tolua++ -o Sources/Lua/clanbindings.cpp Sources/Lua/clanbindings.pkg
make %{?_smp_mflags}
pushd Documentation
make %{?_smp_mflags}
popd
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/*.a
pushd Documentation
make install HTML_PREFIX=`pwd`/html
popd
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc COPYING CREDITS NEWS ascii-logo
%{_libdir}/*.so.*
%files devel
%defattr(-,root,root,-)
%doc README README.gui README.upgrade Documentation/html
%{_bindir}/clanlib-config
%{_libdir}/*.so
%{_includedir}/ClanLib
%{_mandir}/man1/clanlib-config.1.gz
%changelog
* Sun Jul 23 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.6.5-3
- Mark asm files as NOT needing execstack, making us OK with new default
SELinux targeted policy settings.
* Sun Jul 23 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.6.5-2
- Add missing BRs: tolua++-devel, Hermes-devel and autoconf
* Wed Jul 19 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.6.5-1
- Initial FE version based on the newrpms SRPM by Che.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ClanLib06/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 24 Jul 2006 13:58:49 -0000 1.1
+++ .cvsignore 24 Jul 2006 14:03:00 -0000 1.2
@@ -0,0 +1 @@
+ClanLib-0.6.5-1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ClanLib06/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 24 Jul 2006 13:58:49 -0000 1.1
+++ sources 24 Jul 2006 14:03:00 -0000 1.2
@@ -0,0 +1 @@
+7115921953ef6fa45102c28622493650 ClanLib-0.6.5-1.tar.gz
More information about the fedora-extras-commits
mailing list