From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1LDYMh-0002np-9q for garchives@archives.gentoo.org; Fri, 19 Dec 2008 05:57:35 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AC2F2E037F; Fri, 19 Dec 2008 05:57:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 50FB5E037F for ; Fri, 19 Dec 2008 05:57:32 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 192EB6568F for ; Fri, 19 Dec 2008 05:57:30 +0000 (UTC) Received: from nerdboy by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1LDYMb-00083G-Nt for gentoo-commits@lists.gentoo.org; Fri, 19 Dec 2008 05:57:29 +0000 From: "Steve Arnold (nerdboy)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, nerdboy@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sci-geosciences/grass: grass-6.2.1.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: grass-6.2.1.ebuild ChangeLog X-VCS-Directories: sci-geosciences/grass X-VCS-Committer: nerdboy X-VCS-Committer-Name: Steve Arnold Content-Type: text/plain; charset=utf8 Message-Id: Sender: Steve Arnold Date: Fri, 19 Dec 2008 05:57:29 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 242ee87e-81f0-487b-b082-1c96692da695 X-Archives-Hash: b25c391e7012f54d192eadbab6fcfd46 nerdboy 08/12/19 05:57:29 Modified: grass-6.2.1.ebuild ChangeLog Log: Backported ffmpeg fixup and use flag cleanup (see bug #250850). (Portage version: 2.2_rc16/cvs/Linux 2.6.27.7 x86_64) Revision Changes Path 1.15 sci-geosciences/grass/grass-6.2.1.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/gr= ass/grass-6.2.1.ebuild?rev=3D1.15&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/gr= ass/grass-6.2.1.ebuild?rev=3D1.15&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/gr= ass/grass-6.2.1.ebuild?r1=3D1.14&r2=3D1.15 Index: grass-6.2.1.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.1.ebuil= d,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- grass-6.2.1.ebuild 14 Aug 2008 07:07:57 -0000 1.14 +++ grass-6.2.1.ebuild 19 Dec 2008 05:57:29 -0000 1.15 @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.1.ebu= ild,v 1.14 2008/08/14 07:07:57 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.2.1.ebu= ild,v 1.15 2008/12/19 05:57:29 nerdboy Exp $ =20 inherit eutils libtool =20 @@ -13,8 +13,8 @@ KEYWORDS=3D"amd64 ppc sparc x86" # To-do: get ppc64 gdal deps fixed up =20 -IUSE=3D"ffmpeg fftw glw gmath jpeg largefile motif mysql nls odbc opengl= png -postgres python readline sqlite tcl tk tiff truetype X" +IUSE=3D"ffmpeg fftw gmath jpeg largefile motif mysql nls odbc opengl png= \ +postgres python readline sqlite tiff truetype X" =20 RESTRICT=3D"strip" =20 @@ -26,9 +26,7 @@ sys-apps/man-db ) sci-libs/gdal >=3Dsci-libs/proj-4.4.7 - ffmpeg? ( =3Ddev-db/unixODBC-2.0.6 ) - opengl? ( ( virtual/opengl ) - glw? ( media-libs/mesa ) ) + opengl? ( virtual/opengl ) png? ( >=3Dmedia-libs/libpng-1.2.2 ) - postgres? ( >=3Dvirtual/postgresql-server-7.3 ) + postgres? ( >=3Dvirtual/postgresql-base-7.3 ) python? ( dev-lang/python ) readline? ( sys-libs/readline ) sqlite? ( dev-db/sqlite ) - tcl? ( >=3Ddev-lang/tcl-8.4 ) - tk? ( >=3Ddev-lang/tk-8.4 ) tiff? ( >=3Dmedia-libs/tiff-3.5.7 ) truetype? ( >=3Dmedia-libs/freetype-2.0 ) X? ( @@ -57,19 +52,19 @@ x11-libs/libICE x11-libs/libXpm x11-libs/libXaw + >=3Ddev-lang/tcl-8.4 + >=3Ddev-lang/tk-8.4 )" =20 DEPEND=3D"${RDEPEND} - >=3Dsys-devel/make-3.80 >=3Dsys-devel/flex-2.5.4a >=3Dsys-devel/bison-1.35 - >=3Dsys-devel/gcc-3.2.2 X? ( x11-proto/xproto x11-proto/xextproto )" =20 -src_unpack() { +pkg_setup() { local myblas if use gmath; then for d in $(eselect lapack show); do myblas=3D${d}; done @@ -88,61 +83,45 @@ fi fi =20 - if use glw && ! use opengl; then - ewarn "You set USE=3D'glw -opengl'. GLw support needs OpenGL." - ewarn "OpenGL support also requires Tcl and Tk support." - die "Set opengl, tcl, and tk useflags." - fi - - if use glw && ! built_with_use media-libs/mesa motif; then - ewarn "GRASS OpenGL support needs mesa with motif headers." - ewarn "Please rebuild mesa with motif support." - die "Re-emerge mesa with motif." - fi - - if use opengl && ! use {tcl,tk}; then - ewarn "GRASS OpenGL support needs both Tcl and Tk." - die "Please set tcl and tk useflags." - fi - - if use tcl && ! use tk; then - ewarn "You set USE=3D'tcl -tk'. GRASS needs both tcl and tk." - die "Set tk useflag." - fi - - if use tk && ! use tcl; then - ewarn "You set USE=3D'-tcl tk'. GRASS needs both tcl and tk." - die "Set tcl useflag." + if use opengl && ! use X; then + ewarn "GRASS OpenGL support needs X (will also pull in Tcl/Tk)." + die "Please set the X useflag." fi +} =20 - if use tcl && built_with_use dev-lang/tcl threads; then - ewarn "GRASS nviz will not work with Tcl compiled with threads!" - ewarn "Please disable either opengl or tcl threads." - die "Emerge TCL without threads." - fi - if use tk && built_with_use dev-lang/tk threads; then - ewarn "GRASS nviz will not work with Tk compiled with threads!" - ewarn "Please disable either opengl or tk threads." - die "Emerge tk without threads." - fi +src_unpack() { unpack ${A} cd "${S}" + use ffmpeg && epatch "${FILESDIR}"/${P}-ffmpeg-fix.patch + epatch "${FILESDIR}"/${P}-gcc43.patch epatch rpm/fedora/grass-readline.patch + elibtoolize + + # patch missing math functions (yes, this is still needed) + sed -i -e "s:\$(EXTRA_LIBS):\$(EXTRA_LIBS) \$(MATHLIB):g" include/Make/= Shlib.make + echo "MATHLIB=3D-lm" >> include/Make/Rules.make } =20 src_compile() { local myconf myconf=3D"--prefix=3D/usr --with-cxx --enable-shared \ --with-gdal=3D$(type -P gdal-config) --with-curses --with-proj \ - --with-proj-includes=3D/usr/include --with-proj-libs=3D/usr/lib \ - --with-proj-share=3D/usr/share/proj" - - if use tcl || use tk; then - myconf=3D"${myconf} --with-tcltk \ - --with-tcltk-includes=3D/usr/include \ - --with-tcltk-libs=3D/usr/$(get_libdir)/tcl8.4 --with-x" + --with-includes=3D/usr/include --with-libs=3D/usr/$(get_libdir) \ + --with-proj-includes=3D/usr/include \ + --with-proj-libs=3D/usr/$(get_libdir) \ + --with-proj-share=3D/usr/share/proj \ + --without-glw --without-wxwidgets" + if use X; then + if has_version ">=3Ddev-lang/tcl-8.5"; then + TCL_LIBDIR=3D"/usr/$(get_libdir)/tcl8.5" + else + TCL_LIBDIR=3D"/usr/$(get_libdir)/tcl8.4" + fi + myconf=3D"${myconf} --with-tcltk --with-x \ + --with-tcltk-includes=3D/usr/include \ + --with-tcltk-libs=3D${TCL_LIBDIR}" else myconf=3D"${myconf} --without-tcltk --without-x" fi @@ -150,28 +129,36 @@ if use opengl; then epatch "${FILESDIR}"/${P}-html-nviz-fix.patch myconf=3D"${myconf} --with-opengl --with-opengl-libs=3D/usr/$(get_l= ibdir)/opengl/xorg-x11/lib" - if use glw; then - myconf=3D"${myconf} --with-glw" - fi else epatch "${FILESDIR}"/${P}-html-nonviz.patch myconf=3D"${myconf} --without-opengl --without-glw" fi =20 + # Should handle either older or latest without intervention; + # this won't work forever, but it should be okay for a while... if use ffmpeg; then - myconf=3D"${myconf} --with-ffmpeg --with-ffmpeg-includes=3D/usr/includ= e/ffmpeg --with-ffmpeg-libs=3D/usr/lib" + myconf=3D"${myconf} --with-ffmpeg \ + --with-ffmpeg-libs=3D/usr/$(get_libdir)" + if has_version ">=3Dmedia-video/ffmpeg-0.4.9_p20080326" ; then + # must pass multiple include dirs now; if anyone has a better + # way to do this, please speak up and file a bug :) + myconf=3D"${myconf} --with-ffmpeg-includes=3D/usr/include/libav= *" + else + myconf=3D"${myconf} --with-ffmpeg-includes=3D/usr/include/ffmpeg" + fi else - myconf=3D"${myconf} --without-ffmpeg" + myconf=3D"${myconf} --without-ffmpeg" fi =20 if use truetype; then - myconf=3D"${myconf} --with-freetype --with-freetype-includes=3D/usr/in= clude/freetype2" + myconf=3D"${myconf} --with-freetype --with-freetype-includes=3D/usr= /include/freetype2" fi =20 if use mysql; then - myconf=3D"${myconf} --with-mysql --with-mysql-includes=3D/usr/include/= mysql --with-mysql-libs=3D/usr/$(get_libdir)/mysql" + myconf=3D"${myconf} --with-mysql --with-mysql-includes=3D/usr/inclu= de/mysql \ + --with-mysql-libs=3D/usr/$(get_libdir)/mysql" else - myconf=3D"${myconf} --without-mysql" + myconf=3D"${myconf} --without-mysql" fi =20 if use sqlite; then @@ -181,7 +168,7 @@ myconf=3D"${myconf} --without-sqlite" fi =20 - export LD_LIBRARY_PATH=3D"/${WORKDIR}/image/usr/${P}/$(get_libdir):${LD= _LIBRARY_PATH}" + #export LD_LIBRARY_PATH=3D"/${WORKDIR}/image/usr/${P}/$(get_libdir):${L= D_LIBRARY_PATH}" econf ${myconf} --with-libs=3D/usr/$(get_libdir) \ $(use_enable amd64 64bit) \ $(use_with fftw) \ @@ -194,11 +181,7 @@ $(use_with postgres) \ $(use_with python) \ $(use_with readline) \ - $(use_with tiff) \ - $(use_with tcl tcltk) || die "configure failed!" - # patch missing math functions - sed -i 's:EXTRA_LIBS=3D:EXTRA_LIBS=3D-lm :g' "${S}"/lib/gmath/Makefile - sed -i 's:EXTRA_LIBS =3D :EXTRA_LIBS =3D -lm :g' "${S}"/lib/gis/Makefil= e + $(use_with tiff) || die "configure failed!" =20 emake -j1 || die "emake failed!" } 1.66 sci-geosciences/grass/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/gr= ass/ChangeLog?rev=3D1.66&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/gr= ass/ChangeLog?rev=3D1.66&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/gr= ass/ChangeLog?r1=3D1.65&r2=3D1.66 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- ChangeLog 8 Nov 2008 22:19:39 -0000 1.65 +++ ChangeLog 19 Dec 2008 05:57:29 -0000 1.66 @@ -1,6 +1,12 @@ # ChangeLog for sci-geosciences/grass # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.6= 5 2008/11/08 22:19:39 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/ChangeLog,v 1.6= 6 2008/12/19 05:57:29 nerdboy Exp $ + + 19 Dec 2008; Steve Arnold + +files/grass-6.2.1-gcc43.patch, grass-6.2.1.ebuild: + Backported ffmpeg fixup and use flag cleanup (see bug #250850). Also=20 + added ggc 4.3 include patch. Still need postgres 8.3 pushed to stable + before Grass 6.3 can go stable. =20 08 Nov 2008; Steve Arnold metadata.xml, grass-6.3.0.ebuild: