| 1 |
nerdboy 08/05/04 01:07:37 |
| 2 |
|
| 3 |
Modified: ChangeLog grass-6.2.3.ebuild |
| 4 |
Log: |
| 5 |
updated for changed include path in latest ffmpeg |
| 6 |
(Portage version: 2.1.5_rc6) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.52 sci-geosciences/grass/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/ChangeLog?rev=1.52&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/ChangeLog?rev=1.52&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/ChangeLog?r1=1.51&r2=1.52 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v |
| 18 |
retrieving revision 1.51 |
| 19 |
retrieving revision 1.52 |
| 20 |
diff -u -r1.51 -r1.52 |
| 21 |
--- ChangeLog 1 May 2008 05:19:47 -0000 1.51 |
| 22 |
+++ ChangeLog 4 May 2008 01:07:37 -0000 1.52 |
| 23 |
@@ -1,6 +1,11 @@ |
| 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.51 2008/05/01 05:19:47 nerdboy Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.52 2008/05/04 01:07:37 nerdboy Exp $ |
| 28 |
+ |
| 29 |
+ 04 May 2008; Steve Arnold <nerdboy@g.o> grass-6.2.3.ebuild: |
| 30 |
+ Updated for changed include path in latest ffmpeg. Still needs testing, |
| 31 |
+ but it builds and runs; so far I've only found avcodec included in the |
| 32 |
+ source. |
| 33 |
|
| 34 |
*grass-6.2.3 (01 May 2008) |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.3 sci-geosciences/grass/grass-6.2.3.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/grass-6.2.3.ebuild?rev=1.3&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/grass-6.2.3.ebuild?rev=1.3&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/grass/grass-6.2.3.ebuild?r1=1.2&r2=1.3 |
| 44 |
|
| 45 |
Index: grass-6.2.3.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.3.ebuild,v |
| 48 |
retrieving revision 1.2 |
| 49 |
retrieving revision 1.3 |
| 50 |
diff -u -r1.2 -r1.3 |
| 51 |
--- grass-6.2.3.ebuild 1 May 2008 16:37:40 -0000 1.2 |
| 52 |
+++ grass-6.2.3.ebuild 4 May 2008 01:07:37 -0000 1.3 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2008 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.3.ebuild,v 1.2 2008/05/01 16:37:40 mr_bones_ Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.3.ebuild,v 1.3 2008/05/04 01:07:37 nerdboy Exp $ |
| 58 |
|
| 59 |
inherit eutils autotools fdo-mime versionator |
| 60 |
|
| 61 |
@@ -33,7 +33,7 @@ |
| 62 |
sys-apps/man-db ) |
| 63 |
sci-libs/gdal |
| 64 |
>=sci-libs/proj-4.4.7 |
| 65 |
- ffmpeg? ( media-video/ffmpeg ) |
| 66 |
+ ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 ) |
| 67 |
fftw? ( sci-libs/fftw ) |
| 68 |
gmath? ( virtual/blas |
| 69 |
virtual/lapack ) |
| 70 |
@@ -105,6 +105,15 @@ |
| 71 |
ewarn "GRASS OpenGL support needs X (will also pull in Tcl/Tk)." |
| 72 |
die "Please set the X useflag." |
| 73 |
fi |
| 74 |
+ |
| 75 |
+ if use ffmpeg; then |
| 76 |
+ ewarn "This version requires the newest ffmpeg, which is a major" |
| 77 |
+ ewarn "ABI change (and may break things). You should definitely" |
| 78 |
+ ewarn "rebuild everything that uses ffmpeg if you haven't already" |
| 79 |
+ ewarn "done so, and be prepared for possible breakage..." |
| 80 |
+ ewarn "Hit Ctrl-C now if you're not ready to do this." |
| 81 |
+ epause 10 |
| 82 |
+ fi |
| 83 |
} |
| 84 |
|
| 85 |
src_unpack() { |
| 86 |
@@ -151,7 +160,8 @@ |
| 87 |
fi |
| 88 |
|
| 89 |
if use ffmpeg; then |
| 90 |
- myconf="${myconf} --with-ffmpeg --with-ffmpeg-includes=/usr/include/ffmpeg \ |
| 91 |
+ myconf="${myconf} --with-ffmpeg \ |
| 92 |
+ --with-ffmpeg-includes=/usr/include/libavcodec \ |
| 93 |
--with-ffmpeg-libs=/usr/$(get_libdir)" |
| 94 |
else |
| 95 |
myconf="${myconf} --without-ffmpeg" |
| 96 |
@@ -201,7 +211,7 @@ |
| 97 |
PREFIX="${D}"usr INST_DIR="${D}"usr/${MY_PM} \ |
| 98 |
|| die "make install failed!" |
| 99 |
|
| 100 |
- # |
| 101 |
+ # get rid of DESTDIR in script path |
| 102 |
sed -i -e "s@${D}@/@" "${D}"usr/bin/${MY_PM} |
| 103 |
|
| 104 |
# Grass Extension Manager conflicts with ruby gems |
| 105 |
|
| 106 |
|
| 107 |
|
| 108 |
-- |
| 109 |
gentoo-commits@l.g.o mailing list |
Archives