pandora: workaround some reported problems

diff --git a/platform/pandora/Makefile b/platform/pandora/Makefile
index c7e7c00..5907169 100644 (file)
--- a/platform/pandora/Makefile
+++ b/platform/pandora/Makefile
@@ -1,7 +1,12 @@
 # release packaging makefile
 
-VER ?= $(shell head -n 1 ../common/version.h | \
+VER := $(shell head -n 1 ../common/version.h | \
        sed 's/.*"\(.*\)\.\(.*\)".*/\1\2/g')
+BUILD := $(shell git describe HEAD | grep -- - | \
+       sed -e 's/.*\-\(.*\)\-.*/\1/')
+ifneq "$(BUILD)" ""
+VER := $(VER)_$(BUILD)
+endif
 
 PND_MAKE ?= $(HOME)/dev/pnd/src/pandora-libraries/testdata/scripts/pnd_make.sh
 
@@ -13,8 +18,8 @@ all: rel
 /tmp/readme.txt: ../../tools/textfilter ../base_readme.txt
        ../../tools/textfilter ../base_readme.txt $@ PANDORA
 
-/tmp/PicoDrive.pxml: PicoDrive.pxml.template
-       ./make_pxml.sh $^ $@
+/tmp/PicoDrive.pxml: PicoDrive.pxml.template FORCE
+       ./make_pxml.sh $< $@
 
 rel: ../../PicoDrive PicoDrive.sh picorestore \
        PicoDrive.png PicoDrive_p.png \
@@ -25,3 +30,5 @@ rel: ../../PicoDrive PicoDrive.sh picorestore \
        cp -r $^ out/
        $(PND_MAKE) -p PicoDrive_$(VER).pnd -d out -x out/PicoDrive.pxml -i out/PicoDrive.png -c
 
+FORCE:
+.PHONY: all rel FORCE

diff --git a/platform/pandora/PicoDrive.sh b/platform/pandora/PicoDrive.sh
index 02943e7..729a7c1 100755 (executable)
--- a/platform/pandora/PicoDrive.sh
+++ b/platform/pandora/PicoDrive.sh
@@ -1,7 +1,10 @@
 #!/bin/sh
 
-# 2x2M hugepages should be enough
-sudo -n /usr/pandora/scripts/op_hugetlb.sh 4
+# 3.2.30 on pandora has broken hugetlb
+if [ "`uname -r`" != "3.2.30" ]; then
+  # 2x2M hugepages should be enough
+  sudo -n /usr/pandora/scripts/op_hugetlb.sh 4
+fi
 
 ./PicoDrive "$@"
 

diff --git a/platform/pandora/plat.c b/platform/pandora/plat.c
index 396e11f..2171c03 100644 (file)
--- a/platform/pandora/plat.c
+++ b/platform/pandora/plat.c
@@ -40,7 +40,6 @@ static int g_layer_x, g_layer_y;
 static int g_layer_w = 320, g_layer_h = 240;\r
 static int g_osd_fps_x, g_osd_y, doing_bg_frame;\r
 \r
-static const char pnd_script_base[] = "sudo -n /usr/pandora/scripts";\r
 static unsigned char __attribute__((aligned(4))) fb_copy[320 * 240 * 2];\r
 static void *temp_frame;\r
 const char *renderer_names[] = { NULL };\r
@@ -375,6 +374,8 @@ void plat_video_loop_prepare(void)
 void pemu_loop_prep(void)\r
 {\r
        // dirty buffers better go now than during gameplay\r
+       fflush(stdout);\r
+       fflush(stderr);\r
        sync();\r
        sleep(0);\r
 }\r