diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2016-11-02 17:05:18 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2016-11-02 17:05:53 +0200 |
| commit | 0c1428c0a82b0ffb4613979c6a4f0ba499e27a60 (patch) | |
| tree | f2be6c9cc9de74f21198c70475d4bc1a6fe1608a /main/dvgrab | |
| parent | 651cc55068935d0d6dc0c39d08c127360ba05f90 (diff) | |
| download | aports-0c1428c0a82b0ffb4613979c6a4f0ba499e27a60.tar.bz2 aports-0c1428c0a82b0ffb4613979c6a4f0ba499e27a60.tar.xz | |
main/dvgrab: fix gcc6 build, and simplify aport
build fix from upstream git
Diffstat (limited to 'main/dvgrab')
| -rw-r--r-- | main/dvgrab/APKBUILD | 28 | ||||
| -rw-r--r-- | main/dvgrab/fix-narrowing.patch | 27 |
2 files changed, 38 insertions, 17 deletions
diff --git a/main/dvgrab/APKBUILD b/main/dvgrab/APKBUILD index afe717634..2f01f1405 100644 --- a/main/dvgrab/APKBUILD +++ b/main/dvgrab/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=dvgrab pkgver=3.5 -pkgrel=2 +pkgrel=3 pkgdesc="Utility to capture video from a DV camera" url="http://www.kinodv.org/" arch="all" @@ -14,21 +14,12 @@ install="" subpackages="$pkgname-doc" source="http://prdownloads.sourceforge.net/kino/dvgrab-$pkgver.tar.gz musl-fixes.patch + fix-narrowing.patch " -_builddir="$srcdir"/dvgrab-$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"/dvgrab-$pkgver build() { - cd "$_builddir" + cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -42,13 +33,16 @@ build() { } package() { - cd "$_builddir" + cd "$builddir" make DESTDIR="$pkgdir" install || return 1 } md5sums="b39a242ce63e80fc347ab59931f75649 dvgrab-3.5.tar.gz -363ed7fe045422e4e7001e19ae2a7f6c musl-fixes.patch" +363ed7fe045422e4e7001e19ae2a7f6c musl-fixes.patch +502f7f4b0c0faf87a23bc97385699a99 fix-narrowing.patch" sha256sums="5910183429d300221783d6054ff5add15bb2ae49ae33272d723a314bc2ce0af9 dvgrab-3.5.tar.gz -05ef1b0e6d9e23ab0a5a2106840f97fd0d9541e6bbecc0731ef13d33f4a98a16 musl-fixes.patch" +05ef1b0e6d9e23ab0a5a2106840f97fd0d9541e6bbecc0731ef13d33f4a98a16 musl-fixes.patch +d8b681da8b272e71e4160c4257a30ae416b5a36f3a21c3179735ff6e2cd2cd9c fix-narrowing.patch" sha512sums="7d9cae1661d27dbef1d0dcdf18966a0ab386d936803ff7d071a18e0303fca45631c9b27187a413adfa4391c395e5909e3b8dc5c543d529e7805550f1a3ee6735 dvgrab-3.5.tar.gz -c69220fa133812063fc6e237a1c15215b7163845d8f9b0e0aba589a86b875f194d2a6899f44449c3e209415ea94d14a13eeff23014ddda0e8a496a6973a0e21b musl-fixes.patch" +c69220fa133812063fc6e237a1c15215b7163845d8f9b0e0aba589a86b875f194d2a6899f44449c3e209415ea94d14a13eeff23014ddda0e8a496a6973a0e21b musl-fixes.patch +9c54e630efcbf2992e785a837b24abc62d064e5538156f4d8a4b16edea1d55a7a2a70163564b3139f29c33c8887166fea0a253da0a4e6bb540142bf5054c551d fix-narrowing.patch" diff --git a/main/dvgrab/fix-narrowing.patch b/main/dvgrab/fix-narrowing.patch new file mode 100644 index 000000000..169f8a3c1 --- /dev/null +++ b/main/dvgrab/fix-narrowing.patch @@ -0,0 +1,27 @@ +From 8dd729f2cf4cc5b99ad2e3961419cf71d2dfb843 Mon Sep 17 00:00:00 2001 +From: Aaro Koskinen <aaro.koskinen@iki.fi> +Date: Sun, 15 May 2016 22:44:23 +0300 +Subject: [PATCH] iec13818-1.h: fix build with GCC 6.1.0 + +Fix the following build issue with GCC 6.1.0: + +iec13818-1.h:45:75: error: narrowing conversion of '255' from 'int' to 'char' inside { } [-Wnarrowing] + static char bitmask[8] = { 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff }; + ^ +--- + iec13818-1.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/iec13818-1.h b/iec13818-1.h +index 56a4aa0..e964288 100644 +--- a/iec13818-1.h ++++ b/iec13818-1.h +@@ -42,7 +42,7 @@ + #define BCD(c) ( ((((c) >> 4) & 0x0f) * 10) + ((c) & 0x0f) ) + + #define TOBYTES( n ) ( ( n + 7 ) / 8 ) +-static char bitmask[8] = { 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff }; ++static unsigned char bitmask[8] = { 0x01, 0x03, 0x07, 0x0f, 0x1f, 0x3f, 0x7f, 0xff }; + #define GETBITS( offset, len ) do { \ + unsigned long value = 0; \ + while ( len > 0 ) \ |