FS#9763 - Sansa Clip modified WPS. This modified wps avoids wps elements getting split over the yellow/cyan
parts of the display. Also introduces a mechanism for selecting a target specific wps if there is already another wps with the same screen size. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19889 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Bertrik Sikken
parent
ba4be51571
commit
31c8eee99d
4 changed files with 51 additions and 10 deletions
|
|
@ -24,7 +24,7 @@ my $verbose;
|
|||
my $sim;
|
||||
my $exe;
|
||||
my $target;
|
||||
my $archos;
|
||||
my $modelname;
|
||||
my $incfonts;
|
||||
my $target_id; # passed in, not currently used
|
||||
my $rbdir=".rockbox"; # can be changed for special builds
|
||||
|
|
@ -70,7 +70,7 @@ sub find_copyfile {
|
|||
# Get options
|
||||
GetOptions ( 'r|root=s' => \$ROOT,
|
||||
'z|ziptool=s' => \$ziptool,
|
||||
't|target=s' => \$archos, # The target name as used in ARCHOS in the root makefile
|
||||
'm|modelname=s' => \$modelname, # The model name as used in ARCHOS in the root makefile
|
||||
'i|id=s' => \$target_id, # The target id name as used in TARGET_ID in the root makefile
|
||||
'o|output=s' => \$output,
|
||||
'f|fonts=s' => \$incfonts, # 0 - no fonts, 1 - fonts only 2 - fonts and package
|
||||
|
|
@ -389,7 +389,7 @@ STOP
|
|||
if(-d "$ROOT/wps") {
|
||||
my $wps_build_cmd="perl $ROOT/wps/wpsbuild.pl ";
|
||||
$wps_build_cmd=$wps_build_cmd."-v " if $verbose;
|
||||
$wps_build_cmd=$wps_build_cmd." --rbdir=$rbdir -r $ROOT $ROOT/wps/WPSLIST $target";
|
||||
$wps_build_cmd=$wps_build_cmd." --rbdir=$rbdir -r $ROOT -m $modelname $ROOT/wps/WPSLIST $target";
|
||||
print "wpsbuild: $wps_build_cmd\n" if $verbose;
|
||||
system("$wps_build_cmd");
|
||||
print "wps_build_cmd: done\n" if $verbose;
|
||||
|
|
|
|||
|
|
@ -203,27 +203,27 @@ tags:
|
|||
$(SILENT)etags -o $(BUILDDIR)/TAGS $(filter-out %.o,$(SRC) $(OTHER_SRC))
|
||||
|
||||
fontzip:
|
||||
$(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -t \"$(MODELNAME)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 1 -o rockbox-fonts.zip $(TARGET) $(BINARY)
|
||||
$(SILENT)$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 1 -o rockbox-fonts.zip $(TARGET) $(BINARY)
|
||||
|
||||
zip:
|
||||
$(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done ; \
|
||||
$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -t \"$(MODELNAME)$$feat\" -i \"$(TARGET_ID)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY)
|
||||
$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY)
|
||||
|
||||
mapzip:
|
||||
$(SILENT)find . -name "*.map" | xargs zip rockbox-maps.zip
|
||||
|
||||
fullzip:
|
||||
$(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \
|
||||
$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -t \"$(MODELNAME)$$feat\" -i \"$(TARGET_ID)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 -o rockbox-full.zip $(TARGET) $(BINARY)
|
||||
$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 -o rockbox-full.zip $(TARGET) $(BINARY)
|
||||
|
||||
7zip:
|
||||
$(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \
|
||||
$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -t \"$(MODELNAME)$$feat\" -i \"$(TARGET_ID)\" -o "rockbox.7z" -z "7za a -mx=9" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY)
|
||||
$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -o "rockbox.7z" -z "7za a -mx=9" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY)
|
||||
|
||||
tar:
|
||||
$(SILENT)rm -f rockbox.tar
|
||||
$(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \
|
||||
$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -t \"$(MODELNAME)$$feat\" -i \"$(TARGET_ID)\" -o "rockbox.tar" -z "tar -cf" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY)
|
||||
$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -o "rockbox.tar" -z "tar -cf" -r "$(ROOTDIR)" --rbdir="$(RBDIR)" $(TARGET) $(BINARY)
|
||||
|
||||
bzip2: tar
|
||||
$(SILENT)bzip2 -f9 rockbox.tar
|
||||
|
|
@ -256,12 +256,12 @@ ifdef SIMVER
|
|||
install:
|
||||
@echo "Installing your build in your 'simdisk' dir"
|
||||
$(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \
|
||||
$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -t \"$(MODELNAME)$$feat\" -i \"$(TARGET_ID)\" -s -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 0 $(TARGET) $(BINARY)
|
||||
$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -s -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 0 $(TARGET) $(BINARY)
|
||||
|
||||
fullinstall:
|
||||
@echo "Installing a full setup in your 'simdisk' dir"
|
||||
$(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \
|
||||
$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -t \"$(MODELNAME)$$feat\" -i \"$(TARGET_ID)\" -s -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 $(TARGET) $(BINARY)
|
||||
$(TOOLSDIR)/buildzip.pl $(VERBOSEOPT) -m \"$(MODELNAME)\" -i \"$(TARGET_ID)\" -s -r "$(ROOTDIR)" --rbdir="$(RBDIR)" -f 2 $(TARGET) $(BINARY)
|
||||
|
||||
endif
|
||||
|
||||
|
|
|
|||
35
wps/cabbiev2.128x64x1.clip.wps
Normal file
35
wps/cabbiev2.128x64x1.clip.wps
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
# cabbie 2.0 default rwps for Iriver Players by Johannes Voggenthaler (Zinc Alloy)
|
||||
# derived from cabbie 2.0 default rwps (C) 2007, Marc Guay
|
||||
# modified for the Sansa Clip, 2009, Bertrik Sikken, Thomas Martitz
|
||||
|
||||
%wd
|
||||
|
||||
# progressbar viewport
|
||||
%V|0|0|128|16|1|
|
||||
%pb|pb-128x64x1.bmp|2|1|124|4|
|
||||
%x|a|pbbackground-128x64x1.bmp|1|0|
|
||||
%pp of %pe%ar%pc
|
||||
|
||||
# tag info viewport
|
||||
%V|0|18|128|25|1|
|
||||
%ac%s%?it<%it|%fn>
|
||||
%ac%s%?ia<%ia|%?d2<%d2|(root)>>
|
||||
%ac%s%?id<%id|%?d1<%d1|(root)>>
|
||||
%x|b|bar-128x64x1.bmp|2|32|
|
||||
|
||||
# playtime info and status bar
|
||||
%V|2|43|124|21|1|
|
||||
%xl|A|lock-128x64x1.bmp|1|12|2|
|
||||
%xl|B|battery-128x64x1.bmp|23|12|9|
|
||||
%xl|C|volume-128x64x1.bmp|46|12|9|
|
||||
%xl|D|shuffle-128x64x1.bmp|67|13|
|
||||
%xl|E|repeat-128x64x1.bmp|93|12|4|
|
||||
%xl|F|playmode-128x64x1.bmp|113|12|5|
|
||||
|
||||
# status bar
|
||||
%?mh<%xdAa|%xdAb>
|
||||
%?bp<%?bc<%xdBa|%xdBb>|%?bl<|%xdBc|%xdBd|%xdBe|%xdBf|%xdBg|%xdBh|%xdBi>>
|
||||
%?pv<%xdCa|%xdCb|%xdCc|%xdCd|%xdCe|%xdCf|%xdCg|%xdCh|%xdCi>
|
||||
%?ps<%xdD>
|
||||
%?mm<|%xdEa|%xdEb|%xdEc|%xdEd>
|
||||
%?mp<%xdFa|%xdFb|%xdFc|%xdFd|%xdFe>
|
||||
|
|
@ -16,9 +16,11 @@ my $verbose;
|
|||
my $rbdir=".rockbox";
|
||||
my $wpslist;
|
||||
my $target;
|
||||
my $modelname;
|
||||
|
||||
# Get options
|
||||
GetOptions ( 'r|root=s' => \$ROOT,
|
||||
'm|modelname=s' => \$modelname,
|
||||
'v|verbose' => \$verbose,
|
||||
'rbdir=s' => \$rbdir, # If we want to put in a different directory
|
||||
);
|
||||
|
|
@ -373,6 +375,10 @@ while(<WPS>) {
|
|||
|
||||
$req_g = $rwidth . "x" . $rheight . "x" . $d;
|
||||
|
||||
# check for model specific wps
|
||||
$req_g_wps = $wps_prefix . "." . $req_g . "." . $modelname . ".wps";
|
||||
last if (-e "$wpsdir/$req_g_wps");
|
||||
|
||||
$req_g_wps = $wps_prefix . "." . $req_g . ".wps";
|
||||
last if (-e "$wpsdir/$req_g_wps");
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue