From 0fbea1d37256fdbe6e16d5d721ed27bd74050bef Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 12 Jul 2009 15:17:50 +0000 Subject: media-video/ov51x-jpeg: fixed for kernel >=.29 svn path=/sunrise/; revision=8801 --- media-video/ov51x-jpeg/ChangeLog | 9 ++- media-video/ov51x-jpeg/Manifest | 6 +- .../ov51x-jpeg/files/1.5.9-2.6.29_final.patch | 88 ++++++++++++++++++++++ .../ov51x-jpeg/files/1.5.9-kernel-messages.patch | 17 +++++ media-video/ov51x-jpeg/ov51x-jpeg-1.5.9-r1.ebuild | 31 ++++++++ media-video/ov51x-jpeg/ov51x-jpeg-1.5.9.ebuild | 26 ------- 6 files changed, 148 insertions(+), 29 deletions(-) create mode 100644 media-video/ov51x-jpeg/files/1.5.9-2.6.29_final.patch create mode 100644 media-video/ov51x-jpeg/files/1.5.9-kernel-messages.patch create mode 100644 media-video/ov51x-jpeg/ov51x-jpeg-1.5.9-r1.ebuild delete mode 100644 media-video/ov51x-jpeg/ov51x-jpeg-1.5.9.ebuild (limited to 'media-video') diff --git a/media-video/ov51x-jpeg/ChangeLog b/media-video/ov51x-jpeg/ChangeLog index 4894dbfb0..7a9daf3b7 100644 --- a/media-video/ov51x-jpeg/ChangeLog +++ b/media-video/ov51x-jpeg/ChangeLog @@ -1,7 +1,14 @@ # ChangeLog for media-video/ov51x-jpeg -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*ov51x-jpeg-1.5.9-r1 (12 Jul 2009) + + 12 Jul 2009; Justin Lecher (jlec) + -ov51x-jpeg-1.5.9.ebuild, +ov51x-jpeg-1.5.9-r1.ebuild: + added patch for kernel >=2.6.29 + stolen from arch linux + 09 Nov 2008; Davide Cendron (scen) -ov51x-jpeg-1.5.8.ebuild, +ov51x-jpeg-1.5.9.ebuild: Version bump diff --git a/media-video/ov51x-jpeg/Manifest b/media-video/ov51x-jpeg/Manifest index 792c22122..2e2ba07ff 100644 --- a/media-video/ov51x-jpeg/Manifest +++ b/media-video/ov51x-jpeg/Manifest @@ -1,4 +1,6 @@ +AUX 1.5.9-2.6.29_final.patch 2321 RMD160 e3cfdf0e48ab871b96e279133b6d2a98de27759e SHA1 bf6736aab9b89fb71d5dd38ab11039d512a2dd8b SHA256 5eb3ca66df5277c023c17ff7c86316e55c4d13e5a184c6e4f8963216384d996a +AUX 1.5.9-kernel-messages.patch 653 RMD160 dbc6eebe6b9594118071eef222cdcfee5c4d5928 SHA1 e8a47dd5798ee4e219df87c212e4d2ca3cb652ae SHA256 9f6a6dffa80a746ca3b190bafe44fc8dd394604628fd43777cd8a4b846954264 DIST ov51x-jpeg-1.5.9.tar.gz 88197 RMD160 878b02a8b807c34bb7141ea68a06ea3da18858c6 SHA1 ab039055707c9af10aa78ba75211c06374b13629 SHA256 d61b3d8ff49f7755119f5d28603dcc900eb4729953947f97b3cb5c4b48a77c8c -EBUILD ov51x-jpeg-1.5.9.ebuild 819 RMD160 7591bd9eab243b8133571bb6b330ad8ec0fcf561 SHA1 b2c2d87eb130c86b832858fb232e18025159231a SHA256 fb4f8f8d624fd5532048c22c3852b51b3340448cdc1d9d566001e5f7257e1be4 -MISC ChangeLog 1755 RMD160 61696ca848a5889c4501e70372839d391be14b60 SHA1 4fc9a32595aff1c90c5b02f044cdfb4cfa0cc1c0 SHA256 d60680ef64c0cb369a8be4164e30be1f6f498040aa1ab1a369034d9ebcd0ae40 +EBUILD ov51x-jpeg-1.5.9-r1.ebuild 921 RMD160 a22fe674e4d26baa9e29b05b0c60b9ff7dbfd653 SHA1 d99a21a697c437f1a6841bda57205493cc221e99 SHA256 b579796052224c8d4dd1bb134affa43db69d19da12089e00ae3834ce755f1c60 +MISC ChangeLog 1965 RMD160 c90577c8efdb0802d13d4eb978c4d517a242f762 SHA1 afadd0c20c081a7a5d94567949e394abcb9198c3 SHA256 511f7a3a3a8e0a2422ad858637aa5b5a28317a28ffa20750bf9f4a84a85f9714 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 diff --git a/media-video/ov51x-jpeg/files/1.5.9-2.6.29_final.patch b/media-video/ov51x-jpeg/files/1.5.9-2.6.29_final.patch new file mode 100644 index 000000000..7477c5e2b --- /dev/null +++ b/media-video/ov51x-jpeg/files/1.5.9-2.6.29_final.patch @@ -0,0 +1,88 @@ +--- ov51x-jpeg-1.5.9/ov51x-jpeg-core.c 2008-09-28 12:58:09.000000000 +0200 ++++ ov51x-jpeg-1.5.9/ov51x-jpeg-core.c.new 2009-05-31 18:19:39.000000000 +0200 +@@ -539,7 +539,7 @@ + + static struct file_operations ov511_control_fops = { + .ioctl = ov51x_control_ioctl, +-#ifdef CONFIG_COMPAT ++#if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) + .compat_ioctl = v4l_compat_ioctl32, + #endif + }; +@@ -5733,7 +5733,7 @@ + { + #else + static int +-ov51x_v4l1_open(struct inode *inode, struct file *file) ++ov51x_v4l1_open(struct file *file) + { + struct video_device *vdev = video_devdata(file); + #endif +@@ -5804,7 +5804,7 @@ + { + #else + static int +-ov51x_v4l1_close(struct inode *inode, struct file *file) ++ov51x_v4l1_close(struct file *file) + { + struct video_device *vdev = file->private_data; + #endif +@@ -5850,13 +5850,15 @@ + } + + /* Do not call this function directly! */ +-static int ++ + #ifdef OV511_OLD_V4L ++static int + ov51x_v4l1_ioctl_internal(struct usb_ov511 *ov, unsigned int cmd, + void *arg) + { + #else +-ov51x_v4l1_ioctl_internal(struct inode *inode, struct file *file, ++static long ++ov51x_v4l1_ioctl_internal(struct file *file, + unsigned int cmd, void *arg) + { + struct video_device *vdev = file->private_data; +@@ -6372,8 +6374,8 @@ + + #else /* If new V4L API */ + +-static int +-ov51x_v4l1_ioctl(struct inode *inode, struct file *file, ++static long ++ov51x_v4l1_ioctl(struct file *file, + unsigned int cmd, unsigned long arg) + { + struct video_device *vdev = file->private_data; +@@ -6383,7 +6385,7 @@ + if (down_interruptible(&ov->lock)) + return -EINTR; + +- rc = video_usercopy(inode, file, cmd, arg, ov51x_v4l1_ioctl_internal); ++ rc = video_usercopy(file, cmd, arg, ov51x_v4l1_ioctl_internal); + + up(&ov->lock); + return rc; +@@ -6624,17 +6626,17 @@ + + #else /* New V4L API */ + +-static struct file_operations ov511_fops = { ++static struct v4l2_file_operations ov511_fops = { + .owner = THIS_MODULE, + .open = ov51x_v4l1_open, + .release = ov51x_v4l1_close, + .read = ov51x_v4l1_read, + .mmap = ov51x_v4l1_mmap, + .ioctl = ov51x_v4l1_ioctl, +-#ifdef CONFIG_COMPAT ++#if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) + .compat_ioctl = v4l_compat_ioctl32, + #endif +- .llseek = no_llseek, ++// .llseek = no_llseek, + }; + + static struct video_device vdev_template = { diff --git a/media-video/ov51x-jpeg/files/1.5.9-kernel-messages.patch b/media-video/ov51x-jpeg/files/1.5.9-kernel-messages.patch new file mode 100644 index 000000000..e8b29f7a3 --- /dev/null +++ b/media-video/ov51x-jpeg/files/1.5.9-kernel-messages.patch @@ -0,0 +1,17 @@ +diff -Nur ov51x-jpeg-1.5.9-old/ov51x-jpeg.h ov51x-jpeg-1.5.9/ov51x-jpeg.h +--- ov51x-jpeg-1.5.9-old/ov51x-jpeg.h 2009-05-04 19:42:00.000000000 +0300 ++++ ov51x-jpeg-1.5.9/ov51x-jpeg.h 2009-05-04 19:43:01.000000000 +0300 +@@ -63,6 +63,12 @@ + #include + #endif + ++/* Add missing info and warn macros by hand for new kernels */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28) ++#define info(args...) printk(KERN_INFO KBUILD_MODNAME args) ++#define warn(args...) printk(KERN_WARNING KBUILD_MODNAME args) ++#endif ++ + /* --------------------------------- */ + /* DEFINES FOR OV511 AND OTHER CHIPS */ + /* --------------------------------- */ + diff --git a/media-video/ov51x-jpeg/ov51x-jpeg-1.5.9-r1.ebuild b/media-video/ov51x-jpeg/ov51x-jpeg-1.5.9-r1.ebuild new file mode 100644 index 000000000..8d07686f9 --- /dev/null +++ b/media-video/ov51x-jpeg/ov51x-jpeg-1.5.9-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit base linux-mod + +DESCRIPTION="OV51x driver for Linux which supports JPEG decompression inside the kernel" +HOMEPAGE="http://www.rastageeks.org/ov51x-jpeg/index.php/Main_Page" +SRC_URI="http://www.rastageeks.org/downloads/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +CONFIG_CHECK="USB VIDEO_V4L1_COMPAT" +ERROR_USB="${P} requires Host-side USB support (CONFIG_USB)." +ERROR_VIDEO_V4L1_COMPAT="${P} require support for the Video For Linux API 1 compatibility layer (CONFIG_VIDEO_V4L1_COMPAT)." +MODULE_NAMES="ov51x-jpeg(media/video:)" +BUILD_TARGETS="all" +BUILD_PARAMS="KERNELDIR=${KV_DIR}" + +PATCHES=( + "${FILESDIR}"/${PV}-kernel-messages.patch + "${FILESDIR}"/${PV}-2.6.29_final.patch + ) + +src_install() { + linux-mod_src_install + dodoc ChangeLog || die "dodoc failed" +} diff --git a/media-video/ov51x-jpeg/ov51x-jpeg-1.5.9.ebuild b/media-video/ov51x-jpeg/ov51x-jpeg-1.5.9.ebuild deleted file mode 100644 index 2e54b74d7..000000000 --- a/media-video/ov51x-jpeg/ov51x-jpeg-1.5.9.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit linux-mod - -DESCRIPTION="OV51x driver for Linux which supports JPEG decompression inside the kernel" -HOMEPAGE="http://www.rastageeks.org/ov51x-jpeg/index.php/Main_Page" -SRC_URI="http://www.rastageeks.org/downloads/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -CONFIG_CHECK="USB VIDEO_V4L1_COMPAT" -ERROR_USB="${P} requires Host-side USB support (CONFIG_USB)." -ERROR_VIDEO_V4L1_COMPAT="${P} require support for the Video For Linux API 1 compatibility layer (CONFIG_VIDEO_V4L1_COMPAT)." -MODULE_NAMES="ov51x-jpeg(media/video:)" -BUILD_TARGETS="all" -BUILD_PARAMS="KERNELDIR=${KV_DIR}" - -src_install() { - linux-mod_src_install - dodoc ChangeLog || die "dodoc failed" -} -- cgit v1.2.3-65-gdbad