diff options
| author | maya <maya> | 2017-03-06 10:19:57 +0000 |
|---|---|---|
| committer | maya <maya> | 2017-03-06 10:19:57 +0000 |
| commit | eda30d9577db58fbb0025df166c1fb4cc1e5a2f5 (patch) | |
| tree | 17ef41ef7d124188ab9e65116f5d1302d46d3c47 /multimedia | |
| parent | 095238ea9fb8c00f0c7f777debbb702089a48268 (diff) | |
| download | pkgsrc-eda30d9577db58fbb0025df166c1fb4cc1e5a2f5.tar.gz | |
libva: drop local patch to workaround the need to specify LIBVA_DRIVER_NAME
intel shouldn't use gallium, there's a separate driver for it which is better,
now in wip/intel-vaapi-driver. thanks leot for pointing it out.
bump pkgrevision
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/libva/Makefile | 4 | ||||
| -rw-r--r-- | multimedia/libva/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/libva/patches/patch-va_va.c | 29 |
3 files changed, 3 insertions, 33 deletions
diff --git a/multimedia/libva/Makefile b/multimedia/libva/Makefile index 13cfb83f4e0..9572b56bbf7 100644 --- a/multimedia/libva/Makefile +++ b/multimedia/libva/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.13 2017/02/24 19:14:17 maya Exp $ +# $NetBSD: Makefile,v 1.14 2017/03/06 10:19:57 maya Exp $ # DISTNAME= libva-1.7.3 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= multimedia MASTER_SITES= http://www.freedesktop.org/software/vaapi/releases/libva/ EXTRACT_SUFX= .tar.bz2 diff --git a/multimedia/libva/distinfo b/multimedia/libva/distinfo index fa2ed13f75e..95360e2f90f 100644 --- a/multimedia/libva/distinfo +++ b/multimedia/libva/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2017/02/24 19:14:17 maya Exp $ +$NetBSD: distinfo,v 1.9 2017/03/06 10:19:57 maya Exp $ SHA1 (libva-1.7.3.tar.bz2) = 18e46f3d5a0e971eb0ec9fe14bc021e69eb13fb8 RMD160 (libva-1.7.3.tar.bz2) = d29e432f666df9df8b312c45cd7d9ec2f6ef6e3c @@ -8,5 +8,4 @@ SHA1 (patch-aa) = 3e4966037c46fada25cc869b672a7e78dda5b04b SHA1 (patch-ac) = d5cf7bb9175617d3d152e8c6fbc9d2ef823eba42 SHA1 (patch-va_Makefile.am) = 0bf9bb930bce79994ef060e6ad44cb1bf9eb0773 SHA1 (patch-va_glx_va__glx__private.h) = daf6552189295a86f1f073ef107b7449e4098251 -SHA1 (patch-va_va.c) = 6987c93b7be0d2c9fda780b73e48894faaed60f1 SHA1 (patch-va_va__trace.c) = 4dfdc200e9e34625929612e594d880cff1f6271d diff --git a/multimedia/libva/patches/patch-va_va.c b/multimedia/libva/patches/patch-va_va.c deleted file mode 100644 index 976f8ef8b2b..00000000000 --- a/multimedia/libva/patches/patch-va_va.c +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-va_va.c,v 1.1 2017/02/24 16:44:03 maya Exp $ - -libva can currently (201702) only use gallium, having tested -for the definition of __vaDriverInit in libraries in DRIVER_SEARCH_PATH -(see package Makefile). - -however, it doesn't guess the right driver name for nouveau, so force -it to use gallium. - ---- va/va.c.orig 2016-11-10 01:04:28.000000000 +0000 -+++ va/va.c -@@ -557,6 +557,17 @@ VAStatus vaInitialize ( - driver_name = strdup(driver_name_env); - vaStatus = VA_STATUS_SUCCESS; - va_infoMessage("User requested driver '%s'\n", driver_name); -+ } else { -+ /* -+ * XXX 201702 only gallium works (provides the required __vaDriverInit) -+ * XXX but the correct name is not guessed, so force it. -+ */ -+ if (driver_name) /* memory is allocated in va_getDriverName */ -+ free(driver_name); -+ -+ driver_name = strdup("gallium"); -+ vaStatus = VA_STATUS_SUCCESS; -+ va_infoMessage("Using hard-coded gallium driver\n"); - } - - if ((VA_STATUS_SUCCESS == vaStatus) && (driver_name != NULL)) { |