diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2015-04-22 14:30:41 +0300 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2015-04-22 14:30:41 +0300 |
| commit | 30044b0f9d2d9c5f6e24277dd3b775e4c73ecc9a (patch) | |
| tree | b154f83fdfdcbedcdf3daacee87ccdb8a8aae87c /main/zoneminder | |
| parent | 856d3923111f49d1193f69c07d24282b1261d20a (diff) | |
| download | aports-30044b0f9d2d9c5f6e24277dd3b775e4c73ecc9a.tar.bz2 aports-30044b0f9d2d9c5f6e24277dd3b775e4c73ecc9a.tar.xz | |
main/zoneminder: add missing patch
Diffstat (limited to 'main/zoneminder')
| -rw-r--r-- | main/zoneminder/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch | 25 | ||||
| -rw-r--r-- | main/zoneminder/APKBUILD | 2 |
2 files changed, 26 insertions, 1 deletions
diff --git a/main/zoneminder/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch b/main/zoneminder/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch new file mode 100644 index 0000000000..b7cbb4c3c2 --- /dev/null +++ b/main/zoneminder/0001-use-pthread_join-instead-of-pthread_tryjoin_np.patch @@ -0,0 +1,25 @@ +From 5779b2e20fe7d5e43a5a38ab289e45fc0ffc9545 Mon Sep 17 00:00:00 2001 +From: Sune1337 <kristoffer.lindahl@gmail.com> +Date: Wed, 8 Apr 2015 22:15:54 +0200 +Subject: [PATCH] * use pthread_join instead of pthread_tryjoin_np + +--- + src/zm_ffmpeg_camera.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp +index 9a4ea5f..5ae1e4a 100644 +--- a/src/zm_ffmpeg_camera.cpp ++++ b/src/zm_ffmpeg_camera.cpp +@@ -120,7 +120,7 @@ int FfmpegCamera::Capture( Image &image ) + void *retval = 0; + int ret; + +- ret = pthread_tryjoin_np(mReopenThread, &retval); ++ ret = pthread_join(mReopenThread, &retval); + if (ret != 0){ + Error("Could not join reopen thread."); + } +-- +2.1.0 + diff --git a/main/zoneminder/APKBUILD b/main/zoneminder/APKBUILD index dd7144e33c..654622bf2c 100644 --- a/main/zoneminder/APKBUILD +++ b/main/zoneminder/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> pkgname=zoneminder pkgver=1.28.1 -pkgrel=0 +pkgrel=1 pkgdesc="Video camera surveillance system" url="http://www.zoneminder.com/" arch="x86_64" |