diff options
28 files changed, 192 insertions, 895 deletions
diff --git a/debian/README.Debian b/debian/README.Debian index e16ccd6..d745c03 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -4,25 +4,33 @@ of them it's questionable if it's even allowed to distribute them). To run these samples you might need to find replacements for the following files: - samples/bin/datas/opengl/background.jpg - samples/bin/datas/opengl/texture.jpg - samples/bin/datas/pong/background.jpg - samples/bin/datas/pong/ball.png - samples/bin/datas/pong/ball.wav - samples/bin/datas/pong/cheeseburger.ttf - samples/bin/datas/pong/paddle_left.png - samples/bin/datas/pong/paddle_right.png - samples/bin/datas/post-fx/background.jpg - samples/bin/datas/post-fx/blur.sfx - samples/bin/datas/post-fx/cheeseburger.ttf - samples/bin/datas/post-fx/colorize.sfx - samples/bin/datas/post-fx/fisheye.sfx - samples/bin/datas/post-fx/nothing.sfx - samples/bin/datas/post-fx/wave.jpg - samples/bin/datas/post-fx/wave.sfx - samples/bin/datas/qt/sfml.png - samples/bin/datas/sound/footsteps.wav - samples/bin/datas/sound/lepidoptera.ogg - samples/bin/datas/wxwidgets/sfml.png + examples/cocoa/resources/blue.png + examples/cocoa/resources/Cocoa-Info.plist + examples/cocoa/resources/Credits.rtf + examples/cocoa/resources/green.png + examples/cocoa/resources/icon.icns + examples/cocoa/resources/logo.png + examples/cocoa/resources/red.png + examples/cocoa/resources/sansation.ttf + examples/opengl/resources/background.jpg + examples/opengl/resources/sansation.ttf + examples/opengl/resources/texture.jpg + examples/pong/resources/ball.wav + examples/pong/resources/sansation.ttf + examples/shader/resources/background.jpg + examples/shader/resources/blink.frag + examples/shader/resources/blur.frag + examples/shader/resources/devices.png + examples/shader/resources/edge.frag + examples/shader/resources/pixelate.frag + examples/shader/resources/sansation.ttf + examples/shader/resources/sfml.png + examples/shader/resources/storm.vert + examples/shader/resources/text-background.png + examples/shader/resources/wave.vert + examples/sound/resources/canary.wav + examples/sound/resources/orchestral.ogg + examples/win32/resources/image1.jpg + examples/win32/resources/image2.jpg - -- Christoph Egger <christoph@akazieLX>, Sun, 9 May 2010 11:36:34 +0200 + -- James Cowgill <james410@cowgill.org.uk> Thu, 16 Aug 2013 16:15:00 +0100 diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 8f88c59..0000000 --- a/debian/README.source +++ /dev/null @@ -1,21 +0,0 @@ -Task: apply debian patches -Tools: quilt -Command: quilt push -a -Description: Please read /usr/share/doc/quilt/README.source how to use - quilt for managing Debian patches - -Task: getting the used tarball -Tools: make, wget -Command: make -f debian/rules get-orig-source -Description: The tarball for libsfml was repacked from upstream to get rid of - some libraries that where built in upstream. Furthermore the executeable - status of parts of the samples where mistakenly set upstream and are fixed by - the repackaging. To download and repack the tarball you can use tha makefile - target create_orig_tarball in debian/rules. Be sure to use it from the base - directory of the extracted source. - . - If you prefer doing this manually remove all «glew» «glext» «libjpeg» «libpng» - «zlib» Subdirectories from the include/ and src/ trees and change the - executeable state e.g. by this command: - find samples \( -name "*.jpg" -o -name "*.png" -o -name "*.[ch]pp" -o \ - -name "*.sfx" \) -print | xargs /bin/chmod a-x ; \ diff --git a/debian/changelog b/debian/changelog index 0b541e7..dd1e0e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +libsfml (2.1+dfsg-1) UNRELEASED; urgency=low + + * New upstream version 2.1 (Closes: #706001) + * Add dependency to libgl-dev and libglu-dev to libsfml-dev (Closes: #706239) + * Modify debian/copyright to use the machine-readable format + (http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/) + * Added doc-base file for API documentation + * Moved debian/watch source to the SFML github repository + * Upgrade source format to 3.0 and debhelper 9 using dh + * Upgrade to standards version 3.9.4 + + -- James Cowgill <james410@cowgill.org.uk> Mon, 19 Aug 2013 22:31:59 +0100 + +libsfml (1.6+dfsg2-2) unstable; urgency=low + + * Add the now needed build-dependency + + -- Christoph Egger <christoph@debian.org> Sun, 08 Jul 2012 22:20:18 +0200 + libsfml (1.6+dfsg2-1) unstable; urgency=low * Remove nonfree Arial.hpp (Closes: 647497) diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index ed4df9d..d8e1cca 100644 --- a/debian/control +++ b/debian/control @@ -2,122 +2,123 @@ Source: libsfml Section: devel Priority: extra Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org> -Uploaders: Christoph Egger <christoph@debian.org> -Vcs-Git: git://git.debian.org/git/pkg-games/libsfml.git/ -Vcs-Browser: http://git.debian.org/?p=pkg-games/libsfml.git -Build-Depends: debhelper (>= 7), - libgl1-mesa-glx, - mesa-common-dev, - libglu1-mesa-dev, - libxrandr-dev, +Uploaders: Christoph Egger <christoph@debian.org>, + James Cowgill <james410@cowgill.org.uk> +Vcs-Git: git://anonscm.debian.org/pkg-games/libsfml.git +Vcs-Browser: http://anonscm.debian.org/git/pkg-games/libsfml.git +Build-Depends: debhelper (>= 9), + cmake (>= 2.8.9), + doxygen, libfreetype6-dev, + libgl1-mesa-dev, + libglew-dev, + libjpeg-dev, libopenal-dev, libsndfile1-dev, - libjpeg-dev, - libpng-dev, - libglew1.5-dev, - quilt, - libsoil-dev -Standards-Version: 3.9.3 + libx11-dev, + libxrandr-dev +Standards-Version: 3.9.4 Homepage: http://www.sfml-dev.org/ Package: libsfml-dev Section: libdevel Architecture: any Depends: ${misc:Depends}, - libsfml-audio1.6 (= ${binary:Version}), - libsfml-graphics1.6 (= ${binary:Version}), - libsfml-network1.6 (= ${binary:Version}), - libsfml-system1.6 (= ${binary:Version}), - libsfml-window1.6 (= ${binary:Version}) + libgl1-mesa-dev | libgl-dev, + libglu1-mesa-dev | libglu-dev, + libsfml-audio2 (= ${binary:Version}), + libsfml-graphics2 (= ${binary:Version}), + libsfml-network2 (= ${binary:Version}), + libsfml-system2 (= ${binary:Version}), + libsfml-window2 (= ${binary:Version}) Conflicts: libsfml1.deb3-dev Replaces: libsfml1.deb3-dev -Suggests: libsfml1.6-dbg, libsfml-doc -Description: Simple and fast cross-platform multimedia library - Development Files +Suggests: libsfml2-dbg, libsfml-doc +Description: Simple and Fast Multimedia Library - Development Files SFML is an modern multimedia library offering a wide range of subsystems useful to produce an multimedia app. It offers OpenGL integration for Hardware accelerated Graphics, Windowing and Input support, Audio and - Network facilities and supports GNU/Linux MS Windows and Mac OS X. + Network facilities and supports GNU/Linux, MS Windows and Mac OS X. . This package includes header files for all SFML libraries. -Package: libsfml-audio1.6 +Package: libsfml-audio2 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Simple and fast cross-platform multimedia library - Audio part +Description: Simple and Fast Multimedia Library - Audio part SFML is an modern multimedia library offering a wide range of subsystems useful to produce an multimedia app. It offers OpenGL integration for Hardware accelerated Graphics, Windowing and Input support, Audio and - Network facilities and supports GNU/Linux MS Windows and Mac OS X. + Network facilities and supports GNU/Linux, MS Windows and Mac OS X. . The Audio library is used to play sound and music in games. It is able to load OGG/Vorbis files. -Package: libsfml-graphics1.6 +Package: libsfml-graphics2 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Simple and fast cross-platform multimedia library - Graphics part +Description: Simple and Fast Multimedia Library - Graphics part SFML is an modern multimedia library offering a wide range of subsystems useful to produce an multimedia app. It offers OpenGL integration for Hardware accelerated Graphics, Windowing and Input support, Audio and - Network facilities and supports GNU/Linux MS Windows and Mac OS X. + Network facilities and supports GNU/Linux, MS Windows and Mac OS X. . The Graphics library contains all the OpenGL and drawing code. It needs the Window library for Window creation. -Package: libsfml-network1.6 +Package: libsfml-network2 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Simple and fast cross-platform multimedia library - Network part +Description: Simple and Fast Multimedia Library - Network part SFML is an modern multimedia library offering a wide range of subsystems useful to produce an multimedia app. It offers OpenGL integration for Hardware accelerated Graphics, Windowing and Input support, Audio and - Network facilities and supports GNU/Linux MS Windows and Mac OS X. + Network facilities and supports GNU/Linux, MS Windows and Mac OS X. . The Network Library brings basic networking support as needed by games. -Package: libsfml-system1.6 +Package: libsfml-system2 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Simple and fast cross-platform multimedia library - System part +Description: Simple and Fast Multimedia Library - System part SFML is an modern multimedia library offering a wide range of subsystems useful to produce an multimedia app. It offers OpenGL integration for Hardware accelerated Graphics, Windowing and Input support, Audio and - Network facilities and supports GNU/Linux MS Windows and Mac OS X. + Network facilities and supports GNU/Linux, MS Windows and Mac OS X. . The system library brings useful system utilities like multithreading and UNICODE handling. -Package: libsfml-window1.6 +Package: libsfml-window2 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Simple and fast cross-platform multimedia library - Window part +Description: Simple and Fast Multimedia Library - Window part SFML is an modern multimedia library offering a wide range of subsystems useful to produce an multimedia app. It offers OpenGL integration for Hardware accelerated Graphics, Windowing and Input support, Audio and - Network facilities and supports GNU/Linux MS Windows and Mac OS X. + Network facilities and supports GNU/Linux, MS Windows and Mac OS X. . The Window library provides basic utilities for creating and managing Windows. -Package: libsfml1.6-dbg +Package: libsfml2-dbg Section: debug Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, - libsfml-audio1.6 (= ${binary:Version}) | - libsfml-graphics1.6 (= ${binary:Version}) | - libsfml-network1.6 (= ${binary:Version}) | - libsfml-system1.6 (= ${binary:Version}) | - libsfml-window1.6 (= ${binary:Version}) -Description: Simple and fast cross-platform multimedia library - debug symbols +Depends: ${misc:Depends}, + libsfml-audio2 (= ${binary:Version}) | + libsfml-graphics2 (= ${binary:Version}) | + libsfml-network2 (= ${binary:Version}) | + libsfml-system2 (= ${binary:Version}) | + libsfml-window2 (= ${binary:Version}) +Description: Simple and Fast Multimedia Library - debug symbols SFML is an modern multimedia library offering a wide range of subsystems useful to produce an multimedia app. It offers OpenGL integration for Hardware accelerated Graphics, Windowing and Input support, Audio and - Network facilities and supports GNU/Linux MS Windows and Mac OS X. + Network facilities and supports GNU/Linux, MS Windows and Mac OS X. . This package includes debug symbols for all SFML libraries. @@ -125,11 +126,11 @@ Package: libsfml-doc Replaces: libsfml1.4-doc Section: doc Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Simple and fast cross-platform multimedia library - documentation +Depends: ${misc:Depends} +Description: Simple and Fast Multimedia Library - documentation SFML is an modern multimedia library offering a wide range of subsystems useful to produce an multimedia app. It offers OpenGL integration for Hardware accelerated Graphics, Windowing and Input support, Audio and - Network facilities and supports GNU/Linux MS Windows and Mac OS X. + Network facilities and supports GNU/Linux, MS Windows and Mac OS X. . - This package includes the source Documentation and library reference for SFML. + This package includes the library reference and examples for SFML. diff --git a/debian/copyright b/debian/copyright index 9e844ce..f52cb35 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,46 +1,38 @@ -This package was debianized by Christoph Egger <debian@christoph-egger.org> on -Sun, 13 Apr 2008 17:05:27 +0200. - -It was downloaded from http://www.sfml-dev.org/download.php - -Upstream Authors: - - Laurent Gomila <laurent@sfml-dev.org> - Lucas Soltic <ceylow@gmail.com> - -Copyright: - - Copyright © 2007-2009 Laurent Gomila - Copyright © 2007-2009 Lucas Soltic - -License: - - This software is provided 'as-is', without any express or - implied warranty. In no event will the authors be held - liable for any damages arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute - it freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; - you must not claim that you wrote the original software. - If you use this software in a product, an acknowledgment - in the product documentation would be appreciated but - is not required. - - 2. Altered source versions must be plainly marked as such, - and must not be misrepresented as being the original software. - - 3. This notice may not be removed or altered from any - source distribution. - -The Debian packaging is © 2008,2009, Christoph Egger <debian@christoph-egger.org> and -is licensed under the same conditions as the software itself. - - - libraries included in SFML - -------------------------- - - src/SFML/Audio/stb_vorbis/* - is placed in public domain +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: SFML (Simple and Fast Multimedia Library) +Source: https://github.com/LaurentGomila/SFML/releases + Repackaged to remove external libraries and non-dfsg example resources + +Files: * +Copyright: 2007-2013 Laurent Gomila <laurent.gom@gmail.com> +License: Zlib + +Files: debian/* +Copyright: 2008,2009 Christoph Egger <debian@christoph-egger.org> + 2013 James Cowgill <james410@cowgill.org.uk> +License: Zlib + +Files: src/SFML/Graphics/stb_image/* +Copyright: Public Domain +License: public-domain + The stb_image library (http://nothings.org/stb_image.c) is explicity + in the public domain. + +License: Zlib + This software is provided 'as-is', without any express or implied warranty. + In no event will the authors be held liable for any damages arising from + the use of this software. + . + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + . + 1. The origin of this software must not be misrepresented; you must not claim + that you wrote the original software. If you use this software in a product, + an acknowledgment in the product documentation would be appreciated but is + not required. + . + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + . + 3. This notice may not be removed or altered from any source distribution. diff --git a/debian/libsfml-audio1.6.install b/debian/libsfml-audio2.install index 0a35773..0a35773 100644 --- a/debian/libsfml-audio1.6.install +++ b/debian/libsfml-audio2.install diff --git a/debian/libsfml-dev.install b/debian/libsfml-dev.install index b341905..5774e64 100644 --- a/debian/libsfml-dev.install +++ b/debian/libsfml-dev.install @@ -1,2 +1,3 @@ usr/include/* usr/lib/lib*.so +usr/lib/pkgconfig/* diff --git a/debian/libsfml-doc.doc-base b/debian/libsfml-doc.doc-base new file mode 100644 index 0000000..933dbf4 --- /dev/null +++ b/debian/libsfml-doc.doc-base @@ -0,0 +1,9 @@ +Document: libsfml-doc +Title: SFML Documentation +Author: Laurent Gomila +Abstract: API documentation for SFML (Simple and Fast Multimedia Library) +Section: Programming/C++ + +Format: HTML +Index: /usr/share/doc/libsfml-doc/html/index.htm +Files: /usr/share/doc/libsfml-doc/html/* diff --git a/debian/libsfml-doc.docs b/debian/libsfml-doc.docs index 9c978b9..5ac6f68 100644 --- a/debian/libsfml-doc.docs +++ b/debian/libsfml-doc.docs @@ -1,2 +1,2 @@ -doc/* debian/README.Debian +debian/tmp/usr/share/SFML/doc/html diff --git a/debian/libsfml-doc.examples b/debian/libsfml-doc.examples index 781fb73..e39721e 100644 --- a/debian/libsfml-doc.examples +++ b/debian/libsfml-doc.examples @@ -1 +1 @@ -samples/* +examples/* diff --git a/debian/libsfml-graphics1.6.install b/debian/libsfml-graphics2.install index 6ef1a46..6ef1a46 100644 --- a/debian/libsfml-graphics1.6.install +++ b/debian/libsfml-graphics2.install diff --git a/debian/libsfml-network1.6.install b/debian/libsfml-network2.install index 7978b21..7978b21 100644 --- a/debian/libsfml-network1.6.install +++ b/debian/libsfml-network2.install diff --git a/debian/libsfml-system1.6.install b/debian/libsfml-system2.install index d8bdd95..d8bdd95 100644 --- a/debian/libsfml-system1.6.install +++ b/debian/libsfml-system2.install diff --git a/debian/libsfml-window1.6.install b/debian/libsfml-window2.install index cddc49e..cddc49e 100644 --- a/debian/libsfml-window1.6.install +++ b/debian/libsfml-window2.install diff --git a/debian/patches/debian/fix-includes.diff b/debian/patches/debian/fix-includes.diff deleted file mode 100644 index 83ef833..0000000 --- a/debian/patches/debian/fix-includes.diff +++ /dev/null @@ -1,38 +0,0 @@ -From: Christoph Egger <christoph@debian.org> -Subject: [PATCH] debian/fix-includes - -SFML needs sme modified includes to build against gcc-4.6 - -Signed-off-by: Christoph Egger <christoph@debian.org> - ---- - include/SFML/System/Resource.hpp | 1 + - include/SFML/System/ResourcePtr.inl | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/include/SFML/System/Resource.hpp b/include/SFML/System/Resource.hpp -index 8f5088d..db651b0 100755 ---- a/include/SFML/System/Resource.hpp -+++ b/include/SFML/System/Resource.hpp -@@ -29,6 +29,7 @@ - // Headers
- ////////////////////////////////////////////////////////////
- #include <set>
-+#include <cstddef>
-
-
- namespace sf
-diff --git a/include/SFML/System/ResourcePtr.inl b/include/SFML/System/ResourcePtr.inl -index dbfcd0d..7bda5f1 100755 ---- a/include/SFML/System/ResourcePtr.inl -+++ b/include/SFML/System/ResourcePtr.inl -@@ -22,6 +22,7 @@ - //
- ////////////////////////////////////////////////////////////
-
-+#include <cstddef>
-
- ////////////////////////////////////////////////////////////
- /// Default constructor
--- -tg: (755caaf..) debian/fix-includes (depends on: debian/scriptheader-in-example-makefiles) diff --git a/debian/patches/debian/gcc-4.6.diff b/debian/patches/debian/gcc-4.6.diff deleted file mode 100644 index d3c541b..0000000 --- a/debian/patches/debian/gcc-4.6.diff +++ /dev/null @@ -1,142 +0,0 @@ -From: Evgeni Golov <evgeni@debian.org> -Subject: [PATCH] debian/gcc-4.6 - -Properly link with GCC 4.6. -#include <cstddef> everywhere. -Closes: #625031 - -Signed-off-by: Evgeni Golov <evgeni@debian.org> - ---- - include/SFML/Audio/Music.hpp | 1 + - include/SFML/Audio/Sound.hpp | 1 + - include/SFML/Audio/SoundBuffer.hpp | 1 + - include/SFML/Graphics/PostFX.hpp | 1 + - include/SFML/Graphics/RenderWindow.hpp | 1 + - include/SFML/Graphics/Sprite.hpp | 1 + - include/SFML/Graphics/String.hpp | 1 + - include/SFML/System/ResourcePtr.inl | 1 + - src/SFML/Graphics/Font.cpp | 1 + - src/SFML/Graphics/Image.cpp | 1 + - 10 files changed, 10 insertions(+) - -Index: libsfml/include/SFML/Audio/Music.hpp -=================================================================== ---- libsfml.orig/include/SFML/Audio/Music.hpp 2012-07-08 21:07:35.000000000 +0200 -+++ libsfml/include/SFML/Audio/Music.hpp 2012-07-08 21:07:39.650370721 +0200 -@@ -28,6 +28,7 @@ - ////////////////////////////////////////////////////////////
- // Headers
- ////////////////////////////////////////////////////////////
-+#include <cstddef>
- #include <SFML/Audio/SoundStream.hpp>
- #include <string>
- #include <vector>
-Index: libsfml/include/SFML/Audio/Sound.hpp -=================================================================== ---- libsfml.orig/include/SFML/Audio/Sound.hpp 2012-07-08 21:07:35.000000000 +0200 -+++ libsfml/include/SFML/Audio/Sound.hpp 2012-07-08 21:07:39.650370721 +0200 -@@ -28,6 +28,7 @@ - ////////////////////////////////////////////////////////////
- // Headers
- ////////////////////////////////////////////////////////////
-+#include <cstddef>
- #include <SFML/System/Resource.hpp>
- #include <SFML/System/Vector3.hpp>
- #include <SFML/Audio/AudioResource.hpp>
-Index: libsfml/include/SFML/Audio/SoundBuffer.hpp -=================================================================== ---- libsfml.orig/include/SFML/Audio/SoundBuffer.hpp 2012-07-08 21:07:35.000000000 +0200 -+++ libsfml/include/SFML/Audio/SoundBuffer.hpp 2012-07-08 21:07:39.650370721 +0200 -@@ -28,6 +28,7 @@ - ////////////////////////////////////////////////////////////
- // Headers
- ////////////////////////////////////////////////////////////
-+#include <cstddef>
- #include <SFML/System/Resource.hpp>
- #include <SFML/Audio/AudioResource.hpp>
- #include <string>
-Index: libsfml/include/SFML/Graphics/PostFX.hpp -=================================================================== ---- libsfml.orig/include/SFML/Graphics/PostFX.hpp 2012-07-08 21:07:35.000000000 +0200 -+++ libsfml/include/SFML/Graphics/PostFX.hpp 2012-07-08 21:07:39.660371117 +0200 -@@ -28,6 +28,7 @@ - ////////////////////////////////////////////////////////////
- // Headers
- ////////////////////////////////////////////////////////////
-+#include <cstddef>
- #include <SFML/Graphics/Drawable.hpp>
- #include <SFML/Graphics/Image.hpp>
- #include <istream>
-Index: libsfml/include/SFML/Graphics/RenderWindow.hpp -=================================================================== ---- libsfml.orig/include/SFML/Graphics/RenderWindow.hpp 2012-07-08 21:07:35.000000000 +0200 -+++ libsfml/include/SFML/Graphics/RenderWindow.hpp 2012-07-08 21:07:39.660371117 +0200 -@@ -28,6 +28,7 @@ - ////////////////////////////////////////////////////////////
- // Headers
- ////////////////////////////////////////////////////////////
-+#include <cstddef>
- #include <SFML/Graphics/Image.hpp>
- #include <SFML/Graphics/RenderTarget.hpp>
- #include <SFML/Window/Window.hpp>
-Index: libsfml/include/SFML/Graphics/Sprite.hpp -=================================================================== ---- libsfml.orig/include/SFML/Graphics/Sprite.hpp 2012-07-08 21:07:35.000000000 +0200 -+++ libsfml/include/SFML/Graphics/Sprite.hpp 2012-07-08 21:07:39.660371117 +0200 -@@ -28,6 +28,7 @@ - ////////////////////////////////////////////////////////////
- // Headers
- ////////////////////////////////////////////////////////////
-+#include <cstddef>
- #include <SFML/System/Resource.hpp>
- #include <SFML/Graphics/Drawable.hpp>
- #include <SFML/Graphics/Rect.hpp>
-Index: libsfml/include/SFML/Graphics/String.hpp -=================================================================== ---- libsfml.orig/include/SFML/Graphics/String.hpp 2012-07-08 21:07:35.000000000 +0200 -+++ libsfml/include/SFML/Graphics/String.hpp 2012-07-08 21:07:39.660371117 +0200 -@@ -28,6 +28,7 @@ - ////////////////////////////////////////////////////////////
- // Headers
- ////////////////////////////////////////////////////////////
-+#include <cstddef>
- #include <SFML/System/Resource.hpp>
- #include <SFML/System/Unicode.hpp>
- #include <SFML/Graphics/Drawable.hpp>
-Index: libsfml/include/SFML/System/ResourcePtr.inl -=================================================================== ---- libsfml.orig/include/SFML/System/ResourcePtr.inl 2012-07-08 21:07:35.000000000 +0200 -+++ libsfml/include/SFML/System/ResourcePtr.inl 2012-07-08 21:07:39.660371117 +0200 -@@ -34,6 +34,7 @@ -
- }
-
-+#include <cstddef>
-
- ////////////////////////////////////////////////////////////
- /// Construct from a raw resource
-Index: libsfml/src/SFML/Graphics/Font.cpp -=================================================================== ---- libsfml.orig/src/SFML/Graphics/Font.cpp 2012-07-08 21:07:35.000000000 +0200 -+++ libsfml/src/SFML/Graphics/Font.cpp 2012-07-08 21:07:39.660371117 +0200 -@@ -25,6 +25,7 @@ - ////////////////////////////////////////////////////////////
- // Headers
- ////////////////////////////////////////////////////////////
-+#include <cstddef>
- #include <SFML/Graphics/Font.hpp>
- #include <SFML/Graphics/FontLoader.hpp>
- #include <iostream>
-Index: libsfml/src/SFML/Graphics/Image.cpp -=================================================================== ---- libsfml.orig/src/SFML/Graphics/Image.cpp 2012-07-08 21:07:35.000000000 +0200 -+++ libsfml/src/SFML/Graphics/Image.cpp 2012-07-08 21:07:39.660371117 +0200 -@@ -25,6 +25,7 @@ - ////////////////////////////////////////////////////////////
- // Headers
- ////////////////////////////////////////////////////////////
-+#include <cstddef>
- #include <SFML/Graphics/Image.hpp>
- #include <SFML/Graphics/ImageLoader.hpp>
- #include <SFML/Graphics/RenderWindow.hpp>
diff --git a/debian/patches/debian/gcc-4.7.diff b/debian/patches/debian/gcc-4.7.diff deleted file mode 100644 index c72ab99..0000000 --- a/debian/patches/debian/gcc-4.7.diff +++ /dev/null @@ -1,26 +0,0 @@ -From: Matthias Klose <doko@debian.org> -Subject: [PATCH] debian/gcc-4.7 - -Fix build failure with GCC 4.7. Closes: #672086. - -Signed-off-by: Dmitrijs Ledkovs <xnox@debian.org> -Signed-off-by: Matthias Klose <doko@debian.org> - ---- - src/SFML/Window/Linux/Joystick.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/SFML/Window/Linux/Joystick.cpp b/src/SFML/Window/Linux/Joystick.cpp -index 829a741..c2dabf2 100755 ---- a/src/SFML/Window/Linux/Joystick.cpp -+++ b/src/SFML/Window/Linux/Joystick.cpp -@@ -27,6 +27,7 @@ - ////////////////////////////////////////////////////////////
- #include <SFML/Window/Joystick.hpp>
- #include <sstream>
-+#include <unistd.h>
-
-
- namespace sf
--- -tg: (afb79c7..) debian/gcc-4.7 (depends on: master) diff --git a/debian/patches/debian/interlinking.diff b/debian/patches/debian/interlinking.diff deleted file mode 100644 index 4b19c68..0000000 --- a/debian/patches/debian/interlinking.diff +++ /dev/null @@ -1,78 +0,0 @@ -From: Christoph Egger <Christoph.Egger@gmx.de> -Subject: [PATCH] debian/interlinking - - Some of the SFML libraries depend on each other but they are currently not -linked against them. This patch fixes this issue. - -Signed-off-by: Christoph Egger <Christoph.Egger@gmx.de> - ---- - src/SFML/Audio/Makefile | 2 +- - src/SFML/Graphics/Makefile | 2 +- - src/SFML/Makefile | 4 ++-- - src/SFML/Window/Makefile | 2 +- - 4 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/SFML/Audio/Makefile b/src/SFML/Audio/Makefile -index 0215e80..175bb61 100755 ---- a/src/SFML/Audio/Makefile -+++ b/src/SFML/Audio/Makefile -@@ -19,7 +19,7 @@ libsfml-audio-s.a: $(OBJ) $(OBJVORBIS) - $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJVORBIS)
-
- libsfml-audio.so: $(OBJ) $(OBJVORBIS)
-- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJVORBIS) -lsndfile -lopenal
-+ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJVORBIS) -lsndfile -lopenal $(LIBPATH)/libsfml-system.so.$(VERSION)
-
- $(OBJ): %.o: %.cpp
- $(CPP) -o $@ -c $< $(CFLAGS)
-diff --git a/src/SFML/Graphics/Makefile b/src/SFML/Graphics/Makefile -index 4de224d..f149155 100755 ---- a/src/SFML/Graphics/Makefile -+++ b/src/SFML/Graphics/Makefile -@@ -27,7 +27,7 @@ libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLI - $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
-
- libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
-- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype -lX11 -lGL
-+ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype $(LIBPATH)/libsfml-system.so.$(VERSION) $(LIBPATH)/libsfml-window.so.$(VERSION) -lGL
-
- $(OBJ): %.o: %.cpp
- $(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
-diff --git a/src/SFML/Makefile b/src/SFML/Makefile -index d8f633e..cd73816 100755 ---- a/src/SFML/Makefile -+++ b/src/SFML/Makefile -@@ -37,7 +37,7 @@ sfml-system: - @(mkdir -p ../../lib)
- @(cd ./System && $(MAKE))
-
--sfml-window:
-+sfml-window: sfml-system
- @(mkdir -p ../../lib)
- @(cd ./Window && $(MAKE))
-
-@@ -45,7 +45,7 @@ sfml-network: - @(mkdir -p ../../lib)
- @(cd ./Network && $(MAKE))
-
--sfml-graphics:
-+sfml-graphics: sfml-system sfml-window
- @(mkdir -p ../../lib)
- @(cd ./Graphics && $(MAKE))
-
-diff --git a/src/SFML/Window/Makefile b/src/SFML/Window/Makefile -index 0dd689c..a05a54b 100755 ---- a/src/SFML/Window/Makefile -+++ b/src/SFML/Window/Makefile -@@ -18,7 +18,7 @@ libsfml-window-s.a: $(OBJ) - $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ)
-
- libsfml-window.so: $(OBJ)
-- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) -lX11 -lXrandr -lGL
-+ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) -lX11 -lXrandr -lGL $(LIBPATH)/libsfml-system.so.$(VERSION)
-
- $(OBJ): %.o: %.cpp
- $(CPP) -o $@ -c $< $(CFLAGS)
--- -tg: (9b1ef37..) debian/interlinking (depends on: debian/destdir-install-symlinks) diff --git a/debian/patches/debian/kfreebsd.diff b/debian/patches/debian/kfreebsd.diff deleted file mode 100644 index e22e2a4..0000000 --- a/debian/patches/debian/kfreebsd.diff +++ /dev/null @@ -1,27 +0,0 @@ -From: Christoph Egger <Christoph.Egger@gmx.de> -Subject: [PATCH] debian/kfreebsd - -This patch gets GNU/kFreeBSD handled as FreeBSD and therefor enables -building on Debian GNU/kFreeBSD. The same should work on GNU/Hurd so try that. - -Signed-off-by: Christoph Egger <Christoph.Egger@gmx.de> - ---- - include/SFML/Config.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/SFML/Config.hpp b/include/SFML/Config.hpp -index 84ec60f..7db03a9 100755 ---- a/include/SFML/Config.hpp -+++ b/include/SFML/Config.hpp -@@ -49,7 +49,7 @@ - // MacOS
- #define SFML_SYSTEM_MACOS
-
--#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__gnu_hurd__)
-
- // FreeBSD
- #define SFML_SYSTEM_FREEBSD
--- -tg: (1a017fb..) debian/kfreebsd (depends on: master) diff --git a/debian/patches/debian/libpng-1.5.diff b/debian/patches/debian/libpng-1.5.diff deleted file mode 100644 index 48ed743..0000000 --- a/debian/patches/debian/libpng-1.5.diff +++ /dev/null @@ -1,42 +0,0 @@ -From: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> -Subject: [PATCH] debian/libpng-1.5 - -Fix FTBFS libpng-1.5 - -Signed-off-by: Dmitrijs Ledkovs <xnox@debian.org> - ---- - src/SFML/Graphics/ImageLoader.cpp | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/src/SFML/Graphics/ImageLoader.cpp b/src/SFML/Graphics/ImageLoader.cpp -index a3f83bf..a288482 100755 ---- a/src/SFML/Graphics/ImageLoader.cpp -+++ b/src/SFML/Graphics/ImageLoader.cpp -@@ -44,7 +44,11 @@ namespace - void PngErrorHandler(png_structp Png, png_const_charp Message)
- {
- std::cerr << "Failed to write PNG image. Reason : " << Message << std::endl;
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+ longjmp(png_jmpbuf((Png)),1);
-+#else
- longjmp(Png->jmpbuf, 1);
-+#endif
- }
- }
-
-@@ -289,7 +293,11 @@ bool ImageLoader::WritePng(const std::string& Filename, const std::vector<Color> - }
-
- // For proper error handling...
-- if (setjmp(Png->jmpbuf))
-+#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
-+ if (setjmp(png_jmpbuf(Png)))
-+#else
-+ if ( setjmp(Png->jmpbuf))
-+#endif
- {
- png_destroy_write_struct(&Png, &PngInfo);
- return false;
--- -tg: (afb79c7..) debian/libpng-1.5 (depends on: master) diff --git a/debian/patches/debian/remove-Arial.hpp b/debian/patches/debian/remove-Arial.hpp deleted file mode 100644 index 07d4111..0000000 --- a/debian/patches/debian/remove-Arial.hpp +++ /dev/null @@ -1,23 +0,0 @@ -Index: libsfml/src/SFML/Graphics/Font.cpp -=================================================================== ---- libsfml.orig/src/SFML/Graphics/Font.cpp 2012-07-08 21:07:00.520372052 +0200 -+++ libsfml/src/SFML/Graphics/Font.cpp 2012-07-08 21:07:00.670366273 +0200 -@@ -173,17 +173,11 @@ -
- #endif
-
-- // Get the raw data of the Arial font file into an array, so that we can load it into the font
-- static const char DefaultFontData[] =
-- {
-- #include <SFML/Graphics/Arial.hpp>
-- };
--
- // Load the default font on first call
- static bool DefaultFontLoaded = false;
- if (!DefaultFontLoaded)
- {
-- DefaultFont.LoadFromMemory(DefaultFontData, sizeof(DefaultFontData), 30);
-+ DefaultFont.LoadFromFile("/usr/share/fonts/truetype/freefont/FreeSans.ttf", 30);
- DefaultFontLoaded = true;
- }
-
diff --git a/debian/patches/debian/repacking.diff b/debian/patches/debian/repacking.diff deleted file mode 100644 index 1fee7f5..0000000 --- a/debian/patches/debian/repacking.diff +++ /dev/null @@ -1,132 +0,0 @@ -From: Christoph Egger <Christoph.Egger@gmx.de> -Subject: [PATCH] debian/repacking - - SFML Upstream Tarball ships loads of convenience copies in it's tarball and -builds them inseparable in it's Makefiles. - - This patch removes the convenience-copies from all Makefiles and corrects the -source-file to use the generic, system-wide libraries. - -Signed-off-by: Christoph Egger <Christoph.Egger@gmx.de> - ---- - src/SFML/Graphics/GraphicsContext.hpp | 2 +- - src/SFML/Graphics/ImageLoader.cpp | 8 ++++---- - src/SFML/Graphics/Makefile | 19 +++---------------- - src/SFML/Window/Linux/WindowImplX11.cpp | 4 ++-- - src/SFML/Window/Makefile | 3 +-- - 5 files changed, 11 insertions(+), 25 deletions(-) - -diff --git a/src/SFML/Graphics/GraphicsContext.hpp b/src/SFML/Graphics/GraphicsContext.hpp -index 2fa77a3..aebfe1f 100755 ---- a/src/SFML/Graphics/GraphicsContext.hpp -+++ b/src/SFML/Graphics/GraphicsContext.hpp -@@ -30,7 +30,7 @@ - ////////////////////////////////////////////////////////////
- #include <SFML/Config.hpp>
- #include <SFML/System/NonCopyable.hpp>
--#include <SFML/Graphics/GLEW/glew.h>
-+#include <GL/glew.h>
- #include <iostream>
- #include <string>
-
-diff --git a/src/SFML/Graphics/ImageLoader.cpp b/src/SFML/Graphics/ImageLoader.cpp -index a3f83bf..e6ceacd 100755 ---- a/src/SFML/Graphics/ImageLoader.cpp -+++ b/src/SFML/Graphics/ImageLoader.cpp -@@ -28,11 +28,11 @@ - #include <SFML/Graphics/ImageLoader.hpp>
- extern "C"
- {
-- #include <SFML/Graphics/libjpeg/jpeglib.h>
-- #include <SFML/Graphics/libjpeg/jerror.h>
-+ #include <jpeglib.h>
-+ #include <jerror.h>
- }
--#include <SFML/Graphics/libpng/png.h>
--#include <SFML/Graphics/SOIL/SOIL.h>
-+#include <libpng/png.h>
-+#include <SOIL/SOIL.h>
- #include <iostream>
-
-
-diff --git a/src/SFML/Graphics/Makefile b/src/SFML/Graphics/Makefile -index f149155..346f568 100755 ---- a/src/SFML/Graphics/Makefile -+++ b/src/SFML/Graphics/Makefile -@@ -1,15 +1,5 @@ - SRC = $(wildcard *.cpp)
--SRCGLEW = $(wildcard ./GLEW/*.c)
--SRCJPEG = $(wildcard ./libjpeg/*.c)
--SRCPNG = $(wildcard ./libpng/*.c)
--SRCSOIL = $(wildcard ./SOIL/*.c)
--SRCZLIB = $(wildcard ./zlib/*.c)
- OBJ = $(SRC:.cpp=.o)
--OBJGLEW = $(SRCGLEW:.c=.o)
--OBJJPEG = $(SRCJPEG:.c=.o)
--OBJPNG = $(SRCPNG:.c=.o)
--OBJSOIL = $(SRCSOIL:.c=.o)
--OBJZLIB = $(SRCZLIB:.c=.o)
-
- ifeq ($(STATIC), yes)
- LIB = libsfml-graphics-s.a
-@@ -26,19 +16,16 @@ all: $(LIB) - libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
- $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
-
--libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
-- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype $(LIBPATH)/libsfml-system.so.$(VERSION) $(LIBPATH)/libsfml-window.so.$(VERSION) -lGL
-+libsfml-graphics.so: $(OBJ)
-+ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lGLEW -ljpeg -lpng -lSOIL -lfreetype $(LIBPATH)/libsfml-system.so.$(VERSION) $(LIBPATH)/libsfml-window.so.$(VERSION) -lGL
-
- $(OBJ): %.o: %.cpp
- $(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
-
--$(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c
-- $(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG
--
- .PHONY: clean mrproper
-
- clean:
-- @rm -rf $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
-+ @rm -rf $(OBJ)
-
- mrproper: clean
- @rm -rf $(LIBNAME)
-diff --git a/src/SFML/Window/Linux/WindowImplX11.cpp b/src/SFML/Window/Linux/WindowImplX11.cpp -index edec19b..f527864 100755 ---- a/src/SFML/Window/Linux/WindowImplX11.cpp -+++ b/src/SFML/Window/Linux/WindowImplX11.cpp -@@ -27,8 +27,8 @@ - ////////////////////////////////////////////////////////////
- #include <SFML/Window/WindowStyle.hpp> // important to be included first (conflict with None)
- #include <SFML/Window/Linux/WindowImplX11.hpp>
--#include <SFML/Window/glext/glxext.h>
--#include <SFML/Window/glext/glext.h>
-+#include <GL/glxext.h>
-+#include <GL/glext.h>
- #include <SFML/System/Unicode.hpp>
- #include <X11/keysym.h>
- #include <X11/extensions/Xrandr.h>
-diff --git a/src/SFML/Window/Makefile b/src/SFML/Window/Makefile -index a05a54b..5f9708e 100755 ---- a/src/SFML/Window/Makefile -+++ b/src/SFML/Window/Makefile -@@ -1,6 +1,5 @@ - SRC = $(wildcard *.cpp ./Linux/*.cpp)
- OBJ = $(SRC:.cpp=.o)
--OBJGLEW = $(SRCGLEW:.c=.o)
-
- ifeq ($(STATIC), yes)
- LIB = libsfml-window-s.a
-@@ -18,7 +17,7 @@ libsfml-window-s.a: $(OBJ) - $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ)
-
- libsfml-window.so: $(OBJ)
-- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) -lX11 -lXrandr -lGL $(LIBPATH)/libsfml-system.so.$(VERSION)
-+ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lX11 -lXrandr -lGL $(LIBPATH)/libsfml-system.so.$(VERSION)
-
- $(OBJ): %.o: %.cpp
- $(CPP) -o $@ -c $< $(CFLAGS)
--- -tg: (a419948..) debian/repacking (depends on: debian/interlinking) diff --git a/debian/patches/debian/scriptheader-in-example-makefiles.diff b/debian/patches/debian/scriptheader-in-example-makefiles.diff deleted file mode 100644 index b3969c7..0000000 --- a/debian/patches/debian/scriptheader-in-example-makefiles.diff +++ /dev/null @@ -1,157 +0,0 @@ -From: Christoph Egger <Christoph.Egger@gmx.de> -Subject: [PATCH] debian/scriptheader-in-example-makefiles - - All sample Makefiles are executeable but do not have an script header. While -making them non-executeable is an option, having them as working executeables -seems more appropriate to me. - -Signed-off-by: Christoph Egger <Christoph.Egger@gmx.de> - ---- - samples/Makefile | 2 ++ - samples/X11/Makefile | 2 ++ - samples/ftp/Makefile | 2 ++ - samples/opengl/Makefile | 2 ++ - samples/pong/Makefile | 2 ++ - samples/post-fx/Makefile | 2 ++ - samples/qt/Makefile | 2 ++ - samples/sockets/Makefile | 2 ++ - samples/sound/Makefile | 2 ++ - samples/sound_capture/Makefile | 2 ++ - samples/voip/Makefile | 2 ++ - samples/window/Makefile | 2 ++ - samples/wxwidgets/Makefile | 2 ++ - 13 files changed, 26 insertions(+) - -diff --git a/samples/Makefile b/samples/Makefile -index 938152a..7080454 100755 ---- a/samples/Makefile -+++ b/samples/Makefile -@@ -1,3 +1,5 @@ -+#!/usr/bin/make -f
-+
- export DEBUGBUILD = no
- ifeq ($(DEBUGBUILD), yes)
- DEBUGFLAGS = -g -DDEBUG
-diff --git a/samples/X11/Makefile b/samples/X11/Makefile -index eca4cee..4bbc74e 100755 ---- a/samples/X11/Makefile -+++ b/samples/X11/Makefile -@@ -1,3 +1,5 @@ -+#!/usr/bin/make -f -+ - EXEC = X11 - OBJ = X11.o - -diff --git a/samples/ftp/Makefile b/samples/ftp/Makefile -index 8bd25ae..26494b9 100755 ---- a/samples/ftp/Makefile -+++ b/samples/ftp/Makefile -@@ -1,3 +1,5 @@ -+#!/usr/bin/make -f
-+
- EXEC = ftp
- OBJ = Ftp.o
-
-diff --git a/samples/opengl/Makefile b/samples/opengl/Makefile -index 42ff5ca..96596af 100755 ---- a/samples/opengl/Makefile -+++ b/samples/opengl/Makefile -@@ -1,3 +1,5 @@ -+#!/usr/bin/make -f -+ - EXEC = opengl - OBJ = OpenGL.o - -diff --git a/samples/pong/Makefile b/samples/pong/Makefile -index 314ace2..dce1be8 100755 ---- a/samples/pong/Makefile -+++ b/samples/pong/Makefile -@@ -1,3 +1,5 @@ -+#!/usr/bin/make -f
-+
- EXEC = pong
- OBJ = Pong.o
-
-diff --git a/samples/post-fx/Makefile b/samples/post-fx/Makefile -index 2c25988..30f3dff 100755 ---- a/samples/post-fx/Makefile -+++ b/samples/post-fx/Makefile -@@ -1,3 +1,5 @@ -+#!/usr/bin/make -f -+ - EXEC = post-fx - OBJ = PostFX.o - -diff --git a/samples/qt/Makefile b/samples/qt/Makefile -index 43d09cd..3c48097 100755 ---- a/samples/qt/Makefile -+++ b/samples/qt/Makefile -@@ -1,3 +1,5 @@ -+#!/usr/bin/make -f -+ - EXEC = qt - OBJ = Main.o QSFMLCanvas.o - -diff --git a/samples/sockets/Makefile b/samples/sockets/Makefile -index 6adf020..771673e 100755 ---- a/samples/sockets/Makefile -+++ b/samples/sockets/Makefile -@@ -1,3 +1,5 @@ -+#!/usr/bin/make -f -+ - EXEC = sockets - OBJ = Sockets.o TCP.o UDP.o - -diff --git a/samples/sound/Makefile b/samples/sound/Makefile -index 495c13e..d42b4ba 100755 ---- a/samples/sound/Makefile -+++ b/samples/sound/Makefile -@@ -1,3 +1,5 @@ -+#!/usr/bin/make -f -+ - EXEC = sound - OBJ = Sound.o - -diff --git a/samples/sound_capture/Makefile b/samples/sound_capture/Makefile -index bc49217..0589c4a 100755 ---- a/samples/sound_capture/Makefile -+++ b/samples/sound_capture/Makefile -@@ -1,3 +1,5 @@ -+#!/usr/bin/make -f -+ - EXEC = sound_capture - OBJ = SoundCapture.o - -diff --git a/samples/voip/Makefile b/samples/voip/Makefile -index 1adca4e..a7b92d4 100755 ---- a/samples/voip/Makefile -+++ b/samples/voip/Makefile -@@ -1,3 +1,5 @@ -+#!/usr/bin/make -f -+ - EXEC = voip - OBJ = VoIP.o Client.o Server.o - -diff --git a/samples/window/Makefile b/samples/window/Makefile -index 6aa0abc..12f266b 100755 ---- a/samples/window/Makefile -+++ b/samples/window/Makefile -@@ -1,3 +1,5 @@ -+#!/usr/bin/make -f -+ - EXEC = window - OBJ = Window.o - -diff --git a/samples/wxwidgets/Makefile b/samples/wxwidgets/Makefile -index e6586ec..558e565 100755 ---- a/samples/wxwidgets/Makefile -+++ b/samples/wxwidgets/Makefile -@@ -1,3 +1,5 @@ -+#!/usr/bin/make -f -+ - EXEC = wxwidgets - OBJ = Main.o wxSFMLCanvas.o - --- -tg: (6851b4d..) debian/scriptheader-in-example-makefiles (depends on: master) diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 8169a25..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,9 +0,0 @@ -debian/fix-includes.diff -p1 -debian/gcc-4.6.diff -p1 -debian/gcc-4.7.diff -p1 -debian/interlinking.diff -p1 -debian/kfreebsd.diff -p1 -debian/libpng-1.5.diff -p1 -debian/repacking.diff -p1 -debian/scriptheader-in-example-makefiles.diff -p1 -debian/remove-Arial.hpp diff --git a/debian/rules b/debian/rules index aa47356..0598f9d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,79 +1,44 @@ #!/usr/bin/make -f # -*- makefile -*- -# Sample debian/rules that uses debhelper. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -version=1.6 -major=1 - -include /usr/share/quilt/quilt.make -include $(wildcard /usr/share/topgit/tg2quilt.mk) - -get-orig-source: - cd .. ; rm -rf libsfml-$(version).orig ; mkdir libsfml-$(version).orig ; cd libsfml-$(version).orig ; \ - wget http://downloads.sourceforge.net/sfml/SFML-$(version)-sdk-linux-32.tar.gz ; \ - tar -xzf SFML-$(version)-sdk-linux-32.tar.gz ; cd SFML-$(version) ; \ - find . \( -iname glew -o -iname glext -o -iname libjpeg \ - -o -iname libpng -o -iname zlib -o -iname SOIL \) -print | xargs /bin/rm -rf ; \ - find samples \( -name "*.jpg" -o -name "*.png" -o -name "*.[ch]pp" -o \ - -name "*.sfx" \) -print | xargs /bin/chmod a-x ; \ - rm -rf samples/bin/datas/ ;\ - make mrproper ; \ - cd .. ; rm SFML-$(version)-sdk-linux-32.tar.gz; mv SFML-$(version)/* . ; rm -r SFML-$(version) - cd .. ; GZIP="--best" tar -czf libsfml-$(version)+dfsg1.orig.tar.gz libsfml-$(version).orig - -build: build-stamp -build-stamp: $(QUILT_STAMPFN) - dh_testdir - mkdir -p lib - $(MAKE) sfml - touch $@ - -clean: unpatch - dh_testdir - dh_testroot - -# Add here commands to clean up after the build process. - $(MAKE) mrproper - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - - $(MAKE) DESTDIR=$(CURDIR)/debian/tmp/usr install - find $(CURDIR)/debian/tmp -name Win32 -o -name OSX -print | xargs /bin/rm -rf - - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples - dh_install --fail-missing --sourcedir=debian/tmp - dh_installman - dh_link - dh_strip --dbg-package=libsfml$(version)-dbg - dh_lintian - dh_compress - dh_fixperms - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +PKD = $(abspath $(dir $(MAKEFILE_LIST))) +PKG = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source)) +UVER = $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-\d+.*)};') +DTYPE = +dfsg +VER ?= $(subst $(DTYPE),,$(UVER)) + +%: + dh $@ + +override_dh_auto_configure: + dh_auto_configure -- -DSFML_BUILD_DOC=ON + +override_dh_strip: + dh_strip --dbg-package=libsfml2-dbg + +## http://wiki.debian.org/onlyjob/get-orig-source +.PHONY: get-orig-source +get-orig-source: $(PKG)_$(VER)$(DTYPE).orig.tar.xz $(info I: $(PKG)_$(VER)$(DTYPE)) + @ + +$(PKG)_$(VER)$(DTYPE).orig.tar.xz: + @echo "# Downloading..." + uscan --noconf --verbose --rename --destdir=$(CURDIR) --check-dirname-level=0 --force-download --download-version $(VER) $(PKD) + $(if $(wildcard $(PKG)-$(VER)),$(error $(PKG)-$(VER) exist, aborting..)) + @echo "# Extracting..." + mkdir $(PKG)-$(VER) \ + && tar -xf $(PKG)_$(VER).orig.tar.* --directory $(PKG)-$(VER) --strip-components 1 \ + || $(RM) -r $(PKG)-$(VER) + @echo "# Cleaning-up..." + cd $(PKG)-$(VER) \ + && $(RM) -r -v \ + extlibs/ \ + examples/*/resources/ + #$(RM) -v $(PKG)_$(VER).orig.tar.* + @echo "# Packing..." + find -L "$(PKG)-$(VER)" -xdev -type f -print | sort \ + | XZ_OPT="-6v" tar -caf "$(PKG)_$(VER)$(DTYPE).orig.tar.xz" -T- --owner=root --group=root --mode=a+rX \ + && $(RM) -r "$(PKG)-$(VER)" diff --git a/debian/source/format b/debian/source/format index d3827e7..163aaf8 100644 --- a/debian/source/format +++ b/debian/source/format @@ -1 +1 @@ -1.0 +3.0 (quilt) diff --git a/debian/watch b/debian/watch index 20cf63c..7a57eaf 100644 --- a/debian/watch +++ b/debian/watch @@ -1,9 +1,6 @@ # See uscan(1) for format version=3 -#opts=dversionmangle=s/\+repack\d+$//g \ -# http://www.sfml-dev.org/download.php http://downloads.sourceforge.net/sfml/SFML-([\d\.]*\d)-sdk-linux-32\.tar\.gz - -opts=dversionmangle=s/\+dfsg\d+$//g \ - http://sf.net/sfml/SFML-([\d\.]*\d)-sdk-linux\.tar\.gz - +# From GitHub +opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/SFML-$1.tar.gz/,dversionmangle=s/-dfsg\d?$// \ + https://github.com/LaurentGomila/SFML/tags .*/v?(\d\S*)\.tar\.gz |