| 1 |
ssuominen 11/03/31 07:46:45 |
| 2 |
|
| 3 |
Modified: ChangeLog psimedia-1.0.3.ebuild |
| 4 |
psimedia-1.0.3-r1.ebuild |
| 5 |
Log: |
| 6 |
Remove support for V4L v1 because linux-headers-2.6.38 stopped shipping linux/videodev.h. |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.16 net-im/psimedia/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psimedia/ChangeLog?rev=1.16&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psimedia/ChangeLog?rev=1.16&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psimedia/ChangeLog?r1=1.15&r2=1.16 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/net-im/psimedia/ChangeLog,v |
| 20 |
retrieving revision 1.15 |
| 21 |
retrieving revision 1.16 |
| 22 |
diff -u -r1.15 -r1.16 |
| 23 |
--- ChangeLog 1 Feb 2011 06:34:35 -0000 1.15 |
| 24 |
+++ ChangeLog 31 Mar 2011 07:46:45 -0000 1.16 |
| 25 |
@@ -1,6 +1,11 @@ |
| 26 |
# ChangeLog for net-im/psimedia |
| 27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/psimedia/ChangeLog,v 1.15 2011/02/01 06:34:35 pva Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/psimedia/ChangeLog,v 1.16 2011/03/31 07:46:45 ssuominen Exp $ |
| 30 |
+ |
| 31 |
+ 31 Mar 2011; Samuli Suominen <ssuominen@g.o> psimedia-1.0.3-r1.ebuild, |
| 32 |
+ +files/psimedia-1.0.3-linux-headers-2.6.38.patch: |
| 33 |
+ Remove support for V4L v1 because linux-headers-2.6.38 stopped shipping |
| 34 |
+ linux/videodev.h. |
| 35 |
|
| 36 |
*psimedia-1.0.3-r1 (01 Feb 2011) |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
|
| 41 |
1.11 net-im/psimedia/psimedia-1.0.3.ebuild |
| 42 |
|
| 43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psimedia/psimedia-1.0.3.ebuild?rev=1.11&view=markup |
| 44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psimedia/psimedia-1.0.3.ebuild?rev=1.11&content-type=text/plain |
| 45 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psimedia/psimedia-1.0.3.ebuild?r1=1.10&r2=1.11 |
| 46 |
|
| 47 |
Index: psimedia-1.0.3.ebuild |
| 48 |
=================================================================== |
| 49 |
RCS file: /var/cvsroot/gentoo-x86/net-im/psimedia/psimedia-1.0.3.ebuild,v |
| 50 |
retrieving revision 1.10 |
| 51 |
retrieving revision 1.11 |
| 52 |
diff -u -r1.10 -r1.11 |
| 53 |
--- psimedia-1.0.3.ebuild 6 Nov 2010 19:04:49 -0000 1.10 |
| 54 |
+++ psimedia-1.0.3.ebuild 31 Mar 2011 07:46:45 -0000 1.11 |
| 55 |
@@ -1,6 +1,6 @@ |
| 56 |
-# Copyright 1999-2010 Gentoo Foundation |
| 57 |
+# Copyright 1999-2011 Gentoo Foundation |
| 58 |
# Distributed under the terms of the GNU General Public License v2 |
| 59 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/psimedia/psimedia-1.0.3.ebuild,v 1.10 2010/11/06 19:04:49 halcy0n Exp $ |
| 60 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/psimedia/psimedia-1.0.3.ebuild,v 1.11 2011/03/31 07:46:45 ssuominen Exp $ |
| 61 |
|
| 62 |
EAPI="2" |
| 63 |
|
| 64 |
@@ -30,7 +30,6 @@ |
| 65 |
>=media-plugins/gst-plugins-theora-0.10.22 |
| 66 |
>=media-plugins/gst-plugins-alsa-0.10.22 |
| 67 |
>=media-plugins/gst-plugins-ogg-0.10.22 |
| 68 |
- >=media-plugins/gst-plugins-v4l-0.10.22 |
| 69 |
media-plugins/gst-plugins-v4l2 |
| 70 |
media-plugins/gst-plugins-jpeg |
| 71 |
!<net-im/psi-0.13_rc1 |
| 72 |
|
| 73 |
|
| 74 |
|
| 75 |
1.3 net-im/psimedia/psimedia-1.0.3-r1.ebuild |
| 76 |
|
| 77 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psimedia/psimedia-1.0.3-r1.ebuild?rev=1.3&view=markup |
| 78 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psimedia/psimedia-1.0.3-r1.ebuild?rev=1.3&content-type=text/plain |
| 79 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/psimedia/psimedia-1.0.3-r1.ebuild?r1=1.2&r2=1.3 |
| 80 |
|
| 81 |
Index: psimedia-1.0.3-r1.ebuild |
| 82 |
=================================================================== |
| 83 |
RCS file: /var/cvsroot/gentoo-x86/net-im/psimedia/psimedia-1.0.3-r1.ebuild,v |
| 84 |
retrieving revision 1.2 |
| 85 |
retrieving revision 1.3 |
| 86 |
diff -u -r1.2 -r1.3 |
| 87 |
--- psimedia-1.0.3-r1.ebuild 4 Feb 2011 21:23:55 -0000 1.2 |
| 88 |
+++ psimedia-1.0.3-r1.ebuild 31 Mar 2011 07:46:45 -0000 1.3 |
| 89 |
@@ -1,6 +1,6 @@ |
| 90 |
# Copyright 1999-2011 Gentoo Foundation |
| 91 |
# Distributed under the terms of the GNU General Public License v2 |
| 92 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/psimedia/psimedia-1.0.3-r1.ebuild,v 1.2 2011/02/04 21:23:55 mr_bones_ Exp $ |
| 93 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/psimedia/psimedia-1.0.3-r1.ebuild,v 1.3 2011/03/31 07:46:45 ssuominen Exp $ |
| 94 |
|
| 95 |
EAPI="2" |
| 96 |
|
| 97 |
@@ -29,7 +29,6 @@ |
| 98 |
>=media-plugins/gst-plugins-theora-0.10.22 |
| 99 |
>=media-plugins/gst-plugins-alsa-0.10.22 |
| 100 |
>=media-plugins/gst-plugins-ogg-0.10.22 |
| 101 |
- >=media-plugins/gst-plugins-v4l-0.10.22 |
| 102 |
media-plugins/gst-plugins-v4l2 |
| 103 |
media-plugins/gst-plugins-jpeg |
| 104 |
!<net-im/psi-0.13_rc1 |
| 105 |
@@ -42,6 +41,8 @@ |
| 106 |
sed -e '/^TEMPLATE/a CONFIG += ordered' -i psimedia.pro || die |
| 107 |
# Don't build demo if we don't need that. |
| 108 |
use demo || { sed -e '/^SUBDIRS[[:space:]]*+=[[:space:]]*demo[[:space:]]*$/d;' -i psimedia.pro || die; } |
| 109 |
+ # Remove support for V4L v1 because linux-headers-2.6.38 stopped shipping linux/videodev.h. |
| 110 |
+ epatch "${FILESDIR}"/${P}-linux-headers-2.6.38.patch |
| 111 |
} |
| 112 |
|
| 113 |
src_configure() { |
Archives