From fa932f38a8b32cbfdb25b084dcda37022938c90f Mon Sep 17 00:00:00 2001
From: Xavier Moffett <sapphirus@azorium.net>
Date: Fri, 11 Oct 2024 17:50:23 -0400
Subject: [PATCH] Update to 0.2.109.r11.c1069f5

- Updated package `conflicts` and `provides` metadata
---
 .SRCINFO | 11 ++++-------
 PKGBUILD | 20 +++++++++-----------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index a0e66f7..1393422 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ocp-git
 	pkgdesc = Open Cubic Player (GIT Version)
-	pkgver = 0.2.108.r2.d1fc8df
+	pkgver = 0.2.109.r11.c1069f5
 	pkgrel = 1
 	url = https://stian.cubic.org/project-ocp.php
 	arch = i686
@@ -37,10 +37,9 @@ pkgname = ocp-git
 	depends = zlib
 	depends = libancient
 	depends = libdiscid
-	provides = ocp=0.2.108.r2.d1fc8df
-	provides = ocp-curses=0.2.108.r2.d1fc8df
+	provides = ocp=0.2.109.r11.c1069f5
+	conflicts = ocp
 	conflicts = ocp-curses
-	conflicts = ocp-sdl2
 
 pkgname = ocp-sdl2-git
 	install = ocp.install
@@ -58,8 +57,6 @@ pkgname = ocp-sdl2-git
 	depends = libjpeg-turbo
 	depends = libpng
 	depends = ttf-unifont
-	provides = ocp=0.2.108.r2.d1fc8df
-	provides = ocp-sdl2=0.2.108.r2.d1fc8df
+	provides = ocp=0.2.109.r11.c1069f5
 	conflicts = ocp
-	conflicts = ocp-sdl2
 	conflicts = ocp-curses
diff --git a/PKGBUILD b/PKGBUILD
index 9bc1181..e033528 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,9 @@
-# Maintainer: Xavier (sapphirus at azorium dot net)
-# Original Maintainer: Ossi Saukko <osaukko at gmail dot com>
+# Maintainer: Xavier Moffett (sapphirus at azorium dot net)
+# Contributor: Ossi Saukko <osaukko at gmail dot com>
 
 _pkgbase=ocp
 pkgname=('ocp-git' 'ocp-sdl2-git')
-pkgver=0.2.108.r2.d1fc8df
+pkgver=0.2.109.r11.c1069f5
 pkgrel=1
 pkgdesc="Open Cubic Player (GIT Version)"
 arch=('i686' 'x86_64')
@@ -36,12 +36,12 @@ makedepends=('alsa-lib'
 	     'libvorbis')
 
 pkgver() {
-    	cd $_pkgbase
+    cd $_pkgbase
 	echo "$(git describe --tags | sed 's/^v//; s/-/.r/; s/-g/./')"
 }
 
 prepare() {
-        cd $_pkgbase
+    cd $_pkgbase
 	git submodule init
 	git submodule update --init --recursive
 }
@@ -58,9 +58,8 @@ build() {
 }
 
 package_ocp-sdl2-git() {
-	provides=(${_pkgbase}=${pkgver}
-		  ${_pkgbase}-sdl2=${pkgver})
-	conflicts=('ocp' 'ocp-sdl2' 'ocp-curses')
+	provides=(${_pkgbase}=${pkgver})
+	conflicts=('ocp' 'ocp-curses')
 	install=${_pkgbase}.install	
 	depends=('alsa-lib'
 		 'bzip2'
@@ -89,9 +88,8 @@ package_ocp-sdl2-git() {
 }
 
 package_ocp-git() {
-	provides=(${_pkgbase}=${pkgver}
-		  ${_pkgbase}-curses=${pkgver})
-	conflicts=('ocp-curses' 'ocp-sdl2')
+	provides=(${_pkgbase}=${pkgver})
+	conflicts=('ocp' 'ocp-curses')
 	depends=('alsa-lib'
 		 'bzip2'
 		 'cjson'