diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-17 00:01:32 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-24 21:20:13 +0000 |
commit | 8cb555460ff79e636a7907fb2589e16db98c8600 (patch) | |
tree | 930a3878c7641c9ce045b24f0ade1309e36d5806 /tools/buildzip.pl | |
parent | 0c4f89370d05056faa789aa9cabcccc4e509fb9f (diff) | |
download | rockbox-8cb555460ff79e636a7907fb2589e16db98c8600.tar.gz rockbox-8cb555460ff79e636a7907fb2589e16db98c8600.zip |
[3/4] Completely remove HWCODEC support
'swcodec' is now always set (and recording_swcodec for recording-capable
units) in feature.txt so the manual and language strings don't need to
all be fixed up.
Change-Id: Ib2c9d5d157af8d33653e2d4b4a12881b9aa6ddb0
Diffstat (limited to 'tools/buildzip.pl')
-rwxr-xr-x | tools/buildzip.pl | 44 |
1 files changed, 16 insertions, 28 deletions
diff --git a/tools/buildzip.pl b/tools/buildzip.pl index b1626f429c..0e980139bf 100755 --- a/tools/buildzip.pl +++ b/tools/buildzip.pl | |||
@@ -92,7 +92,7 @@ sub find_copyfile { | |||
92 | print "cp $path $destination\n" if $verbose; | 92 | print "cp $path $destination\n" if $verbose; |
93 | copy($path, $destination); | 93 | copy($path, $destination); |
94 | chmod(0755, $destination.'/'.$path); | 94 | chmod(0755, $destination.'/'.$path); |
95 | } | 95 | } |
96 | } | 96 | } |
97 | } | 97 | } |
98 | } | 98 | } |
@@ -266,7 +266,6 @@ LCD Height: LCD_HEIGHT | |||
266 | Icon Width: CONFIG_DEFAULT_ICON_WIDTH | 266 | Icon Width: CONFIG_DEFAULT_ICON_WIDTH |
267 | Icon Height: CONFIG_DEFAULT_ICON_HEIGHT | 267 | Icon Height: CONFIG_DEFAULT_ICON_HEIGHT |
268 | #endif | 268 | #endif |
269 | Codec: CONFIG_CODEC | ||
270 | #ifdef HAVE_REMOTE_LCD | 269 | #ifdef HAVE_REMOTE_LCD |
271 | Remote Depth: LCD_REMOTE_DEPTH | 270 | Remote Depth: LCD_REMOTE_DEPTH |
272 | Remote Icon Width: CONFIG_REMOTE_DEFAULT_ICON_WIDTH | 271 | Remote Icon Width: CONFIG_REMOTE_DEFAULT_ICON_WIDTH |
@@ -287,7 +286,7 @@ STOP | |||
287 | 286 | ||
288 | open(TARGET, "$c|"); | 287 | open(TARGET, "$c|"); |
289 | 288 | ||
290 | my ($bitmap, $width, $height, $depth, $swcodec, $icon_h, $icon_w); | 289 | my ($bitmap, $width, $height, $depth, $icon_h, $icon_w); |
291 | my ($remote_depth, $remote_icon_h, $remote_icon_w); | 290 | my ($remote_depth, $remote_icon_h, $remote_icon_w); |
292 | my ($recording); | 291 | my ($recording); |
293 | my $icon_count = 1; | 292 | my $icon_count = 1; |
@@ -311,10 +310,6 @@ STOP | |||
311 | elsif($_ =~ /^Icon Height: (\d*)/) { | 310 | elsif($_ =~ /^Icon Height: (\d*)/) { |
312 | $icon_h = $1; | 311 | $icon_h = $1; |
313 | } | 312 | } |
314 | elsif($_ =~ /^Codec: (\d*)/) { | ||
315 | # SWCODEC is 1, the others are HWCODEC | ||
316 | $swcodec = ($1 == 1); | ||
317 | } | ||
318 | elsif($_ =~ /^Remote Depth: (\d*)/) { | 313 | elsif($_ =~ /^Remote Depth: (\d*)/) { |
319 | $remote_depth = $1; | 314 | $remote_depth = $1; |
320 | } | 315 | } |
@@ -332,7 +327,7 @@ STOP | |||
332 | unlink("gcctemp"); | 327 | unlink("gcctemp"); |
333 | 328 | ||
334 | return ($bitmap, $depth, $width, $height, $icon_w, $icon_h, $recording, | 329 | return ($bitmap, $depth, $width, $height, $icon_w, $icon_h, $recording, |
335 | $swcodec, $remote_depth, $remote_icon_w, $remote_icon_h); | 330 | $remote_depth, $remote_icon_w, $remote_icon_h); |
336 | } | 331 | } |
337 | 332 | ||
338 | sub filesize { | 333 | sub filesize { |
@@ -345,17 +340,17 @@ sub filesize { | |||
345 | 340 | ||
346 | 341 | ||
347 | sub buildzip { | 342 | sub buildzip { |
348 | my ($image, $fonts)=@_; | 343 | my ($image, $fonts)=@_; |
349 | my $libdir = $install; | 344 | my $libdir = $install; |
350 | my $temp_dir = ".rockbox"; | 345 | my $temp_dir = ".rockbox"; |
351 | 346 | ||
352 | print "buildzip: image=$image fonts=$fonts\n" if $verbose; | 347 | print "buildzip: image=$image fonts=$fonts\n" if $verbose; |
353 | 348 | ||
354 | my ($bitmap, $depth, $width, $height, $icon_w, $icon_h, $recording, | 349 | my ($bitmap, $depth, $width, $height, $icon_w, $icon_h, $recording, |
355 | $swcodec, $remote_depth, $remote_icon_w, $remote_icon_h) = | 350 | $remote_depth, $remote_icon_w, $remote_icon_h) = |
356 | &gettargetinfo(); | 351 | &gettargetinfo(); |
357 | 352 | ||
358 | # print "Bitmap: $bitmap\nDepth: $depth\nSwcodec: $swcodec\n"; | 353 | # print "Bitmap: $bitmap\nDepth: $depth\n"; |
359 | 354 | ||
360 | # remove old traces | 355 | # remove old traces |
361 | rmtree($temp_dir); | 356 | rmtree($temp_dir); |
@@ -406,11 +401,8 @@ sub buildzip { | |||
406 | glob_mkdir("$temp_dir/recpresets"); | 401 | glob_mkdir("$temp_dir/recpresets"); |
407 | } | 402 | } |
408 | 403 | ||
409 | if($swcodec) { | 404 | glob_mkdir("$temp_dir/eqs"); |
410 | glob_mkdir("$temp_dir/eqs"); | 405 | glob_copy("$ROOT/lib/rbcodec/dsp/eqs/*.cfg", "$temp_dir/eqs/"); # equalizer presets |
411 | |||
412 | glob_copy("$ROOT/lib/rbcodec/dsp/eqs/*.cfg", "$temp_dir/eqs/"); # equalizer presets | ||
413 | } | ||
414 | 406 | ||
415 | glob_mkdir("$temp_dir/wps"); | 407 | glob_mkdir("$temp_dir/wps"); |
416 | glob_mkdir("$temp_dir/icons"); | 408 | glob_mkdir("$temp_dir/icons"); |
@@ -556,7 +548,7 @@ sub buildzip { | |||
556 | if( filesize("rombox.ucl") > 1000) { | 548 | if( filesize("rombox.ucl") > 1000) { |
557 | copy("rombox.ucl", "$temp_dir/rombox.ucl"); # UCL for flashing | 549 | copy("rombox.ucl", "$temp_dir/rombox.ucl"); # UCL for flashing |
558 | } | 550 | } |
559 | 551 | ||
560 | # Check for rombox.target | 552 | # Check for rombox.target |
561 | if ($image=~/(.*)\.(\w+)$/) | 553 | if ($image=~/(.*)\.(\w+)$/) |
562 | { | 554 | { |
@@ -596,20 +588,16 @@ sub buildzip { | |||
596 | else { | 588 | else { |
597 | print STDERR "No wps module present, can't do the WPS magic!\n"; | 589 | print STDERR "No wps module present, can't do the WPS magic!\n"; |
598 | } | 590 | } |
599 | 591 | ||
600 | # until buildwps.pl is fixed, manually copy the classic_statusbar theme across | 592 | # until buildwps.pl is fixed, manually copy the classic_statusbar theme across |
601 | mkdir "$temp_dir/wps/classic_statusbar", 0777; | 593 | mkdir "$temp_dir/wps/classic_statusbar", 0777; |
602 | glob_copy("$ROOT/wps/classic_statusbar/*.bmp", "$temp_dir/wps/classic_statusbar"); | 594 | glob_copy("$ROOT/wps/classic_statusbar/*.bmp", "$temp_dir/wps/classic_statusbar"); |
603 | if ($swcodec) { | 595 | if ($depth == 16) { |
604 | if ($depth == 16) { | 596 | copy("$ROOT/wps/classic_statusbar.sbs", "$temp_dir/wps"); |
605 | copy("$ROOT/wps/classic_statusbar.sbs", "$temp_dir/wps"); | 597 | } elsif ($depth > 1) { |
606 | } elsif ($depth > 1) { | 598 | copy("$ROOT/wps/classic_statusbar.grey.sbs", "$temp_dir/wps/classic_statusbar.sbs"); |
607 | copy("$ROOT/wps/classic_statusbar.grey.sbs", "$temp_dir/wps/classic_statusbar.sbs"); | ||
608 | } else { | ||
609 | copy("$ROOT/wps/classic_statusbar.mono.sbs", "$temp_dir/wps/classic_statusbar.sbs"); | ||
610 | } | ||
611 | } else { | 599 | } else { |
612 | copy("$ROOT/wps/classic_statusbar.112x64x1.sbs", "$temp_dir/wps/classic_statusbar.sbs"); | 600 | copy("$ROOT/wps/classic_statusbar.mono.sbs", "$temp_dir/wps/classic_statusbar.sbs"); |
613 | } | 601 | } |
614 | if ($remote_depth != $depth) { | 602 | if ($remote_depth != $depth) { |
615 | copy("$ROOT/wps/classic_statusbar.mono.sbs", "$temp_dir/wps/classic_statusbar.rsbs"); | 603 | copy("$ROOT/wps/classic_statusbar.mono.sbs", "$temp_dir/wps/classic_statusbar.rsbs"); |