[oe-commits] org.oe.dev merge of '296ef22edf7d9a90ec4e4b1c1207b8d2c33940d9'
oe commit
openembedded-commits at lists.openembedded.org
Sun Feb 10 00:52:04 UTC 2008
merge of '296ef22edf7d9a90ec4e4b1c1207b8d2c33940d9'
and '8292332b90148c1fb91e9c775883dcf0639290c7'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 9b11c07033faf21bf0ab6c88eab5ac83b5bd536a
ViewMTN: http://monotone.openembedded.org/revision/info/9b11c07033faf21bf0ab6c88eab5ac83b5bd536a
Files:
1
packages/madwifi/madwifi-ng_r3314-20080131.bb
packages/kobodeluxe
packages/kobodeluxe/files
packages/kobodeluxe/files/debian-kobo.patch
packages/kobodeluxe/kobodeluxe_0.5.1.bb
MAINTAINERS
packages/dbus-java/dbus-java_2.3.bb
packages/libmatthew/libmatthew_0.5.bb
packages/logic-analyzer/logic-analyzer_0.8.bb
packages/rxtx/rxtx_2.1-7r2.bb
Diffs:
#
# mt diff -r296ef22edf7d9a90ec4e4b1c1207b8d2c33940d9 -r9b11c07033faf21bf0ab6c88eab5ac83b5bd536a
#
#
#
# add_file "packages/madwifi/madwifi-ng_r3314-20080131.bb"
# content [a662d5dc1ba7995d1e803c773f5fe9a3571f3ce6]
#
============================================================
--- packages/madwifi/madwifi-ng_r3314-20080131.bb a662d5dc1ba7995d1e803c773f5fe9a3571f3ce6
+++ packages/madwifi/madwifi-ng_r3314-20080131.bb a662d5dc1ba7995d1e803c773f5fe9a3571f3ce6
@@ -0,0 +1,12 @@
+# Bitbake recipe for the madwifi-ng driver
+
+DEFAULT_PREFERENCE = "-1"
+
+# Disable stripping of kernel modules, since this action strips too
+# much out, and the resulting module won't load.
+INHIBIT_PACKAGE_STRIP = "1"
+
+require madwifi-ng_r.inc
+
+# PR set after the include, to override what's set in the included file.
+# PR = "r1"
#
# mt diff -r8292332b90148c1fb91e9c775883dcf0639290c7 -r9b11c07033faf21bf0ab6c88eab5ac83b5bd536a
#
#
#
# add_dir "packages/kobodeluxe"
#
# add_dir "packages/kobodeluxe/files"
#
# add_file "packages/kobodeluxe/files/debian-kobo.patch"
# content [1ccf5770a73fb5d89c2c170e9b3bceb022fb0d3a]
#
# add_file "packages/kobodeluxe/kobodeluxe_0.5.1.bb"
# content [6f71e3405f6607ff54f63f6cd5e55312b2cfdc58]
#
# patch "MAINTAINERS"
# from [b8e3c72c3bb3bde8d00aff12f6ba2abeeb57ed02]
# to [42e1fd8bf852c29ab5e08a51152c446726334145]
#
# patch "packages/dbus-java/dbus-java_2.3.bb"
# from [0f364694e12942f190ab3353a87700e5ae39ac26]
# to [17764905d124799a8edd17b918d5840fb5165cb9]
#
# patch "packages/libmatthew/libmatthew_0.5.bb"
# from [23e5bf387eae5233d4fd7f2f2ec8be582756bac2]
# to [4d5017a96ee835a24017a6f101e47e55243c6816]
#
# patch "packages/logic-analyzer/logic-analyzer_0.8.bb"
# from [1ee8013dcfa98eec177fbdfbfbb2ecb8167f8dad]
# to [6d578bf0553be1e28b4a10f6b80b958df29d68c8]
#
# patch "packages/rxtx/rxtx_2.1-7r2.bb"
# from [3974ebf631b2b9bafd21186daeaaa81409ba5eec]
# to [261fb1dbbffc4e2294a5a6838e4defa40431abd5]
#
============================================================
--- packages/kobodeluxe/files/debian-kobo.patch 1ccf5770a73fb5d89c2c170e9b3bceb022fb0d3a
+++ packages/kobodeluxe/files/debian-kobo.patch 1ccf5770a73fb5d89c2c170e9b3bceb022fb0d3a
@@ -0,0 +1,72 @@
+--- kobodeluxe-0.5.1.orig/kobo.cpp
++++ kobodeluxe-0.5.1/kobo.cpp
+@@ -141,21 +141,21 @@
+ * Graphics data
+ */
+ /* Current dir; from within the build tree */
+- fmap->addpath("GFX", "./data/gfx");
++ //fmap->addpath("GFX", "./data/gfx");
+ /* Real data dir */
+ fmap->addpath("GFX", "DATA>>gfx");
+ /* Current dir */
+- fmap->addpath("GFX", "./gfx");
++ //fmap->addpath("GFX", "./gfx");
+
+ /*
+ * Sound data
+ */
+ /* Current dir; from within the build tree */
+- fmap->addpath("SFX", "./data/sfx");
++ //fmap->addpath("SFX", "./data/sfx");
+ /* Real data dir */
+ fmap->addpath("SFX", "DATA>>sfx");
+ /* Current dir */
+- fmap->addpath("SFX", "./sfx");
++ //fmap->addpath("SFX", "./sfx");
+
+ /*
+ * Score files (user and global)
+@@ -173,7 +173,7 @@
+ /* System local */
+ fmap->addpath("CONFIG", SYSCONF_DIR);
+ /* In current dir (last resort) */
+- fmap->addpath("CONFIG", "./");
++ //fmap->addpath("CONFIG", "./");
+ }
+
+
+--- kobodeluxe-0.5.1.orig/graphics/window.cpp
++++ kobodeluxe-0.5.1/graphics/window.cpp
+@@ -331,7 +331,7 @@
+ }
+
+
+-void window_t::center_token(int _x, int _y, const char *txt, char token)
++void window_t::center_token(int _x, int _y, const char *txt, signed char token)
+ {
+ center_token_fxp(PIXEL2CS(_x), PIXEL2CS(_y), txt, token);
+ }
+@@ -374,7 +374,7 @@
+ }
+
+
+-void window_t::center_token_fxp(int _x, int _y, const char *txt, char token)
++void window_t::center_token_fxp(int _x, int _y, const char *txt, signed char token)
+ {
+ _x = CS2PIXEL((_x * xs + 128) >> 8);
+ _y = CS2PIXEL((_y * ys + 128) >> 8);
+--- kobodeluxe-0.5.1.orig/graphics/window.h
++++ kobodeluxe-0.5.1/graphics/window.h
+@@ -265,10 +265,10 @@
+ void font(int fnt);
+ void string(int _x, int _y, const char *txt);
+ void center(int _y, const char *txt);
+- void center_token(int _x, int _y, const char *txt, char token = 0);
++ void center_token(int _x, int _y, const char *txt, signed char token = 0);
+ void string_fxp(int _x, int _y, const char *txt);
+ void center_fxp(int _y, const char *txt);
+- void center_token_fxp(int _x, int _y, const char *txt, char token = 0);
++ void center_token_fxp(int _x, int _y, const char *txt, signed char token = 0);
+ int textwidth(const char *txt, int min = 0, int max = 255);
+ int textwidth_fxp(const char *txt, int min = 0, int max = 255);
+ int fontheight();
============================================================
--- packages/kobodeluxe/kobodeluxe_0.5.1.bb 6f71e3405f6607ff54f63f6cd5e55312b2cfdc58
+++ packages/kobodeluxe/kobodeluxe_0.5.1.bb 6f71e3405f6607ff54f63f6cd5e55312b2cfdc58
@@ -0,0 +1,26 @@
+DESCRIPTION = "Fast-paced 2D top-down shooter where you have to destroy space station"
+SECTION = "games"
+PRIORITY = "optional"
+LICENSE = "GPL"
+AUTHOR = "David Olofson <david at olofson.net>"
+HOMEPAGE = "http://olofson.net/kobodl"
+
+DEPENDS = "libsdl-image virtual/libsdl"
+
+RDEPENDS_${PN} = "${PN}-data"
+
+SRC_URI = "http://olofson.net/kobodl/download/KoboDeluxe-${PV}.tar.bz2 \
+ file://debian-kobo.patch;patch=1 \
+ "
+
+S = "${WORKDIR}/KoboDeluxe-${PV}"
+
+inherit autotools
+
+EXTRA_OECONF = "--disable-sdltest"
+
+PACKAGES += "${PN}-data"
+
+FILES_${PN}-data = "${datadir}"
+
+PACKAGE_ARCH_${PN}-data = "all"
============================================================
--- MAINTAINERS b8e3c72c3bb3bde8d00aff12f6ba2abeeb57ed02
+++ MAINTAINERS 42e1fd8bf852c29ab5e08a51152c446726334145
@@ -264,3 +264,14 @@ Recipes: avahi, libgsmd
Distros: Ångström
Machines: hx4700, magician
Recipes: avahi, libgsmd
+
+Person: Robert Schuster 'thebohemian'
+Mail: robert.schuster at tarent.de, thebohemian at gmx.net
+Website: http://fsfe.org/en/fellows/robertschuster/weblog
+Interests: free software, java, games
+Distros: chinook-compat
+Recipes: jikes-native, jikes-initial, ecj-initial, ecj-bootstrap-native
+Recipes: classpath*, cacao*, jamvm*
+Recipes: swt-gtk, rxtx, dbus-java, libmatthew, kxml2, xmlpull
+Recipes: midpath*, logic-analyze
+Recipes: kobodeluxe
============================================================
--- packages/dbus-java/dbus-java_2.3.bb 0f364694e12942f190ab3353a87700e5ae39ac26
+++ packages/dbus-java/dbus-java_2.3.bb 17764905d124799a8edd17b918d5840fb5165cb9
@@ -1,10 +1,9 @@ SECTION = "libs"
DESCRIPTION = "A pure Java D-Bus Implementation"
DESCRIPTION_dbus-java-viewer = "${DESCRIPTION} (DBusViewer Binary)"
DESCRIPTION_dbus-java-bin = "${DESCRIPTION} (Binaries)"
LICENSE = "GPLv2 AFL"
SECTION = "libs"
-MAINTAINER = "Fabian Koester, tarent GmbH Bonn <f.koester at tarent.de>"
HOMEPAGE = "http://jalimo.org"
AUTHOR = "Matthew Johnson <dbus at matthew.ath.cx>"
============================================================
--- packages/libmatthew/libmatthew_0.5.bb 23e5bf387eae5233d4fd7f2f2ec8be582756bac2
+++ packages/libmatthew/libmatthew_0.5.bb 4d5017a96ee835a24017a6f101e47e55243c6816
@@ -1,7 +1,6 @@ SECTION = "libs"
DESCRIPTION = "Unix socket, debug and hexdump libraries"
LICENSE = "LGPL"
SECTION = "libs"
-MAINTAINER = "Fabian Koester, tarent GmbH Bonn <f.koester at tarent.de>"
HOMEPAGE = "http://jalimo.org"
AUTHOR = "Matthew Johnson <web at matthew.ath.cx>"
============================================================
--- packages/logic-analyzer/logic-analyzer_0.8.bb 1ee8013dcfa98eec177fbdfbfbb2ecb8167f8dad
+++ packages/logic-analyzer/logic-analyzer_0.8.bb 6d578bf0553be1e28b4a10f6b80b958df29d68c8
@@ -1,6 +1,5 @@ LICENSE = "GPL"
DESCRIPTION = "A Java-based logical analyzer for home use."
LICENSE = "GPL"
-MAINTAINER = "Robert Schuster, tarent GmbH Bonn <robert.schuster at tarent.de>"
HOMEPAGE = "http://sump.org/projects/analyzer/"
inherit java
============================================================
--- packages/rxtx/rxtx_2.1-7r2.bb 3974ebf631b2b9bafd21186daeaaa81409ba5eec
+++ packages/rxtx/rxtx_2.1-7r2.bb 261fb1dbbffc4e2294a5a6838e4defa40431abd5
@@ -1,7 +1,6 @@ SECTION = "libs"
DESCRIPTION = "RXTX provides serial and parallel communication for Java applications"
LICENSE = "LGPL"
SECTION = "libs"
-MAINTAINER = "Robert Schuster, tarent GmbH Bonn <robert.schuster at tarent.de>"
HOMEPAGE = "http://rxtx.org"
inherit autotools java-library
More information about the Openembedded-commits
mailing list