From a2b33ba294b0b9482a86326f6772997cac8a6c8d Mon Sep 17 00:00:00 2001 From: Le Philousophe Date: Mon, 27 Dec 2021 15:58:47 +0000 Subject: [PATCH] ALL: Remove useless packages These packages aren't used anymore by latest ScummVM. libiconv is still needed for tools though. --- check-versions/config.py | 11 -------- toolchains/m4/android/packages_list.m4 | 2 -- toolchains/vita/Dockerfile.m4 | 9 ------- .../packages/vita-shader-collection/build.sh | 27 ------------------- .../vita/packages/vita2dlib_fbo/build.sh | 21 --------------- 5 files changed, 70 deletions(-) delete mode 100755 toolchains/vita/packages/vita-shader-collection/build.sh delete mode 100755 toolchains/vita/packages/vita2dlib_fbo/build.sh diff --git a/check-versions/config.py b/check-versions/config.py index 4fab280..30caa9a 100644 --- a/check-versions/config.py +++ b/check-versions/config.py @@ -504,17 +504,6 @@ VERSIONS = { 'repository': 'https://github.com/vitasdk/autobuilds.git', 'prefix': 'master-linux-v', }, - ('./toolchains/vita/packages/vita-shader-collection/build.sh', 'VITA_SHDR_COLL'): { - 'check': 'git tag', - 'repository': 'https://github.com/frangarcj/vita-shader-collection.git', - # Use pattern as prefix would remove it - 'pattern': '^gtu-', - }, - ('./toolchains/vita/packages/vita2dlib_fbo/build.sh', 'VITA2DLIB'): { - 'check': 'git commit', - 'repository': 'https://github.com/frangarcj/vita2dlib.git', - 'branch': 'fbo', - }, ('./toolchains/windows-9x/packages/pe-util/build.sh', 'PE_UTIL'): { 'check': 'git commit', diff --git a/toolchains/m4/android/packages_list.m4 b/toolchains/m4/android/packages_list.m4 index bbfd1a2..a284b78 100644 --- a/toolchains/m4/android/packages_list.m4 +++ b/toolchains/m4/android/packages_list.m4 @@ -28,8 +28,6 @@ helpers_package(mpeg2dec) helpers_package(a52dec) -helpers_package(libiconv) - android_package(openssl) helpers_package(curl) diff --git a/toolchains/vita/Dockerfile.m4 b/toolchains/vita/Dockerfile.m4 index 1d6650f..f820690 100644 --- a/toolchains/vita/Dockerfile.m4 +++ b/toolchains/vita/Dockerfile.m4 @@ -67,12 +67,3 @@ vdpm_package(FluidLite) vdpm_package(sdl2) vdpm_package(sdl2_net) - -# The following packages are not used in the current development version. - -# These functions aren't implemented on Vita but they are not needed either -helpers_package(libiconv, , ac_cv_func_sigprocmask=yes ac_cv_func_getprogname=yes) - -local_package(vita2dlib_fbo) - -local_package(vita-shader-collection) diff --git a/toolchains/vita/packages/vita-shader-collection/build.sh b/toolchains/vita/packages/vita-shader-collection/build.sh deleted file mode 100755 index 42ff762..0000000 --- a/toolchains/vita/packages/vita-shader-collection/build.sh +++ /dev/null @@ -1,27 +0,0 @@ -#! /bin/sh - -VITA_SHDR_COLL_VERSION=gtu-0.1-v79 - -PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) -HELPERS_DIR=$PACKAGE_DIR/../.. -. $HELPERS_DIR/functions.sh - -do_make_bdir - -PKG=vita-shader-collection - -if [ -d "$PKG" ]; then - rm -r "$PKG" -fi -mkdir "$PKG" -cd "$PKG" - -# Don't use do_http_get as the archive doesn't have a root directory -wget --no-hsts --progress=dot \ - "https://github.com/frangarcj/vita-shader-collection/releases/download/${VITA_SHDR_COLL_VERSION}/vita-shader-collection.tar.gz" -O - | \ - tar --no-same-owner --no-same-permissions -xz - -cp -a lib/. $DESTDIR/$PREFIX/lib/ -cp -a includes/. $DESTDIR/$PREFIX/include/ - -do_clean_bdir diff --git a/toolchains/vita/packages/vita2dlib_fbo/build.sh b/toolchains/vita/packages/vita2dlib_fbo/build.sh deleted file mode 100755 index 880ceb2..0000000 --- a/toolchains/vita/packages/vita2dlib_fbo/build.sh +++ /dev/null @@ -1,21 +0,0 @@ -#! /bin/sh - -# This commit is in fbo branch -VITA2DLIB_VERSION=c221adb0e3757395f95952b84a5920404310140b - -PACKAGE_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) -HELPERS_DIR=$PACKAGE_DIR/../.. -. $HELPERS_DIR/functions.sh - -do_make_bdir - -do_http_fetch vita2dlib \ - "https://github.com/frangarcj/vita2dlib/archive/${VITA2DLIB_VERSION}.tar.gz" 'tar xzf' - -# Makefile is bad coded and overrides CC and AR variables -PATH="$VITASDK/bin:$PATH" do_make -C libvita2d - -cp libvita2d/libvita2d.a $DESTDIR/$PREFIX/lib/libvita2d_fbo.a -cp libvita2d/include/vita2d.h $DESTDIR/$PREFIX/include/vita2d_fbo.h - -do_clean_bdir