summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorjose17112019-01-17 11:22:21 +0100
committerjose17112019-01-17 11:22:21 +0100
commitcc7fcc9cdbef754b808d547eb33111f1f68a1d22 (patch)
treefebbbbe77b44979fe84eb3b3172f9901e95648f2
parent8558137c5ce4fed5d6a45b4f677833e1bd4f9fdf (diff)
downloadaur-cc7fcc9cdbef754b808d547eb33111f1f68a1d22.tar.gz
Update
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD12
-rw-r--r--webcamstudio.sh1
3 files changed, 12 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 40a4fe734d7..d20dcbb746b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Wed Jan 16 08:27:22 UTC 2019
+# Thu Jan 17 10:22:06 UTC 2019
pkgbase = webcamstudio-git
pkgdesc = Webcam desktop recording suite for producing professional looking broadcasts
pkgver = 20170108
@@ -42,12 +42,13 @@ pkgbase = webcamstudio-git
depends = ttf-ubuntu-font-family
depends = v4l2loopback-dkms
depends = wmctrl
+ optdepends = webcamstudio-module: virtual webcam device
provides = webcamstudio
conflicts = webcamstudio
source = git+https://github.com/WebcamStudio/webcamstudio
source = webcamstudio.sh
sha256sums = SKIP
- sha256sums = 903336d75ffb49999bf7a9287a22c3d4382cb59cb073b8005792178b75627d8e
+ sha256sums = ae2a19f3b9381c4eae3897ed33a5fc11907e9989c85a1c33cec8aba47e81bdc6
pkgname = webcamstudio-git
diff --git a/PKGBUILD b/PKGBUILD
index 0a9c0399b86..56460862a17 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -40,12 +40,13 @@ depends=('clutter-gst'
'wmctrl')
#'gstreamer0.10-espeak' (doesn't compile)
makedepends=('apache-ant' 'git')
+optdepends=('webcamstudio-module: virtual webcam device')
url="https://github.com/WebcamStudio/webcamstudio"
license=('GPL3')
source=(git+https://github.com/WebcamStudio/webcamstudio
webcamstudio.sh)
sha256sums=('SKIP'
- '903336d75ffb49999bf7a9287a22c3d4382cb59cb073b8005792178b75627d8e')
+ 'ae2a19f3b9381c4eae3897ed33a5fc11907e9989c85a1c33cec8aba47e81bdc6')
provides=('webcamstudio')
conflicts=('webcamstudio')
install=webcamstudio.install
@@ -60,6 +61,8 @@ build() {
msg2 'Building...'
ant clean jar
+ gcc -fPIC -c -o vloopback/libwebcamstudio.o vloopback/libwebcamstudio.c
+ gcc -fPIC -shared -Wl,-soname,libwebcamstudio.so -o vloopback/libwebcamstudio.so vloopback/libwebcamstudio.o
}
prepare() {
@@ -68,7 +71,7 @@ prepare() {
sed -i -e "s?=/usr/share/java/jna.jar?=libraries/jna.jar?" \
-e "s?=libraries/jna-3.0...jar?=libraries/jna.jar?" \
-e "s?absolutelayout.classpath=libraries/jna.jar?absolutelayout.classpath=libraries/jna.jar:libraries/absolutelayout.jar?" nbproject/project.properties
- sed -i -e "s?#video=gst-launch-0.10?video=gst-launch-0.10?"
+ sed -i -e "s?#video=gst-launch-0.10?video=gst-launch-0.10?" \
-e "s?#audio=gst-launch-0.10?audio=gst-launch-0.10?" \
-e "s?video=avconv?#video=avconv?" \
-e "s?audio=avconv?#audio=avconv?" src/webcamstudio/externals/linux/sources/webcam.properties
@@ -76,8 +79,7 @@ prepare() {
sed -i -e "s?=gst-launch-0.10?=/usr/bin/gst-launch-0.10?" \
-e "s?=avconv?=/usr/bin/ffmpeg?" \
-e "s?=ffmpeg?=/usr/bin/ffmpeg?" \
- src/webcamstudio/externals/linux/*.properties \
- src/webcamstudio/externals/linux/*/*.properties
+ src/webcamstudio/externals/linux/*.properties src/webcamstudio/externals/linux/*/*.properties
}
@@ -102,6 +104,8 @@ package() {
msg2 'Installing executable...'
install -Dm 755 "$srcdir/webcamstudio.sh" "$pkgdir/usr/bin/webcamstudio"
+find . -name libwebcamstudio.so
+ install -Dm 644 "vloopback/libwebcamstudio.so" "${pkgdir}/usr/share/webcamstudio/lib/libwebcamstudio.so"
msg2 'Installing desktop files...'
install -Dm 644 debian/webcamstudio.desktop \
diff --git a/webcamstudio.sh b/webcamstudio.sh
index 2cfd0c74bef..ba665f8df78 100644
--- a/webcamstudio.sh
+++ b/webcamstudio.sh
@@ -1,4 +1,5 @@
#!/bin/bash
+export LD_LIBRARY_PATH="/usr/share/webcamstudio/lib:$LD_LIBRARY_PATH"
pushd /usr/share/webcamstudio > /dev/null \
&& java -cp 'WebcamStudio.jar:lib/*' webcamstudio.WebcamStudio "$@" \
&& popd > /dev/null