diff options
-rw-r--r-- | conf/machine/netvista.conf | 1 | ||||
-rw-r--r-- | packages/gtk+/gtk+-2.6.10/gtk+-2.6.10-bg.patch | 20 | ||||
-rw-r--r-- | packages/gtk+/gtk+_2.6.10.bb | 5 | ||||
-rw-r--r-- | packages/madfu/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/madfu/files/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/madfu/files/autofoo.patch | 54 | ||||
-rw-r--r-- | packages/madfu/madfu_1.2.bb | 27 | ||||
-rw-r--r-- | packages/meta/slugos-packages.bb | 1 | ||||
-rw-r--r-- | packages/puzzles/puzzles_r7436.bb (renamed from packages/puzzles/puzzles_r7387.bb) | 0 | ||||
-rw-r--r-- | packages/puzzles/puzzles_svn.bb | 53 |
10 files changed, 159 insertions, 2 deletions
diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf index b19558bd97..25bf6649bd 100644 --- a/conf/machine/netvista.conf +++ b/conf/machine/netvista.conf @@ -15,6 +15,7 @@ MACHINE_TASK_PROVIDER = "task-base" MACHINE_FEATURES = "kernel26 pci usbhost ext2 screen keyboard irda apm alsa" ROOT_FLASH_SIZE = "32" +GUI_MACHINE_CLASS = "bigscreen" udevdir = "/dev" OLDEST_KERNEL = "2.6.17" diff --git a/packages/gtk+/gtk+-2.6.10/gtk+-2.6.10-bg.patch b/packages/gtk+/gtk+-2.6.10/gtk+-2.6.10-bg.patch new file mode 100644 index 0000000000..039440f933 --- /dev/null +++ b/packages/gtk+/gtk+-2.6.10/gtk+-2.6.10-bg.patch @@ -0,0 +1,20 @@ +diff -ur gtk+-2.8.20/gtk/gtkiconview.c gtk+-2.8.20-new/gtk/gtkiconview.c +--- gtk+-2.8.20/gtk/gtkiconview.c 2006-04-11 20:44:15.000000000 +0200 ++++ gtk+-2.8.20-new/gtk/gtkiconview.c 2007-01-03 20:20:26.000000000 +0100 +@@ -899,9 +899,14 @@ + gdk_window_set_user_data (icon_view->priv->bin_window, widget); + + widget->style = gtk_style_attach (widget->style, widget->window); +- gdk_window_set_background (icon_view->priv->bin_window, &widget->style->base[widget->state]); ++/* gdk_window_set_background (icon_view->priv->bin_window, &widget->style->base[widget->state]); + gdk_window_set_background (widget->window, &widget->style->base[widget->state]); +- ++*/ ++printf("realize iconview\n"); ++// gdk_window_set_back_pixmap(widget->window, NULL, FALSE); ++// gdk_window_set_back_pixmap(icon_view->priv->bin_window, NULL, FALSE); ++ gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL); ++ gtk_style_set_background (widget->style, icon_view->priv->bin_window, GTK_STATE_NORMAL); + gdk_window_show (icon_view->priv->bin_window); + } + diff --git a/packages/gtk+/gtk+_2.6.10.bb b/packages/gtk+/gtk+_2.6.10.bb index f3d36bcb52..c096bbe688 100644 --- a/packages/gtk+/gtk+_2.6.10.bb +++ b/packages/gtk+/gtk+_2.6.10.bb @@ -5,7 +5,7 @@ SECTION = "libs" LICENSE = "LGPL" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt" -PR = "r8" +PR = "r9" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \ file://help.patch;patch=1 \ @@ -32,7 +32,8 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \ file://gtk.keynav.gtksettings.patch;patch=1;pnum=0 \ file://gtk.keynav.gtktextview.patch;patch=1;pnum=0 \ file://gtk.keynav.gtktreeview.patch;patch=1;pnum=0 \ - file://gtk.keynav.gtkwidget.patch;patch=1;pnum=0" + file://gtk.keynav.gtkwidget.patch;patch=1;pnum=0 \ + file://gtk+-2.6.10-bg.patch;patch=1" inherit autotools pkgconfig diff --git a/packages/madfu/.mtn2git_empty b/packages/madfu/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/madfu/.mtn2git_empty diff --git a/packages/madfu/files/.mtn2git_empty b/packages/madfu/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/madfu/files/.mtn2git_empty diff --git a/packages/madfu/files/autofoo.patch b/packages/madfu/files/autofoo.patch new file mode 100644 index 0000000000..a89d38b144 --- /dev/null +++ b/packages/madfu/files/autofoo.patch @@ -0,0 +1,54 @@ +--- madfuload-1.2/configure.org 2007-04-04 13:30:55.186393000 +0200 ++++ madfuload-1.2/configure 2007-04-04 13:33:26.286393000 +0200 +@@ -2831,50 +2831,7 @@ + else + udev_dir="/etc/udev" + fi; +-as_ac_File=`echo "ac_cv_file_$udev_dir/udev.conf" | $as_tr_sh` +-echo "$as_me:$LINENO: checking for $udev_dir/udev.conf" >&5 +-echo $ECHO_N "checking for $udev_dir/udev.conf... $ECHO_C" >&6 +-if eval "test \"\${$as_ac_File+set}\" = set"; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- test "$cross_compiling" = yes && +- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +- { (exit 1); exit 1; }; } +-if test -r "$udev_dir/udev.conf"; then +- eval "$as_ac_File=yes" +-else +- eval "$as_ac_File=no" +-fi +-fi +-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +-if test `eval echo '${'$as_ac_File'}'` = yes; then +- udev_conf="$udev_dir/udev.conf" +-else +- udev_conf="" +-fi +- +- +-echo "$as_me:$LINENO: checking for udev rules directory" >&5 +-echo $ECHO_N "checking for udev rules directory... $ECHO_C" >&6 +-udev_rules="" +-if test -r "$udev_conf"; then +- udev_rules=`. "$udev_conf"; echo "$udev_rules"` +-fi +-if test -n "$udev_rules"; then +- echo "$as_me:$LINENO: result: $udev_rules" >&5 +-echo "${ECHO_T}$udev_rules" >&6 +-else +- udev_rules="$udev_dir/rules.d" +- echo "$as_me:$LINENO: result: not found; assuming $udev_rules" >&5 +-echo "${ECHO_T}not found; assuming $udev_rules" >&6 +-fi +-if test ! -d "$udev_rules"; then +- { { echo "$as_me:$LINENO: error: $udev_rules not found" >&5 +-echo "$as_me: error: $udev_rules not found" >&2;} +- { (exit 1); exit 1; }; } +-fi ++udev_rules="$udev_dir/rules.d" + UDEV_RULES_DIR=$udev_rules + + diff --git a/packages/madfu/madfu_1.2.bb b/packages/madfu/madfu_1.2.bb new file mode 100644 index 0000000000..354e65aced --- /dev/null +++ b/packages/madfu/madfu_1.2.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Firmware loader for m-audio devices" +LICENSE = "GPL" +PR = "r1" + +SRC_URI = "http://heanet.dl.sourceforge.net/sourceforge/usb-midi-fw/madfuload-1.2.tar.gz \ + file://autofoo.patch;patch=1" + +S = "${WORKDIR}/madfuload-1.2" + +inherit autotools + +do_configure() { + oe_runconf +} +do_compile() { + oe_runmake +} +do_install() { + install -d ${D}/${sbindir} + install -m 755 ${S}/madfuload ${D}/${sbindir} + install -d ${D}/${libdir}/firmware + install -m 644 ${S}/*.bin ${D}/${libdir}/firmware + install -d ${D}/${sysconfdir}/udev/rules + install -m 644 ${S}/42-madfuload.rules ${D}/${sysconfdir}/udev/rules +} + +FILES_${PN} += "${libdir}/firmware/" diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb index 843d2ace4a..287a8166af 100644 --- a/packages/meta/slugos-packages.bb +++ b/packages/meta/slugos-packages.bb @@ -104,6 +104,7 @@ SLUGOS_PACKAGES = "\ lsof \ lvm2 \ m4 \ + madfu \ madplay \ madwifi-ng \ mailx \ diff --git a/packages/puzzles/puzzles_r7387.bb b/packages/puzzles/puzzles_r7436.bb index 9b3b3842c7..9b3b3842c7 100644 --- a/packages/puzzles/puzzles_r7387.bb +++ b/packages/puzzles/puzzles_r7436.bb diff --git a/packages/puzzles/puzzles_svn.bb b/packages/puzzles/puzzles_svn.bb new file mode 100644 index 0000000000..536aa445b7 --- /dev/null +++ b/packages/puzzles/puzzles_svn.bb @@ -0,0 +1,53 @@ +DEFAULT_PREFERENCE = "-1" + +DEPENDS = "gtk+ libxt" +PV = "r7436+svn${SRCDATE}" + +SRC_URI = "svn://ixion.tartarus.org/main;module=puzzles;proto=svn \ + file://game.png" +S = "${WORKDIR}/puzzles" + +do_configure () { + ./mkfiles.pl +} + +do_compile_prepend = " \ + export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --libs`'; \ + export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --cflags`'; " + +FILES_${PN} = "${prefix}/games/* ${datadir}/applications/* ${datadir}/pixmaps" +FILES_${PN}-dbg += "${prefix}/games/.debug" + +do_install () { + rm -rf ${D}/* + export prefix=${D} + export DESTDIR=${D} + install -d ${D}/${prefix}/ + install -d ${D}/${prefix}/games/ + oe_runmake install + + install -d ${D}/${datadir}/ + install -d ${D}/${datadir}/applications/ + install -d ${D}/${datadir}/pixmaps/ + + install ${WORKDIR}/game.png ${D}/${datadir}/pixmaps/ + + cd ${D}/${prefix}/games + for prog in *; do + if [ -x $prog ]; then + echo "making ${D}/${datadir}/applications/$prog.desktop" + cat <<STOP > ${D}/${datadir}/applications/$prog.desktop +[Desktop Entry] +Encoding=UTF-8 +Name=$prog +Exec=${prefix}/games/$prog +Icon=game.png +Terminal=false +Type=Application +Categories=Game +StartupNotify=true +SingleInstance=true +STOP + fi + done +} |