diff options
| author |   Fabio Erculiani <lxnay@gentoo.org> | 2010-11-19 21:35:37 +0000 |
|---|---|---|
| committer | Fabio Erculiani <lxnay@gentoo.org> | 2010-11-19 21:35:37 +0000 |
| commit | 62114f60e5258663819362e019a8f42f83cd7a29 (patch) | |
| tree | e97dd2d52e546d469ba46fe48832954dfcaac602 /media-libs/svgalib | |
| parent | Port portpeek to use newer version of gentoolkit (diff) | |
| download | historical-62114f60e5258663819362e019a8f42f83cd7a29.tar.gz historical-62114f60e5258663819362e019a8f42f83cd7a29.tar.bz2 historical-62114f60e5258663819362e019a8f42f83cd7a29.zip | |
update 2.6.36 patch, close bug #346115
Package-Manager: portage-2.2_rc91/cvs/Linux x86_64
Diffstat (limited to 'media-libs/svgalib')
| -rw-r--r-- | media-libs/svgalib/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/svgalib/Manifest | 4 | ||||
| -rw-r--r-- | media-libs/svgalib/files/svgalib-1.9.25-linux2.6.36.patch | 12 |
3 files changed, 12 insertions, 10 deletions
diff --git a/media-libs/svgalib/ChangeLog b/media-libs/svgalib/ChangeLog index 061b26d6e3b2..415b02e50d6f 100644 --- a/media-libs/svgalib/ChangeLog +++ b/media-libs/svgalib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/svgalib # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.89 2010/11/05 16:31:23 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/ChangeLog,v 1.90 2010/11/19 21:35:37 lxnay Exp $ + + 19 Nov 2010; Fabio Erculiani <lxnay@gentoo.org> + files/svgalib-1.9.25-linux2.6.36.patch: + update 2.6.36 patch, close bug #346115 05 Nov 2010; Fabio Erculiani <lxnay@gentoo.org> svgalib-1.9.25-r1.ebuild, +files/svgalib-1.9.25-linux2.6.36.patch: diff --git a/media-libs/svgalib/Manifest b/media-libs/svgalib/Manifest index 4f05ae6aeaa3..5cc9e38a2f52 100644 --- a/media-libs/svgalib/Manifest +++ b/media-libs/svgalib/Manifest @@ -2,10 +2,10 @@ AUX svgalib-1.9.19-pic.patch 487 RMD160 5bd8935162cdfa55292e4fabfbec1515ad80a507 AUX svgalib-1.9.25-build.patch 2163 RMD160 70255c504d944e173a98604ffb96a8f1839301df SHA1 9f103dd569efc1e4eb7fd2937cbf6edb5f7c9f34 SHA256 f2d5033376e02f4424a7d6252dd442eb2f6b6a3834244d8830248b7c651da361 AUX svgalib-1.9.25-glibc210.patch 3842 RMD160 23210ad56b8f6491e43aa1e6ffe454272980c4ed SHA1 fd77a6ce10ed5bba54680cc73d81ab1f16ae0f40 SHA256 d8ac6b82406e9d85fbd7ce3f35ee94a3bb77b729352d62f51d51931c46a2a434 AUX svgalib-1.9.25-linux2.6.28.patch 1672 RMD160 6fb7b32d15c24f927d3d5566cdfacd70ecad212d SHA1 d578c12c05c6d2377972bb7a8f2164f2a9af2d79 SHA256 79e3b78faadc7fc4a0f965e8ce7564c0a391293105a5bcd88ce44a77543af512 -AUX svgalib-1.9.25-linux2.6.36.patch 1244 RMD160 adb3d2372760ba09b7ecc69b6d414bd72c43d102 SHA1 8c3b031846540a083bee656ed223f826c6647d8a SHA256 c2854484530e299472d0cd2be89cc0f27412091875346d755f72bcd619138441 +AUX svgalib-1.9.25-linux2.6.36.patch 1115 RMD160 d0b042e6a6c0d40818b95fc2306cbb84f710f514 SHA1 220a232db7a479487760dcc8b78d71c71dae058e SHA256 9d4094612b4ed221cabb20534c3caf9fe9efad2467962d788d6fb16b8c368a9f AUX svgalib-1.9.25-linux2.6.patch 9547 RMD160 64a9b66e455da08784f464cda70e250684873441 SHA1 eb5ffc6af7c68e51897ac01c37f538b23b6ac9d0 SHA256 553b4c81a87a9c584377cae2795849b5237ca07e6bf0bef5ffc00ebb0b9a1160 AUX svgalib.udev.rules.d.2 44 RMD160 55aa262f106cb98eabe3e6755222b5561da799cd SHA1 37892842ba2c7cb4d71f7e558a20a6dfa26c4204 SHA256 08973143b979ff88ff49701d7173cb6fb9661ea9c8f3911efc031435b648cc96 DIST svgalib-1.9.25.tar.gz 987084 RMD160 e987f65ddb5610c575183e4a2058423eab3ce1e4 SHA1 187b2156dde0e8f397b130d14cc35237386273d6 SHA256 2ad5da713a6bd69622c483de4e4f448ed2b82f7b954db43dc477d5b6b12d8602 EBUILD svgalib-1.9.25-r1.ebuild 3750 RMD160 13466b2678cf6ff980672b58da6de2542744c4f7 SHA1 9080efb029569ba0a116ce16f25a0708e466ac6b SHA256 1447fb46cb9395ab6e109b150d67d6de656ea46857c165f16db290f0704f178b -MISC ChangeLog 15567 RMD160 620d352a30fc614fb61d1c51d28a6c320f564f33 SHA1 10333ebee4f923d1d14136ad39f26a3e431c7140 SHA256 4f73f3f01b80828baada489203068070f63791ad061171c9f4180fce32949650 +MISC ChangeLog 15701 RMD160 ba164add96e10a78a7c5121114d8ebd54eb5f17f SHA1 2029436fb63fe7ccea117a781ea02890883ca1ce SHA256 25c03927bc05fde24e7d406b039147c619a4bfd702d12a754873fc89d35ae869 MISC metadata.xml 327 RMD160 82b751f314a739d78fae922e9512441322987acb SHA1 427ae2605a62cd5f6cb1dfff16cf4e8bb08ea860 SHA256 b72213ab9386fc2d7dcd5949e41ecdb64eba08bc6523701df5e442e148a53ac8 diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.36.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.36.patch index 33cf7e9b1417..eed935ebef4d 100644 --- a/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.36.patch +++ b/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.36.patch @@ -1,24 +1,22 @@ --- svgalib-1.9.25.orig/kernel/svgalib_helper/main.c +++ svgalib-1.9.25/kernel/svgalib_helper/main.c -@@ -162,10 +162,16 @@ static void task_startad(void *data) { - get_user(pciv.address, &user_pciv->address); \ +@@ -163,8 +163,15 @@ static void task_startad(void *data) { get_user(pciv.val, &user_pciv->val); #define PUT_PCIV \ -- put_user(pciv.val, &user_pciv->val); -+ put_user(pciv.val, &user_pciv->val); + put_user(pciv.val, &user_pciv->val); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36) static int svgalib_helper_ioctl( struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg) { +#else +static int svgalib_helper_ioctl(struct file *filp, + unsigned int cmd, unsigned long arg) { ++ ++ struct inode *inode=filp->f_dentry->d_inode; +#endif -+ struct inode *inode=filp->f_dentry->d_inode; io_t iov, *user_iov=(io_t *)arg; pcic_t pciv, *user_pciv=(pcic_t *)arg; - int minor = my_minor(inode->i_rdev); -@@ -595,7 +601,11 @@ struct file_operations svgalib_helper_fo +@@ -595,7 +602,11 @@ struct file_operations svgalib_helper_fo #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0) .owner = THIS_MODULE, #endif |