upgpkg: feeluown-git 2r1176.0ffa777-1

feeluown-git

5 files changed, 63 insertions, 67 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d9ce410d29e6..cec198d270dc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,33 +1,32 @@
-# Generated by mksrcinfo v8
-# Tue Jul 11 12:53:07 UTC 2017
 pkgbase = feeluown-git
-	pkgdesc = 个性化音乐服务 For Mac And Linux
-	pkgver = 9.5.16.gc51b6b6
+	pkgdesc = FeelUOwn Music Player (Master branch)
+	pkgver = r1176.0ffa777
 	pkgrel = 1
-	epoch = 1
+	epoch = 2
 	url = https://github.com/cosven/FeelUOwn
-	install = feeluown-git.install
 	arch = any
+	groups = feeluown-full
 	license = GPL3
 	makedepends = git
 	makedepends = python-setuptools
+	makedepends = python-pip
+	depends = python-qasync
 	depends = python-pyqt5
+	depends = mpv
+	depends = python-opengl
+	depends = python-janus
 	depends = python-requests
-	depends = python-quamash
-	depends = qt5-multimedia
-	depends = python-crypto
-	depends = xdg-utils
-	depends = sh
-	depends = gst-plugins-ugly
-	depends = gst-plugins-bad
-	depends = gst-plugins-good
-	depends = python-beautifulsoup4
-	depends = python-fuocore
-	optdepends = feeluown-mpris2-plugin-git: MPRIS support
-	provides = feeluown==9.5.16.gc51b6b6
+	optdepends = feeluown-local
+	optdepends = feeluown-netease
+	optdepends = feeluown-kuwo
+	optdepends = feeluown-xiami
+	optdepends = feeluown-qqmusic
+	provides = feeluown
 	conflicts = feeluown
-	source = feeluown::git://github.com/cosven/FeelUOwn.git
-	md5sums = SKIP
+	source = feeluown::git+https://github.com/feeluown/FeelUOwn.git
+	source = feeluown.desktop
+	sha256sums = SKIP
+	sha256sums = f093cccd74e29115782b30fcda28fb0c3b935091673b50882b332c934ed56065
 
 pkgname = feeluown-git
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..d3f730ed3ab3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+feeluown/
diff --git a/PKGBUILD b/PKGBUILD
index 4ca3c1496a1c..a49630c1e45a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,56 +1,45 @@
-# Maintainer: wenLiangcan <boxeed at gmail dot com>
-
+# Maintainer: Bruce Zhang <zttt183525594@gmail.com>
 _pkgname=feeluown
-pkgname="${_pkgname}-git"
-pkgver=9.5.16.gc51b6b6
+pkgname=${_pkgname}-git
+pkgver=r1176.0ffa777
 pkgrel=1
-epoch=1
-pkgdesc="个性化音乐服务 For Mac And Linux"
-arch=("any")
+epoch=2
+pkgdesc="FeelUOwn Music Player (Master branch)"
+arch=('any')
 url="https://github.com/cosven/FeelUOwn"
 license=('GPL3')
-depends=('python-pyqt5' 'python-requests' 'python-quamash' 'qt5-multimedia' 'python-crypto' 'xdg-utils' 'sh' 'gst-plugins-ugly' 'gst-plugins-bad' 'gst-plugins-good' 'python-beautifulsoup4' 'python-fuocore')
-optdepends=('feeluown-mpris2-plugin-git: MPRIS support')
-makedepends=('git' 'python-setuptools')
-provides=("${_pkgname}==${pkgver}")
-conflicts=("${_pkgname}")
-source=("${_pkgname}"::'git://github.com/cosven/FeelUOwn.git')
-md5sums=('SKIP')
-install="${pkgname}.install"
-_desktop="${_pkgname}.desktop"
+groups=('feeluown-full')
+provides=('feeluown')
+conflicts=('feeluown')
+depends=('python-qasync' 'python-pyqt5' 'mpv' 'python-opengl' 'python-janus' 'python-requests')
+makedepends=('git' 'python-setuptools' 'python-pip')
+optdepends=(
+	'feeluown-local'
+	'feeluown-netease'
+	'feeluown-kuwo'
+	'feeluown-xiami'
+	'feeluown-qqmusic'
+)
+source=(
+	"$_pkgname::git+https://github.com/feeluown/FeelUOwn.git"
+	"$_pkgname.desktop"
+)
+sha256sums=('SKIP'
+            'f093cccd74e29115782b30fcda28fb0c3b935091673b50882b332c934ed56065')
 
 pkgver() {
-    cd "${srcdir}/${_pkgname}"
-    git describe --tags --long | sed 's/^v//;s/release./r/;s/-/./g'
+    cd "$srcdir/$_pkgname"
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-prepare() {
-    cd "${srcdir}"
-    cat > ${_desktop} << EOF
-[Desktop Entry]
-Type=Application
-Name=FeelUOwn
-Comment=FeelUOwn Launcher
-Exec=${_pkgname}
-Icon=${_pkgname}
-Categories=AudioVideo;Audio;Player;Qt;
-Terminal=false
-StartupNotify=true
-EOF
+build() {
+	cd "$srcdir/$_pkgname"
+	LANG=en_US.UTF-8 python setup.py build
 }
 
 package() {
-    cd "${srcdir}/${_pkgname}"
-
-    python3 setup.py install --root="${pkgdir}" --optimize=1
-    echo "#!/usr/bin/env sh" > "${pkgdir}/usr/bin/feeluown"
-    echo "python -c 'from feeluown import __main__ as fu;fu.main()' \"\$@\"" >> "${pkgdir}/usr/bin/feeluown"
-
-    rm -f "${pkgdir}/usr/bin/"{'feeluown-install-dev','feeluown-genicon','feeluown-update'}
-
-    install -Dm644 './feeluown/feeluown.png' "${pkgdir}/usr/share/pixmaps/${_pkgname}.png"
-    install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
-
-    install -Dm644 "${srcdir}/${_desktop}" "${pkgdir}/usr/share/applications/${_desktop}"
+	cd "$srcdir/$_pkgname"
+	LANG=en_US.UTF-8 python setup.py install --root="$pkgdir/" --optimize=1 --skip-build
+	install -D -m644 "$srcdir/$_pkgname/feeluown/feeluown.png" "$pkgdir/usr/share/icons/hicolor/512x512/apps/feeluown.png"
+	install -D -m644 "$srcdir/feeluown.desktop" "$pkgdir/usr/share/applications/FeelUOwn.desktop"
 }
-
diff --git a/feeluown-git.install b/feeluown-git.install
deleted file mode 100644
index f6cb825136b3..000000000000
--- a/feeluown-git.install
+++ /dev/null
@@ -1,3 +0,0 @@
-post_remove() {
-    echo 'The config files under ~/.FeelUOwn should be removed manually by yourself.'
-}
diff --git a/feeluown.desktop b/feeluown.desktop
new file mode 100644
index 000000000000..9426f27ecd00
--- /dev/null
+++ b/feeluown.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Name=FeelUOwn
+Comment=FeelUOwn Launcher
+Exec=feeluown --log-to-file
+Icon=feeluown
+Categories=AudioVideo;Audio;Player;Qt;
+Terminal=false
+StartupNotify=true
+StartupWMClass=FeelUOwn