diff options
| author | Francesco Colista <fcolista@alpinelinux.org> | 2017-02-20 12:57:36 +0000 |
|---|---|---|
| committer | Francesco Colista <fcolista@alpinelinux.org> | 2017-02-20 12:57:36 +0000 |
| commit | 704dab2aae9f981fe36c0cbe7ba09a3a09880877 (patch) | |
| tree | 1c33349df4fcb22da510cf0a825c026af2a102c6 /main/v4l-utils | |
| parent | e6de48d4857379d7e1d83c13a661503dd47fda0a (diff) | |
| download | aports-704dab2aae9f981fe36c0cbe7ba09a3a09880877.tar.bz2 aports-704dab2aae9f981fe36c0cbe7ba09a3a09880877.tar.xz | |
main/v4l-utils: upgrade to 1.12.3
Diffstat (limited to 'main/v4l-utils')
| -rw-r--r-- | main/v4l-utils/0001-ir-ctl-fixes-for-musl-compile.patch | 37 | ||||
| -rw-r--r-- | main/v4l-utils/APKBUILD | 31 |
2 files changed, 46 insertions, 22 deletions
diff --git a/main/v4l-utils/0001-ir-ctl-fixes-for-musl-compile.patch b/main/v4l-utils/0001-ir-ctl-fixes-for-musl-compile.patch new file mode 100644 index 0000000000..5391d815b5 --- /dev/null +++ b/main/v4l-utils/0001-ir-ctl-fixes-for-musl-compile.patch @@ -0,0 +1,37 @@ +diff --git a/utils/ir-ctl/ir-ctl.c b/utils/ir-ctl/ir-ctl.c +index bc58cee..1a44011 100644 +--- a/utils/ir-ctl/ir-ctl.c ++++ b/utils/ir-ctl/ir-ctl.c +@@ -42,6 +42,16 @@ + # define _(string) string + #endif + ++/* taken from glibc unistd.h */ ++#ifndef TEMP_FAILURE_RETRY ++#define TEMP_FAILURE_RETRY(expression) \ ++ (__extension__ \ ++ ({ long int __result; \ ++ do __result = (long int) (expression); \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; })) ++#endif ++ + # define N_(string) string + + +@@ -344,12 +354,14 @@ static struct file *read_scancode(const char *name) + return NULL; + } + +- pstr = strndupa(name, p - name); ++ pstr = strndup(name, p - name); + + if (!protocol_match(pstr, &proto)) { + fprintf(stderr, _("error: protocol '%s' not found\n"), pstr); ++ free(pstr); + return NULL; + } ++ free(pstr); + + if (!strtoscancode(p + 1, &scancode)) { + fprintf(stderr, _("error: invalid scancode '%s'\n"), p + 1); diff --git a/main/v4l-utils/APKBUILD b/main/v4l-utils/APKBUILD index 4fabc1c09b..ae05d38856 100644 --- a/main/v4l-utils/APKBUILD +++ b/main/v4l-utils/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=v4l-utils -pkgver=1.10.1 -pkgrel=2 +pkgver=1.12.3 +pkgrel=0 pkgdesc="Userspace tools and conversion library for Video 4 Linux" url="http://freshmeat.net/projects/libv4l" arch="all" @@ -14,21 +14,13 @@ subpackages="$pkgname-dev $pkgname-doc qv4l2 $pkgname-dvbv5 $pkgname-libs ir_key source="http://linuxtv.org/downloads/v4l-utils/$pkgname-$pkgver.tar.bz2 qv4l2.svg qv4l2.desktop + 0001-ir-ctl-fixes-for-musl-compile.patch " -_builddir="$srcdir"/$pkgname-$pkgver -prepare() { - local i - cd "$_builddir" - for i in $source; do - case $i in - *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; - esac - done -} +builddir="$srcdir"/$pkgname-$pkgver build() { - cd "$_builddir" + cd "$builddir" [ "$CLIBC" = "musl" ] && export CFLAGS="$CFLAGS -D__off_t=off_t" export LIBS="-largp -lintl" ./configure \ @@ -46,7 +38,7 @@ build() { } package() { - cd "$_builddir" + cd "$builddir" make -j1 DESTDIR="$pkgdir" install || return 1 install -Dm644 "$srcdir"/qv4l2.desktop \ "$pkgdir"/usr/share/applications/qv4l2.desktop || return 1 @@ -94,12 +86,7 @@ ir_keytable() { "$subpkgdir"/etc || return 1 } -md5sums="936c9c58343840e91294e4dcec7dc05f v4l-utils-1.10.1.tar.bz2 -75ef594ddfe48e48df99c96c2af6b51e qv4l2.svg -b2e51f9663cee1c38a1d99d76a6b529f qv4l2.desktop" -sha256sums="6147ccc29fe7dd3c5c3994d613c4f2a099bac8b44694a96e5cf4d7caca8336c0 v4l-utils-1.10.1.tar.bz2 -b1dad7c1649881be8e66f4d9d0f32206796dd0a10dd936c342426ec64cf9c77c qv4l2.svg -1c5739631e37a7338409ea8b5c797a6888fd9a595e72d9dc96dd634df26373f3 qv4l2.desktop" -sha512sums="524bfd4e93e82f2dd55f0baa3e8be5850d4675b46fd0197b6d1287fc0d502c6b5c64bdf461af9630345f2d847d6aa5b6dc483693cee452da0b6729f156a5d98d v4l-utils-1.10.1.tar.bz2 +sha512sums="6d0269d900c5dad08499ee551ce1507b8b750895f48423ccd534db51cf68794b59a279743fd22dc6da0c092ca31ef744aa564f26b6d6252cbbc7a62e2e1c714a v4l-utils-1.12.3.tar.bz2 bc18280046c15b19984103f7c2bb44a0aea79715803c64f0c64bc932499c09022c956914c3b15ae59499adc09f6fbff5378be45707fe851250f495a26b63d682 qv4l2.svg -6f74aa524b3de420eeb8de788ff3f717020732a3f1f6530caee50e63aae7eddbe5f551ffc50065c9f5d6078c13bace089948ecdcacf01f8b82c1a44960e06315 qv4l2.desktop" +6f74aa524b3de420eeb8de788ff3f717020732a3f1f6530caee50e63aae7eddbe5f551ffc50065c9f5d6078c13bace089948ecdcacf01f8b82c1a44960e06315 qv4l2.desktop +f93d18b282d52c6cccbedc489e201a19b59f44b5e0aeb74b96537c3f5797c0b3c3f1499cd6ae822715c712e92b5ec5749749394f004ae1887a8bae3bac117c5b 0001-ir-ctl-fixes-for-musl-compile.patch" |