Merge pull request #199 from pspdev/fix-license-names

Fix license names

Author: diamant3

CONTRIBUTING.md

@@ -31,6 +31,7 @@ For new contributions to be merged, the PSPBUILDs in them should meet the follow
   - PSPBUILDs which use a git repository as source should use a specific tag or commit.
   - ``pkgname`` should not contain capital letters or special characters other than ``-``.
   - ``groups`` should be set if to ``pspdev-default`` unless the package conflicts with an existing package.
+  - Be specific in the license field and follow the [spdx](https://spdx.org/licenses/) formatting for the license name.
 - For existing packages:
   - Either the ``pkgver`` or ``rel`` has been changed.
 - For all PSPBUILDs:

angelscript/PSPBUILD

@@ -1,10 +1,10 @@
 pkgname=angelscript
 pkgver=2.28.2
-pkgrel=3
+pkgrel=4
 pkgdesc="A game-oriented interpreted compiled scripting language library"
 arch=('mips')
 url="http://angelcode.com/angelscript/"
-license=('ZLIB')
+license=('Zlib')
 groups=('pspdev-default')
 depends=()
 makedepends=()

argtable2/PSPBUILD

@@ -1,10 +1,10 @@
 pkgname=argtable2
 pkgver=13
-pkgrel=4
+pkgrel=5
 pkgdesc="Argtable is an ANSI C library for parsing GNU style command line options with a minimum of fuss"
 arch=('mips')
 url="http://argtable.sourceforge.net/"
-license=('GPL2')
+license=('GPL-2.0-only')
 groups=('pspdev-default')
 depends=()
 makedepends=()

dumb/PSPBUILD

@@ -1,10 +1,10 @@
 pkgname=dumb
 pkgver=2.0.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Dynamic Universal Music Bibliotheque - DUMB - Module/tracker based music format parser and player library"
 arch=('mips')
 url="https://github.com/kode54/dumb"
-license=('GPL2')
+license=('custom')
 groups=('pspdev-default')
 depends=()
 makedepends=()

flac/PSPBUILD

@@ -1,10 +1,10 @@
 pkgname=flac
 pkgver=1.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Free Lossless Audio Codec"
 arch=('mips')
 url="https://xiph.org/flac/"
-license=('GFDL-1.2 AND GPL-2.0 AND LGPL-2.1 AND BSD-3-Clause')
+license=('BSD-3-Clause')
 groups=('pspdev-default')
 depends=('libogg')
 makedepends=()
@@ -44,6 +44,6 @@ package() {
     rm -rf "${pkgdir}"/psp/lib/lib{FLAC,FLAC++}.la
 
     mkdir -m 755 -p "${pkgdir}/psp/share/licenses/${pkgname}"
-    install -m 644 COPYING.* "${pkgdir}/psp/share/licenses/${pkgname}"
+    install -m 644 COPYING.Xiph "${pkgdir}/psp/share/licenses/${pkgname}"
 }
 

flatbuffers/PSPBUILD

@@ -1,10 +1,10 @@
 pkgname=flatbuffers
 pkgver=24.3.25
-pkgrel=1
+pkgrel=2
 pkgdesc="Memory Efficient Serialization Library"
 arch=('mips')
 url="https://flatbuffers.dev"
-license=('Apache-2.0 license')
+license=('Apache-2.0')
 groups=('pspdev-default')
 source=("https://github.com/google/${pkgname}/archive/refs/tags/v${pkgver}.tar.gz")
 sha256sums=('4157c5cacdb59737c5d627e47ac26b140e9ee28b1102f812b36068aab728c1ed')

freetype2/PSPBUILD

@@ -1,10 +1,10 @@
 pkgname=freetype2
 pkgver=2.11.0
-pkgrel=5
+pkgrel=6
 pkgdesc="a freely available software library to render fonts"
 arch=('mips')
 url="https://www.freetype.org/"
-license=('custom:Freetype' 'GPL2')
+license=('FTL OR GPL-2.0-or-later')
 groups=('pspdev-default')
 depends=('zlib' 'bzip2' 'libpng')
 makedepends=()

jsoncpp/PSPBUILD

@@ -1,9 +1,9 @@
 pkgname=jsoncpp
 pkgver=1.9.5
-pkgrel=3
+pkgrel=4
 pkgdesc="a C++ library for interacting with JSON"
 arch=('mips')
-license=('unlicense')
+license=('Unlicense')
 groups=('pspdev-default')
 url="https://github.com/open-source-parsers/jsoncpp"
 makedepends=()

kubridge/PSPBUILD

@@ -1,9 +1,9 @@
 pkgname=kubridge
 pkgver=20240427
-pkgrel=2
+pkgrel=3
 pkgdesc="a bridging library to provide Kernel functions for PSPs in User Mode"
 arch=('mips')
-license=('GPL2')
+license=('GPL-2.0-only')
 groups=('pspdev-default')
 url="https://github.com/pspdev/kubridge"
 makedepends=()

libbulletml/PSPBUILD

@@ -1,10 +1,10 @@
 pkgname=libbulletml
 pkgver=0.0.5
-pkgrel=3
+pkgrel=4
 pkgdesc="Bullet Markup Language for PSP"
 arch=('mips')
 url="https://www.asahi-net.or.jp/~cs8k-cyu/bulletml/index_e.html"
-license=('BSD')
+license=('BSD-3-Clause')
 groups=('pspdev-default')
 depends=()
 makedepends=()

libeigen/PSPBUILD

@@ -1,9 +1,9 @@
 pkgname=libeigen
 pkgver=3.4.0
-pkgrel=2
+pkgrel=3
 url="http://eigen.tuxfamily.org"
 source=("https://gitlab.com/libeigen/eigen/-/archive/3.4.0/eigen-$pkgver.tar.gz")
-license=('BSD')
+license=('MPL-2.0 AND BSD-3-Clause AND LGPL-2.1-only AND LGPL-2.1-or-later')
 groups=('pspdev-default')
 depends=()
 makedepends=()

libintrafont/PSPBUILD

@@ -1,9 +1,9 @@
 pkgname=libintrafont
 pkgver=4.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A bitmap font library using the PSP's internal fonts (firmware pgf and bwfon files)"
 arch=('mips')
-license=('cc-by-sa-3.0')
+license=('CC-BY-SA-3.0')
 groups=('pspdev-default')
 url="https://github.com/pspdev/libintrafont"
 makedepends=()

libmad/PSPBUILD

@@ -1,10 +1,10 @@
 pkgname=libmad
 pkgver=0.15.1
-pkgrel=4
+pkgrel=5
 pkgdesc="MPEG audio decoder library for PSP"
 arch=('mips')
 url="https://www.underbit.com/products/mad"
-license=('GPL2')
+license=('GPL-2.0-only')
 groups=('pspdev-default')
 depends=()
 makedepends=()

libmikmod/PSPBUILD

@@ -1,10 +1,10 @@
 pkgname=libmikmod
 pkgver=3.3.11.1
-pkgrel=6
+pkgrel=7
 pkgdesc="a portable sound library capable of playing samples as well as module files"
 arch=('mips')
 url="http://mikmod.sourceforge.net/"
-license=('GPL2.1')
+license=('LGPL-2.1-only')
 groups=('pspdev-default')
 depends=()
 makedepends=()
@@ -35,7 +35,6 @@ package () {
     cd ..
 
     mkdir -m 755 -p "$pkgdir/psp/share/licenses/$pkgname/"
-    install -m 644 COPYING.LIB "$pkgdir/psp/share/licenses/$pkgname/"
     install -m 644 COPYING.LESSER "$pkgdir/psp/share/licenses/$pkgname/"
     install -m 644 AUTHORS "$pkgdir/psp/share/licenses/$pkgname/"
 }

libmodplug/PSPBUILD

@@ -1,10 +1,10 @@
 pkgname=libmodplug
 pkgver=0.8.8.5
-pkgrel=3
+pkgrel=4
 pkgdesc="libmodplug - the library which was part of the Modplug-xmms project"
 arch=('mips')
 url="http://modplug-xmms.sf.net/"
-license=('public domain')
+license=('custom:Public-Domain')
 groups=('pspdev-default')
 depends=()
 makedepends=()

libogg/PSPBUILD

@@ -1,10 +1,10 @@
 pkgname=libogg
 pkgver=1.3.5
-pkgrel=4
+pkgrel=5
 pkgdesc="library for the multimedia container format, and the native file and stream format ogg"
 arch=('mips')
 url="https://www.xiph.org/ogg/"
-license=('BSD')
+license=('BSD-3-Clause')
 groups=('pspdev-default')
 depends=()
 makedepends=()

libpng/PSPBUILD

@@ -1,10 +1,10 @@
 pkgname=libpng
 pkgver=1.6.43
-pkgrel=7
+pkgrel=8
 pkgdesc="libpng is the official PNG reference library"
 arch=('mips')
 url="http://libpng.org/pub/png/libpng.html"
-license=('ZLIB')
+license=('libpng-2.0')
 groups=('pspdev-default')
 depends=('zlib')
 makedepends=()

libun7zip/PSPBUILD

@@ -1,9 +1,9 @@
 pkgname=libun7zip
 pkgver=19.00
-pkgrel=3
+pkgrel=4
 pkgdesc="A library that provides 7-Zip (.7z) archive handling and extraction"
 arch=('mips')
-license=('Apache-2.0 license')
+license=('Apache-2.0')
 groups=('pspdev-default')
 url="https://github.com/bucanero/libun7zip"
 makedepends=()

libvorbis/PSPBUILD

@@ -1,10 +1,10 @@
 pkgname=libvorbis
 pkgver=1.3.7
-pkgrel=4
+pkgrel=5
 pkgdesc="Vorbis audio compression reference implementation"
 arch=('mips')
 url="https://gitlab.xiph.org/xiph/vorbis"
-license=('BSD')
+license=('BSD-3-Clause')
 groups=('pspdev-default')
 depends=('libogg')
 makedepends=()

libxmp/PSPBUILD

@@ -1,10 +1,10 @@
 pkgname=libxmp
 pkgver=4.5.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Libxmp is a library that renders module files to PCM data"
 arch=('mips')
 url="https://github.com/libxmp/libxmp"
-license=('GPL2')
+license=('LGPL-2.1-only')
 groups=('pspdev-default')
 depends=()
 makedepends=()
@@ -36,5 +36,6 @@ package() {
 
     mkdir -m 755 -p "$pkgdir/psp/share/licenses/$pkgname"
     install -m 644 docs/COPYING.LIB "$pkgdir/psp/share/licenses/$pkgname"
+    install -m 644 docs/CREDITS "$pkgdir/psp/share/licenses/$pkgname"
 }
 

libzip/PSPBUILD

@@ -1,10 +1,10 @@
 pkgname=libzip
 pkgver=1.9.2
-pkgrel=3
+pkgrel=4
 pkgdesc="libzip is a C library for reading, creating, and modifying zip archives."
 arch=('mips')
 url="https://libzip.org/"
-license=('3-clause BSD license')
+license=('BSD-3-Clause')
 groups=('pspdev-default')
 depends=('zlib' 'bzip2')
 makedepends=()

mbedtls/PSPBUILD

@@ -1,10 +1,10 @@
 pkgname=mbedtls
 pkgver=2.16.12
-pkgrel=2
+pkgrel=3
 pkgdesc="Secure Socket Layer library"
 arch=('mips')
 url="https://www.trustedfirmware.org/projects/mbed-tls/"
-license=('Apache 2.0 license')
+license=('Apache-2.0')
 groups=('pspdev-default')
 depends=()
 optdepends=()

mini18n/PSPBUILD

@@ -1,10 +1,10 @@
 pkgname=mini18n
 pkgver=0.2.1
-pkgrel=3
+pkgrel=4
 pkgdesc="mini18n is a translation library under GNU GPL."
 arch=('mips')
 url="https://github.com/bucanero/mini18n/"
-license=('GPL 2.0')
+license=('GPL-2.0-only')
 groups=('pspdev-default')
 depends=()
 makedepends=()

minizip/PSPBUILD

@@ -1,10 +1,10 @@
 pkgname=minizip
 pkgver=3.0.4
-pkgrel=4
+pkgrel=5
 pkgdesc="fork of the popular zip manipulation library found in the zlib distribution"
 arch=('mips')
 url="https://github.com/zlib-ng/minizip-ng"
-license=('zlib')
+license=('Zlib')
 groups=('pspdev-default')
 depends=('zlib' 'bzip2')
 makedepends=()

mpg123/PSPBUILD

@@ -1,10 +1,10 @@
 pkgname=mpg123
 pkgver=1.32.10
-pkgrel=1
+pkgrel=2
 pkgdesc="MPEG audio decoder library"
 arch=('mips')
 url="http://www.mpg123.org/"
-license=('LGPL-2.1')
+license=('LGPL-2.1-only')
 groups=('pspdev-default')
 depends=()
 makedepends=()

openal/PSPBUILD

@@ -1,17 +1,17 @@
 pkgname=openal
-pkgver=1.6.372
-pkgrel=2
+pkgver=1.6.372.2
+pkgrel=1
 pkgdesc="a cross-platform 3D audio API"
 arch=('mips')
-license=('LGPL-2.0')
+license=('LGPL-2.0-only')
 groups=('pspdev-default')
 url="https://openal-soft.org/"
 makedepends=()
-source=("https://github.com/illteteka/openal-soft-psp/archive/refs/tags/${pkgver}.${pkgrel}.tar.gz")
+source=("https://github.com/illteteka/openal-soft-psp/archive/refs/tags/${pkgver}.tar.gz")
 sha256sums=('2dd94abc457906203c03e87fd2c513077bde0d7344b377f09ec535f3b7cb0a91')
 
 prepare() {
-  cd $pkgname-soft-psp-$pkgver.${pkgrel}
+  cd $pkgname-soft-psp-$pkgver
   sed -i 's#@prefix@#${PSPDEV}/psp#' openal.pc.in
   sed -i 's#@exec_prefix@#${prefix}#' openal.pc.in
   sed -i 's#@libdir@#${prefix}/lib#' openal.pc.in
@@ -24,12 +24,12 @@ prepare() {
 }
 
 build() {
-  cd $pkgname-soft-psp-$pkgver.${pkgrel}
+  cd $pkgname-soft-psp-$pkgver
   make --quiet $MAKEFLAGS || { exit 1; }
 }
 
 package () {
-  cd $pkgname-soft-psp-$pkgver.${pkgrel}
+  cd $pkgname-soft-psp-$pkgver
   mkdir -m 755 -p "$pkgdir/psp/lib" "$pkgdir/psp/include/AL" "$pkgdir/psp/include/OpenAL"
   install -m 644 libopenal.a "$pkgdir/psp/lib/libopenal.a"
   install -m 644 src/include/AL/*.h "$pkgdir/psp/include/AL/"
@@ -40,4 +40,4 @@ package () {
 
   mkdir -m 755 -p "$pkgdir/psp/lib/pkgconfig"
   install -m 644 openal.pc.in "$pkgdir/psp/lib/pkgconfig/openal.pc"
-}
+}

opentri/PSPBUILD

@@ -1,10 +1,10 @@
 pkgname=opentri
 pkgver=r7.95b040d
-pkgrel=5
+pkgrel=6
 pkgdesc="openTRI is a game engine for the PSP"
 arch=('mips')
 url="https://github.com/fjtrujy/openTRI"
-license=('GPL2')
+license=('GPL-2.0-only')
 groups=('pspdev-default')
 depends=('zlib' 'freetype2')
 makedepends=()