Merge pull request #132 from wally4000/master

Hurray another PR

libpng/PSPBUILD

@@ -1,6 +1,6 @@
 pkgname=libpng
 pkgver=1.6.43
-pkgrel=4
+pkgrel=5
 pkgdesc="libpng is the official PNG reference library"
 arch=('mips')
 url="http://libpng.org/pub/png/libpng.html"
@@ -9,7 +9,7 @@ depends=('zlib')
 makedepends=()
 optdepends=()
 source=("https://github.com/pnggroup/libpng/archive/v${pkgver}.tar.gz")
-sha256sums=('2141134328d54e5d323ed9955eb41dae257c3500730fb5b09bfba8c63aa7f123')
+sha256sums=('fecc95b46cf05e8e3fc8a414750e0ba5aad00d89e9fdf175e94ff041caf1a03a')
 
 prepare() {
     cd "$pkgname-${pkgver}"
@@ -24,7 +24,7 @@ build() {
     mkdir -p build
     cd build
     cmake -Wno-dev -DCMAKE_TOOLCHAIN_FILE=$PSPDEV/psp/share/pspdev.cmake -DCMAKE_INSTALL_PREFIX=/psp -DBUILD_SHARED_LIBS=OFF \
-        -DPNG_SHARED=OFF -DPNG_STATIC=ON "${XTRA_OPTS[@]}" .. || { exit 1; }
+        -DPNG_SHARED=OFF -DPNG_STATIC=ON -DUNIX=ON "${XTRA_OPTS[@]}" .. || { exit 1; }
     make --quiet $MAKEFLAGS || { exit 1; }
 }
 

minizip/PSPBUILD

@@ -4,7 +4,7 @@ pkgrel=2
 pkgdesc="fork of the popular zip manipulation library found in the zlib distribution"
 arch=('mips')
 url="https://github.com/zlib-ng/minizip-ng"
-depends=('zlib' 'bzip2' 'libpng')
+depends=('zlib' 'bzip2')
 makedepends=()
 optdepends=()
 source=("https://github.com/zlib-ng/minizip-ng/archive/$pkgver.zip")

opentri/PSPBUILD

@@ -1,14 +1,14 @@
 pkgname=opentri
 pkgver=r7.95b040d
-pkgrel=3
+pkgrel=4
 pkgdesc="openTRI is a game engine for the PSP"
 arch=('mips')
 url="https://github.com/fjtrujy/openTRI"
 license=('GPL2')
 depends=('zlib' 'freetype2')
 makedepends=()
 optdepends=()
-source=("git+https://github.com/fjtrujy/openTRI.git#commit=c4a47d4117aced8d7fc5d959a2d94291ed2ca3d0")
+source=("git+https://github.com/fjtrujy/openTRI.git#commit=660f0c86f97c80fdf085e6e083d35a53828467cc")
 sha256sums=('SKIP')
 
 build() {

pixman/PSPBUILD

@@ -1,6 +1,6 @@
 pkgname=pixman
 pkgver=0.40.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Pixman is a low-level software library for pixel manipulation"
 arch=('mips')
 url="http://pixman.org/"
@@ -23,7 +23,7 @@ build() {
     cd "${pkgname}-${pkgver}"
     autoreconf -if
     LDFLAGS="-L$(psp-config --pspsdk-path)/lib $(psp-pkgconf --libs libpng zlib)" \
-    CFLAGS="-G0 -O2 $(psp-pkgconf --cflags libpng zlib)" \
+    CFLAGS="-G0 -O2 $(psp-pkgconf --cflags libpng zlib) -Wno-error=incompatible-pointer-types " \
     ./configure --disable-loongson-mmi --host=psp --prefix=/psp
     make --quiet $MAKEFLAGS || { exit 1; }
 }

sdl-image/PSPBUILD

@@ -1,35 +1,36 @@
 pkgname=sdl-image
-pkgver=1.2.12
-pkgrel=2
+pkgver=1.2.13
+pkgrel=3
 pkgdesc="a simple library to load images of various formats as SDL2 surfaces"
 arch=('mips')
 url="https://www.libsdl.org/projects/SDL_image/release-1.2.html"
 license=('MIT')
 depends=('sdl' 'libpng' 'jpeg')
 makedepends=()
 optdepends=()
-source=("https://github.com/pspdev/SDL_image/archive/${pkgver}-psp.tar.gz")
-sha256sums=('345229534a7429ea944fa83d6fe2518bea169a75bb77295701865e6aed3a02f4')
+source=("git+https://github.com/libsdl-org/SDL_image.git#commit=7adb1a70f97d62f1bb307bfb4e6c2fa0bc8c33ab")
+
+sha256sums=('SKIP')
 
 prepare() {
-    cd "SDL_image-$pkgver-psp"
+    cd "SDL_image"
     sed -i 's#@prefix@#${PSPDEV}/psp#' SDL_image.pc.in
     sed -i 's#@exec_prefix@#${prefix}#' SDL_image.pc.in
     sed -i 's#@libdir@#${prefix}/lib#' SDL_image.pc.in
     sed -i 's#@includedir@#${prefix}/include#' SDL_image.pc.in
 }
 
 build() {
-    cd "SDL_image-$pkgver-psp"
+    cd "SDL_image"
     ./autogen.sh
     LDFLAGS="-L$(psp-config --pspsdk-path)/lib" LIBS="-lc -lpspuser" \
     ./configure --host psp --prefix=/psp  --with-sdl-prefix=$(psp-config --psp-prefix)
     make
 }
 
 package() {
-    cd "SDL_image-$pkgver-psp"
-    make DESTDIR="$pkgdir/" install
+    cd "SDL_image"
+    make DESTDIR="$pkgdir/" install 
 
     rm "${pkgdir}/psp/lib/libSDL_image.la"
 

sdl-mixer/PSPBUILD

@@ -1,36 +1,38 @@
 pkgname=sdl-mixer
-pkgver=1.2.12
-pkgrel=3
+pkgver=1.2.14
+pkgrel=4
 pkgdesc="an audio mixer library based on the SDL library"
 arch=('mips')
 url="https://www.libsdl.org/projects/SDL_mixer/release-1.2.html"
 license=('custom')
 depends=('sdl' 'libmikmod' 'libogg' 'libvorbis')
 makedepends=()
 optdepends=()
-source=("https://github.com/pspdev/SDL_mixer/archive/${pkgver}-psp.tar.gz")
-sha256sums=('6e6a3a07898b164140b4032635829a725cd78a3f7123cba5b3746aa8e4ad76c9')
+source=("git+https://github.com/libsdl-org/SDL_mixer.git#commit=78cde6dd63222f9345dda38e8b7dca836aa55803")
+
+sha256sums=('SKIP')
 
 prepare() {
-    cd "SDL_mixer-$pkgver-psp"
+    cd "SDL_mixer"
+    wget -O build-scripts/config.sub "http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=blob_plain;f=build-aux/config.sub"
     sed -i 's#@prefix@#${PSPDEV}/psp#' SDL_mixer.pc.in
     sed -i 's#@exec_prefix@#${prefix}#' SDL_mixer.pc.in
     sed -i 's#@libdir@#${prefix}/lib#' SDL_mixer.pc.in
     sed -i 's#@includedir@#${prefix}/include#' SDL_mixer.pc.in
 }
 
 build() {
-    cd "SDL_mixer-$pkgver-psp"
+    cd "SDL_mixer"
     ./autogen.sh
     LDFLAGS="-L$(psp-config --pspsdk-path)/lib" LIBS="-lc -lpspuser" \
     ./configure --host psp --with-sdl-prefix=$(psp-config --psp-prefix) \
     --disable-music-mp3 --prefix=/psp \
-    --disable-music-libmikmod --enable-music-mod
+    --enable-music-mod --disable-music-cmd
     make
 }
 
 package() {
-    cd "SDL_mixer-$pkgver-psp"
+    cd "SDL_mixer"
     make DESTDIR="$pkgdir/" install
 
     rm "${pkgdir}/psp/lib/libSDL_mixer.la"