| 1 |
nerdboy 08/05/07 06:56:13 |
| 2 |
|
| 3 |
Modified: ChangeLog grass-6.2.3.ebuild |
| 4 |
Log: |
| 5 |
updated to handle either ffmpeg API, but not a permanent fix |
| 6 |
(Portage version: 2.1.5_rc6) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.54 sci-geosciences/grass/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/ChangeLog?rev=1.54&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/ChangeLog?rev=1.54&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/ChangeLog?r1=1.53&r2=1.54 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v |
| 18 |
retrieving revision 1.53 |
| 19 |
retrieving revision 1.54 |
| 20 |
diff -u -r1.53 -r1.54 |
| 21 |
--- ChangeLog 4 May 2008 01:14:07 -0000 1.53 |
| 22 |
+++ ChangeLog 7 May 2008 06:56:13 -0000 1.54 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for sci-geosciences/grass |
| 25 |
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.53 2008/05/04 01:14:07 nerdboy Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.54 2008/05/07 06:56:13 nerdboy Exp $ |
| 28 |
+ |
| 29 |
+ 07 May 2008; Steve Arnold <nerdboy@g.o> grass-6.2.3.ebuild: |
| 30 |
+ Updated to handle either ffmpeg API, but not a permanent fix; this should |
| 31 |
+ be reverted to the new interface once ffmpeg is unmasked and stable. |
| 32 |
|
| 33 |
04 May 2008; Steve Arnold <nerdboy@g.o> grass-6.2.1.ebuild: |
| 34 |
forced stable version to use the older ffmpeg |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.4 sci-geosciences/grass/grass-6.2.3.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/grass-6.2.3.ebuild?rev=1.4&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/grass-6.2.3.ebuild?rev=1.4&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/grass-6.2.3.ebuild?r1=1.3&r2=1.4 |
| 43 |
|
| 44 |
Index: grass-6.2.3.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.3.ebuild,v |
| 47 |
retrieving revision 1.3 |
| 48 |
retrieving revision 1.4 |
| 49 |
diff -u -r1.3 -r1.4 |
| 50 |
--- grass-6.2.3.ebuild 4 May 2008 01:07:37 -0000 1.3 |
| 51 |
+++ grass-6.2.3.ebuild 7 May 2008 06:56:13 -0000 1.4 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2008 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.3.ebuild,v 1.3 2008/05/04 01:07:37 nerdboy Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.3.ebuild,v 1.4 2008/05/07 06:56:13 nerdboy Exp $ |
| 57 |
|
| 58 |
inherit eutils autotools fdo-mime versionator |
| 59 |
|
| 60 |
@@ -33,7 +33,7 @@ |
| 61 |
sys-apps/man-db ) |
| 62 |
sci-libs/gdal |
| 63 |
>=sci-libs/proj-4.4.7 |
| 64 |
- ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 ) |
| 65 |
+ ffmpeg? ( media-video/ffmpeg ) |
| 66 |
fftw? ( sci-libs/fftw ) |
| 67 |
gmath? ( virtual/blas |
| 68 |
virtual/lapack ) |
| 69 |
@@ -105,15 +105,6 @@ |
| 70 |
ewarn "GRASS OpenGL support needs X (will also pull in Tcl/Tk)." |
| 71 |
die "Please set the X useflag." |
| 72 |
fi |
| 73 |
- |
| 74 |
- if use ffmpeg; then |
| 75 |
- ewarn "This version requires the newest ffmpeg, which is a major" |
| 76 |
- ewarn "ABI change (and may break things). You should definitely" |
| 77 |
- ewarn "rebuild everything that uses ffmpeg if you haven't already" |
| 78 |
- ewarn "done so, and be prepared for possible breakage..." |
| 79 |
- ewarn "Hit Ctrl-C now if you're not ready to do this." |
| 80 |
- epause 10 |
| 81 |
- fi |
| 82 |
} |
| 83 |
|
| 84 |
src_unpack() { |
| 85 |
@@ -159,10 +150,17 @@ |
| 86 |
myconf="${myconf} --without-opengl --without-glw" |
| 87 |
fi |
| 88 |
|
| 89 |
+ # Should handle either older or latest without intervention; |
| 90 |
+ # this won't work forever, but it should be okay for a while... |
| 91 |
if use ffmpeg; then |
| 92 |
- myconf="${myconf} --with-ffmpeg \ |
| 93 |
- --with-ffmpeg-includes=/usr/include/libavcodec \ |
| 94 |
- --with-ffmpeg-libs=/usr/$(get_libdir)" |
| 95 |
+ myconf="${myconf} --with-ffmpeg \ |
| 96 |
+ --with-ffmpeg-libs=/usr/$(get_libdir)" |
| 97 |
+ if has_version media-video/ffmpeg-0.4.9_p20080326 ; then |
| 98 |
+ myconf="${myconf} \ |
| 99 |
+ --with-ffmpeg-includes=/usr/include/libavcodec" |
| 100 |
+ else |
| 101 |
+ myconf="${myconf} --with-ffmpeg-includes=/usr/include/ffmpeg" |
| 102 |
+ fi |
| 103 |
else |
| 104 |
myconf="${myconf} --without-ffmpeg" |
| 105 |
fi |
| 106 |
|
| 107 |
|
| 108 |
|
| 109 |
-- |
| 110 |
gentoo-commits@l.g.o mailing list |
Archives