vdr/vdr-plugin-games/debian/patches 00list 01_Makefile-fPIC-fix.dpatch 02_Makefile-nosilent.dpatch
Thomas Schmidt
pkg-vdr-dvb-changes@lists.alioth.debian.org
Thu, 19 Aug 2004 15:26:57 +0000
Update of /cvsroot/pkg-vdr-dvb/vdr/vdr-plugin-games/debian/patches
In directory haydn:/tmp/cvs-serv12503/vdr/vdr-plugin-games/debian/patches
Added Files:
00list 01_Makefile-fPIC-fix.dpatch 02_Makefile-nosilent.dpatch
Log Message:
* added -fPIc to Makefiles in the game-subdirs (closes: #266793)
* removed output-suppression of the make and g++-calls
--- NEW FILE: 02_Makefile-nosilent.dpatch ---
#! /bin/sh -e
## 02_Makefile-nosilent.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Removes output-suppresions from the Makefiles
if [ $# -lt 1 ]; then
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
exit 1
fi
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
case "$1" in
-patch) patch -p1 ${patch_opts} < $0;;
-unpatch) patch -R -p1 ${patch_opts} < $0;;
*)
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
exit 1;;
esac
exit 0
@DPATCH@
diff -urNad /home/chelli/vdr/cvs-buildpackage/vdr-plugin-games/vdr-plugin-games-0.6.1/Makefile vdr-plugin-games-0.6.1/Makefile
--- /home/chelli/vdr/cvs-buildpackage/vdr-plugin-games/vdr-plugin-games-0.6.1/Makefile 2004-08-19 17:19:17.000000000 +0200
+++ vdr-plugin-games-0.6.1/Makefile 2004-08-19 17:19:18.000000000 +0200
@@ -49,18 +49,18 @@
all:
@echo
@echo -n "Building $(TARGET) "
- @for GAME in $(GAMES); do cd $$GAME; make -s all; cd -; done
+ for GAME in $(GAMES); do cd $$GAME; make all; cd -; done
@rm -f $(TARGET)
- @make -s $(TARGET)
+ @make $(TARGET)
@echo " done"
@echo
libvdr-games.so: $(OBJS)
- @g++ $(OBJS) $(LFLAGS) $(ARCHIVES) -o $@
+ g++ $(OBJS) $(LFLAGS) $(ARCHIVES) -o $@
@cp $@ $(LIBDIR)/$@.$(VDRVER)
sdl-games: $(OBJS)
- @g++ $(OBJS) $(LFLAGS) $(ARCHIVES) -o $@
+ g++ $(OBJS) $(LFLAGS) $(ARCHIVES) -o $@
install: all
@cp $(LIBDIR)/libvdr-games.so.$(VDRVER) /mnt/vdr/lib/plugins/
@@ -78,11 +78,11 @@
clean:
@echo
@echo -n "Cleaning source tree "
- @for GAME in $(GAMES); do cd $$GAME; make -s clean; cd -; done
+ @for GAME in $(GAMES); do cd $$GAME; make clean; cd -; done
@rm -f *.o *.a $(TARGET)
@echo " done"
@echo
.cpp.o:
@echo -n "."
- @$(COMPILE.cpp) $(DEFINES) $(CFLAGS) -c $< $(OUTPUT_OPTION)
+ $(COMPILE.cpp) $(DEFINES) $(CFLAGS) -c $< $(OUTPUT_OPTION)
diff -urNad /home/chelli/vdr/cvs-buildpackage/vdr-plugin-games/vdr-plugin-games-0.6.1/minesweeper/Makefile vdr-plugin-games-0.6.1/minesweeper/Makefile
--- /home/chelli/vdr/cvs-buildpackage/vdr-plugin-games/vdr-plugin-games-0.6.1/minesweeper/Makefile 2004-08-19 17:19:18.000000000 +0200
+++ vdr-plugin-games-0.6.1/minesweeper/Makefile 2004-08-19 17:19:42.000000000 +0200
@@ -11,4 +11,4 @@
.cpp.o:
@echo -n "."
- @g++ $(CFLAGS) -c $<
+ g++ $(CFLAGS) -c $<
diff -urNad /home/chelli/vdr/cvs-buildpackage/vdr-plugin-games/vdr-plugin-games-0.6.1/snake/Makefile vdr-plugin-games-0.6.1/snake/Makefile
--- /home/chelli/vdr/cvs-buildpackage/vdr-plugin-games/vdr-plugin-games-0.6.1/snake/Makefile 2004-08-19 17:19:18.000000000 +0200
+++ vdr-plugin-games-0.6.1/snake/Makefile 2004-08-19 17:19:53.000000000 +0200
@@ -11,4 +11,4 @@
.cpp.o:
@echo -n "."
- @g++ $(CFLAGS) -c $<
+ g++ $(CFLAGS) -c $<
diff -urNad /home/chelli/vdr/cvs-buildpackage/vdr-plugin-games/vdr-plugin-games-0.6.1/tetris/Makefile vdr-plugin-games-0.6.1/tetris/Makefile
--- /home/chelli/vdr/cvs-buildpackage/vdr-plugin-games/vdr-plugin-games-0.6.1/tetris/Makefile 2004-08-19 17:19:18.000000000 +0200
+++ vdr-plugin-games-0.6.1/tetris/Makefile 2004-08-19 17:20:05.000000000 +0200
@@ -11,4 +11,4 @@
.cpp.o:
@echo -n "."
- @g++ $(CFLAGS) -c $<
+ g++ $(CFLAGS) -c $<
diff -urNad /home/chelli/vdr/cvs-buildpackage/vdr-plugin-games/vdr-plugin-games-0.6.1/tictactoe/Makefile vdr-plugin-games-0.6.1/tictactoe/Makefile
--- /home/chelli/vdr/cvs-buildpackage/vdr-plugin-games/vdr-plugin-games-0.6.1/tictactoe/Makefile 2004-08-19 17:19:18.000000000 +0200
+++ vdr-plugin-games-0.6.1/tictactoe/Makefile 2004-08-19 17:20:15.000000000 +0200
@@ -11,4 +11,4 @@
.cpp.o:
@echo -n "."
- @g++ $(CFLAGS) -c $<
+ g++ $(CFLAGS) -c $<
diff -urNad /home/chelli/vdr/cvs-buildpackage/vdr-plugin-games/vdr-plugin-games-0.6.1/tron/Makefile vdr-plugin-games-0.6.1/tron/Makefile
--- /home/chelli/vdr/cvs-buildpackage/vdr-plugin-games/vdr-plugin-games-0.6.1/tron/Makefile 2004-08-19 17:19:18.000000000 +0200
+++ vdr-plugin-games-0.6.1/tron/Makefile 2004-08-19 17:20:22.000000000 +0200
@@ -11,4 +11,4 @@
.cpp.o:
@echo -n "."
- @g++ $(CFLAGS) -c $<
+ g++ $(CFLAGS) -c $<
--- NEW FILE: 00list ---
01_Makefile-fPIC-fix
02_Makefile-nosilent
--- NEW FILE: 01_Makefile-fPIC-fix.dpatch ---
#! /bin/sh -e
## 01_Makefile-fPIC-fix.dpatch by Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Adds -fPIC to Makefiles, to fix FTBFS (#266793)
if [ $# -lt 1 ]; then
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
exit 1
fi
[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
case "$1" in
-patch) patch -p1 ${patch_opts} < $0;;
-unpatch) patch -R -p1 ${patch_opts} < $0;;
*)
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
exit 1;;
esac
exit 0
@DPATCH@
diff -urNad /home/chelli/vdr/cvs-buildpackage/vdr-plugin-games/vdr-plugin-games-0.6.1/minesweeper/Makefile vdr-plugin-games-0.6.1/minesweeper/Makefile
--- /home/chelli/vdr/cvs-buildpackage/vdr-plugin-games/vdr-plugin-games-0.6.1/minesweeper/Makefile 2004-07-03 16:44:40.000000000 +0200
+++ vdr-plugin-games-0.6.1/minesweeper/Makefile 2004-08-19 16:55:14.000000000 +0200
@@ -1,6 +1,6 @@
GAME = minesweeper
OBJS = minesweeper.o
-CFLAGS = -g -pipe -O2 -Wall -Woverloaded-virtual
+CFLAGS = -fPIC -g -pipe -O2 -Wall -Woverloaded-virtual
all: $(OBJS)
@ar -r $(GAME).a $(OBJS)
diff -urNad /home/chelli/vdr/cvs-buildpackage/vdr-plugin-games/vdr-plugin-games-0.6.1/snake/Makefile vdr-plugin-games-0.6.1/snake/Makefile
--- /home/chelli/vdr/cvs-buildpackage/vdr-plugin-games/vdr-plugin-games-0.6.1/snake/Makefile 2004-07-03 16:44:40.000000000 +0200
+++ vdr-plugin-games-0.6.1/snake/Makefile 2004-08-19 16:55:29.000000000 +0200
@@ -1,6 +1,6 @@
GAME = snake
OBJS = snake.o
-CFLAGS = -g -pipe -O2 -Wall -Woverloaded-virtual
+CFLAGS = -fPIC -g -pipe -O2 -Wall -Woverloaded-virtual
all: $(OBJS)
@ar -r $(GAME).a $(OBJS)
diff -urNad /home/chelli/vdr/cvs-buildpackage/vdr-plugin-games/vdr-plugin-games-0.6.1/tetris/Makefile vdr-plugin-games-0.6.1/tetris/Makefile
--- /home/chelli/vdr/cvs-buildpackage/vdr-plugin-games/vdr-plugin-games-0.6.1/tetris/Makefile 2004-07-03 16:44:40.000000000 +0200
+++ vdr-plugin-games-0.6.1/tetris/Makefile 2004-08-19 16:55:49.000000000 +0200
@@ -1,6 +1,6 @@
GAME = tetris
OBJS = tetris.o
-CFLAGS = -g -pipe -O2 -Wall -Woverloaded-virtual
+CFLAGS = -fPIC -g -pipe -O2 -Wall -Woverloaded-virtual
all: $(OBJS)
@ar -r $(GAME).a $(OBJS)
diff -urNad /home/chelli/vdr/cvs-buildpackage/vdr-plugin-games/vdr-plugin-games-0.6.1/tictactoe/Makefile vdr-plugin-games-0.6.1/tictactoe/Makefile
--- /home/chelli/vdr/cvs-buildpackage/vdr-plugin-games/vdr-plugin-games-0.6.1/tictactoe/Makefile 2004-07-03 16:44:40.000000000 +0200
+++ vdr-plugin-games-0.6.1/tictactoe/Makefile 2004-08-19 16:56:02.000000000 +0200
@@ -1,6 +1,6 @@
GAME = tictactoe
OBJS = tictactoe.o
-CFLAGS = -g -pipe -O2 -Wall -Woverloaded-virtual
+CFLAGS = -fPIC -g -pipe -O2 -Wall -Woverloaded-virtual
all: $(OBJS)
@ar -r $(GAME).a $(OBJS)
diff -urNad /home/chelli/vdr/cvs-buildpackage/vdr-plugin-games/vdr-plugin-games-0.6.1/tron/Makefile vdr-plugin-games-0.6.1/tron/Makefile
--- /home/chelli/vdr/cvs-buildpackage/vdr-plugin-games/vdr-plugin-games-0.6.1/tron/Makefile 2004-07-03 16:44:40.000000000 +0200
+++ vdr-plugin-games-0.6.1/tron/Makefile 2004-08-19 16:56:13.000000000 +0200
@@ -1,6 +1,6 @@
GAME = tron
OBJS = tron.o
-CFLAGS = -g -pipe -O2 -Wall -Woverloaded-virtual
+CFLAGS = -fPIC -g -pipe -O2 -Wall -Woverloaded-virtual
all: $(OBJS)
@ar -r $(GAME).a $(OBJS)