Beta 2.9.3

4 files changed, 39 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 60de4dadaaaf..507c50cbbdb9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = vokoscreen-git
 	pkgdesc = An easy to use screencast creator. Development version.
-	pkgver = 2.5.8.beta.27.g5b1f17a
-	pkgrel = 2
+	pkgver = 2.9.3.beta.35.gb763020
+	pkgrel = 1
 	url = http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html
 	arch = i686
 	arch = x86_64
@@ -11,17 +11,17 @@ pkgbase = vokoscreen-git
 	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.27.g5b1f17a
+	optdepends = gst-plugins-ugly: for x264 video codec
+	provides = vokoscreen=2.9.3.beta.35.gb763020
 	conflicts = vokoscreen
-	source = git+https://github.com/vkohaupt/vokoscreen.git
-	source = desktop_file.patch
+	source = git+https://github.com/vkohaupt/vokoscreenNG.git
+	source = install.pri
 	sha512sums = SKIP
-	sha512sums = 3ddc567f831b9f6e2672997a77a099cf8fdd5a6a1d79157738c1670c9106fd6c4e09d74287a770c19bac23dcb73a19ce69cc1ac893d4988f75c7ac35668f7a90
+	sha512sums = 0a5e0523adaa9e7f9b46cbbc8f7d8d0167787b67f11cfb7895785e3f93ab8836526c1b0891f4bf3362f4e8bc44885ffcf99670b86558aa667bd4f4ac7df56f11
 
 pkgname = vokoscreen-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 7dcea9861b56..0f46be266455 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,41 +4,43 @@
 
 _pkgname=vokoscreen
 pkgname=${_pkgname}-git
-pkgver=2.5.8.beta.27.g5b1f17a
-pkgrel=2
+pkgver=2.9.3.beta.35.gb763020
+pkgrel=1
 pkgdesc='An easy to use screencast creator. Development version.'
 arch=('i686' 'x86_64')
 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=('git' 'qt5-tools' 'libxrandr')
+optdepends=('gst-plugins-ugly: for x264 video codec')
 provides=("${_pkgname}=${pkgver}")
 conflicts=("${_pkgname}")
 
 source=(
-	"git+https://github.com/vkohaupt/${_pkgname}.git"
-	'desktop_file.patch'
+	"git+https://github.com/vkohaupt/${_pkgname}NG.git"
+	'install.pri'
 )
 sha512sums=(
 	'SKIP'
-	'3ddc567f831b9f6e2672997a77a099cf8fdd5a6a1d79157738c1670c9106fd6c4e09d74287a770c19bac23dcb73a19ce69cc1ac893d4988f75c7ac35668f7a90'
+	'0a5e0523adaa9e7f9b46cbbc8f7d8d0167787b67f11cfb7895785e3f93ab8836526c1b0891f4bf3362f4e8bc44885ffcf99670b86558aa667bd4f4ac7df56f11'
 )
 
 pkgver() {
 	# Updating package version
-	cd "${srcdir}"/${_pkgname}
+	cd "${srcdir}"/${_pkgname}NG
 	git describe --long --tags 2>/dev/null | sed -r 's/-/./g'
 }
 
 prepare() {
-	cd "${srcdir}"/${_pkgname}
+	cd "${srcdir}"/${_pkgname}NG
 
-	# Desktop entry
-	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
@@ -47,7 +49,7 @@ prepare() {
 build() {
 	# Building package
 	cd "${srcdir}"/build
-	qmake-qt5 ../${_pkgname} \
+	qmake-qt5 ../${_pkgname}NG/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/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
+}