From 54f53a6ca7c3f162ebb0e86659e8ff4f7d552a24 Mon Sep 17 00:00:00 2001 From: Jiri Brozovsky Date: Sat, 31 Jul 2010 18:04:27 +0200 Subject: [PATCH 1/9] Initial Port of plucker (plkr.org) handheld reader. It's market as @BROKEN. It compiles and works but further improvemnt of GUI is necessary. --- plucker/Makefile | 53 +++++++++++++++++++++++++++++++++ plucker/Makefile.bad | 51 +++++++++++++++++++++++++++++++ plucker/patches/configure.patch | 19 ++++++++++++ 3 files changed, 123 insertions(+) create mode 100644 plucker/Makefile create mode 100644 plucker/Makefile.bad create mode 100644 plucker/patches/configure.patch diff --git a/plucker/Makefile b/plucker/Makefile new file mode 100644 index 0000000..c555c12 --- /dev/null +++ b/plucker/Makefile @@ -0,0 +1,53 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=plucker +PKG_VERSION:=1.8 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)_src-$(PKG_VERSION).tar.bz2 + PKG_SOURCE_URL:=http://downloads.plkr.org/1.8/ + PKG_CAT:=bzip2 -cd + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + + +include $(INCLUDE_DIR)/package.mk + +define Package/plucker + SECTION:=utils + CATEGORY:=Utilities + TITLE:=Plucker files reader (PDB) + DEPENDS:=@BROKEN +zlib +libintl +libiconv +libgconf2 +libjpeg +pixman +fontconfig +libfreetype +pango +atk +libpng +DirectFB + URL=http://www.plkr.org +endef + +define Package/plucker/description + Plucker can view files made by the Plucker Distiller (Project Gutenberg books, for example). +endef + + +TARGET_CFLAGS+= -I$(STAGING_DIR)/usr/lib/libintl/include +TARGET_LDFLAGS+= -L$(STAGING_DIR)/usr/lib/libintl/lib +TARGET_LDFLAGS+= -Wl,-rpath-link=$(STAGING_DIR)/usr/lib + +define Build/Configure + $(call Build/Configure/Default, \ + --prefix=/usr \ + --disable-palmosbuild \ + --disable-docbuild \ + --disable-java-distiller\ + --enable-gtkviewer\ + --enable-unplug \ + --disable-explode \ + --disable-desktopbuild, \ + LIBS="-L$(STAGING_DIR)/usr/lib/libiconv/lib -L$(STAGING_DIR)/usr/lib/libintl/lib -L$(STAGING_DIR)/usr/lib -lgtk-directfb-2.0 -lgdk-directfb-2.0 -latk-1.0 -lgio-2.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lpangoft2-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lintl -liconv -lfreetype -lfontconfig -ljpeg -lpng -lpixman-1 -ldirectfb -ldirect -lfusion -lexpat -lz -lm"\ + ) +endef + + +define Package/plucker/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/viewer-GTK+2-POSIX/plucker $(1)/usr/bin/ +endef + +$(eval $(call BuildPackage,plucker)) diff --git a/plucker/Makefile.bad b/plucker/Makefile.bad new file mode 100644 index 0000000..c7355f8 --- /dev/null +++ b/plucker/Makefile.bad @@ -0,0 +1,51 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=plucker +PKG_VERSION:=1.8 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)_src-$(PKG_VERSION).tar.bz2 + PKG_SOURCE_URL:=http://downloads.plkr.org/1.8/ + PKG_CAT:=bzip2 -cd + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + + +include $(INCLUDE_DIR)/package.mk + +define Package/plucker + SECTION:=utils + CATEGORY:=Utilities + TITLE:=Plucker files reader (PDB) + DEPENDS:=+zlib +libintl +libiconv +libgconf2 +gtk +jpeg +pixman +fontconfig +libfreetype +pango +atk +libpng +DirectFB + URL=http://www.plkr.org +endef + +define Package/plucker/description + Plucker can view files made by the Plucker Distiller (Project Gutenberg books, for example). +endef + +#TARGET_CFLAGS+=-"I$(STAGING_DIR)/usr/include/gtk-2.0 -I$(STAGING_DIR)/usr/include" + +define Build/Configure + $(call Build/Configure/Default, \ + --prefix=/usr \ + --disable-palmosbuild \ + --disable-docbuild \ + --disable-java-distiller\ + --enable-gtkviewer\ + --enable-unplug \ + --disable-explode \ + --disable-desktopbuild, \ + LIBS="-L$(STAGING_DIR)/usr/lib/libintl/lib -L$(STAGING_DIR)/usr/lib/libiconv/lib -L$(STAGING_DIR)/usr/lib" \ + GTK2LIBS="-latk -lpixman -lfontconfig -lpng"\ + ) +endef + + +define Package/plucker/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/viewer-GTK+2-POSIX/plucker $(1)/usr/bin/ +endef + +$(eval $(call BuildPackage,plucker)) diff --git a/plucker/patches/configure.patch b/plucker/patches/configure.patch new file mode 100644 index 0000000..cb19cdf --- /dev/null +++ b/plucker/patches/configure.patch @@ -0,0 +1,19 @@ +--- plucker-1.8/configure 2004-05-19 17:19:43.000000000 +0200 ++++ plucker-1.8m/configure 2010-07-31 17:14:40.040292498 +0200 +@@ -4655,6 +4655,7 @@ + has_jpeg_library=no + fi + ++BUILD_UNPLUCK=yes + + if test "$BUILD_UNPLUCK" != "yes"; then + echo "$as_me:$LINENO: result: libunpluck will not be built, by request" >&5 +@@ -4670,6 +4671,8 @@ + BUILD_UNPLUCK=no + fi + ++BUILD_UNPLUCK=yes ++ + if test "$BUILD_EXPLODE" = "no" ; then + echo "$as_me:$LINENO: result: explode will not be built, by request" >&5 + echo "${ECHO_T}explode will not be built, by request" >&6 From f7f554502213859c9add20626cc17dcbc70aae63 Mon Sep 17 00:00:00 2001 From: kyak Date: Sat, 31 Jul 2010 21:43:12 +0400 Subject: [PATCH 2/9] worm - the growing worm game of bsd-games --- bsd-games/Makefile | 20 ++++++++++++++++++++ bsd-games/patches/003-worm.patch | 26 ++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 bsd-games/patches/003-worm.patch diff --git a/bsd-games/Makefile b/bsd-games/Makefile index ccadfb7..7ff0bcf 100644 --- a/bsd-games/Makefile +++ b/bsd-games/Makefile @@ -37,6 +37,10 @@ define Build/Compile cd $(PKG_BUILD_DIR)/primes; \ $(TARGET_CC) -c -O2 -Wall -W -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wcast-align -Wcast-qual -Wwrite-strings pattern.c pr_tbl.c primes.c; \ $(TARGET_CC) -lm -o primes pattern.o pr_tbl.o primes.o + +#Building worm + cd $(PKG_BUILD_DIR)/worm; \ + $(TARGET_CC) -lncurses -L$(STAGING_DIR)/usr/lib -I$(STAGING_DIR)/usr/include -O2 -Wall -W -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wcast-align -Wcast-qual -Wwrite-strings -o worm worm.c endef define Package/tetris @@ -69,5 +73,21 @@ define Package/primes/install $(1)/usr/bin/primes endef +define Package/worm +$(call Package/bsd-games) + TITLE:=The growing worm game + DEPENDS:=+libncurses +endef + +define Package/worm/install + $(INSTALL_DIR) \ + $(1)/usr/bin + + $(INSTALL_BIN) \ + $(PKG_BUILD_DIR)/worm/worm \ + $(1)/usr/bin/worm +endef + $(eval $(call BuildPackage,tetris)) $(eval $(call BuildPackage,primes)) +$(eval $(call BuildPackage,worm)) diff --git a/bsd-games/patches/003-worm.patch b/bsd-games/patches/003-worm.patch new file mode 100644 index 0000000..9705c2e --- /dev/null +++ b/bsd-games/patches/003-worm.patch @@ -0,0 +1,26 @@ +diff -u bsd-games-2.17/worm/worm.c bsd-games-2.17-p/worm/worm.c +--- bsd-games-2.17/worm/worm.c 2004-01-27 23:52:07.000000000 +0300 ++++ bsd-games-2.17-p/worm/worm.c 2010-07-31 21:36:08.313419076 +0400 +@@ -30,18 +30,18 @@ + */ + + #include +-#ifndef lint ++/*#ifndef lint + __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ + The Regents of the University of California. All rights reserved.\n"); +-#endif /* not lint */ ++#endif */ /* not lint */ + +-#ifndef lint ++/* #ifndef lint + #if 0 + static char sccsid[] = "@(#)worm.c 8.1 (Berkeley) 5/31/93"; + #else + __RCSID("$NetBSD: worm.c,v 1.25 2004/01/27 20:30:31 jsm Exp $"); + #endif +-#endif /* not lint */ ++#endif */ /* not lint */ + + /* + * Worm. Written by Michael Toy From d696302080592a5594f8e8b92b14125ea76afe50 Mon Sep 17 00:00:00 2001 From: kyak Date: Sun, 1 Aug 2010 12:24:27 +0400 Subject: [PATCH 3/9] backgammon of bsd-games --- bsd-games/Makefile | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/bsd-games/Makefile b/bsd-games/Makefile index 7ff0bcf..57e0133 100644 --- a/bsd-games/Makefile +++ b/bsd-games/Makefile @@ -41,6 +41,17 @@ define Build/Compile #Building worm cd $(PKG_BUILD_DIR)/worm; \ $(TARGET_CC) -lncurses -L$(STAGING_DIR)/usr/lib -I$(STAGING_DIR)/usr/include -O2 -Wall -W -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wcast-align -Wcast-qual -Wwrite-strings -o worm worm.c + +#Building backgammon + cd $(PKG_BUILD_DIR)/backgammon; \ + cd common_source; \ + $(TARGET_CC) -c -O2 -Wall -W -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wcast-align -Wcast-qual -Wwrite-strings -I$(STAGING_DIR)/usr/include -DEXEC_PATH=\"/usr/bin/backgammon\" -DTEACH_PATH=\"/usr/bin/teachgammon\" allow.c board.c check.c fancy.c init.c odds.c one.c save.c subs.c table.c; \ + cd ../backgammon; \ + $(TARGET_CC) -c -O2 -Wall -W -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wcast-align -Wcast-qual -Wwrite-strings -I$(STAGING_DIR)/usr/include -I$(PKG_BUILD_DIR)/backgammon/common_source extra.c main.c move.c text.c version.c; \ + $(TARGET_CC) -lncurses -L$(STAGING_DIR)/usr/lib -o backgammon $(ECHO) ../common_source/*.o ../backgammon/*.o; \ + cd ../teachgammon; \ + $(TARGET_CC) -c -O2 -Wall -W -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wcast-align -Wcast-qual -Wwrite-strings -I$(STAGING_DIR)/usr/include -I$(PKG_BUILD_DIR)/backgammon/common_source data.c teach.c ttext1.c ttext2.c tutor.c; \ + $(TARGET_CC) -lncurses -L$(STAGING_DIR)/usr/lib -o teachgammon $(ECHO) ../common_source/*.o ../teachgammon/*.o endef define Package/tetris @@ -88,6 +99,26 @@ define Package/worm/install $(1)/usr/bin/worm endef +define Package/backgammon +$(call Package/bsd-games) + TITLE:=the game of backgammon + DEPENDS:=+libncurses +endef + +define Package/backgammon/install + $(INSTALL_DIR) \ + $(1)/usr/bin + + $(INSTALL_BIN) \ + $(PKG_BUILD_DIR)/backgammon/backgammon/backgammon \ + $(1)/usr/bin/backgammon + + $(INSTALL_BIN) \ + $(PKG_BUILD_DIR)/backgammon/teachgammon/teachgammon \ + $(1)/usr/bin/teachgammon +endef + $(eval $(call BuildPackage,tetris)) $(eval $(call BuildPackage,primes)) $(eval $(call BuildPackage,worm)) +$(eval $(call BuildPackage,backgammon)) From 48e547ca48b0fea0eb03f79d387f29fe952364df Mon Sep 17 00:00:00 2001 From: kyak Date: Sun, 1 Aug 2010 12:30:49 +0400 Subject: [PATCH 4/9] backgammon of bsd-games --- bsd-games/patches/004-backgammon.patch | 429 +++++++++++++++++++++++++ 1 file changed, 429 insertions(+) create mode 100644 bsd-games/patches/004-backgammon.patch diff --git a/bsd-games/patches/004-backgammon.patch b/bsd-games/patches/004-backgammon.patch new file mode 100644 index 0000000..80d1c2a --- /dev/null +++ b/bsd-games/patches/004-backgammon.patch @@ -0,0 +1,429 @@ +diff -ur bsd-games-2.17/backgammon/backgammon/extra.c bsd-games-2.17-p/backgammon/backgammon/extra.c +--- bsd-games-2.17/backgammon/backgammon/extra.c 2003-12-17 05:47:37.000000000 +0300 ++++ bsd-games-2.17-p/backgammon/backgammon/extra.c 2010-07-31 22:10:07.910053909 +0400 +@@ -30,13 +30,13 @@ + */ + + #include +-#ifndef lint ++/* #ifndef lint + #if 0 + static char sccsid[] = "@(#)extra.c 8.1 (Berkeley) 5/31/93"; + #else + __RCSID("$NetBSD: extra.c,v 1.5 2003/08/07 09:36:55 agc Exp $"); + #endif +-#endif /* not lint */ ++#endif */ /* not lint */ + + #include "back.h" + #include "backlocal.h" +diff -ur bsd-games-2.17/backgammon/backgammon/main.c bsd-games-2.17-p/backgammon/backgammon/main.c +--- bsd-games-2.17/backgammon/backgammon/main.c 2005-02-16 09:24:50.000000000 +0300 ++++ bsd-games-2.17-p/backgammon/backgammon/main.c 2010-08-01 11:08:39.969952583 +0400 +@@ -30,18 +30,18 @@ + */ + + #include +-#ifndef lint ++/* #ifndef lint + __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ + The Regents of the University of California. All rights reserved.\n"); +-#endif /* not lint */ ++#endif */ /* not lint */ + +-#ifndef lint ++/* #ifndef lint + #if 0 + static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 5/31/93"; + #else + __RCSID("$NetBSD: main.c,v 1.21 2005/02/15 12:56:20 jsm Exp $"); + #endif +-#endif /* not lint */ ++#endif */ /* not lint */ + + #include + +@@ -49,6 +49,7 @@ + #include "backlocal.h" + + #define MVPAUSE 5 /* time to sleep when stuck */ ++#define OXTABS XTABS + + extern const char *const instr[]; /* text of instructions */ + extern const char *const message[]; /* update message */ +@@ -124,7 +125,7 @@ + #ifdef V7 + while (*++argv != 0) /* process arguments */ + #else +- while (*++argv != -1) /* process arguments */ ++ while (*++argv != 0) /* process arguments */ + #endif + getarg(&argv); + args[acnt] = '\0'; +diff -ur bsd-games-2.17/backgammon/backgammon/move.c bsd-games-2.17-p/backgammon/backgammon/move.c +--- bsd-games-2.17/backgammon/backgammon/move.c 2004-01-27 23:52:07.000000000 +0300 ++++ bsd-games-2.17-p/backgammon/backgammon/move.c 2010-07-31 22:10:41.854259314 +0400 +@@ -30,13 +30,13 @@ + */ + + #include +-#ifndef lint ++/* #ifndef lint + #if 0 + static char sccsid[] = "@(#)move.c 8.1 (Berkeley) 5/31/93"; + #else + __RCSID("$NetBSD: move.c,v 1.8 2004/01/27 20:30:28 jsm Exp $"); + #endif +-#endif /* not lint */ ++#endif */ /* not lint */ + + #include "back.h" + #include "backlocal.h" +diff -ur bsd-games-2.17/backgammon/backgammon/text.c bsd-games-2.17-p/backgammon/backgammon/text.c +--- bsd-games-2.17/backgammon/backgammon/text.c 2003-12-17 05:47:37.000000000 +0300 ++++ bsd-games-2.17-p/backgammon/backgammon/text.c 2010-07-31 22:10:52.377805941 +0400 +@@ -30,13 +30,13 @@ + */ + + #include +-#ifndef lint ++/* #ifndef lint + #if 0 + static char sccsid[] = "@(#)text.c 8.1 (Berkeley) 5/31/93"; + #else + __RCSID("$NetBSD: text.c,v 1.7 2003/08/07 09:36:56 agc Exp $"); + #endif +-#endif /* not lint */ ++#endif */ /* not lint */ + + #include "back.h" + +diff -ur bsd-games-2.17/backgammon/backgammon/version.c bsd-games-2.17-p/backgammon/backgammon/version.c +--- bsd-games-2.17/backgammon/backgammon/version.c 2003-12-17 05:47:37.000000000 +0300 ++++ bsd-games-2.17-p/backgammon/backgammon/version.c 2010-07-31 22:11:05.756426999 +0400 +@@ -30,13 +30,13 @@ + */ + + #include +-#ifndef lint ++/* #ifndef lint + #if 0 + static char sccsid[] = "@(#)version.c 8.1 (Berkeley) 5/31/93"; + #else + __RCSID("$NetBSD: version.c,v 1.6 2003/08/07 09:36:56 agc Exp $"); + #endif +-#endif /* not lint */ ++#endif */ /* not lint */ + + const char *const message[] = { + "Last updated on Friday, October 10, 1997.", +diff -ur bsd-games-2.17/backgammon/common_source/allow.c bsd-games-2.17-p/backgammon/common_source/allow.c +--- bsd-games-2.17/backgammon/common_source/allow.c 2003-12-17 05:47:37.000000000 +0300 ++++ bsd-games-2.17-p/backgammon/common_source/allow.c 2010-07-31 22:07:44.982982743 +0400 +@@ -30,13 +30,13 @@ + */ + + #include +-#ifndef lint ++/* #ifndef lint + #if 0 + static char sccsid[] = "@(#)allow.c 8.1 (Berkeley) 5/31/93"; + #else + __RCSID("$NetBSD: allow.c,v 1.5 2003/08/07 09:36:56 agc Exp $"); + #endif +-#endif /* not lint */ ++#endif */ /* not lint */ + + #include "back.h" + +diff -ur bsd-games-2.17/backgammon/common_source/board.c bsd-games-2.17-p/backgammon/common_source/board.c +--- bsd-games-2.17/backgammon/common_source/board.c 2003-12-17 05:47:37.000000000 +0300 ++++ bsd-games-2.17-p/backgammon/common_source/board.c 2010-07-31 22:08:08.852355705 +0400 +@@ -30,13 +30,13 @@ + */ + + #include +-#ifndef lint ++/* #ifndef lint + #if 0 + static char sccsid[] = "@(#)board.c 8.1 (Berkeley) 5/31/93"; + #else + __RCSID("$NetBSD: board.c,v 1.7 2003/08/07 09:36:57 agc Exp $"); + #endif +-#endif /* not lint */ ++#endif */ /* not lint */ + + #include "back.h" + +diff -ur bsd-games-2.17/backgammon/common_source/check.c bsd-games-2.17-p/backgammon/common_source/check.c +--- bsd-games-2.17/backgammon/common_source/check.c 2003-12-17 05:47:37.000000000 +0300 ++++ bsd-games-2.17-p/backgammon/common_source/check.c 2010-07-31 22:08:22.639630328 +0400 +@@ -30,13 +30,13 @@ + */ + + #include +-#ifndef lint ++/* #ifndef lint + #if 0 + static char sccsid[] = "@(#)check.c 8.1 (Berkeley) 5/31/93"; + #else + __RCSID("$NetBSD: check.c,v 1.5 2003/08/07 09:36:57 agc Exp $"); + #endif +-#endif /* not lint */ ++#endif */ /* not lint */ + + #include "back.h" + +diff -ur bsd-games-2.17/backgammon/common_source/fancy.c bsd-games-2.17-p/backgammon/common_source/fancy.c +--- bsd-games-2.17/backgammon/common_source/fancy.c 2004-04-24 20:13:09.000000000 +0400 ++++ bsd-games-2.17-p/backgammon/common_source/fancy.c 2010-07-31 22:08:35.011397017 +0400 +@@ -30,13 +30,13 @@ + */ + + #include +-#ifndef lint ++/* #ifndef lint + #if 0 + static char sccsid[] = "@(#)fancy.c 8.1 (Berkeley) 5/31/93"; + #else + __RCSID("$NetBSD: fancy.c,v 1.12 2004/04/23 02:58:27 simonb Exp $"); + #endif +-#endif /* not lint */ ++#endif */ /* not lint */ + + #include "back.h" + +diff -ur bsd-games-2.17/backgammon/common_source/init.c bsd-games-2.17-p/backgammon/common_source/init.c +--- bsd-games-2.17/backgammon/common_source/init.c 2003-12-17 05:47:37.000000000 +0300 ++++ bsd-games-2.17-p/backgammon/common_source/init.c 2010-07-31 22:08:46.900301922 +0400 +@@ -30,13 +30,13 @@ + */ + + #include +-#ifndef lint ++/* #ifndef lint + #if 0 + static char sccsid[] = "@(#)init.c 8.1 (Berkeley) 5/31/93"; + #else + __RCSID("$NetBSD: init.c,v 1.8 2003/08/07 09:36:57 agc Exp $"); + #endif +-#endif /* not lint */ ++#endif */ /* not lint */ + + #include + +diff -ur bsd-games-2.17/backgammon/common_source/odds.c bsd-games-2.17-p/backgammon/common_source/odds.c +--- bsd-games-2.17/backgammon/common_source/odds.c 2003-12-17 05:47:37.000000000 +0300 ++++ bsd-games-2.17-p/backgammon/common_source/odds.c 2010-07-31 22:09:03.219958336 +0400 +@@ -30,13 +30,13 @@ + */ + + #include +-#ifndef lint ++/* #ifndef lint + #if 0 + static char sccsid[] = "@(#)odds.c 8.1 (Berkeley) 5/31/93"; + #else + __RCSID("$NetBSD: odds.c,v 1.5 2003/08/07 09:36:57 agc Exp $"); + #endif +-#endif /* not lint */ ++#endif */ /* not lint */ + + #include "back.h" + +diff -ur bsd-games-2.17/backgammon/common_source/one.c bsd-games-2.17-p/backgammon/common_source/one.c +--- bsd-games-2.17/backgammon/common_source/one.c 2003-12-17 05:47:37.000000000 +0300 ++++ bsd-games-2.17-p/backgammon/common_source/one.c 2010-07-31 22:09:15.025538516 +0400 +@@ -30,13 +30,13 @@ + */ + + #include +-#ifndef lint ++/* #ifndef lint + #if 0 + static char sccsid[] = "@(#)one.c 8.1 (Berkeley) 5/31/93"; + #else + __RCSID("$NetBSD: one.c,v 1.5 2003/08/07 09:36:57 agc Exp $"); + #endif +-#endif /* not lint */ ++#endif */ /* not lint */ + + #include "back.h" + +diff -ur bsd-games-2.17/backgammon/common_source/save.c bsd-games-2.17-p/backgammon/common_source/save.c +--- bsd-games-2.17/backgammon/common_source/save.c 2003-12-17 05:47:37.000000000 +0300 ++++ bsd-games-2.17-p/backgammon/common_source/save.c 2010-08-01 00:38:38.876427096 +0400 +@@ -30,13 +30,13 @@ + */ + + #include +-#ifndef lint ++/* #ifndef lint + #if 0 + static char sccsid[] = "@(#)save.c 8.1 (Berkeley) 5/31/93"; + #else + __RCSID("$NetBSD: save.c,v 1.10 2003/08/07 09:36:57 agc Exp $"); + #endif +-#endif /* not lint */ ++#endif */ /* not lint */ + + #include + +diff -ur bsd-games-2.17/backgammon/common_source/subs.c bsd-games-2.17-p/backgammon/common_source/subs.c +--- bsd-games-2.17/backgammon/common_source/subs.c 2003-12-17 05:47:37.000000000 +0300 ++++ bsd-games-2.17-p/backgammon/common_source/subs.c 2010-08-01 11:10:44.780266356 +0400 +@@ -30,13 +30,13 @@ + */ + + #include +-#ifndef lint ++/* #ifndef lint + #if 0 + static char sccsid[] = "@(#)subs.c 8.1 (Berkeley) 5/31/93"; + #else + __RCSID("$NetBSD: subs.c,v 1.14 2003/08/07 09:36:57 agc Exp $"); + #endif +-#endif /* not lint */ ++#endif */ /* not lint */ + + #include "back.h" + +diff -ur bsd-games-2.17/backgammon/common_source/table.c bsd-games-2.17-p/backgammon/common_source/table.c +--- bsd-games-2.17/backgammon/common_source/table.c 2003-12-17 05:47:37.000000000 +0300 ++++ bsd-games-2.17-p/backgammon/common_source/table.c 2010-07-31 22:09:54.655414207 +0400 +@@ -30,13 +30,13 @@ + */ + + #include +-#ifndef lint ++/* #ifndef lint + #if 0 + static char sccsid[] = "@(#)table.c 8.1 (Berkeley) 5/31/93"; + #else + __RCSID("$NetBSD: table.c,v 1.7 2003/08/07 09:36:57 agc Exp $"); + #endif +-#endif /* not lint */ ++#endif */ /* not lint */ + + #include "back.h" + +diff -ur bsd-games-2.17/backgammon/teachgammon/data.c bsd-games-2.17-p/backgammon/teachgammon/data.c +--- bsd-games-2.17/backgammon/teachgammon/data.c 2004-01-02 21:04:51.000000000 +0300 ++++ bsd-games-2.17-p/backgammon/teachgammon/data.c 2010-08-01 11:18:14.579882098 +0400 +@@ -30,13 +30,13 @@ + */ + + #include +-#ifndef lint ++/*#ifndef lint + #if 0 + static char sccsid[] = "@(#)data.c 8.1 (Berkeley) 5/31/93"; + #else + __RCSID("$NetBSD: data.c,v 1.7 2004/01/01 15:59:09 jsm Exp $"); + #endif +-#endif /* not lint */ ++#endif *//* not lint */ + + #include "tutor.h" + +diff -ur bsd-games-2.17/backgammon/teachgammon/teach.c bsd-games-2.17-p/backgammon/teachgammon/teach.c +--- bsd-games-2.17/backgammon/teachgammon/teach.c 2005-02-16 09:24:50.000000000 +0300 ++++ bsd-games-2.17-p/backgammon/teachgammon/teach.c 2010-08-01 11:39:32.956134539 +0400 +@@ -30,18 +30,18 @@ + */ + + #include +-#ifndef lint ++/*#ifndef lint + __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\ + The Regents of the University of California. All rights reserved.\n"); +-#endif /* not lint */ ++#endif *//* not lint */ + +-#ifndef lint ++/*#ifndef lint + #if 0 + static char sccsid[] = "@(#)teach.c 8.1 (Berkeley) 5/31/93"; + #else + __RCSID("$NetBSD: teach.c,v 1.16 2005/02/15 12:56:20 jsm Exp $"); + #endif +-#endif /* not lint */ ++#endif *//* not lint */ + + #include "back.h" + #include "tutor.h" +@@ -59,6 +59,8 @@ + 0 + }; + ++#define OXTABS XTABS ++ + int + main(argc, argv) + int argc __attribute__((__unused__)); +@@ -81,7 +83,7 @@ + #ifdef V7 + while (*++argv != 0) + #else +- while (*++argv != -1) ++ while (*++argv != 0) + #endif + getarg(&argv); + if (tflag) { +diff -ur bsd-games-2.17/backgammon/teachgammon/ttext1.c bsd-games-2.17-p/backgammon/teachgammon/ttext1.c +--- bsd-games-2.17/backgammon/teachgammon/ttext1.c 2003-12-17 05:47:37.000000000 +0300 ++++ bsd-games-2.17-p/backgammon/teachgammon/ttext1.c 2010-08-01 11:18:57.935091377 +0400 +@@ -30,13 +30,13 @@ + */ + + #include +-#ifndef lint ++/*#ifndef lint + #if 0 + static char sccsid[] = "@(#)ttext1.c 8.1 (Berkeley) 5/31/93"; + #else + __RCSID("$NetBSD: ttext1.c,v 1.7 2003/08/07 09:36:58 agc Exp $"); + #endif +-#endif /* not lint */ ++#endif *//* not lint */ + + #include "back.h" + #include "tutor.h" +diff -ur bsd-games-2.17/backgammon/teachgammon/ttext2.c bsd-games-2.17-p/backgammon/teachgammon/ttext2.c +--- bsd-games-2.17/backgammon/teachgammon/ttext2.c 2003-12-17 05:47:37.000000000 +0300 ++++ bsd-games-2.17-p/backgammon/teachgammon/ttext2.c 2010-08-01 11:19:09.174691288 +0400 +@@ -30,13 +30,13 @@ + */ + + #include +-#ifndef lint ++/*#ifndef lint + #if 0 + static char sccsid[] = "@(#)ttext2.c 8.1 (Berkeley) 5/31/93"; + #else + __RCSID("$NetBSD: ttext2.c,v 1.7 2003/08/07 09:36:58 agc Exp $"); + #endif +-#endif /* not lint */ ++#endif *//* not lint */ + + #include "back.h" + #include "tutor.h" +diff -ur bsd-games-2.17/backgammon/teachgammon/tutor.c bsd-games-2.17-p/backgammon/teachgammon/tutor.c +--- bsd-games-2.17/backgammon/teachgammon/tutor.c 2003-12-17 05:47:37.000000000 +0300 ++++ bsd-games-2.17-p/backgammon/teachgammon/tutor.c 2010-08-01 11:37:12.464301896 +0400 +@@ -30,13 +30,13 @@ + */ + + #include +-#ifndef lint ++/*#ifndef lint + #if 0 + static char sccsid[] = "@(#)tutor.c 8.1 (Berkeley) 5/31/93"; + #else + __RCSID("$NetBSD: tutor.c,v 1.6 2003/08/07 09:36:58 agc Exp $"); + #endif +-#endif /* not lint */ ++#endif *//* not lint */ + + #include "back.h" + #include "tutor.h" From 88b28ae9ce99fc5927812bda22bc19de93496a3b Mon Sep 17 00:00:00 2001 From: Neil Stockbridge Date: Sun, 1 Aug 2010 20:37:27 +1200 Subject: [PATCH 5/9] initial port of Freedroid --- freedroid/Makefile | 80 +++++++++++++++++ freedroid/patches/001-screen-cursor-tab.patch | 86 +++++++++++++++++++ 2 files changed, 166 insertions(+) create mode 100644 freedroid/Makefile create mode 100644 freedroid/patches/001-screen-cursor-tab.patch diff --git a/freedroid/Makefile b/freedroid/Makefile new file mode 100644 index 0000000..a6bdba2 --- /dev/null +++ b/freedroid/Makefile @@ -0,0 +1,80 @@ +# Copyright (C) 2008 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=freedroid +PKG_VERSION:=1.0.2 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://downloads.sourceforge.net/project/freedroid/freedroidClassic/FreedroidClassic-1.0.2/ +PKG_CAT:=zcat + +PKG_BUILD_DIR:=$(BUILD_DIR)/freedroid-$(PKG_VERSION) + +include $(INCLUDE_DIR)/package.mk + +define Package/freedroid + TITLE:=FreeDroid + SECTION:=games + CATEGORY:=Games + URL:=http://freedroid.sourceforge.net/ + DEPENDS:=libsdl-image libsdl-mixer libvorbis +endef + +define Package/freedroid/description + A free clone of the C64-classic "Paradroid" +endef + +CONFIGURE_VARS:=LDFLAGS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" +CONFIGURE_ARGS:=--prefix=/usr + +define Build/Configure + $(call Build/Configure/Default) +endef + +define Package/freedroid/install + $(INSTALL_DIR) \ + $(1)/usr/bin/ \ + $(1)/usr/share/freedroid/ \ + $(1)/usr/share/freedroid/graphics/ \ + $(1)/usr/share/freedroid/graphics/classic_theme/ \ + $(1)/usr/share/freedroid/graphics/lanzz_theme/ \ + $(1)/usr/share/freedroid/map/ \ + $(1)/usr/share/freedroid/sound + + $(INSTALL_BIN) \ + $(PKG_BUILD_DIR)/src/freedroid \ + $(1)/usr/bin/ + + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/graphics/*.png \ + $(PKG_BUILD_DIR)/graphics/*.jpg \ + $(1)/usr/share/freedroid/graphics/ + + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/graphics/classic_theme/*.png \ + $(PKG_BUILD_DIR)/graphics/classic_theme/config.theme \ + $(1)/usr/share/freedroid/graphics/classic_theme/ + + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/graphics/lanzz_theme/*.png \ + $(PKG_BUILD_DIR)/graphics/lanzz_theme/config.theme \ + $(1)/usr/share/freedroid/graphics/lanzz_theme/ + + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/map/freedroid.ruleset \ + $(PKG_BUILD_DIR)/map/Paradroid.* \ + $(1)/usr/share/freedroid/map/ + + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/sound/*.wav \ + $(PKG_BUILD_DIR)/sound/*.mod \ + $(PKG_BUILD_DIR)/sound/*.ogg \ + $(1)/usr/share/freedroid/sound/ +endef + +$(eval $(call BuildPackage,freedroid)) diff --git a/freedroid/patches/001-screen-cursor-tab.patch b/freedroid/patches/001-screen-cursor-tab.patch new file mode 100644 index 0000000..a571d97 --- /dev/null +++ b/freedroid/patches/001-screen-cursor-tab.patch @@ -0,0 +1,86 @@ +diff -u /tmp/freedroid-1.0.2/src/defs.h ./src/defs.h +--- /tmp/freedroid-1.0.2/src/defs.h 2003-08-09 22:42:08.000000000 +1200 ++++ ./src/defs.h 2010-07-28 22:57:36.000000000 +1200 +@@ -43,6 +43,9 @@ + #define DROID_ROTATION_TIME 3.0 + #define NUM_DECAL_PICS 2 + ++// Don't want the mouse cursor at all on the NanoNote ++#define SDL_ShowCursor( visible) 1 ++ + #define UserCenter_x (User_Rect.x + User_Rect.w/2) + #define UserCenter_y (User_Rect.y + User_Rect.h/2) + +@@ -72,11 +75,11 @@ + #define RightPressed() (KeyIsPressed(SDLK_RIGHT)||KeyIsPressed('d')) + + #define EscapePressed() KeyIsPressed(SDLK_ESCAPE) +-#define SpacePressed() KeyIsPressed(SDLK_SPACE) ++#define SpacePressed() KeyIsPressed(SDLK_TAB) + #define FirePressed() (SpacePressed()||MouseLeftPressed()) + + #define EscapePressedR() KeyIsPressedR (SDLK_ESCAPE) +-#define SpacePressedR() KeyIsPressedR (SDLK_SPACE) ++#define SpacePressedR() KeyIsPressedR (SDLK_TAB) + #define FirePressedR() (SpacePressedR()||MouseLeftPressedR()) + + #define UpPressedR() (KeyIsPressedR(SDLK_UP)||KeyIsPressedR('w')) +Only in ./src/: .deps +diff -u /tmp/freedroid-1.0.2/src/init.c ./src/init.c +--- /tmp/freedroid-1.0.2/src/init.c 2003-08-10 00:19:32.000000000 +1200 ++++ ./src/init.c 2010-07-28 22:13:15.000000000 +1200 +@@ -912,7 +912,7 @@ + GameConfig.TakeoverActivates = TRUE; + GameConfig.ShowDecals = TRUE; + GameConfig.AllMapVisible = TRUE; // classic setting: map always visible +- GameConfig.scale = 1.0; // overall scaling of _all_ graphics (e.g. for 320x200 displays) ++ GameConfig.scale = 0.5; // overall scaling of _all_ graphics (e.g. for 320x200 displays) + + // now load saved options from the config-file + LoadGameConfig (); +diff -u /tmp/freedroid-1.0.2/src/main.c ./src/main.c +--- /tmp/freedroid-1.0.2/src/main.c 2003-08-09 22:30:43.000000000 +1200 ++++ ./src/main.c 2010-07-28 22:55:08.000000000 +1200 +@@ -47,6 +47,7 @@ + + extern bool show_cursor; + void UpdateCountersForThisFrame (void); ++void turn_off_cursor(); + + /*----------------------------------------------------------------- + * @Desc: the heart of the Game +@@ -72,6 +73,8 @@ + now = SDL_GetTicks(); + InitFreedroid (argc, argv); // Initialisation of global variables and arrays + ++ turn_off_cursor(); ++ + SDL_ShowCursor (SDL_DISABLE); + + #ifdef __WIN32__ +@@ -246,4 +249,11 @@ + } /* UpdateCountersForThisFrame() */ + + ++void turn_off_cursor() ++{ ++ #undef SDL_ShowCursor ++ SDL_ShowCursor( SDL_DISABLE); ++} ++ ++ + #undef _main_c +Only in ./src/: Makefile +diff -u /tmp/freedroid-1.0.2/src/sound.c ./src/sound.c +--- /tmp/freedroid-1.0.2/src/sound.c 2003-08-09 03:09:20.000000000 +1200 ++++ ./src/sound.c 2010-07-29 00:16:45.000000000 +1200 +@@ -347,8 +347,7 @@ + if ( Tmp_MOD_File == NULL ) + { + DebugPrintf (0, "\nError loading sound-file: %s\n", filename_raw); +- DebugPrintf (0, "SDL Mixer Error: %s\n Continuing with sound disabled\n", Mix_GetError()); +- sound_on = FALSE; ++ DebugPrintf (0, "SDL Mixer Error: %s\n", Mix_GetError()); + return; + } // if ( !Loaded_WAV... + Mix_PlayMusic (Tmp_MOD_File, -1); From 1ad8df09beaf9108df268b85825f851f82d7e57d Mon Sep 17 00:00:00 2001 From: kyak Date: Sun, 1 Aug 2010 14:20:20 +0400 Subject: [PATCH 6/9] sound now works in freedroid, but only after enabling swap (takes quite some RAM) --- freedroid/Makefile | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/freedroid/Makefile b/freedroid/Makefile index a6bdba2..5d49e69 100644 --- a/freedroid/Makefile +++ b/freedroid/Makefile @@ -12,6 +12,7 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.sourceforge.net/project/freedroid/freedroidClassic/FreedroidClassic-1.0.2/ PKG_CAT:=zcat +PKG_MD5SUM:=585a65f61c2cd308ab45d5c514f695dc PKG_BUILD_DIR:=$(BUILD_DIR)/freedroid-$(PKG_VERSION) @@ -22,19 +23,15 @@ define Package/freedroid SECTION:=games CATEGORY:=Games URL:=http://freedroid.sourceforge.net/ - DEPENDS:=libsdl-image libsdl-mixer libvorbis + DEPENDS:=+libsdl-image +libsdl-mixer +libvorbis endef define Package/freedroid/description A free clone of the C64-classic "Paradroid" endef -CONFIGURE_VARS:=LDFLAGS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" -CONFIGURE_ARGS:=--prefix=/usr - -define Build/Configure - $(call Build/Configure/Default) -endef +CONFIGURE_VARS+=LDFLAGS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" ac_cv_lib_vorbis_ov_open="yes" +CONFIGURE_ARGS+=--with-x="no" define Package/freedroid/install $(INSTALL_DIR) \ From 5efb5730985a9c96a21e1df20bb6ccbe7492ac1d Mon Sep 17 00:00:00 2001 From: Xiangfu Liu Date: Sun, 1 Aug 2010 21:30:13 +0800 Subject: [PATCH 7/9] [links] move to Web submenu Signed-off-by: Xiangfu Liu --- links/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/links/Makefile b/links/Makefile index a526601..3028528 100644 --- a/links/Makefile +++ b/links/Makefile @@ -21,8 +21,9 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk define Package/links - TITLE:=links - SECTION:=network + TITLE:=Text and graphics WWW browser + SUBMENU:=Web + SECTION:=net CATEGORY:=Network URL:=http://links.twibright.com/ DEPENDS:=+libpng +libtiff From 5492fb215415246f88768bfbfe96e5e734b9eee2 Mon Sep 17 00:00:00 2001 From: Xiangfu Liu Date: Sun, 1 Aug 2010 21:32:54 +0800 Subject: [PATCH 8/9] [guile] fix compile error by John Moore Signed-off-by: Xiangfu Liu --- guile/Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/guile/Makefile b/guile/Makefile index 8a60d89..a99d8a9 100644 --- a/guile/Makefile +++ b/guile/Makefile @@ -6,6 +6,9 @@ # See /LICENSE for more information. # +# modified 02/05/2010 +# author: jmoore@zedstar.org + include $(TOPDIR)/rules.mk PKG_NAME:=guile @@ -24,7 +27,7 @@ define Package/guile TITLE:=guile SECTION:=lang CATEGORY:=Languages - DEPENDS:=+libgmp +libpthread +libltdl @BROKEN + DEPENDS:=+libgmp +libpthread +libltdl +libncurses +libreadline URL:=http://savannah.gnu.org/projects/guile/ endef @@ -34,7 +37,12 @@ endef TARGET_LDFLAGS+="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" -CONFIGURE_ARGS += --without-threads +# should fix issue with threads +CONFIGURE_ARGS += --without-threads --without-gettext + +define Build/Compile + (cd $(PKG_BUILD_DIR); autoreconf --force --install || exit 0); +endef define Package/guile/install $(INSTALL_DIR) $(1)/usr/bin From 819508f12a6e77f6390d7c8378ac3915e1e208f9 Mon Sep 17 00:00:00 2001 From: Xiangfu Liu Date: Sun, 1 Aug 2010 23:16:24 +0800 Subject: [PATCH 9/9] [fbgrab] fix typo Signed-off-by: Xiangfu Liu --- fbgrab/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/fbgrab/Makefile b/fbgrab/Makefile index 997e744..da92bfc 100644 --- a/fbgrab/Makefile +++ b/fbgrab/Makefile @@ -1,6 +1,5 @@ # -# Copyright (C) 2010 Qi Hardware Inc. -# Author: Xiangfu Liu +# Author: Xiangfu Liu # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information.