diff options
author | Seemant Kulleen <seemant@gentoo.org> | 2005-10-19 18:08:53 +0000 |
---|---|---|
committer | Seemant Kulleen <seemant@gentoo.org> | 2005-10-19 18:08:53 +0000 |
commit | 70145e9da516c6c3c80c7eb1e98eb505487905bf (patch) | |
tree | 1a57ff13d726ce9537090b499a88215762b13625 /media-libs/libdc1394 | |
parent | Recommitting since Manifest signing bombed. (diff) | |
download | historical-70145e9da516c6c3c80c7eb1e98eb505487905bf.tar.gz historical-70145e9da516c6c3c80c7eb1e98eb505487905bf.tar.bz2 historical-70145e9da516c6c3c80c7eb1e98eb505487905bf.zip |
fix the nox11 patch for libdc1394-1.0.0. Closes bug #90952 by Christoph Diesch
Package-Manager: portage-2.0.53_rc5
Diffstat (limited to 'media-libs/libdc1394')
-rw-r--r-- | media-libs/libdc1394/ChangeLog | 6 | ||||
-rw-r--r-- | media-libs/libdc1394/Manifest | 22 | ||||
-rw-r--r-- | media-libs/libdc1394/files/nox11.patch | 138 | ||||
-rw-r--r-- | media-libs/libdc1394/libdc1394-1.0.0.ebuild | 8 |
4 files changed, 62 insertions, 112 deletions
diff --git a/media-libs/libdc1394/ChangeLog b/media-libs/libdc1394/ChangeLog index 3e8c79fddb7e..770123664559 100644 --- a/media-libs/libdc1394/ChangeLog +++ b/media-libs/libdc1394/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libdc1394 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/ChangeLog,v 1.10 2005/09/30 13:06:11 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/ChangeLog,v 1.11 2005/10/19 18:08:53 seemant Exp $ + + 19 Oct 2005; Seemant Kulleen <seemant@gentoo.org> files/nox11.patch, + libdc1394-1.0.0.ebuild: + fix the nox11 patch for libdc1394-1.0.0. Closes bug #90952 by Christoph Diesch 30 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> libdc1394-2.0.0_pre4.ebuild: diff --git a/media-libs/libdc1394/Manifest b/media-libs/libdc1394/Manifest index c08377e01880..43a7ae740571 100644 --- a/media-libs/libdc1394/Manifest +++ b/media-libs/libdc1394/Manifest @@ -1,18 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 8c508b7fe8782ef51c759979f02e6110 metadata.xml 254 -MD5 003d5c99996c3b93411c6ee66e56ebdb libdc1394-2.0.0_pre4.ebuild 1222 -MD5 53ace931231e6cd5e7ac7df584e97836 libdc1394-1.0.0.ebuild 921 -MD5 023165ab30a4825d3fb85f7699de464e ChangeLog 3214 +MD5 486ea5f482638bec88d55bd44e6ccb8a ChangeLog 3393 MD5 4fc355449f1b06ba0387efc3c70d6249 files/digest-libdc1394-1.0.0 67 -MD5 7c6dee34c19af4ed536bed9fdd0c6795 files/nox11.patch 3699 -MD5 878ff31cebe2ccca989bb8e60ef5e0b6 files/nox11-2.patch 3221 MD5 d24f1e449aa173fce2d9f93ae627131d files/digest-libdc1394-2.0.0_pre4 155 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDRJwWgIKl8Uu19MoRAhqHAJ4u3Q2M2swQ1vLbvxzzXdEKfFxsBACbBta9 -3tX7IDRbPr9nwBOwDsLzlSg= -=Z71x ------END PGP SIGNATURE----- +MD5 878ff31cebe2ccca989bb8e60ef5e0b6 files/nox11-2.patch 3221 +MD5 5b920f2f9f6db3d25002af5bddf73e1b files/nox11.patch 2194 +MD5 b2b2f6953de74208b537cecd72a9a1e5 libdc1394-1.0.0.ebuild 941 +MD5 003d5c99996c3b93411c6ee66e56ebdb libdc1394-2.0.0_pre4.ebuild 1222 +MD5 8c508b7fe8782ef51c759979f02e6110 metadata.xml 254 diff --git a/media-libs/libdc1394/files/nox11.patch b/media-libs/libdc1394/files/nox11.patch index 5635a498d9ad..178c107bbc81 100644 --- a/media-libs/libdc1394/files/nox11.patch +++ b/media-libs/libdc1394/files/nox11.patch @@ -1,92 +1,46 @@ -*** Makefile.in Wed Jun 30 03:25:27 2004 ---- ../../../libdc1394-0.9.5/examples/Makefile.in Wed Sep 22 13:19:19 2004 -*************** -*** 87,93 **** - - MAINTAINERCLEANFILES = Makefile.in - bin_PROGRAMS = dc1394_vloopback -! noinst_PROGRAMS = grab_gray_image grab_partial_image dc1394_multiview grab_color_image - - grab_gray_image_SOURCES = grab_gray_image.c - grab_gray_image_LDADD = ../libdc1394/libdc1394_control.la -lraw1394 ---- 87,93 ---- - - MAINTAINERCLEANFILES = Makefile.in - bin_PROGRAMS = dc1394_vloopback -! noinst_PROGRAMS = grab_gray_image grab_partial_image grab_color_image - - grab_gray_image_SOURCES = grab_gray_image.c - grab_gray_image_LDADD = ../libdc1394/libdc1394_control.la -lraw1394 -*************** -*** 98,106 **** - grab_partial_image_SOURCES = grab_partial_image.c - grab_partial_image_LDADD = ../libdc1394/libdc1394_control.la -lraw1394 - -- dc1394_multiview_SOURCES = dc1394_multiview.c -- dc1394_multiview_LDADD = ../libdc1394/libdc1394_control.la -lraw1394 -L/usr/X11R6/lib -lXv -lXext -lX11 -- - dc1394_vloopback_SOURCES = dc1394_vloopback.c affine.c affine.h - dc1394_vloopback_LDADD = -lm ../libdc1394/libdc1394_control.la -lraw1394 - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ---- 98,103 ---- -*************** -*** 108,114 **** - CONFIG_CLEAN_FILES = - bin_PROGRAMS = dc1394_vloopback$(EXEEXT) - noinst_PROGRAMS = grab_gray_image$(EXEEXT) grab_partial_image$(EXEEXT) \ -! dc1394_multiview$(EXEEXT) grab_color_image$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) - - ---- 105,111 ---- - CONFIG_CLEAN_FILES = - bin_PROGRAMS = dc1394_vloopback$(EXEEXT) - noinst_PROGRAMS = grab_gray_image$(EXEEXT) grab_partial_image$(EXEEXT) \ -! grab_color_image$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) - - -*************** -*** 125,133 **** - grab_partial_image_OBJECTS = grab_partial_image.$(OBJEXT) - grab_partial_image_DEPENDENCIES = ../libdc1394/libdc1394_control.la - grab_partial_image_LDFLAGS = -- dc1394_multiview_OBJECTS = dc1394_multiview.$(OBJEXT) -- dc1394_multiview_DEPENDENCIES = ../libdc1394/libdc1394_control.la -- dc1394_multiview_LDFLAGS = - grab_color_image_OBJECTS = grab_color_image.$(OBJEXT) - grab_color_image_DEPENDENCIES = ../libdc1394/libdc1394_control.la - grab_color_image_LDFLAGS = ---- 122,127 ---- -*************** -*** 143,150 **** - - TAR = tar - GZIP_ENV = --best -! SOURCES = $(dc1394_vloopback_SOURCES) $(grab_gray_image_SOURCES) $(grab_partial_image_SOURCES) $(dc1394_multiview_SOURCES) $(grab_color_image_SOURCES) -! OBJECTS = $(dc1394_vloopback_OBJECTS) $(grab_gray_image_OBJECTS) $(grab_partial_image_OBJECTS) $(dc1394_multiview_OBJECTS) $(grab_color_image_OBJECTS) - - all: all-redirect - .SUFFIXES: ---- 137,144 ---- - - TAR = tar - GZIP_ENV = --best -! SOURCES = $(dc1394_vloopback_SOURCES) $(grab_gray_image_SOURCES) $(grab_partial_image_SOURCES) $(grab_color_image_SOURCES) -! OBJECTS = $(dc1394_vloopback_OBJECTS) $(grab_gray_image_OBJECTS) $(grab_partial_image_OBJECTS) $(grab_color_image_OBJECTS) - - all: all-redirect - .SUFFIXES: -*************** -*** 247,256 **** - @rm -f grab_partial_image$(EXEEXT) - $(LINK) $(grab_partial_image_LDFLAGS) $(grab_partial_image_OBJECTS) $(grab_partial_image_LDADD) $(LIBS) - -- dc1394_multiview$(EXEEXT): $(dc1394_multiview_OBJECTS) $(dc1394_multiview_DEPENDENCIES) -- @rm -f dc1394_multiview$(EXEEXT) -- $(LINK) $(dc1394_multiview_LDFLAGS) $(dc1394_multiview_OBJECTS) $(dc1394_multiview_LDADD) $(LIBS) -- - grab_color_image$(EXEEXT): $(grab_color_image_OBJECTS) $(grab_color_image_DEPENDENCIES) - @rm -f grab_color_image$(EXEEXT) - $(LINK) $(grab_color_image_LDFLAGS) $(grab_color_image_OBJECTS) $(grab_color_image_LDADD) $(LIBS) ---- 241,246 ---- +diff -urN libdc1394-1.0.0.orig/examples/Makefile.in libdc1394-1.0.0/examples/Makefile.in +--- libdc1394-1.0.0.orig/examples/Makefile.in 2004-09-16 04:13:18.000000000 -0400 ++++ libdc1394-1.0.0/examples/Makefile.in 2005-10-19 12:18:32.000000000 -0400 +@@ -134,7 +134,7 @@ + target_alias = @target_alias@ + MAINTAINERCLEANFILES = Makefile.in + bin_PROGRAMS = dc1394_vloopback +-noinst_PROGRAMS = grab_gray_image grab_partial_image dc1394_multiview grab_color_image ++noinst_PROGRAMS = grab_gray_image grab_partial_image grab_color_image + + grab_gray_image_SOURCES = grab_gray_image.c + grab_gray_image_LDADD = ../libdc1394/libdc1394_control.la -lraw1394 +@@ -145,9 +145,6 @@ + grab_partial_image_SOURCES = grab_partial_image.c + grab_partial_image_LDADD = ../libdc1394/libdc1394_control.la -lraw1394 + +-dc1394_multiview_SOURCES = dc1394_multiview.c +-dc1394_multiview_LDADD = ../libdc1394/libdc1394_control.la -lraw1394 -L/usr/X11R6/lib -lXv -lXext -lX11 +- + dc1394_vloopback_SOURCES = dc1394_vloopback.c affine.c affine.h + dc1394_vloopback_LDADD = -lm ../libdc1394/libdc1394_control.la -lraw1394 + subdir = examples +@@ -157,13 +154,9 @@ + CONFIG_CLEAN_FILES = + bin_PROGRAMS = dc1394_vloopback$(EXEEXT) + noinst_PROGRAMS = grab_gray_image$(EXEEXT) grab_partial_image$(EXEEXT) \ +- dc1394_multiview$(EXEEXT) grab_color_image$(EXEEXT) ++ grab_color_image$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) + +-am_dc1394_multiview_OBJECTS = dc1394_multiview.$(OBJEXT) +-dc1394_multiview_OBJECTS = $(am_dc1394_multiview_OBJECTS) +-dc1394_multiview_DEPENDENCIES = ../libdc1394/libdc1394_control.la +-dc1394_multiview_LDFLAGS = + am_dc1394_vloopback_OBJECTS = dc1394_vloopback.$(OBJEXT) \ + affine.$(OBJEXT) + dc1394_vloopback_OBJECTS = $(am_dc1394_vloopback_OBJECTS) +@@ -202,7 +195,7 @@ + $(grab_color_image_SOURCES) $(grab_gray_image_SOURCES) \ + $(grab_partial_image_SOURCES) + DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +-SOURCES = $(dc1394_multiview_SOURCES) $(dc1394_vloopback_SOURCES) $(grab_color_image_SOURCES) $(grab_gray_image_SOURCES) $(grab_partial_image_SOURCES) ++SOURCES = $(dc1394_vloopback_SOURCES) $(grab_color_image_SOURCES) $(grab_gray_image_SOURCES) $(grab_partial_image_SOURCES) + + all: all-am + diff --git a/media-libs/libdc1394/libdc1394-1.0.0.ebuild b/media-libs/libdc1394/libdc1394-1.0.0.ebuild index 198dafcb0759..5bc910b02de0 100644 --- a/media-libs/libdc1394/libdc1394-1.0.0.ebuild +++ b/media-libs/libdc1394/libdc1394-1.0.0.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-1.0.0.ebuild,v 1.4 2005/10/06 03:36:23 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-1.0.0.ebuild,v 1.5 2005/10/19 18:08:53 seemant Exp $ + +inherit eutils DESCRIPTION="libdc1394 is a library that is intended to provide a high level programming interface for application developers who wish to control IEEE 1394 based cameras that conform to the 1394-based Digital Camera Specification (found at http://www.1394ta.org/)" HOMEPAGE="http://sourceforge.net/projects/libdc1394/" @@ -9,14 +11,14 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86" -IUSE="" +IUSE="X" DEPEND=">=sys-libs/libraw1394-0.9.0 sys-devel/libtool X? ( virtual/x11 )" src_unpack() { - unpack ${A} || die + unpack ${A}; cd ${S} if ! use X; then epatch ${FILESDIR}/nox11.patch fi |