← Back to branch summary

~ppsspp/ppsspp/debian-qt-xenial

« back to all changes in this revision

Viewing changes to patches/08_assets.patch

  • Committer: Sérgio Benjamim
  • Date: 2015-10-16 16:46:54 UTC
  • Revision ID: sergio_br2@yahoo.com.br-20151016164654-nx8kdmxoty713wt1
Downsize the binary, Qt assets are now in the ppsspp-common package (load dynamically).

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/08_assets.patch
 
1
Description: allows Qt frontend to load assets dynamically from the system (provided by ppsspp-common package)
 
2
Index: ppsspp-git2/Qt/desktop_assets.qrc
 
3
===================================================================
 
4
--- ppsspp-git2.orig/Qt/desktop_assets.qrc      2015-10-16 13:05:16.847780532 -0300
 
5
+++ ppsspp-git2/Qt/desktop_assets.qrc   2015-10-16 13:08:27.402098233 -0300
 
6
@@ -1,15 +1,5 @@
 
7
 <RCC>
 
8
        <qresource prefix="/">
 
9
-               <file alias="assets/ui_atlas_lowmem.zim">../assets/ui_atlas_lowmem.zim</file>
 
10
-               <file alias="assets/ppge_atlas.zim">../assets/ppge_atlas.zim</file>
 
11
-               <file alias="assets/lang">../lang</file>
 
12
-               <file alias="assets/compat.ini">../assets/compat.ini</file>
 
13
-               <file alias="assets/langregion.ini">../assets/langregion.ini</file>
 
14
-               <file alias="assets/unknown.png">../assets/unknown.png</file>
 
15
-               <file alias="assets/rargray.png">../assets/rargray.png</file>
 
16
-               <file alias="assets/zip.png">../assets/zip.png</file>
 
17
-               <file alias="assets/shaders">../assets/shaders</file>
 
18
-               <file alias="assets/flash0/font">../flash0/font</file>
 
19
                <file>languages/ppsspp_de.qm</file>
 
20
                <file>languages/ppsspp_en.qm</file>
 
21
                <file>languages/ppsspp_fr.qm</file>
 
22
Index: ppsspp-git2/ext/native/file/zip_read.cpp
 
23
===================================================================
 
24
--- ppsspp-git2.orig/ext/native/file/zip_read.cpp       2015-10-16 13:05:43.012104599 -0300
 
25
+++ ppsspp-git2/ext/native/file/zip_read.cpp    2015-10-16 13:08:21.894032586 -0300
 
26
@@ -67,7 +67,7 @@
 
27
 
 
28
 #ifdef USING_QT_UI
 
29
 uint8_t *AssetsAssetReader::ReadAsset(const char *path, size_t *size) {
 
30
-       QFile asset(QString(":/assets/") + path);
 
31
+       QFile asset(QString("/usr/share/ppsspp/assets/") + path);
 
32
        if (!asset.open(QIODevice::ReadOnly))
 
33
                return 0;
 
34
 
 
35
@@ -81,7 +81,7 @@
 
36
 
 
37
 bool AssetsAssetReader::GetFileListing(const char *path, std::vector<FileInfo> *listing, const char *filter = 0)
 
38
 {
 
39
-       QDir assetDir(QString(":/assets/") + path);
 
40
+       QDir assetDir(QString("/usr/share/ppsspp/assets/") + path);
 
41
        QStringList filters = QString(filter).split(':', QString::SkipEmptyParts);
 
42
        for (int i = 0; i < filters.count(); i++)
 
43
                filters[i].prepend("*.");
 
44
@@ -90,7 +90,7 @@
 
45
        foreach(QFileInfo qinfo, infoList) {
 
46
                FileInfo info;
 
47
                info.name = qinfo.fileName().toStdString();
 
48
-               info.fullName = qinfo.absoluteFilePath().remove(":/assets/").toStdString();
 
49
+               info.fullName = qinfo.absoluteFilePath().remove("/usr/share/ppsspp/assets/").toStdString();
 
50
                info.exists = true;
 
51
                info.isWritable = false;
 
52
                info.isDirectory = qinfo.isDir();
 
53
@@ -100,7 +100,7 @@
 
54
 }
 
55
 
 
56
 bool AssetsAssetReader::GetFileInfo(const char *path, FileInfo *info) {
 
57
-       QFileInfo qinfo(QString(":/assets/") + path);
 
58
+       QFileInfo qinfo(QString("/usr/share/ppsspp/assets/") + path);
 
59
        if (!qinfo.exists()) {
 
60
                info->exists = false;
 
61
                info->size = 0;