Module Name: xsrc
Committed By: mrg
Date: Sun Mar 10 04:25:39 UTC 2019
Modified Files:
xsrc/external/mit/libvdpau/dist/src: mesa_dri2.c util.h vdpau_wrapper.c
Log Message:
merge this change from maya@:
commit 4fa18f04dce5333189004834c1183d7a14ee0ef5
Author: Maya Rashish <m...@netbsd.org>
Date: Sun Feb 24 09:32:11 2019 +0200
Don't warn (-Werror) about secure_getenv, use getenv_wrapper.
Does the same thing for netbsd.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/libvdpau/dist/src/mesa_dri2.c \
xsrc/external/mit/libvdpau/dist/src/util.h \
xsrc/external/mit/libvdpau/dist/src/vdpau_wrapper.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libvdpau/dist/src/mesa_dri2.c
diff -u xsrc/external/mit/libvdpau/dist/src/mesa_dri2.c:1.1.1.1 xsrc/external/mit/libvdpau/dist/src/mesa_dri2.c:1.2
--- xsrc/external/mit/libvdpau/dist/src/mesa_dri2.c:1.1.1.1 Sun Mar 10 02:55:40 2019
+++ xsrc/external/mit/libvdpau/dist/src/mesa_dri2.c Sun Mar 10 04:25:39 2019
@@ -132,7 +132,7 @@ _vdp_DRI2Connect(Display * dpy, XID wind
req->driverType = DRI2DriverVDPAU;
#ifdef DRI2DriverPrimeShift
{
- char *prime = secure_getenv("DRI_PRIME");
+ char *prime = getenv_wrapper("DRI_PRIME");
if (prime) {
unsigned int primeid;
errno = 0;
Index: xsrc/external/mit/libvdpau/dist/src/util.h
diff -u xsrc/external/mit/libvdpau/dist/src/util.h:1.1.1.1 xsrc/external/mit/libvdpau/dist/src/util.h:1.2
--- xsrc/external/mit/libvdpau/dist/src/util.h:1.1.1.1 Sun Mar 10 02:55:40 2019
+++ xsrc/external/mit/libvdpau/dist/src/util.h Sun Mar 10 04:25:39 2019
@@ -38,7 +38,7 @@ static char * getenv_wrapper(const char
}
}
-#ifndef HAVE_SECURE_GETENV
+#if 0 // Just substituting it for the above equivalent
# ifdef HAVE___SECURE_GETENV
# define secure_getenv __secure_getenv
# else
Index: xsrc/external/mit/libvdpau/dist/src/vdpau_wrapper.c
diff -u xsrc/external/mit/libvdpau/dist/src/vdpau_wrapper.c:1.1.1.1 xsrc/external/mit/libvdpau/dist/src/vdpau_wrapper.c:1.2
--- xsrc/external/mit/libvdpau/dist/src/vdpau_wrapper.c:1.1.1.1 Sun Mar 10 02:55:40 2019
+++ xsrc/external/mit/libvdpau/dist/src/vdpau_wrapper.c Sun Mar 10 04:25:39 2019
@@ -118,7 +118,7 @@ static VdpStatus _vdp_open_driver(
char const * vdpau_trace;
char const * func_name;
- vdpau_driver = secure_getenv("VDPAU_DRIVER");
+ vdpau_driver = getenv_wrapper("VDPAU_DRIVER");
if (vdpau_driver) {
if (strchr(vdpau_driver, '/')) {
vdpau_driver = NULL;
@@ -133,7 +133,7 @@ static VdpStatus _vdp_open_driver(
}
/* Don't allow setuid apps to use VDPAU_DRIVER_PATH */
- vdpau_driver_path = secure_getenv("VDPAU_DRIVER_PATH");
+ vdpau_driver_path = getenv_wrapper("VDPAU_DRIVER_PATH");
if (vdpau_driver_path &&
snprintf(vdpau_driver_lib, sizeof(vdpau_driver_lib),
DRIVER_LIB_FORMAT, vdpau_driver_path, vdpau_driver) <
@@ -181,7 +181,7 @@ static VdpStatus _vdp_open_driver(
_vdp_backend_dll = _vdp_driver_dll;
- vdpau_trace = secure_getenv("VDPAU_TRACE");
+ vdpau_trace = getenv_wrapper("VDPAU_TRACE");
if (vdpau_trace && atoi(vdpau_trace)) {
SetDllHandle * set_dll_handle;
