fixed up no X patch from Andre Hinrichs in bug #132208

Package-Manager: portage-2.1.1

4 files changed, 76 insertions, 11 deletions

diff --git a/media-libs/libdc1394/ChangeLog b/media-libs/libdc1394/ChangeLog
index 5d83882ed277..73c6d3996800 100644
--- a/media-libs/libdc1394/ChangeLog
+++ b/media-libs/libdc1394/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libdc1394
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/ChangeLog,v 1.24 2006/08/29 15:16:34 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/ChangeLog,v 1.25 2006/09/13 02:10:20 seemant Exp $
+
+  13 Sep 2006; Seemant Kulleen <seemant@gentoo.org>
+  +files/libdc1394-1.2.1-nox11.patch, libdc1394-1.2.1.ebuild:
+  fixed up no X patch from Andre Hinrichs in bug #132208
 
 *libdc1394-2.0.0_rc3 (29 Aug 2006)
 
diff --git a/media-libs/libdc1394/Manifest b/media-libs/libdc1394/Manifest
index f293f01257ca..5d2a69ca083a 100644
--- a/media-libs/libdc1394/Manifest
+++ b/media-libs/libdc1394/Manifest
@@ -1,3 +1,7 @@
+AUX libdc1394-1.2.1-nox11.patch 2818 RMD160 00b65a5080b12cfe80fb875aa9d5f652e2e27582 SHA1 711fe0dccacedaafdf0533a65ae0a7fea4dbbe0e SHA256 94198adc2d2b4b1229737a5ee6e456dddfbfb2a7ef0e9ab7156ba9de80dc8747
+MD5 337203218a64dc0f6b10bdb9f9efbb7a files/libdc1394-1.2.1-nox11.patch 2818
+RMD160 00b65a5080b12cfe80fb875aa9d5f652e2e27582 files/libdc1394-1.2.1-nox11.patch 2818
+SHA256 94198adc2d2b4b1229737a5ee6e456dddfbfb2a7ef0e9ab7156ba9de80dc8747 files/libdc1394-1.2.1-nox11.patch 2818
 AUX libdc1394-2.0.0_pre5-update-iso_channel.patch 403 RMD160 f2a3061f74f918ca05d7e13119a481c4f4dc5930 SHA1 cabdad2d47ac5d3d5dd896b83634a218966444f4 SHA256 ba47f1266114500c9ad98a3da111ee4a2e6b16b330a40e43d9a8e3f5782fed0d
 MD5 a52999e1811677c31441092df95a9e88 files/libdc1394-2.0.0_pre5-update-iso_channel.patch 403
 RMD160 f2a3061f74f918ca05d7e13119a481c4f4dc5930 files/libdc1394-2.0.0_pre5-update-iso_channel.patch 403
@@ -41,10 +45,10 @@ EBUILD libdc1394-1.0.0-r1.ebuild 1194 RMD160 84a943d3ea4a49bb461a7465df74b644602
 MD5 3ba305a068235562cdf478aa894b3803 libdc1394-1.0.0-r1.ebuild 1194
 RMD160 84a943d3ea4a49bb461a7465df74b64460247df5 libdc1394-1.0.0-r1.ebuild 1194
 SHA256 989509f1a9655974181e12a64f42d14980cc729ff6fcb4e86d106890dd6a43d6 libdc1394-1.0.0-r1.ebuild 1194
-EBUILD libdc1394-1.2.1.ebuild 1208 RMD160 96c79317e8e7caaac1ce872e76306653ba361544 SHA1 688581d426e14f0827f567474242316ac8735edb SHA256 1bd92207a79192612f41e6fe8e51957be062e6181a567dfe05560d13d39b1f79
-MD5 ebb381a720d7e7c0f3b192803cb78b74 libdc1394-1.2.1.ebuild 1208
-RMD160 96c79317e8e7caaac1ce872e76306653ba361544 libdc1394-1.2.1.ebuild 1208
-SHA256 1bd92207a79192612f41e6fe8e51957be062e6181a567dfe05560d13d39b1f79 libdc1394-1.2.1.ebuild 1208
+EBUILD libdc1394-1.2.1.ebuild 1213 RMD160 ac38831b14bd5c3c81071588eb6d6653dd077dcd SHA1 411b71735db9ee3c6e81c42e497c8eba6bf56ee6 SHA256 1864d8f696142c651f5231462df9443021e275026d4319cd1240018bf0a73700
+MD5 407e22c3a5990b4c9a2281aa59f89616 libdc1394-1.2.1.ebuild 1213
+RMD160 ac38831b14bd5c3c81071588eb6d6653dd077dcd libdc1394-1.2.1.ebuild 1213
+SHA256 1864d8f696142c651f5231462df9443021e275026d4319cd1240018bf0a73700 libdc1394-1.2.1.ebuild 1213
 EBUILD libdc1394-2.0.0_pre4.ebuild 1204 RMD160 181632b7de22f4997190de76951bdff5b1db9f66 SHA1 46a98cd7a9c8f52f8aa881e6aa21179a477a7aff SHA256 3b9ccdc8f693183799be7b17bf33a1bcf530c5b0726d1a98f8cea727d090c9cb
 MD5 df88e51f579453538f12cafe69894870 libdc1394-2.0.0_pre4.ebuild 1204
 RMD160 181632b7de22f4997190de76951bdff5b1db9f66 libdc1394-2.0.0_pre4.ebuild 1204
@@ -61,10 +65,10 @@ EBUILD libdc1394-2.0.0_rc3.ebuild 1023 RMD160 586f792bd38f65c04594c4f11f37cce5a2
 MD5 fc973a365c3fe5d05f7193b09f272d06 libdc1394-2.0.0_rc3.ebuild 1023
 RMD160 586f792bd38f65c04594c4f11f37cce5a20475c9 libdc1394-2.0.0_rc3.ebuild 1023
 SHA256 dd093658aaaaf13b8206b077c479e65d6668dedc682e09ad111c0c5f68022249 libdc1394-2.0.0_rc3.ebuild 1023
-MISC ChangeLog 7219 RMD160 a3f7c8fe7f884fe3d6caab13937e859d409c0e58 SHA1 ccf315564cf3e8c61042c6b157a782a8cd041643 SHA256 9ee707550a50d5fd5614c4c80d8cde23685cead4a160caf4d882cce545a113bf
-MD5 f0408d71899d3d07cbeb703384f79c0b ChangeLog 7219
-RMD160 a3f7c8fe7f884fe3d6caab13937e859d409c0e58 ChangeLog 7219
-SHA256 9ee707550a50d5fd5614c4c80d8cde23685cead4a160caf4d882cce545a113bf ChangeLog 7219
+MISC ChangeLog 7391 RMD160 31934b5dd35340fdafb332b2e3e5cb8b0fb0367d SHA1 aa608a1a51b480408dc9dc68554392252b88e654 SHA256 052fe8e3b1a29779fcd3f2fbae1a78bcedf5bc70a0801106974fb3018c15cda1
+MD5 b9eb2f13022d0998e9b722b091656c33 ChangeLog 7391
+RMD160 31934b5dd35340fdafb332b2e3e5cb8b0fb0367d ChangeLog 7391
+SHA256 052fe8e3b1a29779fcd3f2fbae1a78bcedf5bc70a0801106974fb3018c15cda1 ChangeLog 7391
 MISC metadata.xml 254 RMD160 e443fb2011869d9fa797e4d71e336cac9b91a57c SHA1 3a978a742ce76f4f08724d0956e0e20586063e8e SHA256 10f669506638ebd14d588da05f936dd27b3ffcc7a69e6063cbd77f6439edea0c
 MD5 8c508b7fe8782ef51c759979f02e6110 metadata.xml 254
 RMD160 e443fb2011869d9fa797e4d71e336cac9b91a57c metadata.xml 254
diff --git a/media-libs/libdc1394/files/libdc1394-1.2.1-nox11.patch b/media-libs/libdc1394/files/libdc1394-1.2.1-nox11.patch
new file mode 100644
index 000000000000..cbbb5c4aaa5b
--- /dev/null
+++ b/media-libs/libdc1394/files/libdc1394-1.2.1-nox11.patch
@@ -0,0 +1,57 @@
+diff -ruN libdc1394-1.2.1.orig/examples/Makefile.in libdc1394-1.2.1/examples/Makefile.in
+--- libdc1394-1.2.1.orig/examples/Makefile.in	2006-03-31 06:53:44.000000000 +0200
++++ libdc1394-1.2.1/examples/Makefile.in	2006-05-07 09:59:31.000000000 +0200
+@@ -38,7 +38,7 @@
+ host_triplet = @host@
+ 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)
+ subdir = examples
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -51,13 +51,7 @@
+ am__installdirs = "$(DESTDIR)$(bindir)"
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+-am_dc1394_multiview_OBJECTS =  \
+-	dc1394_multiview-dc1394_multiview.$(OBJEXT)
+-dc1394_multiview_OBJECTS = $(am_dc1394_multiview_OBJECTS)
+ am__DEPENDENCIES_1 =
+-dc1394_multiview_DEPENDENCIES = ../libdc1394/libdc1394_control.la \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1)
+ am_dc1394_vloopback_OBJECTS = dc1394_vloopback.$(OBJEXT) \
+ 	affine.$(OBJEXT)
+ dc1394_vloopback_OBJECTS = $(am_dc1394_vloopback_OBJECTS)
+@@ -82,10 +76,10 @@
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+-SOURCES = $(dc1394_multiview_SOURCES) $(dc1394_vloopback_SOURCES) \
++SOURCES = $(dc1394_vloopback_SOURCES) \
+ 	$(grab_color_image_SOURCES) $(grab_gray_image_SOURCES) \
+ 	$(grab_partial_image_SOURCES)
+-DIST_SOURCES = $(dc1394_multiview_SOURCES) $(dc1394_vloopback_SOURCES) \
++DIST_SOURCES = $(dc1394_vloopback_SOURCES) \
+ 	$(grab_color_image_SOURCES) $(grab_gray_image_SOURCES) \
+ 	$(grab_partial_image_SOURCES)
+ ETAGS = etags
+@@ -202,8 +196,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
+ all: all-am
+@@ -276,7 +268,7 @@
+ 	done
+ 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)
++	$(LINK) $(dc1394_multiview_OBJECTS) $(dc1394_multiview_LDADD) $(LIBS)
+ dc1394_vloopback$(EXEEXT): $(dc1394_vloopback_OBJECTS) $(dc1394_vloopback_DEPENDENCIES) 
+ 	@rm -f dc1394_vloopback$(EXEEXT)
+ 	$(LINK) $(dc1394_vloopback_LDFLAGS) $(dc1394_vloopback_OBJECTS) $(dc1394_vloopback_LDADD) $(LIBS)
diff --git a/media-libs/libdc1394/libdc1394-1.2.1.ebuild b/media-libs/libdc1394/libdc1394-1.2.1.ebuild
index 27f09245cc3b..637e8e905fb0 100644
--- a/media-libs/libdc1394/libdc1394-1.2.1.ebuild
+++ b/media-libs/libdc1394/libdc1394-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-1.2.1.ebuild,v 1.1 2006/05/03 14:05:49 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdc1394/libdc1394-1.2.1.ebuild,v 1.2 2006/09/13 02:10:21 seemant Exp $
 
 inherit eutils flag-o-matic
 
@@ -23,7 +23,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}; cd ${S}
 	if ! use X; then
-		epatch ${FILESDIR}/nox11.patch
+		epatch ${FILESDIR}/${P}-nox11.patch
 	fi
 }