From 9782c8d9c5bd875fbc0b1bcc07b722154f3d0031 Mon Sep 17 00:00:00 2001 From: Xavier Date: Mon, 20 Feb 2023 05:52:16 -0500 Subject: [PATCH] Bump to ocp-git-0.2.102.r40.3e1a320-1 ttf-unifont no longer required as make dependency --- .SRCINFO | 11 ++++++----- PKGBUILD | 16 ++++++++-------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 1e8c3b6..ba4bccb 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = ocp-git pkgdesc = Open Cubic Player (GIT Version) - pkgver = 0.2.102.r27.7fcbda1 + pkgver = 0.2.102.r40.3e1a320 pkgrel = 1 url = https://stian.cubic.org/project-ocp.php arch = i686 @@ -21,7 +21,6 @@ pkgbase = ocp-git makedepends = libjpeg-turbo makedepends = libpng makedepends = libvorbis - makedepends = ttf-unifont optdepends = libvorbis: Vorbis codec support optdepends = libmad: MPEG codec support optdepends = flac: FLAC codec support @@ -36,8 +35,8 @@ pkgname = ocp-git depends = zlib depends = libancient depends = libdiscid - provides = ocp=0.2.102.r27.7fcbda1 - provides = ocp-curses=0.2.102.r27.7fcbda1 + provides = ocp=0.2.102.r40.3e1a320 + provides = ocp-curses=0.2.102.r40.3e1a320 conflicts = ocp-curses conflicts = ocp-sdl2 @@ -57,6 +56,8 @@ pkgname = ocp-sdl2-git depends = libjpeg-turbo depends = libpng depends = ttf-unifont - provides = ocp-sdl2=0.2.102.r27.7fcbda1 + provides = ocp=0.2.102.r40.3e1a320 + provides = ocp-sdl2=0.2.102.r40.3e1a320 conflicts = ocp + conflicts = ocp-sdl2 conflicts = ocp-curses diff --git a/PKGBUILD b/PKGBUILD index d2236df..007cc91 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ _pkgbase=ocp pkgname=('ocp-git' 'ocp-sdl2-git') -pkgver=0.2.102.r27.7fcbda1 +pkgver=0.2.102.r40.3e1a320 pkgrel=1 pkgdesc="Open Cubic Player (GIT Version)" arch=('i686' 'x86_64') @@ -28,8 +28,7 @@ makedepends=('alsa-lib' 'libmad' 'libjpeg-turbo' 'libpng' - 'libvorbis' - 'ttf-unifont') + 'libvorbis') source=(${_pkgbase}::git+https://github.com/mywave82/opencubicplayer.git) sha256sums=('SKIP') @@ -52,7 +51,7 @@ prepare() { build() { 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-mime-database\ --with-unifontdir=/usr/share/fonts/Unifont\ @@ -63,8 +62,9 @@ build() { } package_ocp-sdl2-git() { - provides=(${_pkgbase}-sdl2=${pkgver}) - conflicts=('ocp' 'ocp-curses') + provides=(${_pkgbase}=${pkgver} + ${_pkgbase}-sdl2=${pkgver}) + conflicts=('ocp' 'ocp-sdl2' 'ocp-curses') install=${_pkgbase}.install depends=('alsa-lib' 'bzip2' @@ -81,7 +81,7 @@ package_ocp-sdl2-git() { 'libpng' 'ttf-unifont') 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-mime-database\ --with-unifontdir=/usr/share/fonts/Unifont\ @@ -104,7 +104,7 @@ package_ocp-git() { 'libancient' 'libdiscid') 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-update-desktop-database\ --without-update-mime-database