Import libva version 1.0.6.

VAAPI (Video Acceleration API) enables hardware accelerated video
decode/encode at various entry-points (VLD, IDCT, Motion Compensation etc.)
for the prevailing coding standards today (MPEG-2, MPEG-4 ASP/H.263, MPEG-4
AVC/H.264, and VC-1/VMW3).

9 files changed, 178 insertions, 0 deletions

diff --git a/multimedia/libva/DESCR b/multimedia/libva/DESCR
new file mode 100644
index 00000000000..d73eb26459f
--- /dev/null
+++ b/multimedia/libva/DESCR
@@ -0,0 +1,4 @@
+VAAPI (Video Acceleration API) enables hardware accelerated video
+decode/encode at various entry-points (VLD, IDCT, Motion Compensation etc.)
+for the prevailing coding standards today (MPEG-2, MPEG-4 ASP/H.263, MPEG-4
+AVC/H.264, and VC-1/VMW3).
diff --git a/multimedia/libva/Makefile b/multimedia/libva/Makefile
new file mode 100644
index 00000000000..d6f842ab292
--- /dev/null
+++ b/multimedia/libva/Makefile
@@ -0,0 +1,39 @@
+# $NetBSD: Makefile,v 1.1.1.1 2011/01/19 04:15:41 jmcneill Exp $
+#
+
+# libva-1.0.7+ needs libdrm-2.4.23
+DISTNAME=	libva-1.0.6
+CATEGORIES=	multimedia
+MASTER_SITES=	http://cgit.freedesktop.org/libva/snapshot/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.freedesktop.org/wiki/Software/vaapi
+COMMENT=	Video Acceleration API
+LICENSE=	mit
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	autoreconf autoconf automake gmake pkg-config
+
+.include "../../mk/bsd.prefs.mk"
+
+DRIVER_SEARCH_PATH=	${PREFIX}/lib/xorg/modules/dri
+
+CONFIGURE_ARGS+=	--enable-i965-driver
+CONFIGURE_ARGS+=	--enable-shared
+CONFIGURE_ARGS+=	--with-drivers-path=${DRIVER_SEARCH_PATH}
+
+PKGCONFIG_OVERRIDE+=	libva-glx.pc.in
+PKGCONFIG_OVERRIDE+=	libva-tpi.pc.in
+PKGCONFIG_OVERRIDE+=	libva-x11.pc.in
+PKGCONFIG_OVERRIDE+=	libva.pc.in
+
+pre-configure:
+	cd ${WRKSRC} && autoreconf -i
+
+.include "../../x11/libdrm/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libva/PLIST b/multimedia/libva/PLIST
new file mode 100644
index 00000000000..21a64357e78
--- /dev/null
+++ b/multimedia/libva/PLIST
@@ -0,0 +1,23 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2011/01/19 04:15:41 jmcneill Exp $
+include/va/va.h
+include/va/va_backend.h
+include/va/va_backend_glx.h
+include/va/va_backend_tpi.h
+include/va/va_dri.h
+include/va/va_dri2.h
+include/va/va_dricommon.h
+include/va/va_dummy.h
+include/va/va_glx.h
+include/va/va_tpi.h
+include/va/va_version.h
+include/va/va_x11.h
+lib/libva-glx.la
+lib/libva-tpi.la
+lib/libva-x11.la
+lib/libva.la
+lib/pkgconfig/libva-glx.pc
+lib/pkgconfig/libva-tpi.pc
+lib/pkgconfig/libva-x11.pc
+lib/pkgconfig/libva.pc
+lib/xorg/modules/dri/dummy_drv_video.la
+lib/xorg/modules/dri/i965_drv_video.la
diff --git a/multimedia/libva/buildlink3.mk b/multimedia/libva/buildlink3.mk
new file mode 100644
index 00000000000..a315624c3c8
--- /dev/null
+++ b/multimedia/libva/buildlink3.mk
@@ -0,0 +1,13 @@
+# $NetBSD: buildlink3.mk,v 1.1.1.1 2011/01/19 04:15:41 jmcneill Exp $
+
+BUILDLINK_TREE+=	libva
+
+.if !defined(LIBVA_BUILDLINK3_MK)
+LIBVA_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.libva+=	libva>=1.0.6
+BUILDLINK_PKGSRCDIR.libva?=	../../multimedia/libva
+
+.endif	# LIBVA_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-libva
diff --git a/multimedia/libva/distinfo b/multimedia/libva/distinfo
new file mode 100644
index 00000000000..8bbbe26402f
--- /dev/null
+++ b/multimedia/libva/distinfo
@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.1.1.1 2011/01/19 04:15:41 jmcneill Exp $
+
+SHA1 (libva-1.0.6.tar.bz2) = 3b0f8032d74cfab54b83bb081d935ae14188a8b8
+RMD160 (libva-1.0.6.tar.bz2) = bf6d1010be69176f6b1c1614faa5d3d7ea1a985b
+Size (libva-1.0.6.tar.bz2) = 453303 bytes
+SHA1 (patch-aa) = 0a7ffecaedef805031b13a5f9a7262a761484201
+SHA1 (patch-ab) = b98ce4693eda7f06459be78e69e1b05b9253ca78
+SHA1 (patch-ac) = 8a2e2a7dfd6eda11ce36b50e1e50e5ac22f548da
+SHA1 (patch-ad) = 0542e7f4e533f78d32ab01b1a1e91f9ddaffaed6
diff --git a/multimedia/libva/patches/patch-aa b/multimedia/libva/patches/patch-aa
new file mode 100644
index 00000000000..272ac79509a
--- /dev/null
+++ b/multimedia/libva/patches/patch-aa
@@ -0,0 +1,18 @@
+$NetBSD: patch-aa,v 1.1.1.1 2011/01/19 04:15:41 jmcneill Exp $
+
+Fix v4l2 header path on NetBSD.
+
+--- va/va_backend.h.orig	2011-01-19 01:31:44.000000000 +0000
++++ va/va_backend.h
+@@ -33,7 +33,11 @@
+ #ifndef ANDROID
+ #include <X11/Xlib.h>
+ #endif
++#if defined(__linux__)
+ #include <linux/videodev2.h>
++#elif defined(__NetBSD__)
++#include <sys/videoio.h>
++#endif
+ 
+ typedef struct VADriverContext *VADriverContextP;
+ typedef struct VADisplayContext *VADisplayContextP;
diff --git a/multimedia/libva/patches/patch-ab b/multimedia/libva/patches/patch-ab
new file mode 100644
index 00000000000..8f62b19b8d5
--- /dev/null
+++ b/multimedia/libva/patches/patch-ab
@@ -0,0 +1,18 @@
+$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-ac b/multimedia/libva/patches/patch-ac
new file mode 100644
index 00000000000..5a381c936c6
--- /dev/null
+++ b/multimedia/libva/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1.1.1 2011/01/19 04:15:41 jmcneill Exp $
+
+Don't build tests.
+
+--- Makefile.am.orig	2011-01-19 01:42:40.000000000 +0000
++++ Makefile.am
+@@ -22,7 +22,7 @@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+-SUBDIRS = va test
++SUBDIRS = va
+ if BUILD_DUMMY_DRIVER
+ SUBDIRS += dummy_drv_video
+ endif
diff --git a/multimedia/libva/patches/patch-ad b/multimedia/libva/patches/patch-ad
new file mode 100644
index 00000000000..08c591e6cbf
--- /dev/null
+++ b/multimedia/libva/patches/patch-ad
@@ -0,0 +1,39 @@
+$NetBSD: patch-ad,v 1.1.1.1 2011/01/19 04:15:41 jmcneill Exp $
+
+Don't hardcode -ldl
+
+--- va/Makefile.am.orig	2011-01-19 01:42:46.000000000 +0000
++++ va/Makefile.am
+@@ -30,12 +30,12 @@ LDADD = \
+ libva_la_SOURCES = va.c va_trace.c va_fool.c
+ libva_ladir = $(libdir)
+ libva_la_LDFLAGS = $(LDADD) -no-undefined
+-libva_la_LIBADD = $(LIBVA_LIBS) -ldl
++libva_la_LIBADD = $(LIBVA_LIBS)
+ 
+ libva_tpi_la_SOURCES = va_tpi.c
+ libva_tpi_ladir = $(libdir)
+ libva_tpi_la_LDFLAGS = $(LDADD) -no-undefined
+-libva_tpi_la_LIBADD = $(libvacorelib) -ldl
++libva_tpi_la_LIBADD = $(libvacorelib)
+ libva_tpi_la_DEPENDENCIES = $(libvacorelib) 
+ 
+ 
+@@ -43,7 +43,7 @@ libva_x11_backend      = libva-x11.la
+ libva_x11_backenddir   = x11
+ 
+ libva_x11_la_SOURCES = 
+-libva_x11_la_LIBADD  = $(libvacorelib) x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(DRM_LIBS) $(XFIXES_LIBS) -ldl
++libva_x11_la_LIBADD  = $(libvacorelib) x11/libva_x11.la $(LIBVA_LIBS) $(X11_LIBS) $(XEXT_LIBS) $(DRM_LIBS) $(XFIXES_LIBS)
+ libva_x11_la_LDFLAGS = $(LDADD)
+ libva_x11_la_DEPENDENCIES = $(libvacorelib) x11/libva_x11.la
+ 
+@@ -65,7 +65,7 @@ libva_glx_backend      = libva-glx.la
+ libva_glx_backenddir   = glx
+ 
+ libva_glx_la_SOURCES =
+-libva_glx_la_LIBADD  = $(libvacorelib) glx/libva_glx.la libva-x11.la $(GL_DEPS_LIBS) -ldl
++libva_glx_la_LIBADD  = $(libvacorelib) glx/libva_glx.la libva-x11.la $(GL_DEPS_LIBS)
+ libva_glx_la_LDFLAGS = $(LDADD)
+ libva_glx_la_DEPENDENCIES = $(libvacorelib) glx/libva_glx.la libva-x11.la
+