Skip to content

Commit

Permalink
ci: fix libvita2d atlas size
Browse files Browse the repository at this point in the history
  • Loading branch information
dragonflylee committed Aug 29, 2023
1 parent e94ca04 commit 4adae6c
Show file tree
Hide file tree
Showing 6 changed files with 84 additions and 1 deletion.
6 changes: 6 additions & 0 deletions ci/conan-libvita2d/conandata.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
sources:
"0.0.2":
url: "https://github.com/xerpi/libvita2d/archive/master.tar.gz"
patches:
"0.0.2":
- patch_file: "patches/0001-fix-tex-size.patch"
31 changes: 31 additions & 0 deletions ci/conan-libvita2d/conanfile.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
import os

from conan import ConanFile
from conan.tools import files


class Vita2dConan(ConanFile):
name = "libvita2d"
version = "0.0.2"
settings = "os", "compiler", "build_type", "arch"
exports_sources = "temp-support.patch"
user = "blastrock"
channel = "pkgj"

def export_sources(self):
files.export_conandata_patches(self)

def source(self):
files.get(self, **self.conan_data["sources"][self.version], strip_root=True)

def build(self):
files.apply_conandata_patches(self)
self.run("make -C libvita2d")

def package(self):
self.run("make -C libvita2d install")

def package_info(self):
self.cpp_info.libs = ["libvita2d"]
45 changes: 45 additions & 0 deletions ci/conan-libvita2d/patches/0001-fix-tex-size.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
diff --git a/libvita2d/source/vita2d_font.c b/libvita2d/source/vita2d_font.c
index d1d9287..72e1ec7 100755
--- a/libvita2d/source/vita2d_font.c
+++ b/libvita2d/source/vita2d_font.c
@@ -11,8 +11,8 @@
#include "utils.h"
#include "shared.h"

-#define ATLAS_DEFAULT_W 512
-#define ATLAS_DEFAULT_H 512
+#define ATLAS_DEFAULT_W 4096
+#define ATLAS_DEFAULT_H 4096

typedef enum {
VITA2D_LOAD_FONT_FROM_FILE,
diff --git a/libvita2d/source/vita2d_pgf.c b/libvita2d/source/vita2d_pgf.c
index 6fc461c..7f9b4f0 100755
--- a/libvita2d/source/vita2d_pgf.c
+++ b/libvita2d/source/vita2d_pgf.c
@@ -13,8 +13,8 @@
#include "utils.h"
#include "shared.h"

-#define ATLAS_DEFAULT_W 512
-#define ATLAS_DEFAULT_H 512
+#define ATLAS_DEFAULT_W 4096
+#define ATLAS_DEFAULT_H 4096

typedef struct vita2d_pgf_font_handle {
SceFontHandle font_handle;
diff --git a/libvita2d/source/vita2d_pvf.c b/libvita2d/source/vita2d_pvf.c
index ce58283..affd080 100755
--- a/libvita2d/source/vita2d_pvf.c
+++ b/libvita2d/source/vita2d_pvf.c
@@ -13,8 +13,8 @@
#include "utils.h"
#include "shared.h"

-#define ATLAS_DEFAULT_W 512
-#define ATLAS_DEFAULT_H 512
+#define ATLAS_DEFAULT_W 4096
+#define ATLAS_DEFAULT_H 4096

#define PVF_GLYPH_MARGIN 2

1 change: 0 additions & 1 deletion ci/conan-vitasdk/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ def source(self):
files.unzip(self, "vitasdk.tar.bz2")

additional_libs = [
"libvita2d",
"libpng",
"freetype",
"libjpeg-turbo",
Expand Down
1 change: 1 addition & 0 deletions ci/setup_conan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ poetry run conan export conan-vitasdk
poetry run conan export conan-fmt
poetry run conan export conan-libzip
poetry run conan export conan-vitasqlite
poetry run conan export conan-libvita2d
1 change: 1 addition & 0 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ class PkgjConan(ConanFile):
def requirements(self):
if self.settings.os == "PSVita":
self.requires("vitasqlite/0.0.2@blastrock/pkgj")
self.requires("libvita2d/0.0.2@blastrock/pkgj")
self.requires("imgui/1.89.4")
else:
self.requires("sqlite3/3.42.0")
Expand Down

0 comments on commit 4adae6c

Please sign in to comment.