Transport plugin

3 files changed, 12 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6bfaedbce4d1..3e6299acf514 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = qmmp-plugin-youtube
 	pkgdesc = Plugin for Qt-based Multimedia Player (Qmmp) to search and play musics directly from YouTube
-	pkgver = 0.1
+	pkgver = 0.2
 	pkgrel = 1
 	url = https://github.com/rigon/qmmp-plugin-youtube
-	install = qmmp-plugin-youtube.install
 	arch = i686
 	arch = x86_64
 	license = GPL
@@ -13,11 +12,8 @@ pkgbase = qmmp-plugin-youtube
 	depends = youtube-dl
 	depends = qjson
 	depends = pythonqt
-	backup = usr/lib/qmmp/Transports/libhttp.so
-	source = https://github.com/rigon/qmmp-plugin-youtube/archive/v0.1.tar.gz
-	source = http://qmmp.ylsoftware.com/files/qmmp-1.0.6.tar.bz2
-	md5sums = 3170539cb9bf5c07a999984d6ca8369f
-	md5sums = fd4900cd6a2c5330df452ce6adc4fb06
+	source = https://github.com/rigon/qmmp-plugin-youtube/archive/v0.2.tar.gz
+	md5sums = 52504d92695f2e5c9a9fab338062b4d9
 
 pkgname = qmmp-plugin-youtube
 
diff --git a/PKGBUILD b/PKGBUILD
index dfdf37890a28..fc8e32474754 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,29 @@
 # Maintainer: Ricardo Gonçalves <ricardompgoncalves@gmail.com>
 
-_qmmpver=1.0.6
-
 pkgname=qmmp-plugin-youtube
-pkgver=0.1
+pkgver=0.2
 pkgrel=1
 pkgdesc="Plugin for Qt-based Multimedia Player (Qmmp) to search and play musics directly from YouTube"
 arch=('i686' 'x86_64')
 url="https://github.com/rigon/qmmp-plugin-youtube"
 license=('GPL')
 depends=('qmmp' 'python>=3.5' 'python<3.6' 'youtube-dl' 'qjson' 'pythonqt')
-install=$pkgname.install
-source=(https://github.com/rigon/$pkgname/archive/v$pkgver.tar.gz
-        http://qmmp.ylsoftware.com/files/qmmp-$_qmmpver.tar.bz2)
-md5sums=('3170539cb9bf5c07a999984d6ca8369f'
-         'fd4900cd6a2c5330df452ce6adc4fb06')
-backup=('usr/lib/qmmp/Transports/libhttp.so')
-
-
-prepare() {
-  # HTTP plugin patch
-  cd "qmmp-$_qmmpver"/
-  patch -p0 < ../"$pkgname-$pkgver"/http-fix.patch
-}
+source=("https://github.com/rigon/$pkgname/archive/v$pkgver.tar.gz")
+md5sums=('52504d92695f2e5c9a9fab338062b4d9')
 
 build() {
   cd "$pkgname-$pkgver"/
-
+  
   qmake
   make -j4
-  
-  # HTTP plugin build
-  cd ../"qmmp-$_qmmpver"/
-  cmake .
-  make -j4 http
 }
 
 package() {
-  mkdir -p "$pkgdir"/usr/lib/qmmp/General
   mkdir -p "$pkgdir"/usr/lib/qmmp/Transports
-
-  cp "$pkgname-$pkgver"/libyoutube.so.1.0.0 "$pkgdir"/usr/lib/qmmp/General/libyoutube.so
-  cp "qmmp-$_qmmpver"/src/plugins/Transports/http/libhttp.so "$pkgdir"/usr/lib/qmmp/Transports/libhttp-patched.so
-
+  cp "$pkgname-$pkgver"/libyoutube.so "$pkgdir"/usr/lib/qmmp/Transports/
+  
+  # This is very hacky!!
+  mkdir -p "$pkgdir"/usr/lib/qmmp/General
+  cp "$pkgname-$pkgver"/libyoutube.so "$pkgdir"/usr/lib/qmmp/General/
 }
 
diff --git a/qmmp-plugin-youtube.install b/qmmp-plugin-youtube.install
deleted file mode 100644
index 482f16cda479..000000000000
--- a/qmmp-plugin-youtube.install
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-# Backup and replace by the patched HTTP plugin
-post_install() {
-	sudo mv /usr/lib/qmmp/Transports/libhttp.so /usr/lib/qmmp/Transports/libhttp.so.bak
-}
-
-
-# Restore the original HTTP plugin
-post_remove() {
-	sudo mv /usr/lib/qmmp/Transports/libhttp.so.bak /usr/lib/qmmp/Transports/libhttp.so
-}
-