diff options
| -rw-r--r-- | debian/patches/linking_against_all_needed_libs.patch | 42 | ||||
| -rw-r--r-- | debian/patches/removing_removed_sources_from_makefiles.patch | 4 | ||||
| -rwxr-xr-x | debian/rules | 16 |
3 files changed, 36 insertions, 26 deletions
diff --git a/debian/patches/linking_against_all_needed_libs.patch b/debian/patches/linking_against_all_needed_libs.patch index 101683b..810b925 100644 --- a/debian/patches/linking_against_all_needed_libs.patch +++ b/debian/patches/linking_against_all_needed_libs.patch @@ -1,30 +1,42 @@ Index: libsfml/src/SFML/Graphics/Makefile =================================================================== ---- libsfml.orig/src/SFML/Graphics/Makefile 2008-11-01 17:48:07.000000000 +0100 -+++ libsfml/src/SFML/Graphics/Makefile 2008-11-01 17:54:19.000000000 +0100 -@@ -14,10 +14,10 @@ +--- libsfml.orig/src/SFML/Graphics/Makefile 2008-11-01 23:09:41.000000000 +0100 ++++ libsfml/src/SFML/Graphics/Makefile 2008-11-01 23:12:36.000000000 +0100 +@@ -14,21 +14,19 @@ all: $(LIB)
- libsfml-graphics-s.a: $(OBJ) $(OBJSOIL)
+ libsfml-graphics-s.a: $(OBJ)
- $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) -lpng -ljpeg -lz -lfreetype -lGLEW -lSOIL
-+ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) -lpng -ljpeg -lz -lfreetype -lGLEW -lSOIL $(LIBPATH)/libsfml-window-s.a -lGL
++ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) -lpng -ljpeg -lfreetype -lGLEW -lSOIL
- libsfml-graphics.so: $(OBJ) $(OBJSOIL)
+ libsfml-graphics.so: $(OBJ)
- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lpng -ljpeg -lGLEW -lz -lfreetype -lSOIL
-+ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lpng -ljpeg -lGLEW -lfreetype -lSOIL $(LIBPATH)/libsfml-window.so.$(VERSION) -lGL
++ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lpng -ljpeg -lGLEW -lfreetype -lSOIL $(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)
Index: libsfml/src/SFML/Audio/Makefile =================================================================== ---- libsfml.orig/src/SFML/Audio/Makefile 2008-11-01 17:43:48.000000000 +0100 -+++ libsfml/src/SFML/Audio/Makefile 2008-11-01 17:54:19.000000000 +0100 +--- libsfml.orig/src/SFML/Audio/Makefile 2008-11-01 22:36:36.000000000 +0100 ++++ libsfml/src/SFML/Audio/Makefile 2008-11-01 23:09:51.000000000 +0100 @@ -16,10 +16,10 @@ all: $(LIB)
libsfml-audio-s.a: $(OBJ) $(OBJVORBIS)
- $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJVORBIS)
-+ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJVORBIS) $(LIBPATH/libsfml-system-s.a
++ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJVORBIS) $(LIBPATH)/libsfml-system-s.a
libsfml-audio.so: $(OBJ) $(OBJVORBIS)
- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJVORBIS) -lsndfile -lopenal
@@ -34,8 +46,8 @@ Index: libsfml/src/SFML/Audio/Makefile $(CPP) -o $@ -c $< $(CFLAGS)
Index: libsfml/src/SFML/Makefile =================================================================== ---- libsfml.orig/src/SFML/Makefile 2008-11-01 17:43:48.000000000 +0100 -+++ libsfml/src/SFML/Makefile 2008-11-01 17:54:19.000000000 +0100 +--- libsfml.orig/src/SFML/Makefile 2008-11-01 23:09:40.000000000 +0100 ++++ libsfml/src/SFML/Makefile 2008-11-01 23:09:51.000000000 +0100 @@ -35,16 +35,16 @@ sfml-system:
@(cd ./System && $(MAKE))
@@ -48,7 +60,7 @@ Index: libsfml/src/SFML/Makefile @(cd ./Network && $(MAKE))
-sfml-graphics:
-+sfml-graphics: sfml-window
++sfml-graphics: sfml-window sfml-system
@(cd ./Graphics && $(MAKE))
-sfml-audio:
@@ -58,8 +70,8 @@ Index: libsfml/src/SFML/Makefile .PHONY: clean mrproper
Index: libsfml/src/SFML/Window/Makefile =================================================================== ---- libsfml.orig/src/SFML/Window/Makefile 2008-11-01 17:48:07.000000000 +0100 -+++ libsfml/src/SFML/Window/Makefile 2008-11-01 17:54:19.000000000 +0100 +--- libsfml.orig/src/SFML/Window/Makefile 2008-11-01 23:09:41.000000000 +0100 ++++ libsfml/src/SFML/Window/Makefile 2008-11-01 23:09:51.000000000 +0100 @@ -14,10 +14,10 @@ all: $(LIB)
diff --git a/debian/patches/removing_removed_sources_from_makefiles.patch b/debian/patches/removing_removed_sources_from_makefiles.patch index 8a9d578..6217e81 100644 --- a/debian/patches/removing_removed_sources_from_makefiles.patch +++ b/debian/patches/removing_removed_sources_from_makefiles.patch @@ -24,12 +24,12 @@ Index: libsfml/src/SFML/Graphics/Makefile -libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
- $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
-+libsfml-graphics-s.a: $(OBJ) $(OBJSOIL)
++libsfml-graphics-s.a: $(OBJ)
+ $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) -lpng -ljpeg -lz -lfreetype -lGLEW -lSOIL
-libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype
-+libsfml-graphics.so: $(OBJ) $(OBJSOIL)
++libsfml-graphics.so: $(OBJ)
+ $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) -lpng -ljpeg -lGLEW -lz -lfreetype -lSOIL
$(OBJ): %.o: %.cpp
diff --git a/debian/rules b/debian/rules index 20e8d5f..706c141 100755 --- a/debian/rules +++ b/debian/rules @@ -9,6 +9,8 @@ version=1.4.0 major=1 +include /usr/share/quilt/quilt.make + get-orig-source: cd .. ; rm -rf libsfml-1.3.orig ; mkdir libsfml-1.3.orig ; cd libsfml-1.3.orig ; \ wget http://downloads.sourceforge.net/sfml/SFML-1.3-sdk-linux.tar.gz ; \ @@ -20,11 +22,10 @@ get-orig-source: cd .. ; rm SFML-1.3-sdk-linux.tar.gz; mv SFML-1.3/* . ; rm -r SFML-1.3 cd .. ; dpkg-source -b -su libsfml libsfml-1.3.orig -configure: configure-stamp -configure-stamp: +configure: configure-stamp +configure-stamp: $(QUILT_STAMPFN) dh_testdir -# Add here commands to configure the package. - QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 + touch configure-stamp @@ -32,18 +33,16 @@ build: build-stamp build-stamp: configure-stamp dh_testdir -# Add here commands to compile the package. $(MAKE) sfml touch $@ -clean: +clean: unpatch find lib -name "*so*" -exec rm {} \; dh_testdir dh_testroot # Add here commands to clean up after the build process. $(MAKE) clean - QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2 rm -Rf .pc @@ -55,7 +54,6 @@ install: build dh_clean -k dh_installdirs -# Add here commands to install the package into debian/tmp $(MAKE) DESTDIR=$(CURDIR)/debian/tmp/usr install find $(CURDIR)/debian/tmp -name Win32 -o -name OSX -print | xargs /bin/rm -rf @@ -70,7 +68,7 @@ binary-arch: build install dh_testroot dh_installchangelogs dh_installdocs - dh_installexamples ; find debian/libsfml1.4-doc/usr/share/doc/libsfml1.4-doc/examples/bin -maxdepth 1 ! -type d -exec rm {} \; + dh_installexamples ; ( cd debian/libsfml1.4-doc/usr/share/doc/libsfml1.4-doc/examples/ && make clean ) dh_install --fail-missing --sourcedir=debian/tmp dh_installman dh_link |