Updated to 1.1.0. A lot of changes since 1.0.6, see NEWS file.

10 files changed, 134 insertions, 67 deletions

diff --git a/multimedia/libva/Makefile b/multimedia/libva/Makefile
index 9e8957a5661..57b5c531182 100644
--- a/multimedia/libva/Makefile
+++ b/multimedia/libva/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2012/10/08 09:21:07 asau Exp $
+# $NetBSD: Makefile,v 1.5 2013/04/14 00:30:02 cheusov Exp $
 #
 
-# libva-1.0.7+ needs libdrm-2.4.23
-DISTNAME=	libva-1.0.6
-PKGREVISION=	1
+DISTNAME=	libva-1.1.0
 CATEGORIES=	multimedia
-MASTER_SITES=	http://cgit.freedesktop.org/libva/snapshot/
+MASTER_SITES=	http://www.freedesktop.org/software/vaapi/releases/libva/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -23,7 +21,9 @@ 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}
+CONFIGURE_ARGS+=	--with-drivers-path=${DRIVER_SEARCH_PATH:Q}
+
+LIBS+=			${BUILDLINK_LDADD.dl}
 
 PKGCONFIG_OVERRIDE+=	libva-glx.pc.in
 PKGCONFIG_OVERRIDE+=	libva-tpi.pc.in
diff --git a/multimedia/libva/PLIST b/multimedia/libva/PLIST
index 21a64357e78..e3d533648f9 100644
--- a/multimedia/libva/PLIST
+++ b/multimedia/libva/PLIST
@@ -1,23 +1,25 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/01/19 04:15:41 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/04/14 00:30:02 cheusov 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_dec_jpeg.h
 include/va/va_dri2.h
 include/va/va_dricommon.h
-include/va/va_dummy.h
+include/va/va_drm.h
+include/va/va_drmcommon.h
 include/va/va_glx.h
 include/va/va_tpi.h
 include/va/va_version.h
 include/va/va_x11.h
+lib/libva-drm.la
 lib/libva-glx.la
 lib/libva-tpi.la
 lib/libva-x11.la
 lib/libva.la
+lib/pkgconfig/libva-drm.pc
 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/available.mk b/multimedia/libva/available.mk
new file mode 100644
index 00000000000..dd1d037d173
--- /dev/null
+++ b/multimedia/libva/available.mk
@@ -0,0 +1,10 @@
+# $NetBSD: available.mk,v 1.1 2013/04/14 00:30:02 cheusov Exp $
+
+.include "../../mk/bsd.prefs.mk"
+
+# At the moment VAAPI is available only for XXX.  The following
+# condition is here to NOT list these platforms in multiple places,
+# i.e. in mplayer, xine, xbmc etc.  Have a look at buildlink3.mk too.
+
+# Enable VAAPI everywhere for now
+VAAPI_AVAILABLE=	yes
diff --git a/multimedia/libva/buildlink3.mk b/multimedia/libva/buildlink3.mk
index a315624c3c8..a790872c8b4 100644
--- a/multimedia/libva/buildlink3.mk
+++ b/multimedia/libva/buildlink3.mk
@@ -1,4 +1,7 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2011/01/19 04:15:41 jmcneill Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2013/04/14 00:30:02 cheusov Exp $
+
+.include "../../multimedia/libva/available.mk"
+.if ${VAAPI_AVAILABLE} == "yes"
 
 BUILDLINK_TREE+=	libva
 
@@ -8,6 +11,11 @@ LIBVA_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.libva+=	libva>=1.0.6
 BUILDLINK_PKGSRCDIR.libva?=	../../multimedia/libva
 
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libdrm/buildlink3.mk"
+
 .endif	# LIBVA_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-libva
+
+.endif # VAAPI_AVAILABLE
diff --git a/multimedia/libva/distinfo b/multimedia/libva/distinfo
index 9313920ffbd..bfb6c257ca3 100644
--- a/multimedia/libva/distinfo
+++ b/multimedia/libva/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.2 2013/01/23 17:28:54 wiz Exp $
+$NetBSD: distinfo,v 1.3 2013/04/14 00:30:02 cheusov 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 (libva-1.1.0.tar.bz2) = af6e912ea86a6378992f5783390ab9cb8e5cadf9
+RMD160 (libva-1.1.0.tar.bz2) = a496111e5d942065ab7ad639cc4579d1be202aca
+Size (libva-1.1.0.tar.bz2) = 728879 bytes
+SHA1 (patch-aa) = 3e4966037c46fada25cc869b672a7e78dda5b04b
 SHA1 (patch-ab) = b98ce4693eda7f06459be78e69e1b05b9253ca78
-SHA1 (patch-ac) = 8a2e2a7dfd6eda11ce36b50e1e50e5ac22f548da
-SHA1 (patch-ad) = 0542e7f4e533f78d32ab01b1a1e91f9ddaffaed6
-SHA1 (patch-configure.ac) = b4b858dc25923883e8e9c719062c0775a371ac6b
+SHA1 (patch-ac) = 776cd2f381ec974bf25054b949912a713d832ae3
+SHA1 (patch-ad) = c2fc89791700ef1c7a93b732a6c08b32c133d6c7
+SHA1 (patch-configure.ac) = b4cf0e0dc275fcf13c537255723597401bbeb622
+SHA1 (patch-va_glx_va__glx__private.h) = daf6552189295a86f1f073ef107b7449e4098251
diff --git a/multimedia/libva/patches/patch-aa b/multimedia/libva/patches/patch-aa
index 272ac79509a..0abeb935b17 100644
--- a/multimedia/libva/patches/patch-aa
+++ b/multimedia/libva/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2011/01/19 04:15:41 jmcneill Exp $
+$NetBSD: patch-aa,v 1.2 2013/04/14 00:30:02 cheusov Exp $
 
 Fix v4l2 header path on NetBSD.
 
---- va/va_backend.h.orig	2011-01-19 01:31:44.000000000 +0000
+--- va/va_backend.h.orig	2012-09-28 14:04:28.000000000 +0000
 +++ va/va_backend.h
-@@ -33,7 +33,11 @@
- #ifndef ANDROID
- #include <X11/Xlib.h>
- #endif
+@@ -30,7 +30,11 @@
+ #define _VA_BACKEND_H_
+ 
+ #include <va/va.h>
 +#if defined(__linux__)
  #include <linux/videodev2.h>
 +#elif defined(__NetBSD__)
diff --git a/multimedia/libva/patches/patch-ac b/multimedia/libva/patches/patch-ac
index 5a381c936c6..c1498575187 100644
--- a/multimedia/libva/patches/patch-ac
+++ b/multimedia/libva/patches/patch-ac
@@ -1,15 +1,15 @@
-$NetBSD: patch-ac,v 1.1.1.1 2011/01/19 04:15:41 jmcneill Exp $
+$NetBSD: patch-ac,v 1.2 2013/04/14 00:30:02 cheusov Exp $
 
 Don't build tests.
 
---- Makefile.am.orig	2011-01-19 01:42:40.000000000 +0000
+--- Makefile.am.orig	2012-09-28 14:04:28.000000000 +0000
 +++ Makefile.am
-@@ -22,7 +22,7 @@
+@@ -24,7 +24,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
  
  AUTOMAKE_OPTIONS = foreign
  
--SUBDIRS = va test
-+SUBDIRS = va
- if BUILD_DUMMY_DRIVER
- SUBDIRS += dummy_drv_video
- endif
+-SUBDIRS = va dummy_drv_video pkgconfig test debian.upstream doc
++SUBDIRS = va dummy_drv_video pkgconfig debian.upstream doc
+ 
+ # Extra clean files so that maintainer-clean removes *everything*
+ MAINTAINERCLEANFILES = \
diff --git a/multimedia/libva/patches/patch-ad b/multimedia/libva/patches/patch-ad
index 08c591e6cbf..06be2da6eee 100644
--- a/multimedia/libva/patches/patch-ad
+++ b/multimedia/libva/patches/patch-ad
@@ -1,39 +1,67 @@
-$NetBSD: patch-ad,v 1.1.1.1 2011/01/19 04:15:41 jmcneill Exp $
+$NetBSD: patch-ad,v 1.2 2013/04/14 00:30:02 cheusov Exp $
 
 Don't hardcode -ldl
 
---- va/Makefile.am.orig	2011-01-19 01:42:46.000000000 +0000
+--- va/Makefile.am.orig	2012-09-28 14:04:28.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)
+@@ -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)
  
- 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) 
+ 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
  
-@@ -43,7 +43,7 @@ libva_x11_backend      = libva-x11.la
- libva_x11_backenddir   = x11
+ 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
  
- 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
+ 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
  
-@@ -65,7 +65,7 @@ libva_glx_backend      = libva-glx.la
- libva_glx_backenddir   = glx
+ 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
  
- 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
+ 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
diff --git a/multimedia/libva/patches/patch-configure.ac b/multimedia/libva/patches/patch-configure.ac
index 28199c72b3e..268c7188faf 100644
--- a/multimedia/libva/patches/patch-configure.ac
+++ b/multimedia/libva/patches/patch-configure.ac
@@ -1,15 +1,15 @@
-$NetBSD: patch-configure.ac,v 1.1 2013/01/23 17:28:54 wiz Exp $
+$NetBSD: patch-configure.ac,v 1.2 2013/04/14 00:30:02 cheusov Exp $
 
 automake-1.13 compat.
 
---- configure.ac.orig	2010-10-27 23:26:04.000000000 +0000
+--- configure.ac.orig	2012-10-04 13:30:51.000000000 +0000
 +++ configure.ac
-@@ -41,7 +41,7 @@ AC_INIT([libva], [libva_version], [waldo
- AC_CONFIG_SRCDIR([Makefile.am])
+@@ -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])])
  
- LIBVA_MAJOR_VERSION=libva_major_version
- LIBVA_MINOR_VERSION=libva_minor_version
+ TODAY="`LC_ALL=C date +'%a, %d %b %Y %X %z'`"
diff --git a/multimedia/libva/patches/patch-va_glx_va__glx__private.h b/multimedia/libva/patches/patch-va_glx_va__glx__private.h
new file mode 100644
index 00000000000..104cc3f3d70
--- /dev/null
+++ b/multimedia/libva/patches/patch-va_glx_va__glx__private.h
@@ -0,0 +1,18 @@
+$NetBSD: patch-va_glx_va__glx__private.h,v 1.1 2013/04/14 00:30:03 cheusov Exp $
+
+Fix for build failure with pkgsrc Xorg.
+Tested on Linux (pkgsrc X) and NetBSD (native X).
+
+--- va/glx/va_glx_private.h.orig	2012-02-14 12:53:50.000000000 +0000
++++ va/glx/va_glx_private.h
+@@ -41,8 +41,10 @@ typedef void (*PFNGLXRELEASETEXIMAGEEXTP
+ #if GLX_GLXEXT_VERSION < 27
+ /* XXX: this is not exactly that version but this is the only means to
+    make sure we have the correct <GL/glx.h> with those signatures */
++/*
+ typedef GLXPixmap (*PFNGLXCREATEPIXMAPPROC)(Display *, GLXFBConfig, Pixmap, const int *);
+ typedef void (*PFNGLXDESTROYPIXMAPPROC)(Display *, GLXPixmap);
++*/
+ #endif
+ 
+ typedef struct VAOpenGLVTable *VAOpenGLVTableP;