Fixed package. Installing against master.

2 files changed, 34 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6f8a8b33cac2..ad8571b8928d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = annie-git
 	pkgdesc = A fast, simple and clean video downloader written in Go
-	pkgver = 0.6.4.r17.ge975f14
+	pkgver = 0.9.3
 	pkgrel = 1
 	url = https://github.com/iawia002/annie
 	arch = x86_64
-	arch = i686
 	license = MIT
-	makedepends = go
-	makedepends = git
+	makedepends = dep
+	depends = go-pie
 	depends = ffmpeg
-	provides = annie
 	conflicts = annie
-	source = git+https://github.com/iawia002/annie
+	options = !strip
+	options = !emptydirs
+	source = annie-git::git+https://github.com/iawia002/annie#branch=master
 	sha256sums = SKIP
 
 pkgname = annie-git
diff --git a/PKGBUILD b/PKGBUILD
index 795d9ea81057..06c500ef1667 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,45 @@
 # Maintainer: Joaquin Garmendia <joaquingc123 at gmail dot com>
-
 # All my PKGBUILDs can be found in https://www.github.com/joaquingx/PKGBUILDs
 
+# Co-Maintainer: Aniket Pradhan <aniket17133@iiitd.ac.in>
+
+# Owner/Cofntributer: Xinzhao Xu <z2d@jifangcheng.com>
+
 pkgname=annie-git
-pkgver=0.6.4.r17.ge975f14
+pkgver=0.9.3
 pkgrel=1
-arch=('x86_64' 'i686')
+arch=('x86_64')
 pkgdesc="A fast, simple and clean video downloader written in Go"
 url="https://github.com/iawia002/annie"
 license=("MIT")
-makedepends=("go" "git")
-depends=("ffmpeg")
-provides=("annie")
+makedepends=('dep')
+depends=('go-pie' 'ffmpeg')
 conflicts=("annie")
-source=("git+${url}")
-sha256sums=("SKIP")
-_gourl="github.com/iawia002/annie"
-
-pkgver(){
-    cd "${pkgname%-git}"
-    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-}
+options=('!strip' '!emptydirs')
+source=("${pkgname}::git+https://github.com/iawia002/annie#branch=master")
+sha256sums=('SKIP')
 
 prepare(){
-	mkdir -p "$srcdir/src/github.com/iawia002/annie"
-	cp -r "$srcdir/${pkgname%-git}/"{downloader,config,extractors,parser,request,static,utils,vendor} \
-		"$srcdir/src/github.com/iawia002/annie"
+	mkdir -p gopath/src/github.com
+	ln -rTsf $pkgname $srcdir/gopath/src/github.com/$pkgname
+	export GOPATH="$srcdir"/gopath
+	cd $GOPATH/src/github.com/$pkgname
+	#dep init
+	dep ensure
 }
 
 build(){
-	cd "${pkgname%-git}"
-	GOPATH="$srcdir" go build
+	export GOPATH=$srcdir/gopath
+	cd gopath/src/github.com/$pkgname
+	go install \
+		-gcflags "all=-trimpath=$GOPATH" \
+		-asmflags "all=-trimpath=$GOPATH" \
+		-ldflags "-extldflags $LDFLAGS" \
+		-v ./...
 }
 
-package(){
-	install -Dm755 "${srcdir}/${pkgname%-git}/${pkgname%-git}" "${pkgdir}/usr/bin/${pkgname%-git}"
-	install -Dm644 "${srcdir}/${pkgname%-git}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+package() {
+	install -Dm755 gopath/bin/annie-git "$pkgdir"/usr/bin/annie
+	cd "${srcdir}/${pkgname}"
+	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
-