summaryrefslogtreecommitdiff
path: root/multimedia/libva
diff options
context:
space:
mode:
authorGuido Falsi <madpilot@FreeBSD.org>2017-12-12 21:29:57 +0000
committerGuido Falsi <madpilot@FreeBSD.org>2017-12-12 21:29:57 +0000
commitc26152ae1a7db2c114ab9f5a13ef927eb6186438 (patch)
tree854bdaba20de06958c822081f4c989c3ce7d6e10 /multimedia/libva
parentGodef - find symbol information in Go source (diff)
- Update libva to 2.0.0
- Update libva-intel-driver to 2.0.0 - Update libva-utils to 2.0.0 - Bump dependent ports due to shlib bump - Import upstream patch to fix multimedia/mpv [1] - Import upstream patch to fix multimedia/gstreamer1-vaapi [2] Approved by: cpm [1], multimedia (timeout) [2] Obtained from: https://github.com/mpv-player/mpv/commit/2ecf240b1cd20875991a5b18efafbe799864ff7f [1] https://cgit.freedesktop.org/gstreamer/gstreamer-vaapi/commit/gst-libs/gst/vaapi/gstvaapiutils.c?id=777bba473e3ed1c7b8b7f7f0322892851c70dfd9 [2] Differential Revision: https://reviews.freebsd.org/D12761
Notes
Notes: svn path=/head/; revision=456184
Diffstat (limited to 'multimedia/libva')
-rw-r--r--multimedia/libva/Makefile20
-rw-r--r--multimedia/libva/distinfo6
-rw-r--r--multimedia/libva/files/patch-va_glx_va__glx__private.h (renamed from multimedia/libva/files/patch-va__glx__va_glx_private.h)4
-rw-r--r--multimedia/libva/files/patch-va_va.c (renamed from multimedia/libva/files/patch-va__va.c)6
-rw-r--r--multimedia/libva/files/patch-va_va__trace.c14
-rw-r--r--multimedia/libva/pkg-plist29
6 files changed, 31 insertions, 48 deletions
diff --git a/multimedia/libva/Makefile b/multimedia/libva/Makefile
index aadc499d74bc..41e0e3e5c3cb 100644
--- a/multimedia/libva/Makefile
+++ b/multimedia/libva/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= libva
-PORTVERSION= 1.8.3
+PORTVERSION= 2.0.0
CATEGORIES= multimedia
MAINTAINER= madpilot@FreeBSD.org
@@ -20,6 +20,7 @@ USE_GL= gl
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-prefix=va
USE_LDCONFIG= yes
+INSTALL_TARGET= install-strip
USE_GITHUB= yes
GH_ACCOUNT= 01org
@@ -30,19 +31,8 @@ CFLAGS+= -DHAVE_LINUX_INTEGER_TYPES
OPTIONS_DEFINE= DEBUG
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDEBUG}
-CFLAGS+= -D_DEBUG
-.else
-CFLAGS+= -DNDEBUG
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if defined(STRIP) && ${STRIP} != ""
-INSTALL_TARGET= install-strip
-.endif
+DEBUG_CFLAGS= -D_DEBUG
+DEBUG_CFLAGS_OFF= -DNDEBUG
post-patch: .SILENT
${REINPLACE_CMD} -e 's|\($$libdir\)/dri|\1/va|' \
@@ -52,4 +42,4 @@ post-patch: .SILENT
${WRKSRC}/doc/Makefile.am
${REINPLACE_CMD} 's/-ldl//' ${WRKSRC}/va/Makefile.am
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/libva/distinfo b/multimedia/libva/distinfo
index 42a07fdb3ce4..ab6bde028748 100644
--- a/multimedia/libva/distinfo
+++ b/multimedia/libva/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498657745
-SHA256 (01org-libva-1.8.3_GH0.tar.gz) = 5ac4b0156c39cbca78913ebc0ff823b1abd5faa41121204c0707d62c27f07285
-SIZE (01org-libva-1.8.3_GH0.tar.gz) = 186915
+TIMESTAMP = 1508575075
+SHA256 (01org-libva-2.0.0_GH0.tar.gz) = dce5e21ffe6083a230814493e806f9e622d11570d633d48ca2f6bd103f6afe3e
+SIZE (01org-libva-2.0.0_GH0.tar.gz) = 191311
diff --git a/multimedia/libva/files/patch-va__glx__va_glx_private.h b/multimedia/libva/files/patch-va_glx_va__glx__private.h
index db19f449b15b..19aa82a91ca7 100644
--- a/multimedia/libva/files/patch-va__glx__va_glx_private.h
+++ b/multimedia/libva/files/patch-va_glx_va__glx__private.h
@@ -1,6 +1,6 @@
---- va/glx/va_glx_private.h.orig 2015-07-01 07:54:24 UTC
+--- va/glx/va_glx_private.h.orig 2017-10-21 04:49:28 UTC
+++ va/glx/va_glx_private.h
-@@ -38,7 +38,7 @@ typedef void (*PFNGLXBINDTEXIMAGEEXTPROC
+@@ -38,7 +38,7 @@ typedef void (*PFNGLXBINDTEXIMAGEEXTPROC)(Display *, G
typedef void (*PFNGLXRELEASETEXIMAGEEXTPROC)(Display *, GLXDrawable, int);
#endif
diff --git a/multimedia/libva/files/patch-va__va.c b/multimedia/libva/files/patch-va_va.c
index 0e0ae1db4c18..c93738827602 100644
--- a/multimedia/libva/files/patch-va__va.c
+++ b/multimedia/libva/files/patch-va_va.c
@@ -1,9 +1,9 @@
---- va/va.c.orig 2014-09-30 01:48:34 UTC
+--- va/va.c.orig 2017-10-21 04:49:28 UTC
+++ va/va.c
-@@ -227,7 +227,7 @@
+@@ -350,7 +350,7 @@ static VAStatus va_openDriver(VADisplay dpy, char *dri
strncat( driver_path, DRIVER_EXTENSION, strlen(DRIVER_EXTENSION) );
- va_infoMessage("Trying to open %s\n", driver_path);
+ va_infoMessage(dpy, "Trying to open %s\n", driver_path);
-#ifndef ANDROID
+#if !defined(ANDROID) && defined(RTLD_NODELETE)
handle = dlopen( driver_path, RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE );
diff --git a/multimedia/libva/files/patch-va_va__trace.c b/multimedia/libva/files/patch-va_va__trace.c
index 501eb0720333..cfaf5867b9d2 100644
--- a/multimedia/libva/files/patch-va_va__trace.c
+++ b/multimedia/libva/files/patch-va_va__trace.c
@@ -1,6 +1,6 @@
---- va/va_trace.c.orig 2016-06-21 01:29:25 UTC
+--- va/va_trace.c.orig 2017-10-21 04:49:28 UTC
+++ va/va_trace.c
-@@ -48,6 +48,9 @@
+@@ -50,6 +50,9 @@
#include <sys/stat.h>
#include <sys/syscall.h>
#include <pthread.h>
@@ -10,7 +10,7 @@
#include <unistd.h>
#include <time.h>
#include <errno.h>
-@@ -294,7 +297,13 @@ static void add_trace_config_info(
+@@ -291,7 +294,13 @@ static void add_trace_config_info(
{
struct trace_config_info *pconfig_info;
int idx = 0;
@@ -24,7 +24,7 @@
LOCK_RESOURCE(pva_trace);
-@@ -318,7 +327,13 @@ static void delete_trace_config_info(
+@@ -315,7 +324,13 @@ static void delete_trace_config_info(
{
struct trace_config_info *pconfig_info;
int idx = 0;
@@ -38,7 +38,7 @@
LOCK_RESOURCE(pva_trace);
-@@ -663,7 +678,13 @@ static struct trace_log_file *start_trac
+@@ -662,7 +677,13 @@ static struct trace_log_file *start_tracing2log_file(
{
struct trace_log_files_manager *plog_files_mgr = NULL;
struct trace_log_file *plog_file = NULL;
@@ -52,7 +52,7 @@
int i = 0;
LOCK_RESOURCE(pva_trace);
-@@ -702,7 +723,13 @@ static void refresh_log_file(
+@@ -701,7 +722,13 @@ static void refresh_log_file(
struct trace_context *ptra_ctx)
{
struct trace_log_file *plog_file = NULL;
@@ -66,7 +66,7 @@
int i = 0;
plog_file = ptra_ctx->plog_file;
-@@ -1226,7 +1253,13 @@ static void internal_TraceUpdateContext
+@@ -1224,7 +1251,13 @@ static void internal_TraceUpdateContext (
{
struct trace_context *trace_ctx = NULL;
int i = 0, delete = 1;
diff --git a/multimedia/libva/pkg-plist b/multimedia/libva/pkg-plist
index 529557e3de3f..0f3c420f9bbd 100644
--- a/multimedia/libva/pkg-plist
+++ b/multimedia/libva/pkg-plist
@@ -1,8 +1,6 @@
include/va/va.h
include/va/va_backend.h
-include/va/va_backend_egl.h
include/va/va_backend_glx.h
-include/va/va_backend_tpi.h
include/va/va_backend_vpp.h
include/va/va_compat.h
include/va/va_dec_hevc.h
@@ -20,32 +18,27 @@ include/va/va_enc_jpeg.h
include/va/va_enc_mpeg2.h
include/va/va_enc_vp8.h
include/va/va_enc_vp9.h
+include/va/va_fei_h264.h
+include/va/va_fei.h
include/va/va_glx.h
+include/va/va_str.h
include/va/va_tpi.h
include/va/va_version.h
include/va/va_vpp.h
include/va/va_x11.h
lib/libva-drm.so
-lib/libva-drm.so.1
-lib/libva-drm.so.1.4000.0
-lib/libva-egl.so
-lib/libva-egl.so.1
-lib/libva-egl.so.1.4000.0
+lib/libva-drm.so.2
+lib/libva-drm.so.2.0.0
lib/libva-glx.so
-lib/libva-glx.so.1
-lib/libva-glx.so.1.4000.0
-lib/libva-tpi.so
-lib/libva-tpi.so.1
-lib/libva-tpi.so.1.4000.0
+lib/libva-glx.so.2
+lib/libva-glx.so.2.0.0
lib/libva-x11.so
-lib/libva-x11.so.1
-lib/libva-x11.so.1.4000.0
+lib/libva-x11.so.2
+lib/libva-x11.so.2.0.0
lib/libva.so
-lib/libva.so.1
-lib/libva.so.1.4000.0
+lib/libva.so.2
+lib/libva.so.2.0.0
libdata/pkgconfig/libva-drm.pc
-libdata/pkgconfig/libva-egl.pc
libdata/pkgconfig/libva-glx.pc
-libdata/pkgconfig/libva-tpi.pc
libdata/pkgconfig/libva-x11.pc
libdata/pkgconfig/libva.pc
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-27 18:36:17 +0000