diff options
| -rw-r--r-- | abs/extra-testing/v4l-dvb-dvico/PKGBUILD | 3 | ||||
| -rw-r--r-- | abs/extra-testing/v4l-dvb-dvico/fix-jdelvare-i2c-i2c-constify-client-address-data.patch | 25 |
2 files changed, 27 insertions, 1 deletions
diff --git a/abs/extra-testing/v4l-dvb-dvico/PKGBUILD b/abs/extra-testing/v4l-dvb-dvico/PKGBUILD index 4f4de06..3673f9c 100644 --- a/abs/extra-testing/v4l-dvb-dvico/PKGBUILD +++ b/abs/extra-testing/v4l-dvb-dvico/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Cecil Watson<knoppmyth@gmail.com> pkgname=v4l-dvb -_kernver=2.6.27-ARCH +_kernver=2.6.28-ARCH pkgver=1 pkgrel=1 pkgdesc="V4L-DVB drivers from mercurial" @@ -16,6 +16,7 @@ source=(http://linuxtv.org/hg/~pascoe/xc-test/archive/tip.tar.bz2) build() { cd $startdir/src/xc-test-d4f7804a393c + patch -p0 < ../../fix-jdelvare-i2c-i2c-constify-client-address-data.patch make KERNDIR=/lib/modules/$_kernver/build \ DESTDIR=$startdir/pkg KERNELRELEASE=$_kernver all || return 1 make KERNDIR=/lib/modules/$_kernver/build \ diff --git a/abs/extra-testing/v4l-dvb-dvico/fix-jdelvare-i2c-i2c-constify-client-address-data.patch b/abs/extra-testing/v4l-dvb-dvico/fix-jdelvare-i2c-i2c-constify-client-address-data.patch new file mode 100644 index 0000000..8c603f6 --- /dev/null +++ b/abs/extra-testing/v4l-dvb-dvico/fix-jdelvare-i2c-i2c-constify-client-address-data.patch @@ -0,0 +1,25 @@ +From: Andrew Morton <akpm@linux-foundation.org> + +drivers/media/video/tvaudio.c:147: error: conflicting type qualifiers for 'addr_data' +include/media/v4l2-i2c-drv-legacy.h:37: error: previous declaration of 'addr_data' was here + +Cc: Jean Delvare <khali@linux-fr.org> +Signed-off-by: Andrew Morton <akpm@linux-foundation.org> +--- + + include/media/v4l2-i2c-drv-legacy.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff -puN include/media/v4l2-i2c-drv-legacy.h~fix-jdelvare-i2c-i2c-constify-client-address-data include/media/v4l2-i2c-drv-legacy.h +--- a/include/media/v4l2-i2c-drv-legacy.h~fix-jdelvare-i2c-i2c-constify-client-address-data ++++ a/include/media/v4l2-i2c-drv-legacy.h +@@ -34,7 +34,7 @@ struct v4l2_i2c_driver_data { + }; + + static struct v4l2_i2c_driver_data v4l2_i2c_data; +-static struct i2c_client_address_data addr_data; ++static const struct i2c_client_address_data addr_data; + static struct i2c_driver v4l2_i2c_driver_legacy; + static char v4l2_i2c_drv_name_legacy[32]; + +_ |