chore: bring pkg into aur compliance

per changes and suggestions by fabiololix

2 files changed, 39 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0c4f42abf139..86a821a3377d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,21 @@
-# Generated by mksrcinfo v8
-# Sat May  22 10:19:33 UTC 2020
 pkgbase = flac-git
-	pkgver = v1.3.3.ce6dd6b
-	pkgrel = 3
+	pkgver = 1.3.3.r85.gb358381a
+	pkgrel = 1
 	url = https://xiph.org/flac/
 	arch = x86_64
 	arch = aarch64
 	license = BSD
 	license = GPL
+	makedepends = git
 	makedepends = nasm
 	makedepends = doxygen
 	depends = gcc-libs
 	depends = libogg
-	options = !makeflags
-	source = git://github.com/xiph/flac.git
-	sha1sums = SKIP
+	source = git+https://github.com/xiph/flac.git
+	sha256sums = SKIP
 
 pkgname = flac-git
-	pkgdesc = Free Lossless Audio Codec (git version)
+	pkgdesc = Free Lossless Audio Codec
 	provides = flac
 	provides = libFLAC.so
 	provides = libFLAC++.so
@@ -25,8 +23,8 @@ pkgname = flac-git
 	options = !docs
 
 pkgname = flac-doc-git
-	pkgdesc = Developer documentation for the Free Lossless Audio Codec (git version)
+	pkgdesc = Developer documentation for the Free Lossless Audio Codec
+	arch = any
 	depends = flac
 	provides = flac-doc
 	conflicts = flac-doc
-
diff --git a/PKGBUILD b/PKGBUILD
index becedb2d1710..1174152371d2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,51 +1,53 @@
-# $Id: PKGBUILD 255141 2015-12-10 04:45:28Z foutrelis $
 # Maintainer: Kamran Mackey <kamranm1200@gmail.com>
 
 pkgbase=flac-git
-pkgname=('flac-git' 'flac-doc-git')
-pkgver=v1.3.3.ce6dd6b
-pkgrel=3
-arch=('x86_64' 'aarch64')
+pkgname=(flac-git flac-doc-git)
+pkgver=1.3.3.r85.gb358381a
+pkgrel=1
+arch=(x86_64 aarch64)
 url="https://xiph.org/flac/"
-license=('BSD' 'GPL')
-depends=('gcc-libs' 'libogg')
-makedepends=('nasm' 'doxygen')
-options=('!makeflags')
-source=(git://github.com/xiph/flac.git)
-sha1sums=('SKIP')
-_gitname=flac
+license=(BSD GPL)
+depends=(gcc-libs libogg)
+makedepends=(git nasm doxygen)
+source=("git+https://github.com/xiph/flac.git")
+sha256sums=('SKIP')
 
 pkgver() {
-  cd "$_gitname"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd "flac"
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
 
+prepare() {
+  cd "flac"
+  ./autogen.sh
 }
 
 build() {
-  cd "$_gitname"
-  ./autogen.sh
-  ./configure --prefix=/usr --disable-sse
+  cd "flac"
+  ./configure --prefix=/usr --enable-64-bit-words
   make
 }
 
 package_flac-git() {
-  pkgdesc="Free Lossless Audio Codec (git version)"
-  options=('!docs')
-  conflicts=('flac')
-  provides=('flac' 'libFLAC.so' 'libFLAC++.so')
+  pkgdesc="Free Lossless Audio Codec"
+  options=(!docs)
+  conflicts=(flac)
+  provides=(flac libFLAC.so libFLAC++.so)
 
-  cd "$_gitname"
+  cd "flac"
   make DESTDIR="${pkgdir}" install
-  install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/$_gitname/LICENSE"
+  install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 package_flac-doc-git() {
-  pkgdesc="Developer documentation for the Free Lossless Audio Codec (git version)"
-  depends=('flac')
-  conflicts=('flac-doc')
-  provides=('flac-doc')
+  pkgdesc="Developer documentation for the Free Lossless Audio Codec"
+  arch=(any)
+  depends=(flac)
+  conflicts=(flac-doc)
+  provides=(flac-doc)
 
-  cd "$_gitname"
+  cd "flac"
   make DESTDIR="${pkgdir}" -C doc install
-  sed -i "s|$srcdir/$_gitname|/usr|" "${pkgdir}/usr/share/doc/$_gitname/FLAC.tag"
+  sed -i "s|$srcdir/flac|/usr|" "${pkgdir}/usr/share/doc/flac/FLAC.tag"
+  install -D -m644 COPYING.Xiph "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }