diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-11-17 14:58:25 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-11-17 14:58:25 +0000 |
| commit | 2aac4e312bfd6b546b6974461fce026c0fc67790 (patch) | |
| tree | ca105340e8f5230aa71a72a30bce5137264d7976 /media-libs/libdc1394 | |
| parent | fix build failure wrt #488716 (diff) | |
| download | gentoo-2-2aac4e312bfd6b546b6974461fce026c0fc67790.tar.gz gentoo-2-2aac4e312bfd6b546b6974461fce026c0fc67790.tar.bz2 gentoo-2-2aac4e312bfd6b546b6974461fce026c0fc67790.zip | |
fix out of source builds. bug #488716
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'media-libs/libdc1394')
| -rw-r--r-- | media-libs/libdc1394/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libdc1394/files/libdc1394-2.2.1-includes.patch | 29 | ||||
| -rw-r--r-- | media-libs/libdc1394/libdc1394-2.2.1.ebuild | 9 |
3 files changed, 39 insertions, 5 deletions
diff --git a/media-libs/libdc1394/ChangeLog b/media-libs/libdc1394/ChangeLog index 14a6c928659c..1dd4035f6871 100644 --- a/media-libs/libdc1394/ChangeLog +++ b/media-libs/libdc1394/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libdc1394 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/ChangeLog,v 1.71 2013/11/17 14:49:24 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/ChangeLog,v 1.72 2013/11/17 14:58:25 aballier Exp $ + + 17 Nov 2013; Alexis Ballier <aballier@gentoo.org> libdc1394-2.2.1.ebuild, + +files/libdc1394-2.2.1-includes.patch: + fix out of source builds. bug #488716 17 Nov 2013; Julian Ospald <hasufell@gentoo.org> libdc1394-2.2.1.ebuild: fix build failure wrt #488716 diff --git a/media-libs/libdc1394/files/libdc1394-2.2.1-includes.patch b/media-libs/libdc1394/files/libdc1394-2.2.1-includes.patch new file mode 100644 index 000000000000..db703e9c3718 --- /dev/null +++ b/media-libs/libdc1394/files/libdc1394-2.2.1-includes.patch @@ -0,0 +1,29 @@ +Fix out of source builds. +https://bugs.gentoo.org/show_bug.cgi?id=488716 + +Index: libdc1394-2.2.1/dc1394/juju/Makefile.am +=================================================================== +--- libdc1394-2.2.1.orig/dc1394/juju/Makefile.am ++++ libdc1394-2.2.1/dc1394/juju/Makefile.am +@@ -7,7 +7,7 @@ noinst_LTLIBRARIES = libdc1394-juju.la + pkgjujuinclude_HEADERS = + endif + +-AM_CFLAGS = -I$(top_srcdir)/dc1394 ++AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/dc1394 + libdc1394_juju_la_SOURCES = \ + control.c \ + capture.c \ +Index: libdc1394-2.2.1/dc1394/usb/Makefile.am +=================================================================== +--- libdc1394-2.2.1.orig/dc1394/usb/Makefile.am ++++ libdc1394-2.2.1/dc1394/usb/Makefile.am +@@ -7,7 +7,7 @@ noinst_LTLIBRARIES = libdc1394-usb.la + pkgusbinclude_HEADERS = + endif + +-AM_CFLAGS = -I$(top_srcdir)/dc1394 $(LIBUSB_CFLAGS) ++AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/dc1394 $(LIBUSB_CFLAGS) + libdc1394_usb_la_LIBADD = $(LIBUSB_LIBS) + libdc1394_usb_la_SOURCES = \ + control.c \ diff --git a/media-libs/libdc1394/libdc1394-2.2.1.ebuild b/media-libs/libdc1394/libdc1394-2.2.1.ebuild index b46f45c55eea..00efe6301180 100644 --- a/media-libs/libdc1394/libdc1394-2.2.1.ebuild +++ b/media-libs/libdc1394/libdc1394-2.2.1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-2.2.1.ebuild,v 1.2 2013/11/17 14:49:24 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-2.2.1.ebuild,v 1.3 2013/11/17 14:58:25 aballier Exp $ EAPI=5 -inherit multilib-minimal +inherit autotools eutils multilib-minimal DESCRIPTION="Library to interface with IEEE 1394 cameras following the IIDC specification" HOMEPAGE="http://sourceforge.net/projects/libdc1394/" @@ -22,7 +22,8 @@ DEPEND="${RDEPEND} doc? ( app-doc/doxygen )" src_prepare() { - multilib_copy_sources + epatch "${FILESDIR}/${P}-includes.patch" + eautoreconf } multilib_src_configure() { @@ -30,7 +31,7 @@ multilib_src_configure() { multilib_is_native_abi || myconf="--disable-doxygen-html --disable-examples" # X is only useful for examples that are not installed. - econf \ + ECONF_SOURCE="${S}" econf \ $(use_enable static-libs static) \ --program-suffix=2 \ --without-x \ |