[SCM] Simple and fast multimedia library for C++ branch, sfml-ng, updated. 68c3ce67da27ccd2b9706f639ff10079638ef664
Christoph Egger
Christoph.Egger at gmx.de
Sat Nov 1 21:51:51 UTC 2008
The following commit has been merged in the sfml-ng branch:
commit 68c3ce67da27ccd2b9706f639ff10079638ef664
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date: Sat Nov 1 22:50:51 2008 +0100
* SFML's new $(DESTDIR) actually works so I don't need to work around any more!
* Deleting not used patches from debian/patches
diff --git a/debian/patches/add_destdir_to_makefiles.patch b/debian/patches/add_destdir_to_makefiles.patch
index a70bdc8..ee965a9 100644
--- a/debian/patches/add_destdir_to_makefiles.patch
+++ b/debian/patches/add_destdir_to_makefiles.patch
@@ -1,8 +1,8 @@
Index: libsfml/src/SFML/Makefile
===================================================================
---- libsfml.orig/src/SFML/Makefile 2008-11-01 18:17:59.000000000 +0100
-+++ libsfml/src/SFML/Makefile 2008-11-01 18:28:32.000000000 +0100
-@@ -21,13 +21,13 @@
+--- libsfml.orig/src/SFML/Makefile 2008-11-01 22:36:36.000000000 +0100
++++ libsfml/src/SFML/Makefile 2008-11-01 22:45:17.000000000 +0100
+@@ -21,7 +21,7 @@
export CFLAGSEXT = -I../../../include -I../.. $(DEBUGFLAGS) $(BUILDFLAGS)
export LDFLAGS = $(LINKFLAGS)
export LIBPATH = ../../../lib
@@ -11,13 +11,6 @@ Index: libsfml/src/SFML/Makefile
export CP = cp
export LN = ln
export LNFLAGS = -s -f
- export AR = ar
- export ARFLAGS = rcs
--export DESTDIR = /usr
-+export DESTDIR = $(DDESTDIR)/usr
- export DESTLIBDIR = $(DESTDIR)/lib
-
- all: sfml-system sfml-window sfml-network sfml-graphics sfml-audio
@@ -56,4 +56,5 @@
@(cd ./System && $(MAKE) $@ && cd ../Window && $(MAKE) $@ && cd ../Network && $(MAKE) $@ && cd ../Graphics && $(MAKE) $@ && cd ../Audio && $(MAKE) $@)
diff --git a/debian/patches/building_on_all_arches.patch b/debian/patches/building_on_all_arches.patch
deleted file mode 100644
index e877b84..0000000
--- a/debian/patches/building_on_all_arches.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Index: libsfml/include/SFML/Config.hpp
-===================================================================
---- libsfml.orig/include/SFML/Config.hpp 2008-06-17 17:31:39.000000000 +0200
-+++ libsfml/include/SFML/Config.hpp 2008-06-17 17:35:42.000000000 +0200
-@@ -44,6 +44,12 @@
- // Linux
- #define SFML_SYSTEM_LINUX
-
-+#elif defined(unix) || defined(__unix)
-+
-+ // unixoid so probably working like linux
-+ #define SFML_SYSTEM_LINUX
-+ #warning This flavor of unix is not supported upstream
-+
- #elif defined(__APPLE__) || defined(MACOSX) || defined(macintosh) || defined(Macintosh)
-
- // MacOS
-@@ -83,7 +89,7 @@
- #else
-
- // Unsupported platform
-- #error This platform is not supported by SFML library
-+ #warning This platform is not supported by SFML library
-
- #endif
-
-@@ -145,18 +151,21 @@
- ////////////////////////////////////////////////////////////
- // Define endianness depending on current platform
- ////////////////////////////////////////////////////////////
--#ifdef SFML_PLATFORM_POWERPC
-+#if defined(SFML_PLATFORM_POWERPC)
-
- // Apple PowerPC processors are big endian
- #define SFML_BIG_ENDIAN
-
--#else
-+#elif defined(SFML_PLATFORM_X86) || defined(SFML_PLATFORM_AMD64) || defined(SFML_PLATFORM_IA64)
-
- // The other supported processors (x86, IA64, AMD64) are little endian
- #define SFML_LITTLE_ENDIAN
-
--#endif
-+#else
-+
-+ #define SFML_UNKNOWN_ENDIAN
-
-+#endif
-
- ////////////////////////////////////////////////////////////
- // Define portable types
diff --git a/debian/patches/bump_soname.patch b/debian/patches/bump_soname.patch
deleted file mode 100644
index fe448ce..0000000
--- a/debian/patches/bump_soname.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: libsfml/src/SFML/Makefile
-===================================================================
---- libsfml.orig/src/SFML/Makefile 2008-06-22 14:08:20.000000000 +0200
-+++ libsfml/src/SFML/Makefile 2008-06-22 14:09:32.000000000 +0200
-@@ -4,7 +4,7 @@
- export CFLAGSEXT = -I../../../include -I../.. -DNDEBUG -O2 -fPIC
- export LDFLAGS = -shared
- export LIBPATH = ../../../lib
--export VERSION = 1
-+export VERSION = 1.deb3
- export CP = cp
- export LN = ln
- export LNFLAGS = -s -f
diff --git a/debian/patches/cstring_ftbfs.patch b/debian/patches/cstring_ftbfs.patch
deleted file mode 100644
index 3be2845..0000000
--- a/debian/patches/cstring_ftbfs.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Index: libsfml/src/SFML/Network/IPAddress.cpp
-===================================================================
---- libsfml.orig/src/SFML/Network/IPAddress.cpp 2008-06-22 12:00:51.000000000 +0200
-+++ libsfml/src/SFML/Network/IPAddress.cpp 2008-06-22 12:30:16.000000000 +0200
-@@ -28,6 +28,8 @@
- #include <SFML/Network/IPAddress.hpp>
- #include <SFML/Network/SocketHelper.hpp>
-
-+#include <cstring>
-+using std::memset;
-
- namespace sf
- {
-Index: libsfml/src/SFML/Network/Packet.cpp
-===================================================================
---- libsfml.orig/src/SFML/Network/Packet.cpp 2008-06-22 12:00:51.000000000 +0200
-+++ libsfml/src/SFML/Network/Packet.cpp 2008-06-22 12:30:16.000000000 +0200
-@@ -28,6 +28,9 @@
- #include <SFML/Network/Packet.hpp>
- #include <SFML/Network/SocketHelper.hpp>
-
-+#include <cstring>
-+using std::memset;
-+using std::strncpy;
-
- namespace sf
- {
-Index: libsfml/src/SFML/Network/SocketTCP.cpp
-===================================================================
---- libsfml.orig/src/SFML/Network/SocketTCP.cpp 2008-06-22 12:00:51.000000000 +0200
-+++ libsfml/src/SFML/Network/SocketTCP.cpp 2008-06-22 12:30:16.000000000 +0200
-@@ -31,6 +31,8 @@
- #include <algorithm>
- #include <iostream>
-
-+#include <cstring>
-+using std::memset;
-
- namespace sf
- {
-Index: libsfml/src/SFML/Network/SocketUDP.cpp
-===================================================================
---- libsfml.orig/src/SFML/Network/SocketUDP.cpp 2008-06-22 12:00:51.000000000 +0200
-+++ libsfml/src/SFML/Network/SocketUDP.cpp 2008-06-22 12:30:16.000000000 +0200
-@@ -31,6 +31,8 @@
- #include <algorithm>
- #include <iostream>
-
-+#include <cstring>
-+using std::memset;
-
- namespace sf
- {
-Index: libsfml/src/SFML/Audio/SoundFileDefault.cpp
-===================================================================
---- libsfml.orig/src/SFML/Audio/SoundFileDefault.cpp 2008-06-22 12:00:51.000000000 +0200
-+++ libsfml/src/SFML/Audio/SoundFileDefault.cpp 2008-06-22 12:30:16.000000000 +0200
-@@ -28,6 +28,8 @@
- #include <SFML/Audio/SoundFileDefault.hpp>
- #include <iostream>
-
-+#include <cstring>
-+using std::memcpy;
-
- namespace sf
- {
diff --git a/debian/patches/modifying_toplevel_makefile b/debian/patches/modifying_toplevel_makefile
index d22facc..0e33070 100644
--- a/debian/patches/modifying_toplevel_makefile
+++ b/debian/patches/modifying_toplevel_makefile
@@ -13,8 +13,8 @@ Index: libsfml/Makefile
@(cd ./samples && $(MAKE))
install:
-+ mkdir -p $(DDESTDIR)/usr/lib
-+ mkdir -p $(DDESTDIR)/usr/include
++ mkdir -p $(DESTDIR)/lib
++ mkdir -p $(DESTDIR)/include
@(cd ./src/SFML && $(MAKE) $@)
clean:
diff --git a/debian/rules b/debian/rules
index 9497d5a..20e8d5f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,7 +56,7 @@ install: build
dh_installdirs
# Add here commands to install the package into debian/tmp
- $(MAKE) DDESTDIR=$(CURDIR)/debian/tmp install
+ $(MAKE) DESTDIR=$(CURDIR)/debian/tmp/usr install
find $(CURDIR)/debian/tmp -name Win32 -o -name OSX -print | xargs /bin/rm -rf
--
Simple and fast multimedia library for C++
More information about the Pkg-games-commits
mailing list