freac-cvs_20170317-2

6 files changed, 36 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index da5ff3bf4c9e..ca4b6445ace6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,30 @@
 # Generated by mksrcinfo v8
-# Sat Mar 18 10:08:00 UTC 2017
+# Fri Mar 24 01:51:14 UTC 2017
 pkgbase = freac
 	pkgdesc = Audio converter and CD ripper with support for various popular formats and encoders.
 	pkgver = cvs_20170317
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.freac.org/
 	arch = i686
 	arch = x86_64
 	license = GPL2
-	depends = alsa-lib
-	depends = gtk3
-	depends = libxmu
-	source = freac
+	depends = freac_cdk
+	depends = mpg123
+	depends = libvorbis
+	depends = libsndfile
+	depends = flac
+	depends = lame
+	depends = libfdk-aac
+	depends = faac
+	depends = faad2
+	depends = opus
+	depends = speex
+	depends = libsamplerate
+	depends = libmp4v2
+	source = http://sourceforge.net/projects/bonkenc/files/snapshots/20170317/freac-20170317.tar.gz
 	source = freac.desktop
-	source = freaccmd
-	source = freac-translator
-	sha512sums = 6b8e3f3c2e53e6b9a17b0c1fd1029c0e65b6e1cf2ae5ee95bcbecc508b37c1b01d8242bc03ef557a572c47cfeb9af48d5c9f058b542c864ac5133fd7e914b843
+	sha512sums = a416faf220459c5eba6718816991ace861d5895a63e1cf5e7968834248122f563c47b20361b26e604f1e02752ccfd5cec58cc16e47258ecdb505d015da4e3555
 	sha512sums = 61634e759c4621dee3485ef82c584faa6d8e4b67d5240a5b929b4b166913e6ea031d03a7fd85422d4422841700d6ab140b3815e12777c53c9254ebffeb8ae021
-	sha512sums = 3676c271bf92bac450552ce0209e62be9ccd9db6c6cd75fa36a2b1d23dd3a7d423ee6dc1497fae59c2f28e41ee2fe334238ef523c644c60cd48602ff02520f87
-	sha512sums = ef2182ec9d31c08a0bda37bbf76ce981893d1657cdbd44f346c9f2433aab3c5a618fea78f6d1d14096260d45d72487b8d0dda1582cb8d8c6b491f5499b93f0b0
-	source_i686 = http://sourceforge.net/projects/bonkenc/files/snapshots/20170317/freac-20170317-linux.tar.gz
-	sha512sums_i686 = 7918f89a4323bd543d3e07b42f7c6141301a526bf4e9293307bddb7c2af016f8076830b11f80b6bae3f30fafbc67b6e6e3b4d7cb9ac5528ba91ca145e54a45b0
-	source_x86_64 = http://sourceforge.net/projects/bonkenc/files/snapshots/20170317/freac-20170317-linux-x64.tar.gz
-	sha512sums_x86_64 = ec5138f133f5a77ade0aad350b0b5814eb309cdbe1c980b5f3a1f13647f7993da6df5e49f8bb2d51ad9852766d82a130807e6d187a8f964f2360bb626512dc1a
 
 pkgname = freac
 
diff --git a/PKGBUILD b/PKGBUILD
index 3538719052cf..c52abebd22ff 100755..100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,43 +4,32 @@
 pkgname=freac
 _realpkgver=20170317
 pkgver=cvs_${_realpkgver}
-pkgrel=1
+pkgrel=2
 pkgdesc="Audio converter and CD ripper with support for various popular formats and encoders."
 arch=('i686' 'x86_64')
 url="http://www.freac.org/"
 license=('GPL2')
-depends=('alsa-lib' 'gtk3' 'libxmu')
+depends=('freac_cdk' 'mpg123' 'libvorbis' 'libsndfile' 'flac' 'lame' 'libfdk-aac' 'faac' 'faad2' 'opus' 'speex' 'libsamplerate' 'libmp4v2')
 
-source=(freac
-        freac.desktop
-        freaccmd
-        freac-translator)
-source_i686=( "http://sourceforge.net/projects/bonkenc/files/snapshots/${_realpkgver}/freac-${_realpkgver}-linux.tar.gz" )
-source_x86_64=( "http://sourceforge.net/projects/bonkenc/files/snapshots/${_realpkgver}/freac-${_realpkgver}-linux-x64.tar.gz" )
-sha512sums=('6b8e3f3c2e53e6b9a17b0c1fd1029c0e65b6e1cf2ae5ee95bcbecc508b37c1b01d8242bc03ef557a572c47cfeb9af48d5c9f058b542c864ac5133fd7e914b843'
-            '61634e759c4621dee3485ef82c584faa6d8e4b67d5240a5b929b4b166913e6ea031d03a7fd85422d4422841700d6ab140b3815e12777c53c9254ebffeb8ae021'
-            '3676c271bf92bac450552ce0209e62be9ccd9db6c6cd75fa36a2b1d23dd3a7d423ee6dc1497fae59c2f28e41ee2fe334238ef523c644c60cd48602ff02520f87'
-            'ef2182ec9d31c08a0bda37bbf76ce981893d1657cdbd44f346c9f2433aab3c5a618fea78f6d1d14096260d45d72487b8d0dda1582cb8d8c6b491f5499b93f0b0')
-sha512sums_i686=('7918f89a4323bd543d3e07b42f7c6141301a526bf4e9293307bddb7c2af016f8076830b11f80b6bae3f30fafbc67b6e6e3b4d7cb9ac5528ba91ca145e54a45b0')
-sha512sums_x86_64=('ec5138f133f5a77ade0aad350b0b5814eb309cdbe1c980b5f3a1f13647f7993da6df5e49f8bb2d51ad9852766d82a130807e6d187a8f964f2360bb626512dc1a')
+source=( "http://sourceforge.net/projects/bonkenc/files/snapshots/${_realpkgver}/freac-${_realpkgver}.tar.gz" freac.desktop)
+sha512sums=('a416faf220459c5eba6718816991ace861d5895a63e1cf5e7968834248122f563c47b20361b26e604f1e02752ccfd5cec58cc16e47258ecdb505d015da4e3555'
+            '61634e759c4621dee3485ef82c584faa6d8e4b67d5240a5b929b4b166913e6ea031d03a7fd85422d4422841700d6ab140b3815e12777c53c9254ebffeb8ae021')
 
-package() {
-   cd $srcdir
-
-   # Data files
-   mkdir -p $pkgdir/usr/share/freac
-   cp -r freac-${_realpkgver}-linux/* $pkgdir/usr/share/freac
-   chmod -R 755 $pkgdir/usr/share/freac
+prepare() {
+	cd "${pkgname/_/-}-${_realpkgver}" || exit 1
+	find . -type f -exec sed -i 's!/usr/local!/usr!g' {} \;
+}
 
-   # Delete source code
-   rm -rf $pkgdir/usr/share/freac/source
+build() {
+	cd "${pkgname/_/-}-${_realpkgver}" || exit 1
+	make
+}
 
-   # Start files
-   install -Dm755 freac $pkgdir/usr/bin/freac
-   install -Dm755 freaccmd $pkgdir/usr/bin/freaccmd
-   install -Dm755 freac-translator $pkgdir/usr/bin/freac-translator
+package() {
+	cd "${pkgname/_/-}-${_realpkgver}" || exit 1
+	make DESTDIR="$pkgdir/" install
 
-   # Desktop icon
-   install -Dm644 freac-$_realpkgver-linux/icons/freac.png $pkgdir/usr/share/pixmaps/freac.png
-   install -Dm644 freac.desktop $pkgdir/usr/share/applications/freac.desktop
+	# Desktop icon
+	install -Dm644 bin/icons/freac.png "$pkgdir/usr/share/pixmaps/freac.png"
+	install -Dm644 "$srcdir/freac.desktop" "$pkgdir/usr/share/applications/freac.desktop"
 }
diff --git a/freac b/freac
deleted file mode 100755
index 98478f091dc7..000000000000
--- a/freac
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /usr/share/freac
-./freac
\ No newline at end of file
diff --git a/freac-translator b/freac-translator
deleted file mode 100755
index 7dc07d045347..000000000000
--- a/freac-translator
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /usr/share/freac
-./translator
\ No newline at end of file
diff --git a/freac.desktop b/freac.desktop
index 755fd3d17791..755fd3d17791 100755..100644
--- a/freac.desktop
+++ b/freac.desktop
diff --git a/freaccmd b/freaccmd
deleted file mode 100755
index b9dfbde368fa..000000000000
--- a/freaccmd
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /usr/share/freac
-./freaccmd
\ No newline at end of file