Permalink
Browse files

Simplify

  • Loading branch information...
1 parent 526d236 commit 30f57a3f73ab1dfe02992365611fffde7ec5fdca @xyzz xyzz committed Dec 16, 2016
View
@@ -1,5 +1 @@
-config
-.DS_Store
-*~
-_*
-binpkg
+vitasdk-nightly.*
View
@@ -1,31 +0,0 @@
-sudo: required
-os: linux
-language: c
-compiler: clang
-env:
-- secure: "vmVFv4ccRBy9TyLh4Me95PKrG/1ttuKuQaC6E0l/ALhxIwQ2PrESwcO4TSiZemPjP6R70NaKQLpyNvaLGlNdQmamooNCsLDTc3vKpgXqLHfIExns6Uv4a5p/1HK7ADgJfNesRL9LRUhxWm2KQ+MqXFi79rGt7xGVdUK5hGTt9IZpq/hwBPyyKafdAjBeWW7Yoy99/WleTenot30XDEa3ErcUIBego6mWREwWLJCGyvTDyJOpLGDBDl9X2r3wQOoU1FwC2BXpZb1/XyqFK5mTTOrnwzf+OU3p5gDOVlXzKMkT6KxpQ94O8O2QrBJ4jPwoa5gExu8NrItXxCkACb6cKxcHSCKAgzfs/6Qw2cRYLdqti3aHWVA7IPAaPLH/JqwNqNLT4BZ3qIvlMYkyI3Pp3I+YiYeVyzWQ762sz+BWozWbL+9+osjC1DsW/wOygqPqFcL7H4eDxnVRUVRfTcrT3b2Pzt6DWyZVks93qt7ZNf35sob1UvHr2cNgUQSoVpgqcWZ2KhDj00aT9X62nziGuJC8SFVqTUiJsionlsK8HM7aQoqSQ+pA7ZVxs8XTJzGxcuputI7fbNfg6EXUL6maXBJHHeejNBhf8dYQblGZqU+eTFUjM5upvpu337bNBOQLu1u2oU+pZxtZtRjcV36AbMs0rWUrZEFHJZROWYdXicI="
-
-notifications:
- email: false
-
-before_install:
- - sudo apt-get install sshpass
- - echo "|1|319gPn4gbuUnAOPWNsRR1+PX6i0=|lrV+WR6nMUM7/hgPHEBzzDDogmI= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8Z6HD2zR2C45TVnpAx8BaV96pK5RmITKCfl3yYxkTxrryLo8rhz/N6CPK1MgRv1iChZh7d1rrarLzMAcZq+B6pB5k1aieoOIIz3WpeWrRImcAK/D3ltN4gq4Uaccah48ojjD3o9MBTPqgM2tMyVdYRfwIlcMVH3tXoFax8/ISADkA6ZcoJcFCCriJmUVmLM/vypPXQPEnskxO3EepQCKvAtjFA0W4qoIyH7vV852HS8fLwRSI3YZfxcWmunqFo0fSnw97powGJxSN85SG2AQGib1aS9Tv/s52vDfW/0PHg04FMtPqDOBPn1fQi37ygFzWeWXetNhg6a9VTz94pgVJ" >> ~/.ssh/known_hosts
- - ./bootstrap-vitasdk.sh
- - export VITASDK=/usr/local/vitasdk
- - export PATH=$VITASDK/bin:$PATH
- - cp config.travis config
-
-script:
- - ./vdpm -i zlib
- - ./vdpm -i libpng
- - ./vdpm -i libexif
- - ./vdpm -i libjpeg
- - ./vdpm -i jansson
- - ./vdpm -i freetype
- - ./vdpm -i sqlite
- - ./vdpm -i fftw
- - ./vdpm -i libvita2d
- - ./vdpm -i libmad
- - ./vdpm -i libogg
- - ./vdpm -i libvorbis
View
@@ -97,25 +97,6 @@ Contributing
Contributions are welcome to both the package repo, documentation or the package manager itself.
-Packages
---------
-
-The format for packages are as follows.
-
-```shell
-# required
-URL=http://example.com/testpkg-0.3.2.tar.gz # direct source url
-TYPE=tar # tar/git
-DESC="a test package for vdpm" # short description for the package
-# optional
-TARGET="libtest.a" # custom target for make
-PKGINSTALL="${MAKE} install-libtest.a" # custom install command
-USER_CFGARGS="--disable-shared --disable-threadsafe" # configure arguments
-CFLAGS="${CFLAGS} -O3" # CFLAGS (must include ${CFLAGS} unless the intention is to replace computed CFLAGS)
-```
-
-They need to be placed in `pkg/` with their filename matching the extracted folder/git clone folder of the source.
-
License
-------
LGPL v2.1 or later.
View
@@ -1,28 +0,0 @@
-# Configuration shellscript for vdpm
-
-# for system wide use
-DESTDIR=
-PREFIX="${VITASDK}/arm-vita-eabi"
-
-WGET="wget"
-REMOTE="http://dl.vitasdk.org/"
-
-CHROOTABLE=0
-DODEPS=1
-
-IGNEXE=0 # set to '1' to ignore .configure_executed and .build_executed
-#CHKSUM=md5sum
-
-# Directory to store binary packages
-#BINPKGDIR=/tmp
-
-CFLAGS="-O2 -Wall"
-#LDFLAGS="-static"
-MAKEFLAGS="-j4"
-
-EXTRA_CFGARGS=""
-
-SYSDEPS=""
-IGNDIRS="/usr/share/locale /usr/share/doc"
-
-export WGET CFLAGS LDFLAGS EXTRA_CFGARGS CHKSUM IGNDIRS
View
@@ -1,28 +0,0 @@
-# Configuration shellscript for vdpm
-
-# packaging
-PREFIX="${VITASDK}/arm-vita-eabi"
-DESTDIR=
-
-WGET="wget"
-REMOTE=
-
-CHROOTABLE=0
-DODEPS=1
-
-IGNEXE=0 # set to '1' to ignore .configure_executed and .build_executed
-#CHKSUM=md5sum
-
-# Directory to store binary packages
-#BINPKGDIR=/tmp
-
-CFLAGS="-O2 -Wall"
-#LDFLAGS="-static"
-MAKEFLAGS="-j4"
-
-EXTRA_CFGARGS=""
-
-SYSDEPS=""
-IGNDIRS="/usr/share/locale /usr/share/doc"
-
-export WGET CFLAGS LDFLAGS EXTRA_CFGARGS CHKSUM IGNDIRS
View
@@ -1,12 +1,20 @@
#!/bin/bash
-# install all
-./vdpm -i zlib
-./vdpm -i libpng
-./vdpm -i libexif
-./vdpm -i libjpeg
-./vdpm -i jansson
-./vdpm -i freetype
-./vdpm -i sqlite
-./vdpm -i fftw
-./vdpm -i libvita2d
+set -e
+
+b() {
+ ./vdpm $1
+}
+
+b zlib
+b libpng
+b libexif
+b libjpeg-turbo
+b jansson
+b freetype
+b fftw
+b libvita2d
+b libmad
+b libogg
+b libvorbis
+b libftpvita
@@ -1,29 +0,0 @@
-Allow in-source builds, we can just nuke, and reextract if
-builds need to be repeated. (also it's a pain to do out of
-source builds)
----
-diff -u a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2016-08-01 18:25:06.753718317 -0400
-+++ b/CMakeLists.txt 2016-08-01 18:25:29.061706962 -0400
-@@ -123,20 +123,7 @@
- message(FATAL_ERROR "Building shared libraries on Windows needs MinGW")
- endif ()
-
--# Disallow in-source builds
--if ("${PROJECT_BINARY_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}")
-- message(FATAL_ERROR
-- "
--In-source builds are not permitted! Make a separate folder for"
-- " building, e.g.,"
-- "
-- mkdir build; cd build; cmake .."
-- "
--Before that, remove the files created by this failed run with"
-- "
-- rm -rf CMakeCache.txt CMakeFiles")
--endif ()
--
-+# Allow in-source builds
-
- # Add local cmake modules
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/builds/cmake)
@@ -1,34 +0,0 @@
-From: Dave Martin
-Subject: "rsc" doesnt exist anymore in thumb2
-
-diff --git a/fixed.h b/fixed.h
-index 4b58abf..ba4bc26 100644
---- a/fixed.h
-+++ b/fixed.h
-@@ -275,12 +275,25 @@ mad_fixed_t mad_f_mul_inline(mad_fixed_t x, mad_fixed_t y)
- : "+r" (lo), "+r" (hi) \
- : "%r" (x), "r" (y))
-
-+#ifdef __thumb__
-+/* In Thumb-2, the RSB-immediate instruction is only allowed with a zero
-+ operand. If needed this code can also support Thumb-1
-+ (simply append "s" to the end of the second two instructions). */
-+# define MAD_F_MLN(hi, lo) \
-+ asm ("rsbs %0, %0, #0\n\t" \
-+ "sbc %1, %1, %1\n\t" \
-+ "sub %1, %1, %2" \
-+ : "+&r" (lo), "=&r" (hi) \
-+ : "r" (hi) \
-+ : "cc")
-+#else /* ! __thumb__ */
- # define MAD_F_MLN(hi, lo) \
- asm ("rsbs %0, %2, #0\n\t" \
- "rsc %1, %3, #0" \
-- : "=r" (lo), "=r" (hi) \
-+ : "=&r" (lo), "=r" (hi) \
- : "0" (lo), "1" (hi) \
- : "cc")
-+#endif /* __thumb__ */
-
- # define mad_f_scale64(hi, lo) \
- ({ mad_fixed_t __result; \
View
@@ -1,3 +0,0 @@
-URL=http://www.fftw.org/fftw-3.3.5.tar.gz
-USER_CFGARGS="--disable-shared --enable-static --disable-fortran --without-g77-wrappers"
-CFLAGS="${CFLAGS} -std=c99 -ftree-vectorize -O3 -mword-relocations -fomit-frame-pointer -ffast-math -ffat-lto-objects -flto"
View
@@ -1,7 +0,0 @@
-URL=http://downloads.sourceforge.net/project/freetype/freetype2/2.7/freetype-2.7.tar.gz
-DESC=FreeType
-TYPE=tar
-USER_CFGARGS="--disable-shared --enable-static --without-harfbuzz --without-bzip2"
-USER_CMARGS="-DWITH_ZLIB=ON -DWITH_BZip2=OFF -DWITH_PNG=ON -DWITH_HarfBuzz=OFF"
-CFLAGS="${CFLAGS} -std=c99 -ftree-vectorize -O3 -mword-relocations -fomit-frame-pointer -ffast-math -ffat-lto-objects -flto"
-PATCHES="freetype-2.7-cmake"
View
@@ -1,5 +0,0 @@
-URL=http://www.digip.org/jansson/releases/jansson-2.7.tar.bz2
-DESC="JSON parser"
-USER_CFGARGS="--disable-shared --enable-static --without-simd"
-CFLAGS="${CFLAGS} -std=c99 -ftree-vectorize -O3 -mword-relocations -fomit-frame-pointer -ffast-math -ffat-lto-objects -flto"
-IGNORE_CMAKE=true
View
@@ -1,3 +0,0 @@
-URL=http://sourceforge.net/projects/libexif/files/libexif/0.6.21/libexif-0.6.21.tar.bz2
-USER_CFGARGS="--disable-shared --enable-static"
-CFLAGS="${CFLAGS} -std=c99 -ftree-vectorize -O3 -mword-relocations -fomit-frame-pointer -ffast-math -ffat-lto-objects -flto"
View
@@ -1,9 +0,0 @@
-URL=https://github.com/xerpi/libftpvita
-TYPE=git
-DESC="FTP Server for the PSVita"
-DEPS=""
-# support weird dir structure
-PRECONFIGURE="cd libftpvita"
-POSTCONFIGURE="cd -"
-PREINSTALL="cd libftpvita"
-POSTINSTALL="cd -"
@@ -1,8 +0,0 @@
-URL=http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-1.5.1.tar.gz
-TYPE=tar
-DESC="MMX/SSE optimized version of libjpeg (2-4x faster) only for x86,x86-64"
-USER_CFGARGS="--disable-shared --enable-static --without-simd"
-PKGINSTALL="${MAKE} install-libLTLIBRARIES install-data-am"
-TARGET="PROGRAMS="
-CFLAGS="${CFLAGS} -std=c99 -ftree-vectorize -O3 -mword-relocations -fomit-frame-pointer -ffast-math -ffat-lto-objects -flto"
-IGNORE_CMAKE=true
View
@@ -1,9 +0,0 @@
-URL=http://download.sourceforge.net/mad/libmad-0.15.1b.tar.gz
-DESC="MAD library"
-USER_CFGARGS="--disable-shared --enable-static"
-DEPS=""
-CFLAGS="${CFLAGS} -DHAVE_CONFIG_H -DHAVE_SYS_TYPES_H -DHAVE_ERRNO_H -DHAVE_UNISTD_H -DHAVE_FCNTL_H \
- -ftree-vectorize -O3 -mword-relocations -fomit-frame-pointer -ffast-math \
- -march=armv7-a -mtune=cortex-a9 -mfpu=neon -mfloat-abi=hard"
-IGNORE_CMAKE=true
-PATCHES="libmad-0.15.1b-Provide-Thumb-2-alternative-code-for-MAD_F_MLN"
View
@@ -1,7 +0,0 @@
-URL=http://downloads.xiph.org/releases/ogg/libogg-1.3.2.tar.gz
-DESC="OGG library"
-USER_CFGARGS="--disable-shared --enable-static"
-DEPS=""
-CFLAGS="${CFLAGS} -ftree-vectorize -O3 -mword-relocations -fomit-frame-pointer -ffast-math \
- -march=armv7-a -mtune=cortex-a9 -mfpu=neon -mfloat-abi=hard"
-IGNORE_CMAKE=true
View
@@ -1,6 +0,0 @@
-URL=http://download.sourceforge.net/libpng/libpng-1.6.25.tar.gz
-DESC="PNG library"
-USER_CFGARGS="--disable-shared --enable-static --enable-arm-neon"
-DEPS="zlib"
-CFLAGS="${CFLAGS} -std=c99 -ftree-vectorize -mword-relocations -fomit-frame-pointer -ffast-math -DPNG_NO_CONSOLE_IO -ffat-lto-objects -flto"
-IGNORE_CMAKE=true
View
@@ -1,4 +0,0 @@
-URL=https://github.com/Cpasjuste/PSP2SHELL
-TYPE=git
-DESC="remote debugging shell library"
-CMARGS="-DCMAKE_TOOLCHAIN_FILE=Vita.cmake"
View
@@ -1,9 +0,0 @@
-URL=https://github.com/xerpi/libvita2d
-TYPE=git
-DESC="2D graphics library for the PS Vita"
-DEPS="libpng freetype"
-# support weird dir structure
-PRECONFIGURE="cd libvita2d"
-POSTCONFIGURE="cd -"
-PREINSTALL="cd libvita2d"
-POSTINSTALL="cd -"
View
@@ -1,7 +0,0 @@
-URL=http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.5.tar.gz
-DESC="Vorbis library"
-USER_CFGARGS="--disable-shared --enable-static"
-DEPS=""
-CFLAGS="${CFLAGS} -ftree-vectorize -O3 -mword-relocations -fomit-frame-pointer -ffast-math \
- -march=armv7-a -mtune=cortex-a9 -mfpu=neon -mfloat-abi=hard"
-IGNORE_CMAKE=true
@@ -1,7 +0,0 @@
-URL=https://www.sqlite.org/2016/sqlite-autoconf-3130000.tar.gz
-TYPE=tar
-DESC="sqlite3"
-TARGET="libsqlite3.la"
-PKGINSTALL="${MAKE} install-libLTLIBRARIES install-data-am"
-USER_CFGARGS="--disable-shared --disable-threadsafe"
-CFLAGS="${CFLAGS} -std=c99 -ftree-vectorize -O3 -mword-relocations -fomit-frame-pointer -DSQLITE_OS_OTHER=1 -ffat-lto-objects -flto"
View
@@ -1,5 +0,0 @@
-URL=http://zlib.net/zlib-1.2.8.tar.gz
-TYPE=tar
-DESC="zip library"
-PKGCONFIGURE="CHOST=arm-vita-eabi ./configure --prefix=$PREFIX"
-CFLAGS="${CFLAGS} -std=c99 -ftree-vectorize -O3 -mword-relocations -fomit-frame-pointer -ffast-math -ffat-lto-objects -flto"
Oops, something went wrong.

0 comments on commit 30f57a3

Please sign in to comment.