diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-12-27 17:34:43 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-12-27 17:34:43 +0000 |
| commit | fdd9995895fc742971a92aaabf31bb1496bc7e71 (patch) | |
| tree | c976d6650f36646b061183d1e827c564f0ff2dbe | |
| parent | Version bump (diff) | |
| download | gentoo-2-fdd9995895fc742971a92aaabf31bb1496bc7e71.tar.gz gentoo-2-fdd9995895fc742971a92aaabf31bb1496bc7e71.tar.bz2 gentoo-2-fdd9995895fc742971a92aaabf31bb1496bc7e71.zip | |
Respect user CFLAGS and install m4 into proper dir.
(Portage version: 2.1.2_rc4-r1)
| -rw-r--r-- | media-libs/libdvdnav/ChangeLog | 8 | ||||
| -rw-r--r-- | media-libs/libdvdnav/files/libdvdnav-0.1.10-build.patch | 29 | ||||
| -rw-r--r-- | media-libs/libdvdnav/libdvdnav-0.1.10.ebuild | 10 |
3 files changed, 44 insertions, 3 deletions
diff --git a/media-libs/libdvdnav/ChangeLog b/media-libs/libdvdnav/ChangeLog index cf44c798a741..f5bc7088c1f9 100644 --- a/media-libs/libdvdnav/ChangeLog +++ b/media-libs/libdvdnav/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libdvdnav -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/ChangeLog,v 1.34 2006/06/22 17:03:59 grobian Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/ChangeLog,v 1.35 2006/12/27 17:34:43 vapier Exp $ + + 27 Dec 2006; Mike Frysinger <vapier@gentoo.org> + +files/libdvdnav-0.1.10-build.patch, libdvdnav-0.1.10.ebuild: + Respect user CFLAGS and install m4 into proper dir. 22 Jun 2006; Fabian Groffen <grobian@gentoo.org> libdvdnav-0.1.10.ebuild: Marked ppc-macos stable (bug #111133) diff --git a/media-libs/libdvdnav/files/libdvdnav-0.1.10-build.patch b/media-libs/libdvdnav/files/libdvdnav-0.1.10-build.patch new file mode 100644 index 000000000000..9c0bdda9e206 --- /dev/null +++ b/media-libs/libdvdnav/files/libdvdnav-0.1.10-build.patch @@ -0,0 +1,29 @@ +Use CFLAGS from environment and make sure we install the .m4 into the +correct place regardless of whether `aclocal` is installed on the host. + +--- configure ++++ configure +@@ -21459,8 +21459,9 @@ + ;; + esac + +-CFLAGS="-O3 -Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE $CFLAGS" +-DEBUG_CFLAGS="-g -DDEBUG $CFLAGS" ++CFLAGS="$CFLAGS -Wall" ++CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE" ++DEBUG_CFLAGS="$CFLAGS -g -DDEBUG" + + + +--- m4/Makefile.in ++++ m4/Makefile.in +@@ -116,8 +116,7 @@ + + EXTRA_DIST = dvdnav.m4 + +-@INSTALL_M4_TRUE@m4datadir = @ACLOCAL_DIR@ +-@INSTALL_M4_FALSE@m4datadir = $(datadir)/aclocal ++m4datadir = $(datadir)/aclocal + + m4data_DATA = dvdnav.m4 + subdir = m4 diff --git a/media-libs/libdvdnav/libdvdnav-0.1.10.ebuild b/media-libs/libdvdnav/libdvdnav-0.1.10.ebuild index a2ebc25d5267..0373dcaf9044 100644 --- a/media-libs/libdvdnav/libdvdnav-0.1.10.ebuild +++ b/media-libs/libdvdnav/libdvdnav-0.1.10.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/libdvdnav-0.1.10.ebuild,v 1.15 2006/11/12 04:09:41 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/libdvdnav-0.1.10.ebuild,v 1.16 2006/12/27 17:34:43 vapier Exp $ + +inherit eutils DESCRIPTION="Library for DVD navigation tools" HOMEPAGE="http://sourceforge.net/projects/dvd/" @@ -14,6 +16,12 @@ IUSE="" RDEPEND="media-libs/libdvdread" DEPEND="${RDEPEND}" +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-build.patch +} + src_install () { emake DESTDIR="${D}" install || die dodoc AUTHORS NEWS README |