--- libsfml-1.6+dfsg1.orig/debian/libsfml-graphics1.6.install +++ libsfml-1.6+dfsg1/debian/libsfml-graphics1.6.install @@ -0,0 +1 @@ +usr/lib/lib*-graphics.so.* --- libsfml-1.6+dfsg1.orig/debian/README.Debian +++ libsfml-1.6+dfsg1/debian/README.Debian @@ -0,0 +1,28 @@ +The Debian documentation package ships some samples that won't run out +of the box. This is because the data files aren't free (and for some +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 + + -- Christoph Egger , Sun, 9 May 2010 11:36:34 +0200 --- libsfml-1.6+dfsg1.orig/debian/control +++ libsfml-1.6+dfsg1/debian/control @@ -0,0 +1,135 @@ +Source: libsfml +Section: devel +Priority: extra +Maintainer: Debian Games Team +Uploaders: Christoph Egger +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, + libfreetype6-dev, + libopenal-dev, + libsndfile1-dev, + libjpeg-dev, + libpng-dev, + libglew1.5-dev, + quilt, + libsoil-dev +Standards-Version: 3.9.2 +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}) +Conflicts: libsfml1.deb3-dev +Replaces: libsfml1.deb3-dev +Suggests: libsfml1.6-dbg, libsfml-doc +Description: Simple and fast cross-platform 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. + . + This package includes header files for all SFML libraries. + +Package: libsfml-audio1.6 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Simple and fast cross-platform 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. + . + The Audio library is used to play sound and music in games. It is able to + load OGG/Vorbis files. + +Package: libsfml-graphics1.6 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Simple and fast cross-platform 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. + . + The Graphics library contains all the OpenGL and drawing code. It needs the + Window library for Window creation. + +Package: libsfml-network1.6 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Simple and fast cross-platform 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. + . + The Network Library brings basic networking support as needed by games. + +Package: libsfml-system1.6 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Simple and fast cross-platform 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. + . + The system library brings useful system utilities like multithreading and + UNICODE handling. + +Package: libsfml-window1.6 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: Simple and fast cross-platform 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. + . + The Window library provides basic utilities for creating and managing Windows. + +Package: libsfml1.6-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 + 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. + . + This package includes debug symbols for all SFML libraries. + +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 + 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. + . + This package includes the source Documentation and library reference for SFML. --- libsfml-1.6+dfsg1.orig/debian/libsfml-doc.examples +++ libsfml-1.6+dfsg1/debian/libsfml-doc.examples @@ -0,0 +1 @@ +samples/* --- libsfml-1.6+dfsg1.orig/debian/compat +++ libsfml-1.6+dfsg1/debian/compat @@ -0,0 +1 @@ +7 --- libsfml-1.6+dfsg1.orig/debian/README.source +++ libsfml-1.6+dfsg1/debian/README.source @@ -0,0 +1,21 @@ +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 ; \ --- libsfml-1.6+dfsg1.orig/debian/watch +++ libsfml-1.6+dfsg1/debian/watch @@ -0,0 +1,9 @@ +# 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 + --- libsfml-1.6+dfsg1.orig/debian/libsfml-dev.install +++ libsfml-1.6+dfsg1/debian/libsfml-dev.install @@ -0,0 +1,2 @@ +usr/include/* +usr/lib/lib*.so --- libsfml-1.6+dfsg1.orig/debian/copyright +++ libsfml-1.6+dfsg1/debian/copyright @@ -0,0 +1,46 @@ +This package was debianized by Christoph Egger on +Sun, 13 Apr 2008 17:05:27 +0200. + +It was downloaded from http://www.sfml-dev.org/download.php + +Upstream Authors: + + Laurent Gomila + Lucas Soltic + +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 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 --- libsfml-1.6+dfsg1.orig/debian/libsfml-network1.6.install +++ libsfml-1.6+dfsg1/debian/libsfml-network1.6.install @@ -0,0 +1 @@ +usr/lib/lib*-network.so.* --- libsfml-1.6+dfsg1.orig/debian/libsfml-window1.6.install +++ libsfml-1.6+dfsg1/debian/libsfml-window1.6.install @@ -0,0 +1 @@ +usr/lib/lib*-window.so.* --- libsfml-1.6+dfsg1.orig/debian/changelog +++ libsfml-1.6+dfsg1/debian/changelog @@ -0,0 +1,118 @@ +libsfml (1.6+dfsg1-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Patch from Ubuntu by Matthias Klose fix FTBFS. Closes: #628253 + * Don't include system headers in the sf namespace. + + -- Konstantinos Margaritis Fri, 03 Feb 2012 15:31:30 +0200 + +libsfml (1.6+dfsg1-2) unstable; urgency=low + + * Add patch by Evgeni to build against gcc-4.6 (Closes: #625031) + * Upgrade std-version 3.8.4 -> 3.9.2 -- no changes + + -- Christoph Egger Tue, 17 May 2011 00:39:32 +0200 + +libsfml (1.6+dfsg1-1) unstable; urgency=low + + * New Upstream Release + * Rename library packages due to soname change + * Upgrade policy version (no changes) + + -- Christoph Egger Sun, 09 May 2010 11:38:53 +0200 + +libsfml (1.5+repack1-3) unstable; urgency=low + + * Making -dev only suggest -doc instead of recommend + * Update my EMail Address + * Reformat debian/control slightly + * Make -dbg installable with only some SFML libs available + * Try building on Hurd the way it works on kFreeBSD + + -- Christoph Egger Fri, 18 Dec 2009 13:39:19 +0100 + +libsfml (1.5+repack1-2) unstable; urgency=low + + * Patch include/SFML/Config.hpp to correctly detect kFreeBSD kernels + enables the build on these ports + * Bump standards version from 3.8.2 to .3 (no changes) + * Bump compat to 7, use debian/clean file + * Clean up watchfile + * Clean up rules as per NM-review + * Depend on unversioned lib{jpeg,png}-dev packages, no special needs + here + * Remove debian/*dirs files, they're unneeded + + -- Christoph Egger Mon, 24 Aug 2009 15:20:58 +0200 + +libsfml (1.5+repack1-1) unstable; urgency=low + + * [af202195] Imported Upstream version 1.5+repack1 + * [118764a1] Add lintian override, -dbg is explicitly set to + Priority:extra on purpose + * [43beb98d] improve long descriptions + * [b25d0c2c] lib/ is missing from time to time, just create it if + needed + * [eef4cb02] Update standards-Version to 3.8.2 (no changes needed) + * [08ae7680] rename doc package to drop the soname part + + -- Christoph Egger Sat, 25 Jul 2009 14:07:05 +0200 + +libsfml (1.4+repack1-1) unstable; urgency=low + + [ Christoph Egger ] + * New Upstream Version + * Drop patches implemented upstream + * RM: add_destdir_to_makefile.patch + * RM: building_on_all_arches.patch + * RM: bump_soname.patch + * RM: cstring_ftbfs.patch + * RM: modify_toplevel_makefile + * Reorganize remaining patches using topgit + * Using external libSOIL + * Adding SOIL to repacking list + * Building Debug Package + * Building Documentation Package + * Separationg docs and examples from -dev package + * Change my E-Mail Address + + [ Gonéri Le Bouder ] + * libsfml-dev conflicts/replaces libsfml1.deb3-dev + + -- Christoph Egger Sun, 25 Jan 2009 16:51:47 +0100 + +libsfml (1.3-1) unstable; urgency=low + + * New upstream release + + -- Christoph Egger Sun, 22 Jun 2008 13:33:03 +0200 + +libsfml (1.2-3) unstable; urgency=low + + * clean rules improvement (thanks to gnoéri) + * switching to Standards Version 3.8.0 + * Adding README.source + * Renaming make target for orig tarball to reflect + common way to do so + * Allowing build on unknown arches and non-linux + debian kernels (Closes: #486851) + * Linking libraries correctly (fixing upstream makefile) + * Not installing binary sample programms + + -- Christoph Egger Thu, 19 Jun 2008 17:59:52 +0200 + +libsfml (1.2-2) unstable; urgency=low + + * Changing copyright of the packaging part + to be identical to the Source (zlib) + * Fixing Vcs-Git Field + * Fixing build with g++ 4.3 + + -- Christoph Egger Tue, 10 Jun 2008 18:52:46 +0200 + +libsfml (1.2-1) unstable; urgency=low + + * Initial release (Closes: #475850) + + -- Christoph Egger Tue, 13 May 2008 16:57:31 +0200 + --- libsfml-1.6+dfsg1.orig/debian/libsfml-system1.6.install +++ libsfml-1.6+dfsg1/debian/libsfml-system1.6.install @@ -0,0 +1 @@ +usr/lib/lib*-system.so.* --- libsfml-1.6+dfsg1.orig/debian/libsfml-doc.docs +++ libsfml-1.6+dfsg1/debian/libsfml-doc.docs @@ -0,0 +1,2 @@ +doc/* +debian/README.Debian --- libsfml-1.6+dfsg1.orig/debian/rules +++ libsfml-1.6+dfsg1/debian/rules @@ -0,0 +1,79 @@ +#!/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 --- libsfml-1.6+dfsg1.orig/debian/libsfml-audio1.6.install +++ libsfml-1.6+dfsg1/debian/libsfml-audio1.6.install @@ -0,0 +1 @@ +usr/lib/lib*-audio.so.* --- libsfml-1.6+dfsg1.orig/debian/source/format +++ libsfml-1.6+dfsg1/debian/source/format @@ -0,0 +1 @@ +1.0 --- libsfml-1.6+dfsg1.orig/debian/patches/series +++ libsfml-1.6+dfsg1/debian/patches/series @@ -0,0 +1,6 @@ +debian/fix-includes.diff +debian/gcc-4.6.diff -p1 +debian/interlinking.diff -p1 +debian/kfreebsd.diff -p1 +debian/repacking.diff -p1 +debian/scriptheader-in-example-makefiles.diff -p1 --- libsfml-1.6+dfsg1.orig/debian/patches/debian/scriptheader-in-example-makefiles.diff +++ libsfml-1.6+dfsg1/debian/patches/debian/scriptheader-in-example-makefiles.diff @@ -0,0 +1,157 @@ +From: Christoph Egger +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 + +--- + 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(+), 0 deletions(-) + +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: (92298c7..) debian/scriptheader-in-example-makefiles (depends on: master) --- libsfml-1.6+dfsg1.orig/debian/patches/debian/repacking.diff +++ libsfml-1.6+dfsg1/debian/patches/debian/repacking.diff @@ -0,0 +1,132 @@ +From: Christoph Egger +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 + +--- + 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 + #include +-#include ++#include + #include + #include + +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 + extern "C" + { +- #include +- #include ++ #include ++ #include + } +-#include +-#include ++#include ++#include + #include + + +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 // important to be included first (conflict with None) + #include +-#include +-#include ++#include ++#include + #include + #include + #include +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: (cced581..) debian/repacking (depends on: debian/interlinking) --- libsfml-1.6+dfsg1.orig/debian/patches/debian/gcc-4.6.diff +++ libsfml-1.6+dfsg1/debian/patches/debian/gcc-4.6.diff @@ -0,0 +1,132 @@ +From: Evgeni Golov +Subject: [PATCH] debian/gcc-4.6 + +Properly link with GCC 4.6. +#include everywhere. +Closes: #625031 + +Signed-off-by: Evgeni Golov + +--- + 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(+), 0 deletions(-) + +diff --git a/include/SFML/Audio/Music.hpp b/include/SFML/Audio/Music.hpp +index 0b8f70d..3320676 100755 +--- a/include/SFML/Audio/Music.hpp ++++ b/include/SFML/Audio/Music.hpp +@@ -28,6 +28,7 @@ + //////////////////////////////////////////////////////////// + // Headers + //////////////////////////////////////////////////////////// ++#include + #include + #include + #include +diff --git a/include/SFML/Audio/Sound.hpp b/include/SFML/Audio/Sound.hpp +index 7cb8002..5a46481 100755 +--- a/include/SFML/Audio/Sound.hpp ++++ b/include/SFML/Audio/Sound.hpp +@@ -28,6 +28,7 @@ + //////////////////////////////////////////////////////////// + // Headers + //////////////////////////////////////////////////////////// ++#include + #include + #include + #include +diff --git a/include/SFML/Audio/SoundBuffer.hpp b/include/SFML/Audio/SoundBuffer.hpp +index 023e5aa..2db29ad 100755 +--- a/include/SFML/Audio/SoundBuffer.hpp ++++ b/include/SFML/Audio/SoundBuffer.hpp +@@ -28,6 +28,7 @@ + //////////////////////////////////////////////////////////// + // Headers + //////////////////////////////////////////////////////////// ++#include + #include + #include + #include +diff --git a/include/SFML/Graphics/PostFX.hpp b/include/SFML/Graphics/PostFX.hpp +index c875377..be2200a 100755 +--- a/include/SFML/Graphics/PostFX.hpp ++++ b/include/SFML/Graphics/PostFX.hpp +@@ -28,6 +28,7 @@ + //////////////////////////////////////////////////////////// + // Headers + //////////////////////////////////////////////////////////// ++#include + #include + #include + #include +diff --git a/include/SFML/Graphics/RenderWindow.hpp b/include/SFML/Graphics/RenderWindow.hpp +index 088e368..b2154cc 100755 +--- a/include/SFML/Graphics/RenderWindow.hpp ++++ b/include/SFML/Graphics/RenderWindow.hpp +@@ -28,6 +28,7 @@ + //////////////////////////////////////////////////////////// + // Headers + //////////////////////////////////////////////////////////// ++#include + #include + #include + #include +diff --git a/include/SFML/Graphics/Sprite.hpp b/include/SFML/Graphics/Sprite.hpp +index 9d47bb4..deb6bab 100755 +--- a/include/SFML/Graphics/Sprite.hpp ++++ b/include/SFML/Graphics/Sprite.hpp +@@ -28,6 +28,7 @@ + //////////////////////////////////////////////////////////// + // Headers + //////////////////////////////////////////////////////////// ++#include + #include + #include + #include +diff --git a/include/SFML/Graphics/String.hpp b/include/SFML/Graphics/String.hpp +index b0ca81b..6b9c483 100755 +--- a/include/SFML/Graphics/String.hpp ++++ b/include/SFML/Graphics/String.hpp +@@ -28,6 +28,7 @@ + //////////////////////////////////////////////////////////// + // Headers + //////////////////////////////////////////////////////////// ++#include + #include + #include + #include +diff --git a/src/SFML/Graphics/Font.cpp b/src/SFML/Graphics/Font.cpp +index 36c4c28..350c0cc 100755 +--- a/src/SFML/Graphics/Font.cpp ++++ b/src/SFML/Graphics/Font.cpp +@@ -25,6 +25,7 @@ + //////////////////////////////////////////////////////////// + // Headers + //////////////////////////////////////////////////////////// ++#include + #include + #include + #include +diff --git a/src/SFML/Graphics/Image.cpp b/src/SFML/Graphics/Image.cpp +index 14346fb..8b18fb7 100755 +--- a/src/SFML/Graphics/Image.cpp ++++ b/src/SFML/Graphics/Image.cpp +@@ -25,6 +25,7 @@ + //////////////////////////////////////////////////////////// + // Headers + //////////////////////////////////////////////////////////// ++#include + #include + #include + #include +-- +tg: (3794d17..) debian/gcc-4.6 (depends on: master) --- libsfml-1.6+dfsg1.orig/debian/patches/debian/fix-includes.diff +++ libsfml-1.6+dfsg1/debian/patches/debian/fix-includes.diff @@ -0,0 +1,23 @@ +From: Christoph Egger +Subject: [PATCH] debian/fix-includes + +SFML needs sme modified includes to build against gcc-4.6 + +Signed-off-by: Christoph Egger + +--- + include/SFML/System/ResourcePtr.inl | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +Index: libsfml-1.6+dfsg1/include/SFML/System/Resource.hpp +=================================================================== +--- libsfml-1.6+dfsg1.orig/include/SFML/System/Resource.hpp 2011-09-21 15:03:16.449574957 +0000 ++++ libsfml-1.6+dfsg1/include/SFML/System/Resource.hpp 2011-09-21 15:03:34.429601847 +0000 +@@ -29,6 +29,7 @@ + // Headers + //////////////////////////////////////////////////////////// + #include ++#include + + + namespace sf --- libsfml-1.6+dfsg1.orig/debian/patches/debian/kfreebsd.diff +++ libsfml-1.6+dfsg1/debian/patches/debian/kfreebsd.diff @@ -0,0 +1,27 @@ +From: Christoph Egger +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 + +--- + include/SFML/Config.hpp | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +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: (92298c7..) debian/kfreebsd (depends on: master) --- libsfml-1.6+dfsg1.orig/debian/patches/debian/interlinking.diff +++ libsfml-1.6+dfsg1/debian/patches/debian/interlinking.diff @@ -0,0 +1,78 @@ +From: Christoph Egger +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 + +--- + 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: (2bed856..) debian/interlinking (depends on: debian/destdir-install-symlinks)