diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-03-21 14:23:54 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2011-03-21 14:23:54 +0000 |
| commit | 3f6029e454e86bfb6cb9dd7c0f085190a38b4bec (patch) | |
| tree | a857bd72085977fbed809825df44ea769873d762 /media-libs/libdc1394/files | |
| parent | x86 stable per bug 357283 (diff) | |
| download | historical-3f6029e454e86bfb6cb9dd7c0f085190a38b4bec.tar.gz historical-3f6029e454e86bfb6cb9dd7c0f085190a38b4bec.tar.bz2 historical-3f6029e454e86bfb6cb9dd7c0f085190a38b4bec.zip | |
QA: the nox11 patch failed to apply and was totally bogus (patched Makefile.in only); drop the X USE flag, forcing it enabled, which is the only working configuration for SLOT=1 ebuild.
Package-Manager: portage-2.2.0_alpha28/cvs/Linux x86_64
Diffstat (limited to 'media-libs/libdc1394/files')
| -rw-r--r-- | media-libs/libdc1394/files/libdc1394-1.2.1-nox11.patch | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/media-libs/libdc1394/files/libdc1394-1.2.1-nox11.patch b/media-libs/libdc1394/files/libdc1394-1.2.1-nox11.patch deleted file mode 100644 index cbbb5c4aaa5b..000000000000 --- a/media-libs/libdc1394/files/libdc1394-1.2.1-nox11.patch +++ /dev/null @@ -1,57 +0,0 @@ -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) |