fix the nox11 patch to work with 2.0.0 series. Closes bug #105675 by tigger

Package-Manager: portage-2.0.52-r1

6 files changed, 75 insertions, 29 deletions

diff --git a/media-libs/libdc1394/ChangeLog b/media-libs/libdc1394/ChangeLog
index f1edf406b615..629c8f0e53b8 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.6 2005/09/12 15:49:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/ChangeLog,v 1.7 2005/09/12 16:13:08 seemant Exp $
+
+  12 Sep 2005; Seemant Kulleen <seemant@gentoo.org> +files/nox11-2.patch,
+  -libdc1394-0.9.3.ebuild, libdc1394-1.0.0.ebuild:
+  fix the nox11 patch to work with 2.0.0 series.  Closes bug #105675 by tigger
 
   12 Sep 2005; Aron Griffis <agriffis@gentoo.org>
   libdc1394-1.0.0.ebuild, libdc1394-2.0.0_pre4.ebuild:
diff --git a/media-libs/libdc1394/Manifest b/media-libs/libdc1394/Manifest
index 92beab654e62..0aaf723b8290 100644
--- a/media-libs/libdc1394/Manifest
+++ b/media-libs/libdc1394/Manifest
@@ -1,9 +1,8 @@
-MD5 684dc227e15d5a4c0a560e2e04a6f82f libdc1394-2.0.0_pre4.ebuild 1208
+MD5 305afdb12d5e7991f5ef3dc0a7f05ad7 ChangeLog 2842
 MD5 8c508b7fe8782ef51c759979f02e6110 metadata.xml 254
-MD5 bb29687e3a98f2980ff3b6628059aa32 ChangeLog 2638
-MD5 f48322b298f4df4a0b930ef158372810 libdc1394-0.9.3.ebuild 778
-MD5 d5e531666e1a8f7a5fd8a3630423b7cf libdc1394-1.0.0.ebuild 915
-MD5 08e765d381c723ed5c0fa51541b28fdc files/digest-libdc1394-0.9.3 67
+MD5 684dc227e15d5a4c0a560e2e04a6f82f libdc1394-2.0.0_pre4.ebuild 1208
+MD5 e075a897af68ced62527aea7ba0c0b35 libdc1394-1.0.0.ebuild 913
 MD5 4fc355449f1b06ba0387efc3c70d6249 files/digest-libdc1394-1.0.0 67
 MD5 7c6dee34c19af4ed536bed9fdd0c6795 files/nox11.patch 3699
 MD5 d24f1e449aa173fce2d9f93ae627131d files/digest-libdc1394-2.0.0_pre4 155
+MD5 878ff31cebe2ccca989bb8e60ef5e0b6 files/nox11-2.patch 3221
diff --git a/media-libs/libdc1394/files/digest-libdc1394-0.9.3 b/media-libs/libdc1394/files/digest-libdc1394-0.9.3
deleted file mode 100644
index 889303de7a6c..000000000000
--- a/media-libs/libdc1394/files/digest-libdc1394-0.9.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c6461e1d354240bc49a931d8b7440bd6 libdc1394-0.9.3.tar.gz 327413
diff --git a/media-libs/libdc1394/files/nox11-2.patch b/media-libs/libdc1394/files/nox11-2.patch
new file mode 100644
index 000000000000..feec5c17c9a0
--- /dev/null
+++ b/media-libs/libdc1394/files/nox11-2.patch
@@ -0,0 +1,64 @@
+diff -urN libdc1394-2.0.0-pre4.orig/examples/Makefile.in libdc1394-2.0.0-pre4/examples/Makefile.in
+--- libdc1394-2.0.0-pre4.orig/examples/Makefile.in	2005-08-04 04:32:32.000000000 -0400
++++ libdc1394-2.0.0-pre4/examples/Makefile.in	2005-09-12 12:09:51.000000000 -0400
+@@ -90,7 +90,7 @@
+ 
+ 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
+@@ -101,10 +101,6 @@
+ grab_partial_image_SOURCES = grab_partial_image.c
+ grab_partial_image_LDADD = ../libdc1394/libdc1394_control.la -lraw1394
+ 
+-dc1394_multiview_CFLAGS = $(X_CFLAGS)
+-dc1394_multiview_SOURCES = dc1394_multiview.c
+-dc1394_multiview_LDADD = ../libdc1394/libdc1394_control.la -lraw1394 $(X_LIBS) $(X_PRE_LIBS) -lXv -lXext -lX11 $(X_EXTRA_LIBS)
+-
+ dc1394_vloopback_SOURCES = dc1394_vloopback.c affine.c affine.h
+ dc1394_vloopback_LDADD = -lm ../libdc1394/libdc1394_control.la -lraw1394
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -112,7 +108,7 @@
+ 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)
+ 
+ 
+@@ -133,9 +129,6 @@
+ 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 = 
+@@ -151,8 +144,8 @@
+ 
+ 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)
++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:
+@@ -255,10 +248,6 @@
+ 	@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)
diff --git a/media-libs/libdc1394/libdc1394-0.9.3.ebuild b/media-libs/libdc1394/libdc1394-0.9.3.ebuild
deleted file mode 100644
index d6a56d93cf49..000000000000
--- a/media-libs/libdc1394/libdc1394-0.9.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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-0.9.3.ebuild,v 1.1 2005/08/26 15:47:37 seemant Exp $
-
-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/"
-
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ~amd64 ppc"
-IUSE=""
-
-DEPEND=">=sys-libs/libraw1394-0.9.0
-	sys-devel/libtool"
-
-src_install() {
-	einstall || die
-	dodoc NEWS README AUTHORS
-}
diff --git a/media-libs/libdc1394/libdc1394-1.0.0.ebuild b/media-libs/libdc1394/libdc1394-1.0.0.ebuild
index e8659e8457b5..c4b92aeeac2b 100644
--- a/media-libs/libdc1394/libdc1394-1.0.0.ebuild
+++ b/media-libs/libdc1394/libdc1394-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2005/09/12 15:49:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-1.0.0.ebuild,v 1.3 2005/09/12 16:13:08 seemant Exp $
 
 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/"
@@ -8,7 +8,7 @@ HOMEPAGE="http://sourceforge.net/projects/libdc1394/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND=">=sys-libs/libraw1394-0.9.0