summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/libva/Makefile5
-rw-r--r--multimedia/libva/PLIST16
-rw-r--r--multimedia/libva/available.mk8
-rw-r--r--multimedia/libva/distinfo14
-rw-r--r--multimedia/libva/patches/patch-ab18
-rw-r--r--multimedia/libva/patches/patch-ad76
-rw-r--r--multimedia/libva/patches/patch-configure.ac15
7 files changed, 36 insertions, 116 deletions
diff --git a/multimedia/libva/Makefile b/multimedia/libva/Makefile
index 2051310472c..1fe33e3cd2c 100644
--- a/multimedia/libva/Makefile
+++ b/multimedia/libva/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2015/09/16 12:28:53 tnn Exp $
+# $NetBSD: Makefile,v 1.10 2017/02/24 00:10:04 maya Exp $
#
-DISTNAME= libva-1.1.0
-PKGREVISION= 2
+DISTNAME= libva-1.7.3
CATEGORIES= multimedia
MASTER_SITES= http://www.freedesktop.org/software/vaapi/releases/libva/
EXTRACT_SUFX= .tar.bz2
diff --git a/multimedia/libva/PLIST b/multimedia/libva/PLIST
index a10b1bc6867..f55d9420ed9 100644
--- a/multimedia/libva/PLIST
+++ b/multimedia/libva/PLIST
@@ -1,18 +1,30 @@
-@comment $NetBSD: PLIST,v 1.4 2015/04/28 06:57:59 tnn Exp $
+@comment $NetBSD: PLIST,v 1.5 2017/02/24 00:10:04 maya Exp $
include/va/va.h
include/va/va_backend.h
${PLIST.egl}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
include/va/va_dec_jpeg.h
+include/va/va_dec_vp8.h
+include/va/va_dec_vp9.h
include/va/va_dri2.h
include/va/va_dricommon.h
-${PLIST.egl}include/va/va_egl.h
include/va/va_drm.h
include/va/va_drmcommon.h
+${PLIST.egl}include/va/va_egl.h
+include/va/va_enc_h264.h
+include/va/va_enc_hevc.h
+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_glx.h
include/va/va_tpi.h
include/va/va_version.h
+include/va/va_vpp.h
include/va/va_x11.h
lib/libva-drm.la
${PLIST.egl}lib/libva-egl.la
diff --git a/multimedia/libva/available.mk b/multimedia/libva/available.mk
index db499c1c0e7..f8b30b4cb6d 100644
--- a/multimedia/libva/available.mk
+++ b/multimedia/libva/available.mk
@@ -1,4 +1,4 @@
-# $NetBSD: available.mk,v 1.4 2016/02/25 23:35:44 jperkin Exp $
+# $NetBSD: available.mk,v 1.5 2017/02/24 00:10:04 maya Exp $
.include "../../mk/bsd.prefs.mk"
@@ -7,11 +7,7 @@
# i.e. in mplayer, xine, xbmc etc. Have a look at buildlink3.mk too.
# The following should be kept up-to-date!
-.if ${OPSYS} == "Linux"
-VAAPI_AVAILABLE= yes
-.elif ${OPSYS} == "FreeBSD"
-VAAPI_AVAILABLE= yes
-.elif ${OPSYS} == "OpenBSD"
+.if ${OPSYS} != "Darwin"
VAAPI_AVAILABLE= yes
.else
VAAPI_AVAILABLE= no
diff --git a/multimedia/libva/distinfo b/multimedia/libva/distinfo
index 079caddb6ec..82d5de55509 100644
--- a/multimedia/libva/distinfo
+++ b/multimedia/libva/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 23:54:29 agc Exp $
+$NetBSD: distinfo,v 1.5 2017/02/24 00:10:04 maya Exp $
-SHA1 (libva-1.1.0.tar.bz2) = af6e912ea86a6378992f5783390ab9cb8e5cadf9
-RMD160 (libva-1.1.0.tar.bz2) = a496111e5d942065ab7ad639cc4579d1be202aca
-SHA512 (libva-1.1.0.tar.bz2) = 3ae73e789a26b6d2eee0a38a5e1dc7f06430dbca5ca73785295ca5a1bcc0bdc0ca2423e481e1304203471b55369faf62b2a234daa6370edc7ca8013affb6eaee
-Size (libva-1.1.0.tar.bz2) = 728879 bytes
+SHA1 (libva-1.7.3.tar.bz2) = 18e46f3d5a0e971eb0ec9fe14bc021e69eb13fb8
+RMD160 (libva-1.7.3.tar.bz2) = d29e432f666df9df8b312c45cd7d9ec2f6ef6e3c
+SHA512 (libva-1.7.3.tar.bz2) = ecc1ba17e2afea2efe4d36e8d9358d420015b3ad9d2a510ee2b263274c889caf39915a8b8da2d16329184bf4f42d0cbd124af3d070b83235b6a7453afd30b3a0
+Size (libva-1.7.3.tar.bz2) = 824490 bytes
SHA1 (patch-aa) = 3e4966037c46fada25cc869b672a7e78dda5b04b
-SHA1 (patch-ab) = b98ce4693eda7f06459be78e69e1b05b9253ca78
SHA1 (patch-ac) = 776cd2f381ec974bf25054b949912a713d832ae3
-SHA1 (patch-ad) = c2fc89791700ef1c7a93b732a6c08b32c133d6c7
-SHA1 (patch-configure.ac) = b4cf0e0dc275fcf13c537255723597401bbeb622
+SHA1 (patch-ad) = d19b14007a7b031a6b8d2ec2607057b2dea839c9
SHA1 (patch-va_glx_va__glx__private.h) = daf6552189295a86f1f073ef107b7449e4098251
diff --git a/multimedia/libva/patches/patch-ab b/multimedia/libva/patches/patch-ab
deleted file mode 100644
index 8f62b19b8d5..00000000000
--- a/multimedia/libva/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2011/01/19 04:15:41 jmcneill Exp $
-
-Fix v4l2 header path on NetBSD.
-
---- va/va_backend_tpi.h.orig 2011-01-19 01:42:46.000000000 +0000
-+++ va/va_backend_tpi.h
-@@ -32,7 +32,11 @@
- #include <va/va.h>
- #include <va/va_backend.h>
-
-+#if defined(__linux__)
- #include <linux/videodev2.h>
-+#elif defined(__NetBSD__)
-+#include <sys/videoio.h>
-+#endif
-
- struct VADriverVTableTPI
- {
diff --git a/multimedia/libva/patches/patch-ad b/multimedia/libva/patches/patch-ad
index 06be2da6eee..5a7c8dd779d 100644
--- a/multimedia/libva/patches/patch-ad
+++ b/multimedia/libva/patches/patch-ad
@@ -1,67 +1,15 @@
-$NetBSD: patch-ad,v 1.2 2013/04/14 00:30:02 cheusov Exp $
+$NetBSD: patch-ad,v 1.3 2017/02/24 00:10:05 maya Exp $
-Don't hardcode -ldl
+Don't build va_trace.c - it requires linux-specific stuff,
+and is used for tracing (and doesn't seem necessary).
---- va/Makefile.am.orig 2012-09-28 14:04:28.000000000 +0000
+--- va/Makefile.am.orig 2016-11-10 00:34:35.000000000 +0000
+++ va/Makefile.am
-@@ -57,13 +57,13 @@ libvainclude_HEADERS = $(libva_source_h
- noinst_HEADERS = $(libva_source_h_priv)
- libva_la_SOURCES = $(libva_source_c)
- libva_la_LDFLAGS = $(LDADD) -no-undefined
--libva_la_LIBADD = $(LIBVA_LIBS) -ldl
-+libva_la_LIBADD = $(LIBVA_LIBS)
-
- lib_LTLIBRARIES += libva-tpi.la
- libva_tpi_la_SOURCES = va_tpi.c
- libva_tpi_la_LDFLAGS = $(LDADD) -no-undefined
- libva_tpi_la_DEPENDENCIES = libva.la
--libva_tpi_la_LIBADD = libva.la -ldl
-+libva_tpi_la_LIBADD = libva.la
-
- if USE_DRM
- SUBDIRS += drm
-@@ -72,7 +72,7 @@ libva_drm_la_SOURCES =
- libva_drm_la_LDFLAGS = $(LDADD)
- libva_drm_la_DEPENDENCIES = libva.la drm/libva_drm.la
- libva_drm_la_LIBADD = libva.la drm/libva_drm.la \
-- $(LIBVA_LIBS) $(DRM_LIBS) -ldl
-+ $(LIBVA_LIBS) $(DRM_LIBS)
- endif
-
- if USE_X11
-@@ -83,7 +83,7 @@ libva_x11_la_SOURCES =
- libva_x11_la_LDFLAGS = $(LDADD)
- libva_x11_la_DEPENDENCIES = libva.la x11/libva_x11.la
- libva_x11_la_LIBADD = libva.la x11/libva_x11.la \
-- $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(XFIXES_LIBS) $(DRM_LIBS) -ldl
-+ $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(XFIXES_LIBS) $(DRM_LIBS)
- endif
-
- if USE_GLX
-@@ -93,7 +93,7 @@ libva_glx_la_SOURCES =
- libva_glx_la_LDFLAGS = $(LDADD)
- libva_glx_la_DEPENDENCIES = libva.la glx/libva_glx.la libva-x11.la
- libva_glx_la_LIBADD = libva.la glx/libva_glx.la libva-x11.la \
-- $(GLX_LIBS) -ldl
-+ $(GLX_LIBS)
- endif
-
- if USE_EGL
-@@ -103,7 +103,7 @@ libva_egl_la_SOURCES =
- libva_egl_la_LDFLAGS = $(LDADD)
- libva_egl_la_DEPENDENCIES = libva.la egl/libva_egl.la libva-x11.la
- libva_egl_la_LIBADD = libva.la egl/libva_egl.la libva-x11.la \
-- $(EGL_LIBS) -ldl
-+ $(EGL_LIBS)
- endif
-
- if USE_WAYLAND
-@@ -113,7 +113,7 @@ libva_wayland_la_SOURCES =
- libva_wayland_la_LDFLAGS = $(LDADD)
- libva_wayland_la_DEPENDENCIES = libva.la wayland/libva_wayland.la
- libva_wayland_la_LIBADD = libva.la wayland/libva_wayland.la \
-- $(WAYLAND_LIBS) $(DRM_LIBS) -ldl
-+ $(WAYLAND_LIBS) $(DRM_LIBS)
- endif
-
- DIST_SUBDIRS = x11 glx egl drm wayland
+@@ -33,7 +33,6 @@ libva_source_c = \
+ va.c \
+ va_compat.c \
+ va_fool.c \
+- va_trace.c \
+ $(NULL)
+
+ libva_source_h = \
diff --git a/multimedia/libva/patches/patch-configure.ac b/multimedia/libva/patches/patch-configure.ac
deleted file mode 100644
index 268c7188faf..00000000000
--- a/multimedia/libva/patches/patch-configure.ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure.ac,v 1.2 2013/04/14 00:30:02 cheusov Exp $
-
-automake-1.13 compat.
-
---- configure.ac.orig 2012-10-04 13:30:51.000000000 +0000
-+++ configure.ac
-@@ -86,7 +86,7 @@ AC_CONFIG_SRCDIR([Makefile.am])
- AC_CONFIG_MACRO_DIR([m4])
- AM_INIT_AUTOMAKE([dist-bzip2])
-
--AM_CONFIG_HEADER([config.h])
-+AC_CONFIG_HEADERS([config.h])
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
- TODAY="`LC_ALL=C date +'%a, %d %b %Y %X %z'`"
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 12:06:57 +0000