Mon Jan 18 17:59:01 2016 UTC ()
Update the manual Darwin patch to apply against current MesaLib.


(jperkin)
diff -r1.1 -r1.2 pkgsrc/graphics/MesaLib/files/patch-manual_fdo90311
cvs diff -r1.1 -r1.2 pkgsrc/graphics/MesaLib/files/Attic/patch-manual_fdo90311 (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/files/Attic/patch-manual_fdo90311 2015/09/27 21:58:03 1.1
+++ pkgsrc/graphics/MesaLib/files/Attic/patch-manual_fdo90311 2016/01/18 17:59:01 1.2
@@ -1,94 +1,94 @@ @@ -1,94 +1,94 @@
1$NetBSD: patch-manual_fdo90311,v 1.1 2015/09/27 21:58:03 tnn Exp $ 1$NetBSD: patch-manual_fdo90311,v 1.2 2016/01/18 17:59:01 jperkin Exp $
2 2
3https://bugs.freedesktop.org/show_bug.cgi?id=90311 3https://bugs.freedesktop.org/show_bug.cgi?id=90311
4 4
5Regenerated with autoconf to link with C++ linker using this addition: 5Regenerated with autoconf to link with C++ linker using this addition:
6 6
7libglx_la_LIBADD += $(builddir)/apple/libappleglx.la + $(top_builddir)/src/mesa/libmesa.la 7libglx_la_LIBADD += $(builddir)/apple/libappleglx.la + $(top_builddir)/src/mesa/libmesa.la
8nodist_EXTRA_lib@GL_LIB@_la_SOURCES = dummy.cpp 8nodist_EXTRA_lib@GL_LIB@_la_SOURCES = dummy.cpp
9 9
10and then dummy.cpp manuallly edited out. 10and then dummy.cpp manuallly edited out.
11 11
12--- src/glx/Makefile.in.orig 2015-09-27 13:36:10.000000000 +0000 12--- src/glx/Makefile.in.orig 2015-12-15 14:52:32.000000000 +0000
13+++ src/glx/Makefile.in 13+++ src/glx/Makefile.in
14@@ -142,7 +142,7 @@ target_triplet = @target@ 14@@ -143,7 +143,7 @@ target_triplet = @target@
15 @HAVE_APPLEDRI_TRUE@ applegl_glx.c 15 @HAVE_APPLEDRI_TRUE@ applegl_glx.c
16  16
17 @HAVE_APPLEDRI_TRUE@am__append_6 = apple 17 @HAVE_APPLEDRI_TRUE@am__append_7 = apple
18-@HAVE_APPLEDRI_TRUE@am__append_7 = $(builddir)/apple/libappleglx.la 18-@HAVE_APPLEDRI_TRUE@am__append_8 = $(builddir)/apple/libappleglx.la
19+@HAVE_APPLEDRI_TRUE@am__append_7 = $(builddir)/apple/libappleglx.la $(top_builddir)/src/mesa/libmesa.la 19+@HAVE_APPLEDRI_TRUE@am__append_8 = $(builddir)/apple/libappleglx.la $(top_builddir)/src/mesa/libmesa.la
20 subdir = src/glx 20 subdir = src/glx
21 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 21 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
22 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_gnu_make.m4 \ 22 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_gnu_make.m4 \
23@@ -201,10 +201,10 @@ AM_V_lt = $(am__v_lt_@AM_V@) 23@@ -202,10 +202,10 @@ AM_V_lt = $(am__v_lt_@AM_V@)
24 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) 24 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
25 am__v_lt_0 = --silent 25 am__v_lt_0 = --silent
26 am__v_lt_1 =  26 am__v_lt_1 =
27-lib@GL_LIB@_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ 27-lib@GL_LIB@_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
28- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ 28- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
29- $(AM_CFLAGS) $(CFLAGS) $(lib@GL_LIB@_la_LDFLAGS) $(LDFLAGS) -o \ 29- $(AM_CFLAGS) $(CFLAGS) $(lib@GL_LIB@_la_LDFLAGS) $(LDFLAGS) -o \
30- $@ 30- $@
31+lib@GL_LIB@_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ 31+lib@GL_LIB@_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
32+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \ 32+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
33+ $(AM_CXXFLAGS) $(CXXFLAGS) $(lib@GL_LIB@_la_LDFLAGS) \ 33+ $(AM_CXXFLAGS) $(CXXFLAGS) $(lib@GL_LIB@_la_LDFLAGS) \
34+ $(LDFLAGS) -o $@ 34+ $(LDFLAGS) -o $@
35 libglx_la_DEPENDENCIES = $(top_builddir)/src/loader/libloader.la \ 35 libglx_la_DEPENDENCIES = $(top_builddir)/src/loader/libloader.la \
36 $(am__append_7) 36 $(am__append_5) $(am__append_8)
37 am__libglx_la_SOURCES_DIST = clientattrib.c clientinfo.c compsize.c \ 37 am__libglx_la_SOURCES_DIST = clientattrib.c clientinfo.c compsize.c \
38@@ -275,6 +275,24 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) 38@@ -276,6 +276,24 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
39 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) 39 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
40 am__v_CCLD_0 = @echo " CCLD " $@; 40 am__v_CCLD_0 = @echo " CCLD " $@;
41 am__v_CCLD_1 =  41 am__v_CCLD_1 =
42+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ 42+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
43+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) 43+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
44+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ 44+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
45+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \ 45+ $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
46+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ 46+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
47+ $(AM_CXXFLAGS) $(CXXFLAGS) 47+ $(AM_CXXFLAGS) $(CXXFLAGS)
48+AM_V_CXX = $(am__v_CXX_@AM_V@) 48+AM_V_CXX = $(am__v_CXX_@AM_V@)
49+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@) 49+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
50+am__v_CXX_0 = @echo " CXX " $@; 50+am__v_CXX_0 = @echo " CXX " $@;
51+am__v_CXX_1 =  51+am__v_CXX_1 =
52+CXXLD = $(CXX) 52+CXXLD = $(CXX)
53+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \ 53+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
54+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ 54+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
55+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ 55+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
56+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@) 56+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
57+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) 57+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
58+am__v_CXXLD_0 = @echo " CXXLD " $@; 58+am__v_CXXLD_0 = @echo " CXXLD " $@;
59+am__v_CXXLD_1 =  59+am__v_CXXLD_1 =
60 SOURCES = $(lib@GL_LIB@_la_SOURCES) $(libglx_la_SOURCES) 60 SOURCES = $(lib@GL_LIB@_la_SOURCES) $(libglx_la_SOURCES)
61 DIST_SOURCES = $(lib@GL_LIB@_la_SOURCES) $(am__libglx_la_SOURCES_DIST) 61 DIST_SOURCES = $(lib@GL_LIB@_la_SOURCES) $(am__libglx_la_SOURCES_DIST)
62 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ 62 RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
63@@ -683,7 +701,7 @@ lib@GL_LIB@_la_LDFLAGS = $(GL_LDFLAGS) 63@@ -696,7 +714,7 @@ lib@GL_LIB@_la_LDFLAGS = $(GL_LDFLAGS)
64 all: all-recursive 64 all: all-recursive
65  65
66 .SUFFIXES: 66 .SUFFIXES:
67-.SUFFIXES: .c .lo .o .obj 67-.SUFFIXES: .c .lo .o .obj
68+.SUFFIXES: .c .cpp .lo .o .obj 68+.SUFFIXES: .c .cpp .lo .o .obj
69 $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/install-lib-links.mk $(am__configure_deps) 69 $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(top_srcdir)/install-lib-links.mk $(am__configure_deps)
70 @for dep in $?; do \ 70 @for dep in $?; do \
71 case '$(am__configure_deps)' in \ 71 case '$(am__configure_deps)' in \
72@@ -762,7 +780,7 @@ clean-noinstLTLIBRARIES: 72@@ -775,7 +793,7 @@ clean-noinstLTLIBRARIES:
73 } 73 }
74  74
75 lib@GL_LIB@.la: $(lib@GL_LIB@_la_OBJECTS) $(lib@GL_LIB@_la_DEPENDENCIES) $(EXTRA_lib@GL_LIB@_la_DEPENDENCIES)  75 lib@GL_LIB@.la: $(lib@GL_LIB@_la_OBJECTS) $(lib@GL_LIB@_la_DEPENDENCIES) $(EXTRA_lib@GL_LIB@_la_DEPENDENCIES)
76- $(AM_V_CCLD)$(lib@GL_LIB@_la_LINK) -rpath $(libdir) $(lib@GL_LIB@_la_OBJECTS) $(lib@GL_LIB@_la_LIBADD) $(LIBS) 76- $(AM_V_CCLD)$(lib@GL_LIB@_la_LINK) -rpath $(libdir) $(lib@GL_LIB@_la_OBJECTS) $(lib@GL_LIB@_la_LIBADD) $(LIBS)
77+ $(AM_V_CXXLD)$(lib@GL_LIB@_la_LINK) -rpath $(libdir) $(lib@GL_LIB@_la_OBJECTS) $(lib@GL_LIB@_la_LIBADD) $(LIBS) 77+ $(AM_V_CXXLD)$(lib@GL_LIB@_la_LINK) -rpath $(libdir) $(lib@GL_LIB@_la_OBJECTS) $(lib@GL_LIB@_la_LIBADD) $(LIBS)
78  78
79 libglx.la: $(libglx_la_OBJECTS) $(libglx_la_DEPENDENCIES) $(EXTRA_libglx_la_DEPENDENCIES)  79 libglx.la: $(libglx_la_OBJECTS) $(libglx_la_DEPENDENCIES) $(EXTRA_libglx_la_DEPENDENCIES)
80 $(AM_V_CCLD)$(LINK) $(libglx_la_OBJECTS) $(libglx_la_LIBADD) $(LIBS) 80 $(AM_V_CCLD)$(LINK) $(libglx_la_OBJECTS) $(libglx_la_LIBADD) $(LIBS)
81@@ -839,6 +857,30 @@ distclean-compile: 81@@ -852,6 +870,30 @@ distclean-compile:
82 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 82 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
83 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< 83 @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
84  84
85+.cpp.o: 85+.cpp.o:
86+@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ 86+@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
87+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\ 87+@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
88+@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po 88+@am__fastdepCXX_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
89+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ 89+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
90+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ 90+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
91+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $< 91+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
92+ 92+
93+.cpp.obj: 93+.cpp.obj:
94+@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ 94+@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\