diff options
| -rw-r--r-- | media-video/sampeg3/ChangeLog | 9 | ||||
| -rw-r--r-- | media-video/sampeg3/files/sampeg3-0.0.3-gcc4.patch | 27 | ||||
| -rw-r--r-- | media-video/sampeg3/metadata.xml | 2 | ||||
| -rw-r--r-- | media-video/sampeg3/sampeg3-0.0.3.ebuild | 37 |
4 files changed, 58 insertions, 17 deletions
diff --git a/media-video/sampeg3/ChangeLog b/media-video/sampeg3/ChangeLog index d43a18f09d44..a2656aca143a 100644 --- a/media-video/sampeg3/ChangeLog +++ b/media-video/sampeg3/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/sampeg3 -# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/sampeg3/ChangeLog,v 1.8 2005/09/10 15:43:16 flameeyes Exp $ +# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/sampeg3/ChangeLog,v 1.9 2006/03/07 17:15:53 flameeyes Exp $ + + 07 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> + +files/sampeg3-0.0.3-gcc4.patch, metadata.xml, sampeg3-0.0.3.ebuild: + Drop virtual/libc dependency, update to modular X, allow building with gcc4, + use econf instead of ./configure. 10 Sep 2005; Diego Pettenò <flameeyes@gentoo.org> sampeg3-0.0.3.ebuild: Don't install INSTALL file. diff --git a/media-video/sampeg3/files/sampeg3-0.0.3-gcc4.patch b/media-video/sampeg3/files/sampeg3-0.0.3-gcc4.patch new file mode 100644 index 000000000000..4484c9816ead --- /dev/null +++ b/media-video/sampeg3/files/sampeg3-0.0.3-gcc4.patch @@ -0,0 +1,27 @@ +Index: sampeg3-0.0.3/src/coding/dct/idctblk_fp_aan.hh +=================================================================== +--- sampeg3-0.0.3.orig/src/coding/dct/idctblk_fp_aan.hh ++++ sampeg3-0.0.3/src/coding/dct/idctblk_fp_aan.hh +@@ -50,6 +50,9 @@ + + #include "coding/dct/dctblk.hh" + ++#ifndef PI ++#define PI M_PI ++#endif + + template <class OutputType,int Low,int High> class IDCTBlk_AccurateFP + : public IDCTBlk<OutputType,Low,High> +Index: sampeg3-0.0.3/src/test/rdcurves.cc +=================================================================== +--- sampeg3-0.0.3.orig/src/test/rdcurves.cc ++++ sampeg3-0.0.3/src/test/rdcurves.cc +@@ -86,7 +86,7 @@ private: + static const int left = 3*28; + static const int top = 26*28; + static const double width=16*28; +- static const double height = width*3/4; ++ static const double height = (16*28)*3/4; + }; + + diff --git a/media-video/sampeg3/metadata.xml b/media-video/sampeg3/metadata.xml index 1cadc2e4ec21..edccfe5754d2 100644 --- a/media-video/sampeg3/metadata.xml +++ b/media-video/sampeg3/metadata.xml @@ -3,6 +3,6 @@ <pkgmetadata> <herd>video</herd> <maintainer> - <email>media-video@gentoo.org</email> +<email>media-video@gentoo.org</email> </maintainer> </pkgmetadata> diff --git a/media-video/sampeg3/sampeg3-0.0.3.ebuild b/media-video/sampeg3/sampeg3-0.0.3.ebuild index 8e61ac5f63e1..aeec81f789ff 100644 --- a/media-video/sampeg3/sampeg3-0.0.3.ebuild +++ b/media-video/sampeg3/sampeg3-0.0.3.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/sampeg3/sampeg3-0.0.3.ebuild,v 1.6 2005/09/10 15:43:16 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/sampeg3/sampeg3-0.0.3.ebuild,v 1.7 2006/03/07 17:15:53 flameeyes Exp $ + +inherit flag-o-matic DESCRIPTION="MPEG video encoder targeted for optimum picture quality" HOMEPAGE="http://rachmaninoff.informatik.uni-mannheim.de/sampeg/" @@ -13,20 +15,27 @@ KEYWORDS="~x86 ~ppc" IUSE="" -DEPEND="virtual/libc - sys-libs/zlib - >=media-libs/libvideogfx-1.0 +RDEPEND=">=media-libs/libvideogfx-1.0 media-libs/libpng media-libs/jpeg - virtual/x11" - -src_compile() { - ./configure \ - --host=${CHOST} \ - --prefix=/usr \ - --infodir=/usr/share/info \ - --mandir=/usr/share/man || die "./configure failed" - emake || die + || ( ( + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXv + ) virtual/x11 )" + +DEPEND="${RDEPEND} + || ( x11-libs/libXt virtual/x11 )" + +pkg_setup() { + append-flags -fpermissive +} + +src_unpack() { + unpack ${A} + cd ${S} + + epatch "${FILESDIR}/${P}-gcc4.patch" } src_install() { |