Bump to 0.2.103, and introduction of meta packages

2 files changed, 122 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dc5459d4f81b..d26e9bb9f9c7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,34 +1,54 @@
 pkgbase = ocp
-	pkgdesc = Open Cubic Player
-	pkgver = 0.2.102
-	pkgrel = 2
+	pkgdesc = Open Cubic Player (GIT Version)
+	pkgver = 0.2.103
+	pkgrel = 1
 	url = https://stian.cubic.org/project-ocp.php
-	install = ocp.install
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = git
 	makedepends = xa
 	makedepends = desktop-file-utils
-	depends = hicolor-icon-theme
-	depends = libxxf86vm
-	depends = libxpm
+	makedepends = alsa-lib
+	makedepends = sdl2
+	makedepends = freetype2
+	makedepends = flac
+	makedepends = cjson
+	makedepends = libancient
+	makedepends = libdiscid
+	makedepends = libmad
+	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
+	source = ocp::git+https://github.com/mywave82/opencubicplayer.git#tag=v0.2.103
+	sha256sums = SKIP
+
+pkgname = ocp
 	depends = alsa-lib
-	depends = sdl2
-	depends = flac
-	depends = libvorbis
-	depends = libmad
-	depends = libjpeg-turbo
-	depends = libpng
-	depends = freetype2
-	depends = ttf-unifont
+	depends = cjson
+	depends = libancient
 	depends = libdiscid
+	provides = ocp=0.2.103
+	provides = ocp-curses=0.2.103
+	conflicts = ocp-curses
+	conflicts = ocp-sdl2
+
+pkgname = ocp-sdl2
+	install = ocp.install
+	depends = alsa-lib
 	depends = cjson
+	depends = freetype2
+	depends = hicolor-icon-theme
+	depends = sdl2
 	depends = shared-mime-info
 	depends = libancient
-	provides = ocp=0.2.102
-	conflicts = ocp-git
-	source = ocp::git+https://github.com/mywave82/opencubicplayer.git#tag=v0.2.102
-	md5sums = SKIP
-
-pkgname = ocp
+	depends = libdiscid
+	depends = libjpeg-turbo
+	depends = libpng
+	provides = ocp-sdl2=0.2.103
+	conflicts = ocp
+	conflicts = ocp-curses
diff --git a/PKGBUILD b/PKGBUILD
index 050240825c66..5e294f38fb2b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,58 +1,105 @@
 # Maintainer: Xavier (sapphirus at azorium dot net)
-# Original Maintainer: Mikael Eriksson <mikael_eriksson@miffe.org>
+# Original Maintainer: Ossi Saukko <osaukko at gmail dot com>
 
 _pkgbase=ocp
-pkgname=${_pkgbase}
-pkgver=0.2.102
-pkgrel=2
-pkgdesc="Open Cubic Player"
+pkgname=('ocp' 'ocp-sdl2')
+pkgver=0.2.103
+pkgrel=1
+pkgdesc="Open Cubic Player (GIT Version)"
 arch=('i686' 'x86_64')
 url="https://stian.cubic.org/project-ocp.php"
 license=('GPL')
-install=${_pkgbase}.install
-
-conflicts=(${_pkgbase}-git)
-provides=(${_pkgbase}=${pkgver})
-
-
-depends=('hicolor-icon-theme'
-	 'libxxf86vm' 
-	 'libxpm' 
-	 'alsa-lib' 
-	 'sdl2'
-	 'flac'
-	 'libvorbis'
-	 'libmad'
-	 'libjpeg-turbo' 
-	 'libpng' 
-	 'freetype2' 
-	 'ttf-unifont' 
-	 'libdiscid' 
-	 'cjson'
-	 'shared-mime-info'
-	 'libancient')
+
+optdepends=('libvorbis: Vorbis codec support'
+	    'libmad: MPEG codec support'
+	    'flac: FLAC codec support')
 
 makedepends=('git'
              'xa'
-	     'desktop-file-utils')
+	     'desktop-file-utils'
+	     'alsa-lib'  
+	     'sdl2'
+             'freetype2'
+	     'flac'
+	     'cjson'
+	     'libancient'
+	     'libdiscid' 
+	     'libmad'
+	     'libjpeg-turbo'
+	     'libpng'
+	     'libvorbis'
+	     'ttf-unifont')
 
 source=(${_pkgbase}::git+https://github.com/mywave82/opencubicplayer.git#tag=v${pkgver})
-md5sums=('SKIP')
+sha256sums=('SKIP')
+
+pkgver() {
+    	cd $_pkgbase
+	echo "$(git describe --tags | sed 's/^v//; s/-/.r/; s/-g/./')"
+}
 
 prepare() {
+	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 "Depending upon which features you use, no action will need to be taken."
+	echo -e "X11/SDL2 functionality is now provided by the ocp-sdl2 meta package.\033[0m"
+	echo  "Thanks for flying ocp in the AUR! :)"
         cd $_pkgbase
 	git submodule init
-	git submodule update --init --recursive	
-	git merge 006541750261fe6b0a06a1792170719cca09d548 
+	git submodule update --init --recursive
 }
 
 build() {
   	cd $_pkgbase	
-	./configure --prefix=/usr --sysconfdir=/etc --without-update-desktop-database --without-update-mime-database --with-unifontdir=/usr/share/fonts/Unifont --with-unifont-ttf=/usr/share/fonts/Unifont/Unifont.ttf --with-unifont-csur-ttf=/usr/share/fonts/Unifont/Unifont_CSUR.ttf --with-unifont-upper-ttf=/usr/share/fonts/Unifont/Unifont_Upper.ttf		
-	make DESTDIR="$pkgdir"
+	./configure --prefix=/usr --sysconfdir=/etc --with-builtin=core\
+	    	    --without-update-desktop-database\
+		    --without-update-mime-database\
+		    --with-unifontdir=/usr/share/fonts/Unifont\
+		    --with-unifont-ttf=/usr/share/fonts/Unifont/Unifont.ttf\
+		    --with-unifont-csur-ttf=/usr/share/fonts/Unifont/Unifont_CSUR.ttf\
+		    --with-unifont-upper-ttf=/usr/share/fonts/Unifont/Unifont_Upper.ttf
+	make subdirs ocp ocp.hlp DESTDIR="$pkgdir"
+}
+
+package_ocp-sdl2() {
+	provides=(${_pkgbase}-sdl2=${pkgver})
+	conflicts=('ocp' 'ocp-curses')
+	install=${_pkgbase}.install	
+	depends=('alsa-lib'
+		 'cjson'
+		 'freetype2'
+		 'hicolor-icon-theme'
+	   	 'sdl2'
+	 	 'shared-mime-info'
+	 	 'libancient'
+		 'libdiscid'
+		 'libjpeg-turbo' 
+	 	 'libpng')
+	cd $_pkgbase
+	./configure --prefix=/usr --sysconfdir=/etc --with-builtin=core\
+                    --without-update-desktop-database\
+                    --without-update-mime-database\
+                    --with-unifontdir=/usr/share/fonts/Unifont\
+                    --with-unifont-ttf=/usr/share/fonts/Unifont/Unifont.ttf\
+                    --with-unifont-csur-ttf=/usr/share/fonts/Unifont/Unifont_CSUR.ttf\
+                    --with-unifont-upper-ttf=/usr/share/fonts/Unifont/Unifont_Upper.ttf
+	make DESTDIR="$pkgdir" libocp.so
+	make DESTDIR="$pkgdir" install
 }
 
-package() {
+package_ocp() {
+	provides=(${_pkgbase}=${pkgver}
+		  ${_pkgbase}-curses=${pkgver})
+	conflicts=('ocp-curses' 'ocp-sdl2')
+	depends=('alsa-lib' 
+                 'cjson'
+		 'libancient'
+		 'libdiscid')
 	cd $_pkgbase
+	./configure --prefix=/usr --sysconfdir=/etc  --with-builtin=core\
+		    --without-x11 --without-sdl2\
+		    --without-update-desktop-database\
+                    --without-update-mime-database
+	make DESTDIR="$pkgdir" libocp.so
 	make DESTDIR="$pkgdir" install
 }