diff options
author | 2009-11-15 13:06:08 +0000 | |
---|---|---|
committer | 2009-11-15 13:06:08 +0000 | |
commit | b285ba6b35ba3d79e5bf1693441fed6912c597f5 (patch) | |
tree | 989bc3882d1be9d844054b5fc8af7809eb440548 /media-video/qc-usb-messenger | |
parent | Version bump (diff) | |
download | gentoo-2-b285ba6b35ba3d79e5bf1693441fed6912c597f5.tar.gz gentoo-2-b285ba6b35ba3d79e5bf1693441fed6912c597f5.tar.bz2 gentoo-2-b285ba6b35ba3d79e5bf1693441fed6912c597f5.zip |
Remove package masked for removal
Diffstat (limited to 'media-video/qc-usb-messenger')
10 files changed, 0 insertions, 698 deletions
diff --git a/media-video/qc-usb-messenger/ChangeLog b/media-video/qc-usb-messenger/ChangeLog deleted file mode 100644 index 2f37f9041502..000000000000 --- a/media-video/qc-usb-messenger/ChangeLog +++ /dev/null @@ -1,119 +0,0 @@ -# ChangeLog for media-video/qc-usb-messenger -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/qc-usb-messenger/ChangeLog,v 1.23 2009/10/25 17:12:47 tove Exp $ - - 25 Oct 2009; Torsten Veller <tove@gentoo.org> metadata.xml: - Remove coldwind from metadata.xml (#181764) - -*qc-usb-messenger-1.8-r3 (30 Sep 2009) - - 30 Sep 2009; Samuli Suominen <ssuominen@gentoo.org> - +qc-usb-messenger-1.8-r3.ebuild, - +files/qc-usb-messenger-1.8-kcompat-2.6.30.patch: - Fix building with >= 2.6.30 wrt #277605, thanks to Stijn Tintel for - reporting and patch. - - 10 Jan 2009; Markus Meier <maekke@gentoo.org> - qc-usb-messenger-1.8-r2.ebuild: - amd64/x86 stable, bug #252849 - - 09 Jan 2009; Santiago M. Mola <coldwind@gentoo.org> - qc-usb-messenger-1.8-r2.ebuild: - Added ~ppc keyword wrt bug #245585. - -*qc-usb-messenger-1.8-r2 (09 Jan 2009) - - 09 Jan 2009; Santiago M. Mola <coldwind@gentoo.org> - +files/qc-usb-messenger-1.8-kcompat-2.6.28.patch, - +files/qc-usb-messenger-1.8-ppc.patch, +qc-usb-messenger-1.8-r2.ebuild: - Fix compatibility with linux 2.6.28 (bug #252849) and fix Makefile to - support ppc and ppc64 (not keyworded though, bug #245585). Thanks to - Thomas Juergues <thomas@sokrates.homelinux.net> for both patches. - - 25 Dec 2008; Markus Meier <maekke@gentoo.org> - qc-usb-messenger-1.8-r1.ebuild: - x86 stable, bug #245581 - - 25 Dec 2008; Thomas Anderson <gentoofan23@gentoo.org> - qc-usb-messenger-1.8-r1.ebuild: - stable amd64, bug 245581 - -*qc-usb-messenger-1.8-r1 (10 Dec 2008) - - 10 Dec 2008; <ssuominen@gentoo.org> - +files/qc-usb-messenger-1.8-kcompat-2.6.27.patch, - +qc-usb-messenger-1.8-r1.ebuild: - Apply 2.6.27 compat patch from bug #245581, thanks to Thomas Juerges. - - 13 Nov 2008; Torsten Veller <tove@gentoo.org> qc-usb-messenger-1.8.ebuild: - x86 stable (#245688) - - 05 Nov 2008; Santiago M. Mola <coldwind@gentoo.org> - qc-usb-messenger-1.8.ebuild: - amd64 stable wrt bug #245688 - - 02 Nov 2008; Santiago M. Mola <coldwind@gentoo.org> - qc-usb-messenger-1.8.ebuild: - Restore the qc-usb block at the moment. - -*qc-usb-messenger-1.8 (02 Nov 2008) - - 02 Nov 2008; Santiago M. Mola <coldwind@gentoo.org> - +files/qc-usb-messenger-1.8-kcompat-2.6.26.patch, - +qc-usb-messenger-1.8.ebuild: - Version bump, fix kernel 2.6.26 compatibility (bug #232700). Module is now - called qcmessenger. - - 08 Feb 2008; Torsten Veller <tove@gentoo.org> - qc-usb-messenger-1.7-r1.ebuild: - Stable on x86 - - 08 Feb 2008; Santiago M. Mola <coldwind@gentoo.org> - qc-usb-messenger-1.7-r1.ebuild: - amd64 stable - -*qc-usb-messenger-1.7-r1 (28 Jan 2008) - - 28 Jan 2008; Santiago M. Mola <coldwind@gentoo.org> - +files/qc-usb-messenger-1.7-2.6.24.patch, +qc-usb-messenger-1.7-r1.ebuild: - Patch for linux 2.6.24, thanks to Antonio Quartulli <www.quartulli.org> - #207696. - - 24 Jan 2008; <tove@gentoo.org> qc-usb-messenger-1.7.ebuild: - Stable on x86 (#207206) - - 23 Jan 2008; Samuli Suominen <drac@gentoo.org> - qc-usb-messenger-1.7.ebuild: - amd64 stable wrt #207206 - - 21 Oct 2007; Santiago M. Mola <coldwind@gentoo.org> metadata.xml: - Taking maintainership. - -*qc-usb-messenger-1.7 (21 Oct 2007) - - 21 Oct 2007; Samuli Suominen <drac@gentoo.org> - +qc-usb-messenger-1.7.ebuild: - Version bump. - -*qc-usb-messenger-1.6 (11 Jun 2007) - - 11 Jun 2007; Samuli Suominen <drac@gentoo.org> - +qc-usb-messenger-1.6.ebuild: - Version bump. - - 05 Feb 2007; Torsten Veller <tove@gentoo.org> qc-usb-messenger-1.5.ebuild: - Stable on x86. - - 10 Dec 2006; Matthias Schwarzott <zzam@gentoo.org> - qc-usb-messenger-1.5.ebuild: - Added depend to virtual/linux-sources and block against qc-usb. - -*qc-usb-messenger-1.5 (07 Dec 2006) - - 07 Dec 2006; Matthias Schwarzott <zzam@gentoo.org> - +files/qc-usb-messenger-2.6.19.patch, - +files/qc-usb-messenger-koutput.patch, +metadata.xml, - +qc-usb-messenger-1.5.ebuild: - Initial import of ebuild, based on qc-usb, modified and maintained by Samuli - Suominen <sasuomin@uusikaupunki.fi>. - diff --git a/media-video/qc-usb-messenger/Manifest b/media-video/qc-usb-messenger/Manifest deleted file mode 100644 index e692f0faf15b..000000000000 --- a/media-video/qc-usb-messenger/Manifest +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX qc-usb-messenger-1.8-kcompat-2.6.26.patch 12397 RMD160 5fa23ace7c3715e8d3a829e6e718891430351caf SHA1 c44e1c9264d8a36fb45d211e340bf27d3b39d55d SHA256 a3f045781b0e1af0b9c2efbe682ddac0980bdadcceb78e461462d2ca656da3ad -AUX qc-usb-messenger-1.8-kcompat-2.6.27.patch 1285 RMD160 ba8e3f92e763f6424ddaa0249b7627b15922007c SHA1 fd9ce481e20a31a4e6e213f15c00235635585698 SHA256 6fb7f717401943889d6d45c717a3eaef84c7d0f7cac0c0a767555985bdc93c59 -AUX qc-usb-messenger-1.8-kcompat-2.6.28.patch 4062 RMD160 97c120881806f4ad82968d345e06e3823ecc3b8d SHA1 708cbd8fe4dc5d3f3851d331c8b369d43d02a74b SHA256 13bb1cc6cc7b85916b924121b8c85bbcc815328bc93b0e9726fbb1e579d51a98 -AUX qc-usb-messenger-1.8-kcompat-2.6.30.patch 1147 RMD160 bfeb54c46f4d84fffe99cabcb3f1fdd35d8399eb SHA1 f9f0baace425802ace854f14c8263a60755f281c SHA256 a24ff8f9e7d3aaaaebbcb0e8e1256462e779ef4e58b5a55ca9ccbf2c4a5f8f68 -AUX qc-usb-messenger-1.8-ppc.patch 857 RMD160 b6cf8a184cdb3ea6f478202fccc24fd3257d57a4 SHA1 4acdccac7f139a72112729a9e3886f2ba9138cae SHA256 99a6dd740a1133e824a61aa347cdfb646cfc0f7a908226497813f0084e3f703f -AUX qc-usb-messenger-koutput.patch 2424 RMD160 8e061adb423e6a78900160c7f66fdf2fa9ced872 SHA1 a5cdd2e355bc89ae86b0f606b39bcfa00e36ec56 SHA256 ec6d308f351830f06bce785314a860424ce045e737c3bafddc9b8532f0a4e63f -DIST qc-usb-messenger-1.8.tar.gz 168690 RMD160 8fac7914045d894a5f405f793f833f1e65c30992 SHA1 6d357f79170b19c98f062102c401e00461db6da5 SHA256 70407c66d36f333dad3d8319424fe7cf0cc2faf7cba7292a387e634625e2662a -EBUILD qc-usb-messenger-1.8-r3.ebuild 1392 RMD160 94d360e2315df3b343086c5c85e9bd675c6fa7b5 SHA1 48addf64f58a799ef3b632905ba525a7461b5ed5 SHA256 65fb234506402d9d86a71949a4298f5117f165e74ad6c4556333405eaca9e1c4 -MISC ChangeLog 3976 RMD160 d3d39c6689ca14600189a770d83e6d819a264245 SHA1 8a754e5080e341d8e2cceb8fe8c2eb2b6235c483 SHA256 6e6ab150b38c1e2ef4a56c3b236e739a4b141cec32d0f0ac1b257375f3f8b9de -MISC metadata.xml 160 RMD160 a42d246e41349d4ad54c940dc210bac8b370e244 SHA1 91227a2bf9ff71606a0b47b3d05625fe2ffeecec SHA256 02d7eda2306ce32c363268db611d0ef0fc15356e1353a3be273de0d5c034cfff ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAkrkhxUACgkQV3J2n04EauxxXACg0VQNowZ5R4oomZFtkev/6ng/ -UFEAn0Vh5HAPpNJzQMsKl8OuFYrBFdrH -=i4ce ------END PGP SIGNATURE----- diff --git a/media-video/qc-usb-messenger/files/qc-usb-messenger-1.8-kcompat-2.6.26.patch b/media-video/qc-usb-messenger/files/qc-usb-messenger-1.8-kcompat-2.6.26.patch deleted file mode 100644 index 4813e6c1b328..000000000000 --- a/media-video/qc-usb-messenger/files/qc-usb-messenger-1.8-kcompat-2.6.26.patch +++ /dev/null @@ -1,256 +0,0 @@ ---- qc-usb-messenger-1.8/qc-memory.c 2006-11-05 06:36:51.000000000 +0000 -+++ qc-usb-messenger-1.8/qc-memory.c 2008-10-07 01:32:40.000000000 +0100 -@@ -81,12 +81,14 @@ - #define pte_offset(pmd,adr) pte_offset_map(pmd,adr) /* Emulation for a kernel using the new rmap-vm */ - #endif /* Fix by Michele Balistreri <brain87@gmx.net> */ - -+#if LINUX_VERSION_CODE>=KERNEL_VERSION(2,5,3) && LINUX_VERSION_CODE<KERNEL_VERSION(2,6,26) - #ifndef SetPageReserved - #define SetPageReserved(p) mem_map_reserve(p) - #endif - #ifndef ClearPageReserved - #define ClearPageReserved(p) mem_map_unreserve(p) - #endif -+#endif - /* }}} */ - - /* {{{ [fold] kvirt_to_pa(): obtain physical address from virtual address obtained by vmalloc() */ ---- qc-usb-messenger-1.8/qc-driver.c 2008-05-26 12:29:16.000000000 +0100 -+++ qc-usb-messenger-1.8/qc-driver.c 2008-10-07 01:07:48.000000000 +0100 -@@ -1616,7 +1616,7 @@ - fd->maxrawdatalen = 0; /* Hopefully stops all ongoing captures, might need locking though */ - wake_up(&fd->wq); - if (qcdebug&QC_DEBUGFRAME) PDEBUG("waiting=%i",fd->waiting); -- if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(%p) in qc_frame_exit() : %i", qc, sem_getcount(&qc->lock)); -+ if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(%p) in qc_frame_exit() : %i", qc, 0); - up(&qc->lock); /* The lock was down when entering this function */ - while (fd->waiting > 0) { - schedule(); -@@ -1627,7 +1627,7 @@ - } - #endif - } -- if (qcdebug&QC_DEBUGMUTEX) PDEBUG("down(%p) in qc_frame_exit() : %i", qc, sem_getcount(&qc->lock)); -+ if (qcdebug&QC_DEBUGMUTEX) PDEBUG("down(%p) in qc_frame_exit() : %i", qc, 0); - down(&qc->lock); - vfree(fd->rawdatabuf); - POISON(fd->rawdatabuf); -@@ -1656,14 +1656,14 @@ - /* Wait until the next frame is available */ - if (qcdebug&QC_DEBUGFRAME) PDEBUG("qc_frame_get/consume(qc=%p,tail=%i,head=%i)",qc,fd->tail,fd->head); - fd->waiting++; -- if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(%p) in qc_frame_get() : %i", qc, sem_getcount(&qc->lock)); -+ if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(%p) in qc_frame_get() : %i", qc, 0); - up(&qc->lock); /* Release lock while waiting */ - - ret = wait_event_interruptible(fd->wq, fd->head!=fd->tail || fd->exiting); //FIXME:What if we get -ERESTARTSYS? - if(ret == -ERESTARTSYS) { - PDEBUG("wait_event_interruptible() returned ERESTARTSYS"); - } -- if (qcdebug&QC_DEBUGMUTEX) PDEBUG("down(%p) in qc_frame_get() : %i", qc, sem_getcount(&qc->lock)); -+ if (qcdebug&QC_DEBUGMUTEX) PDEBUG("down(%p) in qc_frame_get() : %i", qc, 0); - down(&qc->lock); - if (!ret) { - if (!fd->exiting) { -@@ -2685,12 +2685,12 @@ - if (qcdebug&QC_DEBUGMUTEX) PDEBUG("MOD_INC_USE_COUNT in qc_v4l_open() : %i",GET_USE_COUNT(THIS_MODULE)); - MOD_INC_USE_COUNT; - -- if (qcdebug&QC_DEBUGMUTEX) PDEBUG("down_intr(quickcam_list) in qc_v4l_open() : %i", sem_getcount(&quickcam_list_lock)); -+ if (qcdebug&QC_DEBUGMUTEX) PDEBUG("down_intr(quickcam_list) in qc_v4l_open() : %i", 0); - - r = qc_lock(qc); - if (r<0) goto fail1; - -- if (qcdebug&QC_DEBUGMUTEX) PDEBUG("down_intr(%p) in qc_v4l_open() : %i", qc, sem_getcount(&qc->lock)); -+ if (qcdebug&QC_DEBUGMUTEX) PDEBUG("down_intr(%p) in qc_v4l_open() : %i", qc, 0); - if (down_interruptible(&qc->lock)) { - r = -ERESTARTSYS; - goto fail2; -@@ -2705,15 +2705,15 @@ - if (qcdebug&QC_DEBUGLOGIC) PDEBUG("First user, initializing"); - if ((r = qc_v4l_init(qc))<0) goto fail4; - } -- if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(%p) in qc_v4l_open() : %i",qc, sem_getcount(&qc->lock)); -+ if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(%p) in qc_v4l_open() : %i",qc, 0); - up(&qc->lock); - up(&quickcam_list_lock); - return 0; - - fail4: qc->users--; --fail3: if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(%p) in qc_v4l_open()=failed : %i",qc, sem_getcount(&qc->lock)); -+fail3: if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(%p) in qc_v4l_open()=failed : %i",qc, 0); - up(&qc->lock); --fail2: if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(quickcam_list) in qc_v4l_open()=failed : %i", sem_getcount(&qc->lock)); -+fail2: if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(quickcam_list) in qc_v4l_open()=failed : %i", 0); - up(&quickcam_list_lock); - fail1: if (qcdebug&QC_DEBUGMUTEX) PDEBUG("MOD_DEC_USE_COUNT in qc_v4l_open() : %i",GET_USE_COUNT(THIS_MODULE)); - MOD_DEC_USE_COUNT; -@@ -2747,9 +2747,9 @@ - #else - TEST_BUG_MSG(qc==NULL, "qc==NULL"); - #endif -- if (qcdebug&QC_DEBUGMUTEX) PDEBUG("down(quickcam_list) in qc_v4l_close() : %i", sem_getcount(&quickcam_list_lock)); -+ if (qcdebug&QC_DEBUGMUTEX) PDEBUG("down(quickcam_list) in qc_v4l_close() : %i", 0); - down(&quickcam_list_lock); /* Can not interrupt, we must success */ -- if (qcdebug&QC_DEBUGMUTEX) PDEBUG("down(%p) in qc_v4l_close() : %i", qc, sem_getcount(&qc->lock)); -+ if (qcdebug&QC_DEBUGMUTEX) PDEBUG("down(%p) in qc_v4l_close() : %i", qc, 0); - down(&qc->lock); /* Can not interrupt, we must success */ - qc->users--; - PDEBUG("close users=%i", qc->users); -@@ -2764,10 +2764,10 @@ - } - } - if (qc) { -- if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(%p) in qc_v4l_close() : %i", qc, sem_getcount(&qc->lock)); -+ if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(%p) in qc_v4l_close() : %i", qc, 0); - up(&qc->lock); - } -- if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(quickcam_list) in qc_v4l_close() : %i", sem_getcount(&quickcam_list_lock)); -+ if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(quickcam_list) in qc_v4l_close() : %i", 0); - up(&quickcam_list_lock); - if (qcdebug&QC_DEBUGMUTEX) PDEBUG("MOD_DEC_USE_COUNT in qc_v4l_close() : %i", GET_USE_COUNT(THIS_MODULE)); - MOD_DEC_USE_COUNT; -@@ -2801,7 +2801,7 @@ - PDEBUG("qc_read: no video_device available or no buffer attached :( EFAULT"); - return -EFAULT; - } -- if (qcdebug&QC_DEBUGMUTEX) PDEBUG("down_intr(%p) in qc_v4l_read() : %i", qc, sem_getcount(&qc->lock)); -+ if (qcdebug&QC_DEBUGMUTEX) PDEBUG("down_intr(%p) in qc_v4l_read() : %i", qc, 0); - if (down_interruptible(&qc->lock)) return -ERESTARTSYS; - if (!qc->connected) { - r = -ENODEV; -@@ -2823,7 +2823,7 @@ - } - r = count; - --fail: if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(%p) in qc_v4l_read() : %i", qc, sem_getcount(&qc->lock)); -+fail: if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(%p) in qc_v4l_read() : %i", qc, 0); - up(&qc->lock); - if (qcdebug&QC_DEBUGLOGIC || qcdebug&QC_DEBUGERRORS) if (r<0) PDEBUG("failed qc_v4l_read()=%i", (int)r); - return r; -@@ -2852,14 +2852,14 @@ - struct vm_area_struct *vma = NULL; - #endif - if (qcdebug&QC_DEBUGLOGIC || qcdebug&QC_DEBUGUSER) PDEBUG("qc_v4l_mmap(dev=%p,size=%li,qc=%p)",dev,size,qc); -- if (qcdebug&QC_DEBUGMUTEX) PDEBUG("down_intr(%p) in qc_v4l_mmap() : %i", qc, sem_getcount(&qc->lock)); -+ if (qcdebug&QC_DEBUGMUTEX) PDEBUG("down_intr(%p) in qc_v4l_mmap() : %i", qc, 0); - if (down_interruptible(&qc->lock)) return -ERESTARTSYS; - if (!qc->connected) { ret = -ENODEV; goto fail; } - frame_size = qc_capt_frameaddr(qc, &frame); - if (frame_size<0) { ret = frame_size; goto fail; } /* Should never happen */ - ret = qc_mm_remap(vma, frame, frame_size, start, size); - --fail: if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(%p) in qc_v4l_mmap() : %i", qc, sem_getcount(&qc->lock)); -+fail: if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(%p) in qc_v4l_mmap() : %i", qc, 0); - up(&qc->lock); - if (ret<0) if (qcdebug&QC_DEBUGLOGIC || qcdebug&QC_DEBUGERRORS) PDEBUG("failed qc_v4l_mmap()=%i",ret); - return ret; -@@ -2881,7 +2881,7 @@ - int i, retval = 0; - - if (qcdebug&QC_DEBUGLOGIC || qcdebug&QC_DEBUGUSER) PDEBUG("qc_v4l_ioctl(dev=%p,cmd=%u,arg=%p,qc=%p)",dev,cmd,argp,qc); -- if (qcdebug&QC_DEBUGMUTEX) PDEBUG("down_intr(%p) in qc_v4l_ioctl() : %i", qc, sem_getcount(&qc->lock)); -+ if (qcdebug&QC_DEBUGMUTEX) PDEBUG("down_intr(%p) in qc_v4l_ioctl() : %i", qc, 0); - if (down_interruptible(&qc->lock)) return -ERESTARTSYS; - if (!qc->connected) { - retval = -ENODEV; -@@ -3452,7 +3452,7 @@ - retval = -ENOIOCTLCMD; - break; - } --fail: if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(%p) in qc_v4l_ioctl() : %i", qc, sem_getcount(&qc->lock)); -+fail: if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(%p) in qc_v4l_ioctl() : %i", qc, 0); - up(&qc->lock); - if (retval<0) if (qcdebug&(QC_DEBUGLOGIC|QC_DEBUGUSER|QC_DEBUGERRORS)) PDEBUG("failed qc_v4l_ioctl()=%i",retval); - return retval; -@@ -3547,21 +3547,21 @@ - - /* Check if there is already a suitable quickcam struct that can be reused */ - reuse_qc = FALSE; -- if (qcdebug&QC_DEBUGMUTEX) PDEBUG("down_intr(quickcam_list_lock) in qc_usb_init() : %i", sem_getcount(&quickcam_list_lock)); -+ if (qcdebug&QC_DEBUGMUTEX) PDEBUG("down_intr(quickcam_list_lock) in qc_usb_init() : %i", 0); - if (down_interruptible(&quickcam_list_lock)) return NULL; - list_for_each_entry(qc, &quickcam_list, list) { - if (qc->dev != NULL) { - continue; /* quickcam_list_lock protects this test */ - } -- if (qcdebug&QC_DEBUGMUTEX) PDEBUG("down_intr(%p) in qc_usb_init() : %i",qc, sem_getcount(&qc->lock)); -+ if (qcdebug&QC_DEBUGMUTEX) PDEBUG("down_intr(%p) in qc_usb_init() : %i",qc, 0); - if (down_interruptible(&qc->lock)) { - /* Failed to lock the camera. Move on in the list, skipping this camera */ -- if (qcdebug&QC_DEBUGMUTEX) PDEBUG("failed locking the camera %p in qc_usb_init() : %i",qc,sem_getcount(&qc->lock)); -+ if (qcdebug&QC_DEBUGMUTEX) PDEBUG("failed locking the camera %p in qc_usb_init() : %i",qc,0); - continue; - } - if (qc->users<=0) { - PRINTK(KERN_NOTICE, "Unplugged unused camera detected!"); -- if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(%p) in qc_usb_init() : %i",qc, sem_getcount(&qc->lock)); -+ if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(%p) in qc_usb_init() : %i",qc, 0); - up(&qc->lock); - continue; - } -@@ -3662,7 +3662,7 @@ - #endif - /* Register input device for button */ - qc->input_ptr->name = "Quickcam snapshot button"; -- qc->input_ptr->private = qc; -+ //qc->input_ptr->private = qc; - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,24) - qc->input_ptr->evbit[0] = BIT_MASK(EV_KEY); - qc->input_ptr->keybit[BIT_WORD(BTN_0)] = BIT_MASK(BTN_0); -@@ -3769,9 +3769,9 @@ - qc_v4l_exit(qc); - #endif - -- if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(%p) in qc_usb_init() : %i",qc, sem_getcount(&qc->lock)); -+ if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(%p) in qc_usb_init() : %i",qc, 0); - up(&qc->lock); -- if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(quickcam_list) in qc_usb_init() : %i", sem_getcount(&quickcam_list_lock)); -+ if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(quickcam_list) in qc_usb_init() : %i", 0); - up(&quickcam_list_lock); - return qc; - -@@ -3781,14 +3781,14 @@ - fail2: - qc->dev = NULL; - qc->connected = FALSE; -- if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(%p) in qc_usb_init()=failed : %i",qc, sem_getcount(&qc->lock)); -+ if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(%p) in qc_usb_init()=failed : %i",qc, 0); - up(&qc->lock); - - if (!reuse_qc) { - kfree(qc); - } - fail1: if (qcdebug&QC_DEBUGLOGIC || qcdebug&QC_DEBUGERRORS) PDEBUG("failed qc_usb_init()=%i",r); -- if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(quickcam_list) in qc_usb_init()=failed : %i", sem_getcount(&quickcam_list_lock)); -+ if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(quickcam_list) in qc_usb_init()=failed : %i", 0); - up(&quickcam_list_lock); - return NULL; - } -@@ -4057,9 +4057,9 @@ - */ - qc->connected = FALSE; - -- if (qcdebug&QC_DEBUGMUTEX) PDEBUG("down(quickcam_list) in qc_usb_disconnect() : %i", sem_getcount(&quickcam_list_lock)); -+ if (qcdebug&QC_DEBUGMUTEX) PDEBUG("down(quickcam_list) in qc_usb_disconnect() : %i", 0); - down(&quickcam_list_lock); /* Also avoids race condition with open() */ -- if (qcdebug&QC_DEBUGMUTEX) PDEBUG("down(%p) in qc_usb_disconnect() : %i", qc, sem_getcount(&qc->lock)); -+ if (qcdebug&QC_DEBUGMUTEX) PDEBUG("down(%p) in qc_usb_disconnect() : %i", qc, 0); - down(&qc->lock); /* Can not interrupt, we must success */ - - if (qc->users <= 0) { -@@ -4072,11 +4072,11 @@ - qc_isoc_stop(qc); /* Unlink and free isochronous URBs */ - qc_int_exit(qc); - qc->dev = NULL; /* Must be set to NULL only after interrupts are guaranteed to be disabled! */ -- if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(%p) in qc_usb_disconnect() : %i",qc, sem_getcount(&qc->lock)); -+ if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(%p) in qc_usb_disconnect() : %i",qc, 0); - up(&qc->lock); - } - -- if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(quickcam_list) in qc_usb_disconnect() : %i", sem_getcount(&quickcam_list_lock)); -+ if (qcdebug&QC_DEBUGMUTEX) PDEBUG("up(quickcam_list) in qc_usb_disconnect() : %i", 0); - up(&quickcam_list_lock); - if (qcdebug&QC_DEBUGMUTEX) PDEBUG("MOD_DEC_USE_COUNT in qc_usb_disconnect() : %i",GET_USE_COUNT(THIS_MODULE)); - MOD_DEC_USE_COUNT; /* Release lock--if device is not open, module can be now freed */ diff --git a/media-video/qc-usb-messenger/files/qc-usb-messenger-1.8-kcompat-2.6.27.patch b/media-video/qc-usb-messenger/files/qc-usb-messenger-1.8-kcompat-2.6.27.patch deleted file mode 100644 index 9284800e0dce..000000000000 --- a/media-video/qc-usb-messenger/files/qc-usb-messenger-1.8-kcompat-2.6.27.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- qc-usb-messenger-1.8.org/qc-driver.c 2008-11-04 12:23:01.000000000 -0700 -+++ qc-usb-messenger-1.8/qc-driver.c 2008-11-04 12:52:24.000000000 -0700 -@@ -2895,7 +2895,11 @@ - if (qcdebug&QC_DEBUGUSER) PDEBUG("VIDIOCGCAP"); - memset(&b, 0, sizeof(b)); - strcpy(b.name, "Logitech QuickCam USB"); /* Max 31 characters */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27) -+ b.type = qc->vdev.vfl_type; -+#else - b.type = qc->vdev.type; -+#endif - b.channels = 1; - b.audios = 0; - b.maxwidth = qc->sensor_data.maxwidth; -@@ -3035,7 +3039,11 @@ - if (qcdebug&QC_DEBUGUSER) PDEBUG("VIDIOC_QUERYCAP"); - memset(&vc, 0, sizeof(vc)); - strcpy(vc.name, "Logitech QuickCam USB"); /* Max 31 characters */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27) -+ vc.type = qc->vdev.vfl_type; -+#else - vc.type = qc->vdev.type; -+#endif - vc.inputs = 1; - vc.outputs = 0; - vc.audios = 0; -@@ -3484,7 +3492,11 @@ - - static struct video_device qc_v4l_template = { - name: "QuickCam USB", -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27) -+ vfl_type: VID_TYPE_CAPTURE, // | VID_TYPE_SUBCAPTURE, -+#else - type: VID_TYPE_CAPTURE, // | VID_TYPE_SUBCAPTURE, -+#endif - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) - hardware: VID_HARDWARE_QCAM_USB, - #endif diff --git a/media-video/qc-usb-messenger/files/qc-usb-messenger-1.8-kcompat-2.6.28.patch b/media-video/qc-usb-messenger/files/qc-usb-messenger-1.8-kcompat-2.6.28.patch deleted file mode 100644 index 83bec2c5011a..000000000000 --- a/media-video/qc-usb-messenger/files/qc-usb-messenger-1.8-kcompat-2.6.28.patch +++ /dev/null @@ -1,114 +0,0 @@ -Source: Thomas Juerges <thomas@sokrates.homelinux.net> -Upstream: unknown -Reason: Linux 2.6.28 compatibility. http://bugs.gentoo.org/show_bug.cgi?id=252849 - ---- qc-usb-messenger-1.8.org/qc-driver.c 2008-12-28 11:40:18.000000000 -0700 -+++ qc-usb-messenger-1.8/qc-driver.c 2008-12-28 11:24:23.000000000 -0700 -@@ -2486,7 +2486,7 @@ - } - - if (qc->settings.adaptive && !qc->sensor_data.sensor->autoexposure && r>=0 && midvalue>=0) { -- int ex, gn; -+ int ex = 0, gn = 0; - qc_adapt(qc, midvalue, qc->vpic.brightness>>8, &ex, &gn); - qc->sensor_data.sensor->set_levels(qc, ex, gn, qc->vpic.hue, qc->vpic.colour); - if(qc->settings.shutteradapt) -@@ -2622,7 +2622,11 @@ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) - struct video_device *dev = video_devdata(file); - #endif -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) -+ struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev); -+#else - struct quickcam *qc = (struct quickcam *)dev->priv; -+#endif - struct qc_frame_data *fd = &qc->frame_data; - int mask; - -@@ -2674,7 +2678,11 @@ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) - struct video_device *dev = video_devdata(file); - #endif -- struct quickcam *qc = dev->priv; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) -+ struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev); -+#else -+ struct quickcam *qc = (struct quickcam *)dev->priv; -+#endif - int r; - - if (qcdebug&QC_DEBUGLOGIC || qcdebug&QC_DEBUGUSER) PDEBUG("qc_v4l_open(qc=%p)", qc); -@@ -2739,7 +2747,11 @@ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) - struct video_device *dev = video_devdata(file); - #endif -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) -+ struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev); -+#else - struct quickcam *qc = (struct quickcam *)dev->priv; -+#endif - if (qcdebug&QC_DEBUGLOGIC || qcdebug&QC_DEBUGUSER) PDEBUG("qc_v4l_close(dev=%p,qc=%p)",dev,qc); - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) -@@ -2788,7 +2800,11 @@ - struct video_device *dev = video_devdata(file); - int noblock = file->f_flags & O_NONBLOCK; - #endif -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) -+ struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev); -+#else - struct quickcam *qc = (struct quickcam *)dev->priv; -+#endif - int frame_len; - unsigned char *frame; - long r = 0; -@@ -2845,7 +2861,11 @@ - const void *start = (void *)vma->vm_start; - unsigned long size = vma->vm_end - vma->vm_start; - #endif -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) -+ struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev); -+#else - struct quickcam *qc = (struct quickcam *)dev->priv; -+#endif - unsigned char *frame; - int ret = 0, frame_size; - #if !HAVE_VMA && LINUX_VERSION_CODE<KERNEL_VERSION(2,6,0) -@@ -2877,7 +2897,11 @@ - struct video_device *dev = video_devdata(file); - void *argp = (void *)arg; - #endif -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) -+ struct quickcam *qc = (struct quickcam *)video_get_drvdata(dev); -+#else - struct quickcam *qc = (struct quickcam *)dev->priv; -+#endif - int i, retval = 0; - - if (qcdebug&QC_DEBUGLOGIC || qcdebug&QC_DEBUGUSER) PDEBUG("qc_v4l_ioctl(dev=%p,cmd=%u,arg=%p,qc=%p)",dev,cmd,argp,qc); -@@ -3688,8 +3712,12 @@ - qc->input_ptr->id.vendor = qc->dev->descriptor.idVendor; - qc->input_ptr->id.product = qc->dev->descriptor.idProduct; - qc->input_ptr->id.version = qc->dev->descriptor.bcdDevice; -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) -+ r = input_register_device(qc->input_ptr); -+ CHECK_ERROR(r != 0, fail2b, "qc_int_init input_register_device failed %d", r); -+#else - input_register_device(qc->input_ptr); -- -+#endif - *qc->input_event_path = '\0'; - usb_make_path(qc->dev, qc->input_physname, 56); - strcat(qc->input_physname, "/input0"); -@@ -3748,7 +3776,11 @@ - - /* Register V4L video device */ - memcpy(&qc->vdev, &qc_v4l_template, sizeof(qc_v4l_template)); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) -+ video_set_drvdata(&(qc->vdev), qc); -+#else - qc->vdev.priv = qc; -+#endif - - mb(); - r = video_register_device(&qc->vdev, VFL_TYPE_GRABBER, video_nr); diff --git a/media-video/qc-usb-messenger/files/qc-usb-messenger-1.8-kcompat-2.6.30.patch b/media-video/qc-usb-messenger/files/qc-usb-messenger-1.8-kcompat-2.6.30.patch deleted file mode 100644 index 4d908aa597b0..000000000000 --- a/media-video/qc-usb-messenger/files/qc-usb-messenger-1.8-kcompat-2.6.30.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Nurb qc-usb-messenger-1.8/qc-driver.c qc-usb-messenger-1.8-2.6.30/qc-driver.c ---- qc-usb-messenger-1.8/qc-driver.c 2009-07-10 22:14:56.065971478 +0200 -+++ qc-usb-messenger-1.8-2.6.30/qc-driver.c 2009-07-10 22:44:47.676535154 +0200 -@@ -1124,7 +1124,6 @@ - PRINTK(KERN_WARNING,"Could not register procfs file entry"); - return -ENXIO; - } -- entry->owner = THIS_MODULE; - entry->data = qc; - entry->read_proc = qc_proc_read; - entry->write_proc = qc_proc_write; -@@ -1137,7 +1136,6 @@ - PRINTK(KERN_WARNING,"Could not register procfs file entry"); - return -ENXIO; - } -- entry->owner = THIS_MODULE; - entry->data = qc; - entry->read_proc = qc_proc_button_read; - entry->write_proc = qc_proc_write; -@@ -1179,13 +1177,11 @@ - PRINTK(KERN_WARNING,"Could not register procfs dir entry"); - return -ENXIO; - } -- qc_proc_video_entry->owner = THIS_MODULE; - qc_proc_quickcam_entry = create_proc_entry(qc_proc_quickcam_name, S_IFDIR, qc_proc_video_entry); - if (!qc_proc_quickcam_entry) { - PRINTK(KERN_WARNING,"Could not register procfs dir entry"); - return -ENXIO; - } -- qc_proc_quickcam_entry->owner = THIS_MODULE; - return 0; - } - /* }}} */ diff --git a/media-video/qc-usb-messenger/files/qc-usb-messenger-1.8-ppc.patch b/media-video/qc-usb-messenger/files/qc-usb-messenger-1.8-ppc.patch deleted file mode 100644 index 6e270ada1b4b..000000000000 --- a/media-video/qc-usb-messenger/files/qc-usb-messenger-1.8-ppc.patch +++ /dev/null @@ -1,16 +0,0 @@ -Source: Written by Thomas Juerges <thomas@sokrates.homelinux.net>, thanks to Joseph Jezak <josejx@gentoo.org> - for the tip about ppc64. -Upstream: unknown -Reason: Support ppc and ppc64. https://bugs.gentoo.org/show_bug.cgi?id=245585 - ---- qc-usb-messenger-1.8/Makefile 2008-11-04 11:36:03.000000000 -0700 -+++ qc-usb-messenger-1.8.new/Makefile 2008-11-04 11:23:45.000000000 -0700 -@@ -70,7 +70,7 @@ - USER_OPT := $(USER_OPT) -DHAVE_UTSRELEASE_H=$(HAVE_UTSRELEASE_H) - endif - --ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/) -+ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/ppc64/powerpc/ -e s/ppc/powerpc/) - INSTALL := $(shell which install) - DEPMOD := $(shell which depmod || which /sbin/depmod || echo "true You should now run depmod") - diff --git a/media-video/qc-usb-messenger/files/qc-usb-messenger-koutput.patch b/media-video/qc-usb-messenger/files/qc-usb-messenger-koutput.patch deleted file mode 100644 index 7852a22a1cab..000000000000 --- a/media-video/qc-usb-messenger/files/qc-usb-messenger-koutput.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -ur qc-usb-messenger-1.5.orig/Makefile qc-usb-messenger-1.5/Makefile ---- qc-usb-messenger-1.5.orig/Makefile 2006-10-15 00:23:07.000000000 +0300 -+++ qc-usb-messenger-1.5/Makefile 2006-12-06 16:39:02.000000000 +0200 -@@ -44,11 +44,7 @@ - #RELEASE := $(shell awk -F \" '/[ ]*\#[ ]*define[ ]*UTS_RELEASE[ ]*/ { print $$2 }' $(LINUX_DIR)/include/linux/version.h|tail -n 1) - # This seem to work better - #LINUX_DIR := /usr/src/linux --RELEASE := $(shell if test -r $(LINUX_DIR)/include/linux/version.h && fgrep -q UTS_RELEASE $(LINUX_DIR)/include/linux/version.h; then \ -- ((echo "\#include <linux/version.h>" ; echo "kernsrcver=UTS_RELEASE") | cpp -I $(LINUX_DIR)/include | grep "^kernsrcver=" | cut -d \" -f 2); \ -- elif test -r $(LINUX_DIR)/include/linux/utsrelease.h && fgrep -q UTS_RELEASE $(LINUX_DIR)/include/linux/utsrelease.h; then \ -- ((echo "\#include <linux/utsrelease.h>"; echo "kernsrcver=UTS_RELEASE") | cpp -I $(LINUX_DIR)/include | grep "^kernsrcver=" | cut -d \" -f 2); \ -- fi) -+RELEASE := $(shell awk -F \" '/[ ]*\#[ ]*define[ ]*UTS_RELEASE[ ]*/ { print $$2 }' $(OUTPUT_DIR)/include/linux/version.h|tail -n 1) - MODULE_DIR := /lib/modules/$(RELEASE) - endif - endif -@@ -58,6 +54,10 @@ - LINUX_DIR := $(MODULE_DIR)/build - endif - -+ifndef OUTPUT_DIR -+OUTPUT_DIR := $(LINUX_DIR) -+endif -+ - HAVE_UTSRELEASE_H := $(shell if test -r $(LINUX_DIR)/include/linux/version.h && fgrep -q UTS_RELEASE $(LINUX_DIR)/include/linux/version.h; then \ - echo 0; \ - elif test -r $(LINUX_DIR)/include/linux/utsrelease.h && fgrep -q UTS_RELEASE $(LINUX_DIR)/include/linux/utsrelease.h; then \ -@@ -108,6 +108,7 @@ - @echo "Current configuration:" - @echo "Driver source directory (PWD): $(PWD)" - @echo "Kernel source directory (LINUX_DIR): $(LINUX_DIR)" -+ @echo "Kernel output directory (OUTPUT_DIR): $(OUTPUT_DIR)" - @echo "Module install directory (MODULE_DIR): $(MODULE_DIR)" - @echo "Utility install directory (PREFIX): $(PREFIX)" - @echo "User options (USER_OPT): $(USER_OPT)" -@@ -131,7 +132,7 @@ - else - # No, 2.4.x or older - --MODULE_INC := -I$(LINUX_DIR)/include -nostdinc -iwithprefix include -+MODULE_INC := -I$(LINUX_DIR)/include -I$(OUTPUT_DIR)/include -nostdinc -iwithprefix include - MODULE_DEF := -DMODULE -D__KERNEL__ -DNOKERNEL - MODULE_OPT := -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common - MODULE_WARN := -Wall -Wstrict-prototypes -Wno-trigraphs diff --git a/media-video/qc-usb-messenger/metadata.xml b/media-video/qc-usb-messenger/metadata.xml deleted file mode 100644 index 97966e6b61f9..000000000000 --- a/media-video/qc-usb-messenger/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>video</herd> -</pkgmetadata> diff --git a/media-video/qc-usb-messenger/qc-usb-messenger-1.8-r3.ebuild b/media-video/qc-usb-messenger/qc-usb-messenger-1.8-r3.ebuild deleted file mode 100644 index 2eb1703dd0ae..000000000000 --- a/media-video/qc-usb-messenger/qc-usb-messenger-1.8-r3.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/qc-usb-messenger/qc-usb-messenger-1.8-r3.ebuild,v 1.1 2009/09/30 17:52:36 ssuominen Exp $ - -inherit eutils linux-mod - -DESCRIPTION="Logitech USB Quickcam Express Messenger & Communicate Linux Driver Modules" -HOMEPAGE="http://home.mag.cx/messenger" -SRC_URI="http://home.mag.cx/messenger/source/${P}.tar.gz" - -IUSE="" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" - -CONFIG_CHECK="USB VIDEO_DEV VIDEO_V4L1_COMPAT" -MODULE_NAMES="qcmessenger(usb:)" -BUILD_TARGETS="all" - -DEPEND="virtual/linux-sources - !media-video/qc-usb" - -pkg_setup() { - ABI=${KERNEL_ABI} - linux-mod_pkg_setup - BUILD_PARAMS="LINUX_DIR=${KV_DIR} OUTPUT_DIR=${KV_OUT_DIR}" -} - -src_unpack() { - unpack ${A} - cd "${S}" - convert_to_m Makefile - epatch "${FILESDIR}"/${PN}-koutput.patch - epatch "${FILESDIR}"/${P}-kcompat-2.6.26.patch - epatch "${FILESDIR}"/${P}-kcompat-2.6.27.patch - epatch "${FILESDIR}"/${P}-kcompat-2.6.28.patch - epatch "${FILESDIR}"/${P}-kcompat-2.6.30.patch - epatch "${FILESDIR}"/${P}-ppc.patch -} - -src_install() { - linux-mod_src_install - - dobin qcset - dodoc README* APPLICATIONS CREDITS TODO FAQ _CHANGES_MESSENGER _README_MESSENGER - - insinto /usr/share/doc/${PF} - doins *.sh -} - -pkg_postinst() { - elog "QuickCam Messenger module is now called 'qcmessenger'." -} |