1
0
Fork 0
mirror of https://aur.archlinux.org/ocp.git synced 2024-11-21 20:06:28 +00:00

Bump to release 5, ttf-unifont no longer required as make dependency

This commit is contained in:
Xavier Moffett 2023-02-20 05:59:48 -05:00
parent ed89d63eee
commit 9bf897c685
2 changed files with 15 additions and 19 deletions

View file

@ -1,7 +1,7 @@
pkgbase = ocp pkgbase = ocp
pkgdesc = Open Cubic Player pkgdesc = Open Cubic Player
pkgver = 0.2.103 pkgver = 0.2.103
pkgrel = 4 pkgrel = 5
url = https://stian.cubic.org/project-ocp.php url = https://stian.cubic.org/project-ocp.php
arch = i686 arch = i686
arch = x86_64 arch = x86_64
@ -21,7 +21,6 @@ pkgbase = ocp
makedepends = libjpeg-turbo makedepends = libjpeg-turbo
makedepends = libpng makedepends = libpng
makedepends = libvorbis makedepends = libvorbis
makedepends = ttf-unifont
optdepends = libvorbis: Vorbis codec support optdepends = libvorbis: Vorbis codec support
optdepends = libmad: MPEG codec support optdepends = libmad: MPEG codec support
optdepends = flac: FLAC codec support optdepends = flac: FLAC codec support
@ -57,6 +56,8 @@ pkgname = ocp-sdl2
depends = libjpeg-turbo depends = libjpeg-turbo
depends = libpng depends = libpng
depends = ttf-unifont depends = ttf-unifont
provides = ocp=0.2.103
provides = ocp-sdl2=0.2.103 provides = ocp-sdl2=0.2.103
conflicts = ocp conflicts = ocp
conflicts = ocp-sdl2
conflicts = ocp-curses conflicts = ocp-curses

View file

@ -4,7 +4,7 @@
_pkgbase=ocp _pkgbase=ocp
pkgname=('ocp' 'ocp-sdl2') pkgname=('ocp' 'ocp-sdl2')
pkgver=0.2.103 pkgver=0.2.103
pkgrel=4 pkgrel=5
pkgdesc="Open Cubic Player" pkgdesc="Open Cubic Player"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url="https://stian.cubic.org/project-ocp.php" url="https://stian.cubic.org/project-ocp.php"
@ -28,17 +28,11 @@ makedepends=('alsa-lib'
'libmad' 'libmad'
'libjpeg-turbo' 'libjpeg-turbo'
'libpng' 'libpng'
'libvorbis' 'libvorbis')
'ttf-unifont')
source=(${_pkgbase}::git+https://github.com/mywave82/opencubicplayer.git#tag=v${pkgver}) source=(${_pkgbase}::git+https://github.com/mywave82/opencubicplayer.git#tag=v${pkgver})
sha256sums=('SKIP') sha256sums=('SKIP')
pkgver() {
cd $_pkgbase
echo "$(git describe --tags | sed 's/^v//; s/-/.r/; s/-g/./')"
}
prepare() { prepare() {
echo -e "\033[1;31m##!! NOTICE !!##\033[0m" echo -e "\033[1;31m##!! NOTICE !!##\033[0m"
echo -e "\033[0;33mStarting with ocp 0.2.103, the ocp package has been split into two meta packages." echo -e "\033[0;33mStarting with ocp 0.2.103, the ocp package has been split into two meta packages."
@ -52,19 +46,20 @@ prepare() {
build() { build() {
cd $_pkgbase cd $_pkgbase
./configure --prefix=/usr --sysconfdir=/etc --with-builtin=core\ ./configure --prefix=/usr --sysconfdir=/etc --with-builtin=core cross_compiling=yes\
--without-update-desktop-database\ --without-update-desktop-database\
--without-update-mime-database\ --without-update-mime-database\
--with-unifontdir=/usr/share/fonts/Unifont\ --with-unifontdir=/usr/share/fonts/Unifont\
--with-unifont-ttf=/usr/share/fonts/Unifont/Unifont.ttf\ --with-unifont-ttf=/usr/share/fonts/Unifont/Unifont.ttf\
--with-unifont-csur-ttf=/usr/share/fonts/Unifont/Unifont_CSUR.ttf\ --with-unifont-csur-ttf=/usr/share/fonts/Unifont/Unifont_CSUR.ttf\
--with-unifont-upper-ttf=/usr/share/fonts/Unifont/Unifont_Upper.ttf --with-unifont-upper-ttf=/usr/share/fonts/Unifont/Unifont_Upper.ttf
make DESTDIR="$pkgdir" subdirs ocp ocp.hlp make DESTDIR="$pkgdir" subdirs ocp ocp.hlp
} }
package_ocp-sdl2() { package_ocp-sdl2() {
provides=(${_pkgbase}-sdl2=${pkgver}) provides=(${_pkgbase}=${pkgver}
conflicts=('ocp' 'ocp-curses') ${_pkgbase}-sdl2=${pkgver})
conflicts=('ocp' 'ocp-sdl2' 'ocp-curses')
install=${_pkgbase}.install install=${_pkgbase}.install
depends=('alsa-lib' depends=('alsa-lib'
'bzip2' 'bzip2'
@ -81,7 +76,7 @@ package_ocp-sdl2() {
'libpng' 'libpng'
'ttf-unifont') 'ttf-unifont')
cd $_pkgbase cd $_pkgbase
./configure --prefix=/usr --sysconfdir=/etc --with-builtin=core\ ./configure --prefix=/usr --sysconfdir=/etc --with-builtin=core cross_compiling=yes\
--without-update-desktop-database\ --without-update-desktop-database\
--without-update-mime-database\ --without-update-mime-database\
--with-unifontdir=/usr/share/fonts/Unifont\ --with-unifontdir=/usr/share/fonts/Unifont\
@ -96,15 +91,15 @@ package_ocp() {
provides=(${_pkgbase}=${pkgver} provides=(${_pkgbase}=${pkgver}
${_pkgbase}-curses=${pkgver}) ${_pkgbase}-curses=${pkgver})
conflicts=('ocp-curses' 'ocp-sdl2') conflicts=('ocp-curses' 'ocp-sdl2')
depends=('alsa-lib' depends=('alsa-lib'
'bzip2' 'bzip2'
'cjson' 'cjson'
'ncurses' 'ncurses'
'zlib' 'zlib'
'libancient' 'libancient'
'libdiscid') 'libdiscid')
cd $_pkgbase cd $_pkgbase
./configure --prefix=/usr --sysconfdir=/etc --with-builtin=core\ ./configure --prefix=/usr --sysconfdir=/etc --with-builtin=core cross_compiling=yes\
--without-x11 --without-sdl2\ --without-x11 --without-sdl2\
--without-update-desktop-database\ --without-update-desktop-database\
--without-update-mime-database --without-update-mime-database