View | Details | Raw Unified | Return to bug 173597 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-6 / +8 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	libva-intel-driver
4
PORTNAME=	libva-intel-driver
5
PORTVERSION=	1.0.18
5
PORTVERSION=	1.0.19
6
CATEGORIES=	multimedia
6
CATEGORIES=	multimedia
7
MASTER_SITES=	http://www.freedesktop.org/software/vaapi/releases/${PORTNAME}/
7
MASTER_SITES=	http://www.freedesktop.org/software/vaapi/releases/${PORTNAME}/
8
8
Lines 18-25 Link Here
18
USE_GMAKE=	yes
18
USE_GMAKE=	yes
19
USE_BZIP2=	yes
19
USE_BZIP2=	yes
20
USE_GL=		gl
20
USE_GL=		gl
21
USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtoolize
22
ACLOCAL_ARGS=	-I.
23
AUTOMAKE_ARGS=	--add-missing
21
USE_LDCONFIG=	yes
24
USE_LDCONFIG=	yes
22
GNU_CONFIGURE=	yes
23
25
24
CPPFLAGS+=	-isystem${LOCALBASE}/include
26
CPPFLAGS+=	-isystem${LOCALBASE}/include
25
LDFLAGS+=	-L${LOCALBASE}/lib
27
LDFLAGS+=	-L${LOCALBASE}/lib
Lines 32-40 Link Here
32
.endif
34
.endif
33
35
34
post-patch:     .SILENT
36
post-patch:     .SILENT
35
	${REINPLACE_CMD} -e '/LIBS/{ s/-ldl//; \
37
	${REINPLACE_CMD} -e 's/-ldl//' \
36
		s/-lrt//; s/-lpthread/${PTHREAD_LIBS}/; }' \
38
		${WRKSRC}/src/Makefile.am
37
		-e 's|driverdir|& --define-variable prefix=${PREFIX}|' \
39
	${REINPLACE_CMD} -e 's|driverdir|& --define-variable prefix=${PREFIX}|' \
38
		${WRKSRC}/configure
40
		${WRKSRC}/configure.ac
39
41
40
.include <bsd.port.mk>
42
.include <bsd.port.mk>
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (libva-intel-driver-1.0.18.tar.bz2) = 789fa2d6e22b9028ce12a89981eb33e57b04301431415149acfb61a49d3a63ee
1
SHA256 (libva-intel-driver-1.0.19.tar.bz2) = 2db68da9f4cea9b726ce2cd7c6246d902085310d83609082e453aa01559ea792
2
SIZE (libva-intel-driver-1.0.18.tar.bz2) = 581497
2
SIZE (libva-intel-driver-1.0.19.tar.bz2) = 448951
(-)files/patch-drm_state_upstream (-68 lines)
Lines 1-68 Link Here
1
From 73ccb0c88d53298befa6a896d2bb39a041169b36 Mon Sep 17 00:00:00 2001
2
From: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
3
Date: Fri, 06 Apr 2012 15:24:36 +0000
4
Subject: dri: cope with drm_state changes.
5
6
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
7
---
8
diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c
9
index 3bea253..20fed99 100644
10
--- src/i965_drv_video.c
11
+++ src/i965_drv_video.c
12
@@ -2380,7 +2380,7 @@ i965_PutSurface(VADriverContextP ctx,
13
                 unsigned int flags) /* de-interlacing flags */
14
 {
15
     struct i965_driver_data *i965 = i965_driver_data(ctx); 
16
-    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
17
+    struct dri_state *dri_state = (struct dri_state *)ctx->drm_state;
18
     struct i965_render_state *render_state = &i965->render_state;
19
     struct dri_drawable *dri_drawable;
20
     union dri_buffer *buffer;
21
@@ -2393,7 +2393,7 @@ i965_PutSurface(VADriverContextP ctx,
22
     int pp_flag = 0;
23
 
24
     /* Currently don't support DRI1 */
25
-    if (dri_state->driConnectedFlag != VA_DRI2)
26
+    if (dri_state->base.auth_type != VA_DRM_AUTH_DRI2)
27
         return VA_STATUS_ERROR_UNKNOWN;
28
 
29
     /* Some broken sources such as H.264 conformance case FM2_SVA_C
30
diff --git a/src/intel_driver.c b/src/intel_driver.c
31
index 4e6df81..b34d9a1 100644
32
--- src/intel_driver.c
33
+++ src/intel_driver.c
34
@@ -29,7 +29,7 @@
35
 
36
 #include <assert.h>
37
 
38
-#include <va/va_dricommon.h>
39
+#include <va/va_drmcommon.h>
40
 
41
 #include "intel_batchbuffer.h"
42
 #include "intel_memman.h"
43
@@ -50,15 +50,17 @@ Bool
44
 intel_driver_init(VADriverContextP ctx)
45
 {
46
     struct intel_driver_data *intel = intel_driver_data(ctx);
47
-    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
48
+    struct drm_state * const drm_state = (struct drm_state *)ctx->drm_state;
49
     int has_exec2, has_bsd, has_blt;
50
 
51
-    assert(dri_state);
52
-    assert(dri_state->driConnectedFlag == VA_DRI2 || 
53
-           dri_state->driConnectedFlag == VA_DRI1);
54
+    assert(drm_state);
55
+    assert(drm_state->auth_type == VA_DRM_AUTH_DRI1 ||
56
+           drm_state->auth_type == VA_DRM_AUTH_DRI2 ||
57
+           drm_state->auth_type == VA_DRM_AUTH_CUSTOM);
58
 
59
-    intel->fd = dri_state->fd;
60
-    intel->dri2Enabled = (dri_state->driConnectedFlag == VA_DRI2);
61
+    intel->fd = drm_state->fd;
62
+    intel->dri2Enabled = (drm_state->auth_type == VA_DRM_AUTH_DRI2 ||
63
+                          drm_state->auth_type == VA_DRM_AUTH_CUSTOM);
64
 
65
     if (!intel->dri2Enabled) {
66
         return False;
67
--
68
cgit v0.9.0.2-2-gbebe
(-)files/patch-src-i965_decoder_utils.c (-6 / +6 lines)
Lines 1-9 Link Here
1
--- src/i965_decoder_utils.c.orig	2012-08-14 17:08:16.000000000 +0200
1
--- src/i965_decoder_utils.c.orig	2012-11-09 02:44:47.000000000 +0100
2
+++ src/i965_decoder_utils.c	2012-10-10 17:25:22.358503055 +0200
2
+++ src/i965_decoder_utils.c	2012-11-14 10:45:13.909019239 +0100
3
@@ -24,7 +24,11 @@
3
@@ -22,7 +22,11 @@
4
 #include <assert.h>
4
  */
5
 #include <stddef.h>
5
 
6
 #include <string.h>
6
 #include "sysdeps.h"
7
+#ifdef __FreeBSD__
7
+#ifdef __FreeBSD__
8
+#include <stdlib.h>
8
+#include <stdlib.h>
9
+#else
9
+#else

Return to bug 173597