[SCM] Packaging for bsnes branch, master, updated. debian/0.088-4-5-g2ae08c2
Tobias Hansen
tobias.han at gmx.de
Sun Sep 23 17:57:22 UTC 2012
The following commit has been merged in the master branch:
commit ae751911f1d2d417dac4d6ad9a1515a656616389
Author: Tobias Hansen <tobias.han at gmx.de>
Date: Tue Sep 18 02:10:12 2012 +0200
Fix several issues with bsnes-purify (Closes: #687034).
diff --git a/debian/patches/fix-purify-header-removal-and-input.patch b/debian/patches/fix-purify-header-removal-and-input.patch
index 63b28b1..7bddfec 100644
--- a/debian/patches/fix-purify-header-removal-and-input.patch
+++ b/debian/patches/fix-purify-header-removal-and-input.patch
@@ -1,10 +1,21 @@
Description: Purify: Fix header checks and input handling
* Add parantheses to fix checks for headers.
* Accept folder names entered without trailing slash.
+ * Check also files with uppercase extensions.
+ * Rename purify to bsnes-purify in help output.
Author: Tobias Hansen <tobias.han at gmx.de>
--- a/purify/purify.cpp
+++ b/purify/purify.cpp
+@@ -43,7 +43,7 @@
+ bool Application::loadFile(const string &filename, string &suffix, uint8_t *&data, unsigned &size) {
+ print("-> ", notdir(filename), "\n");
+
+- if(filename.endswith(".zip")) {
++ if(filename.iendswith(".zip")) {
+ zip archive;
+ if(archive.open(filename) == false) return print("* failed to open archive\n"), false;
+ if(archive.file.size() != 1) return print("* file count (", archive.file.size(), ") incorrect\n"), false;
@@ -60,7 +60,7 @@
//<famicom>
@@ -41,12 +52,32 @@ Author: Tobias Hansen <tobias.han at gmx.de>
string markup = SuperFamicomCartridge(data, size).markup;
string path = {target, nall::basename(filename), ".sfc/"};
-@@ -238,15 +238,20 @@
+@@ -225,11 +225,11 @@
+ unsigned size;
+ if(loadFile({source, filename}, suffix, data, size) == false) continue;
+
+- if(suffix == "nes" || suffix == "fc") outputFamicom(filename, data, size);
+- if(suffix == "sfc" || suffix == "smc") outputSuperFamicom(filename, data, size);
+- if(suffix == "gb") outputGameBoy(filename, data, size);
+- if(suffix == "gbc" || suffix == "gbb") outputGameBoyColor(filename, data, size);
+- if(suffix == "gba") outputGameBoyAdvance(filename, data, size);
++ if(suffix.iequals("nes") || suffix.iequals("fc")) outputFamicom(filename, data, size);
++ if(suffix.iequals("sfc") || suffix.iequals("smc")) outputSuperFamicom(filename, data, size);
++ if(suffix.iequals("gb")) outputGameBoy(filename, data, size);
++ if(suffix.iequals("gbc") || suffix.iequals("gbb")) outputGameBoyColor(filename, data, size);
++ if(suffix.iequals("gba")) outputGameBoyAdvance(filename, data, size);
+
+ delete[] data;
+ }
+@@ -238,21 +238,29 @@
int main(int argc, char **argv) {
Application *application = new Application;
-+ string source = argv[2];
-+ if(!source.endswith("/")) source.append("/");
++ string source;
++ if(argc == 4) {
++ source = argv[2];
++ if(!source.endswith("/")) source.append("/");
++ }
+
if(argc == 4 && cstring{argv[1]} == "scan") {
- application->source = argv[2];
@@ -65,3 +96,11 @@ Author: Tobias Hansen <tobias.han at gmx.de>
application->outputDirectory();
}
+ else {
+- print("purify v01\n");
+- print("usage: purify [mode] source target\n\n");
++ print("bsnes-purify v01\n");
++ print("usage: bsnes-purify [mode] source target\n\n");
+ print("modes:\n");
+ print(" scan - create database\n");
+ print(" output - create folder images\n");
--
Packaging for bsnes
More information about the Pkg-games-commits
mailing list