Version 2.9.3.beta

5 files changed, 38 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5b97fa160028..37504d71eee8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = vokoscreen
 	pkgdesc = An easy to use screencast creator
-	pkgver = 2.5.8.beta
+	pkgver = 2.9.3.beta
 	pkgrel = 1
 	url = http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html
 	arch = i686
@@ -10,19 +10,17 @@ pkgbase = vokoscreen
 	makedepends = libxrandr
 	depends = qt5-x11extras
 	depends = qt5-multimedia
-	depends = ffmpeg
-	depends = lame
-	depends = lsof
+	depends = qt-gstreamer
+	depends = gst-plugins-good
+	depends = gst-plugins-bad
 	depends = pulseaudio-alsa
-	depends = xdg-utils
-	provides = vokoscreen=2.5.8.beta
+	optdepends = gst-plugins-ugly: for x264 video codec
+	provides = vokoscreen=2.9.3.beta
 	conflicts = vokoscreen-git
-	source = vokoscreen-2.5.8-beta.tar.gz::https://github.com/vkohaupt/vokoscreen/archive/2.5.8-beta.tar.gz
-	source = desktop_file.patch
-	source = fix_lrelease.patch
-	sha512sums = dd9e25ec9ab7eeddb99aeeac3865f4306d741c78cb81b6a62fcc9d366270446683eadc483bc65637e30b639764ea978ae290baabfcb9ae298ad63fb040a805f6
-	sha512sums = 3ddc567f831b9f6e2672997a77a099cf8fdd5a6a1d79157738c1670c9106fd6c4e09d74287a770c19bac23dcb73a19ce69cc1ac893d4988f75c7ac35668f7a90
-	sha512sums = 4c7e61e06a90de2815dd7564a9df050a939d5a3a1bb5514ee5808fd5277b5e6a12af80384f630e2c8429ca2decb318684b8f300a64846ae393c9482bc81425a4
+	source = vokoscreen-2.9.3-beta.tar.gz::https://github.com/vkohaupt/vokoscreenNG/archive/2.9.3-beta.tar.gz
+	source = install.pri
+	sha512sums = 67a6958429009c6662090a9d64193d077287603b144860f97c9d7a5712550a7d067d5a0a25b7128835a6878fb24d3499c9a2d7b8efd55efa69015a8947ccb517
+	sha512sums = 0a5e0523adaa9e7f9b46cbbc8f7d8d0167787b67f11cfb7895785e3f93ab8836526c1b0891f4bf3362f4e8bc44885ffcf99670b86558aa667bd4f4ac7df56f11
 
 pkgname = vokoscreen
 
diff --git a/PKGBUILD b/PKGBUILD
index ea0947a4785c..663590316f11 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Giacomo <giacomogiorgianni at gmail dot com>
 
 pkgname=vokoscreen
-_pkgver=2.5.8-beta
+_pkgver=2.9.3-beta
 pkgver=${_pkgver/-/.}
 pkgrel=1
 pkgdesc='An easy to use screencast creator'
@@ -11,32 +11,29 @@ url='http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html'
 license=('GPL2')
 
 depends=(
-	'qt5-x11extras' 'qt5-multimedia' 'ffmpeg' 'lame'
-	'lsof' 'pulseaudio-alsa' 'xdg-utils'
+	'qt5-x11extras' 'qt5-multimedia' 'qt-gstreamer'
+	'gst-plugins-good' 'gst-plugins-bad' 'pulseaudio-alsa'
 )
 makedepends=('qt5-tools' 'libxrandr')
+optdepends=('gst-plugins-ugly: for x264 video codec')
 provides=("${pkgname}=${pkgver}")
 conflicts=("${pkgname}-git")
 
 source=(
-	"${pkgname}-${_pkgver}.tar.gz::https://github.com/vkohaupt/${pkgname}/archive/${_pkgver}.tar.gz"
-	'desktop_file.patch'
-	'fix_lrelease.patch'
+	"${pkgname}-${_pkgver}.tar.gz::https://github.com/vkohaupt/${pkgname}NG/archive/${_pkgver}.tar.gz"
+	'install.pri'
 )
 sha512sums=(
-	'dd9e25ec9ab7eeddb99aeeac3865f4306d741c78cb81b6a62fcc9d366270446683eadc483bc65637e30b639764ea978ae290baabfcb9ae298ad63fb040a805f6'
-	'3ddc567f831b9f6e2672997a77a099cf8fdd5a6a1d79157738c1670c9106fd6c4e09d74287a770c19bac23dcb73a19ce69cc1ac893d4988f75c7ac35668f7a90'
-	'4c7e61e06a90de2815dd7564a9df050a939d5a3a1bb5514ee5808fd5277b5e6a12af80384f630e2c8429ca2decb318684b8f300a64846ae393c9482bc81425a4'
+	'67a6958429009c6662090a9d64193d077287603b144860f97c9d7a5712550a7d067d5a0a25b7128835a6878fb24d3499c9a2d7b8efd55efa69015a8947ccb517'
+	'0a5e0523adaa9e7f9b46cbbc8f7d8d0167787b67f11cfb7895785e3f93ab8836526c1b0891f4bf3362f4e8bc44885ffcf99670b86558aa667bd4f4ac7df56f11'
 )
 
 prepare() {
-	cd "${srcdir}"/${pkgname}-${_pkgver}
+	cd "${srcdir}"/${pkgname}NG-${_pkgver}
 
-	# Fix lrelease path
-	patch -Np1 < ../fix_lrelease.patch
-
-	# Desktop file description
-	patch -Np1 < ../desktop_file.patch
+	# Add install instructions
+	cp ../install.pri src/
+	echo 'include(install.pri)' >> src/vokoscreen.pro
 
 	# Create build directory
 	mkdir -p "${srcdir}"/build
@@ -45,7 +42,7 @@ prepare() {
 build() {
 	# Building package
 	cd "${srcdir}"/build
-	qmake-qt5 ../${pkgname}-${_pkgver} \
+	qmake-qt5 ../${pkgname}NG-${_pkgver}/src \
 		QMAKE_CFLAGS="${CFLAGS}" \
 		QMAKE_CXXFLAGS="${CXXFLAGS}" \
 		CONFIG+=release \
diff --git a/desktop_file.patch b/desktop_file.patch
deleted file mode 100644
index 88541c0c0365..000000000000
--- a/desktop_file.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/applications/vokoscreen.desktop	2015-05-27 12:13:34.206233690 -0500
-+++ b/applications/vokoscreen.desktop	2015-05-27 12:16:02.223851764 -0500
-@@ -1,10 +1,10 @@
- [Desktop Entry]
--Comment=screencast
-+Comment=An easy to use screencast creator
- Exec=vokoscreen
- Icon=vokoscreen
- Name=vokoscreen
- StartupNotify=false
- Terminal=false
- Type=Application
--Categories=AudioVideo;Recorder;
-+Categories=AudioVideo;Recorder;Qt;
- Keywords=Audio;Video;Recorder;Screencast;
diff --git a/fix_lrelease.patch b/fix_lrelease.patch
deleted file mode 100644
index 462bb819c79c..000000000000
--- a/fix_lrelease.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uprNEBZ --suppress-blank-empty a/vokoscreen.pro b/vokoscreen.pro
---- a/vokoscreen.pro	2016-04-19 04:48:55.000000000 -0500
-+++ b/vokoscreen.pro	2016-04-21 15:56:08.404677703 -0500
-@@ -27,7 +27,7 @@ TRANSLATIONS = $$files(language/vokoscre
- !isEmpty(TRANSLATIONS) {
-   isEmpty(QMAKE_LRELEASE) {
-     win32: QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe
--      else: QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease-qt5
-+      else: QMAKE_LRELEASE = $$[QT_INSTALL_PREFIX]/bin/lrelease-qt5
-   }
-   isEmpty(TS_DIR):TS_DIR = language
-   TSQM.name = lrelease-qt5 ${QMAKE_FILE_IN}
diff --git a/install.pri b/install.pri
new file mode 100644
index 000000000000..9e876b0be44d
--- /dev/null
+++ b/install.pri
@@ -0,0 +1,15 @@
+unix:!macx {
+	isEmpty(PREFIX) {
+		PREFIX = /usr
+	}
+
+	target.path = $${PREFIX}/bin
+
+	icon.path = $${PREFIX}/share/pixmaps
+	icon.files = pictures/vokoscreen.png
+
+	desktop.path = $${PREFIX}/share/applications
+	desktop.files = applications/vokoscreen.desktop
+
+	INSTALLS += target icon desktop
+}