diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc0e552..87d49e1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ jobs: chown -R 1000:1000 northfear-sdl2 cd northfear-sdl2 sudo --preserve-env=VITASDK -u \#1000 vita-makepkg - vdpm sdl2-2.30.2-1-arm.tar.xz + vdpm sdl2-*-arm.tar.xz - name: Build run: | cargo vita build vpk --release --package vita-std-tests --tests diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c780bad..a287ea0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: chown -R 1000:1000 northfear-sdl2 cd northfear-sdl2 sudo --preserve-env=VITASDK -u \#1000 vita-makepkg - vdpm sdl2-2.30.2-1-arm.tar.xz + vdpm sdl2-*-arm.tar.xz - name: Build run: | cargo vita build vpk --release --package vita-std-tests --tests diff --git a/northfear-sdl2/.gitignore b/northfear-sdl2/.gitignore new file mode 100644 index 0000000..0f3bb3b --- /dev/null +++ b/northfear-sdl2/.gitignore @@ -0,0 +1,4 @@ +src +pkg +*gz +*xz diff --git a/northfear-sdl2/VITABUILD b/northfear-sdl2/VITABUILD index 8a099c1..7f1dcfe 100644 --- a/northfear-sdl2/VITABUILD +++ b/northfear-sdl2/VITABUILD @@ -1,5 +1,5 @@ pkgname=sdl2 -pkgver=2.30.2 +pkgver=2.24.0 pkgrel=1 gitrev=0867aceb28a493b489f54a3407a3b820b092206a url='https://www.libsdl.org' @@ -10,14 +10,22 @@ sha256sums=( SKIP ) +pkgver() { + cd "SDL-${gitrev}" + ref_major=$(sed -ne 's/^#define SDL_MAJOR_VERSION *//p' include/SDL_version.h) + ref_minor=$(sed -ne 's/^#define SDL_MINOR_VERSION *//p' include/SDL_version.h) + ref_micro=$(sed -ne 's/^#define SDL_PATCHLEVEL *//p' include/SDL_version.h) + echo "${ref_major}.${ref_minor}.${ref_micro}" +} + prepare() { cd "SDL-${gitrev}" } build() { cd "SDL-${gitrev}" - mkdir build && cd build - cmake .. -DCMAKE_TOOLCHAIN_FILE=$VITASDK/share/vita.toolchain.cmake -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_BUILD_TYPE=Release -DSDL_TEST=OFF -DVIDEO_VITA_VGL=ON + rm -rf build; mkdir build && cd build + cmake .. -DCMAKE_TOOLCHAIN_FILE=$VITASDK/share/vita.toolchain.cmake -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_BUILD_TYPE=Release -DSDL_TEST=OFF -DVIDEO_VITA_VGL=ON make -j$(nproc) }