CVS commit: pkgsrc/graphics/MesaLib18

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Jan 19 22:19:05 UTC 2019

Modified Files:
        pkgsrc/graphics/MesaLib18: Makefile distinfo
        pkgsrc/graphics/MesaLib18/patches: patch-src_glx_Makefile.am

Log Message:
MesaLib18: patch for FDO bug 90311 appears no longer needed


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/graphics/MesaLib18/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/graphics/MesaLib18/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/graphics/MesaLib18/patches/patch-src_glx_Makefile.am

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/MesaLib18/Makefile
diff -u pkgsrc/graphics/MesaLib18/Makefile:1.13 pkgsrc/graphics/MesaLib18/Makefile:1.14
--- pkgsrc/graphics/MesaLib18/Makefile:1.13     Sat Jan 19 21:54:03 2019
+++ pkgsrc/graphics/MesaLib18/Makefile  Sat Jan 19 22:19:05 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2019/01/19 21:54:03 tnn Exp $
+# $NetBSD: Makefile,v 1.14 2019/01/19 22:19:05 tnn Exp $
 
 DISTNAME=      mesa-18.3.2
 PKGNAME=       ${DISTNAME:S/mesa/MesaLib/}
@@ -88,7 +88,6 @@ CXXFLAGS.NetBSD+=     -Dalloca=__builtin_all
 
 pre-configure:
        cd ${WRKSRC} && autoreconf -vif
-       touch ${WRKSRC}/src/glx/dummy.cpp
 
 DRIRC_DIR=             ${PKG_SYSCONFDIR}/drirc.d
 EGDIR=                 ${PREFIX}/share/examples/mesa

Index: pkgsrc/graphics/MesaLib18/distinfo
diff -u pkgsrc/graphics/MesaLib18/distinfo:1.11 pkgsrc/graphics/MesaLib18/distinfo:1.12
--- pkgsrc/graphics/MesaLib18/distinfo:1.11     Sat Jan 19 21:54:03 2019
+++ pkgsrc/graphics/MesaLib18/distinfo  Sat Jan 19 22:19:05 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2019/01/19 21:54:03 tnn Exp $
+$NetBSD: distinfo,v 1.12 2019/01/19 22:19:05 tnn Exp $
 
 SHA1 (mesa-18.3.2.tar.xz) = 8775d7bfac7e07141ac4299888d426d5550949f7
 RMD160 (mesa-18.3.2.tar.xz) = d3662f72a39d009adb21a70bd7b49c28960c0d5c
@@ -26,7 +26,7 @@ SHA1 (patch-src_gallium_state__trackers_
 SHA1 (patch-src_gallium_state__trackers_clover_llvm_metadata.hpp) = c97d38098ea03658bc193a50e445b87f1c020839
 SHA1 (patch-src_gallium_state__trackers_clover_util_range.hpp) = cdc78067986c1b92818472c4201c58ef1b42c4f4
 SHA1 (patch-src_gbm_Makefile.am) = 5f3107afbf64b97f7d21ce427cecc4fb78974db3
-SHA1 (patch-src_glx_Makefile.am) = 315d35777550ae7a7ba814b6d74d0c3cefd04630
+SHA1 (patch-src_glx_Makefile.am) = b9b13fdec40eb94401c84184b8cfd4e40e6397b9
 SHA1 (patch-src_glx_apple_apple__glapi.c) = c4eea8dabf74eb03d22da4eb834b18ae3384c63b
 SHA1 (patch-src_glx_dri__common.h) = 0274877f8c65a4bb729536a897df4704897a4c6e
 SHA1 (patch-src_glx_dri__glx.c) = 8fd48776e9953b18bd17ba130d90ae2935e67242

Index: pkgsrc/graphics/MesaLib18/patches/patch-src_glx_Makefile.am
diff -u pkgsrc/graphics/MesaLib18/patches/patch-src_glx_Makefile.am:1.1 pkgsrc/graphics/MesaLib18/patches/patch-src_glx_Makefile.am:1.2
--- pkgsrc/graphics/MesaLib18/patches/patch-src_glx_Makefile.am:1.1     Sat Jan 19 21:54:03 2019
+++ pkgsrc/graphics/MesaLib18/patches/patch-src_glx_Makefile.am Sat Jan 19 22:19:05 2019
@@ -1,6 +1,5 @@
-$NetBSD: patch-src_glx_Makefile.am,v 1.1 2019/01/19 21:54:03 tnn Exp $
+$NetBSD: patch-src_glx_Makefile.am,v 1.2 2019/01/19 22:19:05 tnn Exp $
 
-- FDO bug 90311
 - We don't need libmesautil.la here. Those symbols seem to already be
   included in libmesa.la.
 
@@ -23,12 +22,11 @@ $NetBSD: patch-src_glx_Makefile.am,v 1.1
  
  if HAVE_DRISW
  libglx_la_SOURCES += \
-@@ -136,6 +142,8 @@ libglx_la_SOURCES += \
+@@ -136,6 +142,7 @@ libglx_la_SOURCES += \
  
  SUBDIRS += apple
  libglx_la_LIBADD += $(builddir)/apple/libappleglx.la
 +libglx_la_LIBADD += $(top_builddir)/src/mesa/libmesa.la
-+libglx_la_SOURCES += dummy.cpp
  endif
  
  if HAVE_WINDOWSDRI