Update the manual Darwin patch to apply against current MesaLib.

1 files changed, 12 insertions, 12 deletions

diff --git a/graphics/MesaLib/files/patch-manual_fdo90311 b/graphics/MesaLib/files/patch-manual_fdo90311
index 158de1b7f0c..845ab87240a 100644
--- a/graphics/MesaLib/files/patch-manual_fdo90311
+++ b/graphics/MesaLib/files/patch-manual_fdo90311
@@ -1,4 +1,4 @@
-$NetBSD: patch-manual_fdo90311,v 1.1 2015/09/27 21:58:03 tnn Exp $
+$NetBSD: patch-manual_fdo90311,v 1.2 2016/01/18 17:59:01 jperkin Exp $
 
 https://bugs.freedesktop.org/show_bug.cgi?id=90311
 
@@ -9,18 +9,18 @@ nodist_EXTRA_lib@GL_LIB@_la_SOURCES = dummy.cpp
 
 and then dummy.cpp manuallly edited out.
 
---- src/glx/Makefile.in.orig	2015-09-27 13:36:10.000000000 +0000
+--- src/glx/Makefile.in.orig	2015-12-15 14:52:32.000000000 +0000
 +++ src/glx/Makefile.in
-@@ -142,7 +142,7 @@ target_triplet = @target@
+@@ -143,7 +143,7 @@ target_triplet = @target@
  @HAVE_APPLEDRI_TRUE@	applegl_glx.c
  
- @HAVE_APPLEDRI_TRUE@am__append_6 = apple
--@HAVE_APPLEDRI_TRUE@am__append_7 = $(builddir)/apple/libappleglx.la
-+@HAVE_APPLEDRI_TRUE@am__append_7 = $(builddir)/apple/libappleglx.la $(top_builddir)/src/mesa/libmesa.la
+ @HAVE_APPLEDRI_TRUE@am__append_7 = apple
+-@HAVE_APPLEDRI_TRUE@am__append_8 = $(builddir)/apple/libappleglx.la
++@HAVE_APPLEDRI_TRUE@am__append_8 = $(builddir)/apple/libappleglx.la $(top_builddir)/src/mesa/libmesa.la
  subdir = src/glx
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_gnu_make.m4 \
-@@ -201,10 +201,10 @@ AM_V_lt = $(am__v_lt_@AM_V@)
+@@ -202,10 +202,10 @@ AM_V_lt = $(am__v_lt_@AM_V@)
  am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
  am__v_lt_0 = --silent
  am__v_lt_1 = 
@@ -33,9 +33,9 @@ and then dummy.cpp manuallly edited out.
 +	$(AM_CXXFLAGS) $(CXXFLAGS) $(lib@GL_LIB@_la_LDFLAGS) \
 +	$(LDFLAGS) -o $@
  libglx_la_DEPENDENCIES = $(top_builddir)/src/loader/libloader.la \
- 	$(am__append_7)
+ 	$(am__append_5) $(am__append_8)
  am__libglx_la_SOURCES_DIST = clientattrib.c clientinfo.c compsize.c \
-@@ -275,6 +275,24 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+@@ -276,6 +276,24 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
  am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
  am__v_CCLD_0 = @echo "  CCLD    " $@;
  am__v_CCLD_1 = 
@@ -60,7 +60,7 @@ and then dummy.cpp manuallly edited out.
  SOURCES = $(lib@GL_LIB@_la_SOURCES) $(libglx_la_SOURCES)
  DIST_SOURCES = $(lib@GL_LIB@_la_SOURCES) $(am__libglx_la_SOURCES_DIST)
  RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-@@ -683,7 +701,7 @@ lib@GL_LIB@_la_LDFLAGS = $(GL_LDFLAGS)
+@@ -696,7 +714,7 @@ lib@GL_LIB@_la_LDFLAGS = $(GL_LDFLAGS)
  all: all-recursive
  
  .SUFFIXES:
@@ -69,7 +69,7 @@ and then dummy.cpp manuallly edited out.
  $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/install-lib-links.mk $(am__configure_deps)
  	@for dep in $?; do \
  	  case '$(am__configure_deps)' in \
-@@ -762,7 +780,7 @@ clean-noinstLTLIBRARIES:
+@@ -775,7 +793,7 @@ clean-noinstLTLIBRARIES:
  	}
  
  lib@GL_LIB@.la: $(lib@GL_LIB@_la_OBJECTS) $(lib@GL_LIB@_la_DEPENDENCIES) $(EXTRA_lib@GL_LIB@_la_DEPENDENCIES) 
@@ -78,7 +78,7 @@ and then dummy.cpp manuallly edited out.
  
  libglx.la: $(libglx_la_OBJECTS) $(libglx_la_DEPENDENCIES) $(EXTRA_libglx_la_DEPENDENCIES) 
  	$(AM_V_CCLD)$(LINK)  $(libglx_la_OBJECTS) $(libglx_la_LIBADD) $(LIBS)
-@@ -839,6 +857,30 @@ distclean-compile:
+@@ -852,6 +870,30 @@ distclean-compile:
  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
  @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<