From owner-freebsd-multimedia@FreeBSD.ORG Fri Jun 28 22:05:36 2013 Return-Path: Delivered-To: multimedia@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 43940AE2; Fri, 28 Jun 2013 22:05:36 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from winston.madpilot.net (winston.madpilot.net [78.47.75.155]) by mx1.freebsd.org (Postfix) with ESMTP id BFAA518CE; Fri, 28 Jun 2013 22:05:35 +0000 (UTC) Received: from winston.madpilot.net (localhost [127.0.0.1]) by winston.madpilot.net (Postfix) with ESMTP id 3bhsVP47ZszFTXB; Sat, 29 Jun 2013 00:05:33 +0200 (CEST) X-Virus-Scanned: amavisd-new at madpilot.net Received: from winston.madpilot.net ([127.0.0.1]) by winston.madpilot.net (winston.madpilot.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eWb6Vof5N4UN; Sat, 29 Jun 2013 00:05:31 +0200 (CEST) Received: from tommy.madpilot.net (micro.madpilot.net [88.149.173.206]) by winston.madpilot.net (Postfix) with ESMTPSA; Sat, 29 Jun 2013 00:05:31 +0200 (CEST) Message-ID: <51CE08AC.6090706@FreeBSD.org> Date: Sat, 29 Jun 2013 00:05:32 +0200 From: Guido Falsi User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130627 Thunderbird/17.0.7 MIME-Version: 1.0 To: multimedia@FreeBSD.org, dinoex@FreeBSD.org Subject: Fixes for vlc and gnash after libva upgrade Content-Type: multipart/mixed; boundary="------------000204050607010204090802" X-BeenThere: freebsd-multimedia@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Multimedia discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jun 2013 22:05:36 -0000 This is a multi-part message in MIME format. --------------000204050607010204090802 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hi! I'm the maintainer of the multimedia/libva port. I updated it yesterday but there IS an API breakage in the new version I noticed too late. Sorry for the mistake! After some work I narrowed down the breakage to these two ports, when the LIBVA option is turned on (by default in gnash). Here's a patch attached which fixes the problem. ABI compatibility should not be compromised and was not in my tests with vlc, since libva has code to maintain that. I'd like to get approval to commit these two in one go. Thanks in advance, and again sorry for the breakage! -- Guido Falsi --------------000204050607010204090802 Content-Type: text/x-patch; name="libva-fix.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="libva-fix.diff" Index: graphics/gnash/Makefile =================================================================== --- graphics/gnash/Makefile (revision 321990) +++ graphics/gnash/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= gnash PORTVERSION= 0.8.10 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= GNU/${PORTNAME}/${PORTVERSION}/ Index: graphics/gnash/files/patch-libdevice-caapi-VaapiSurface.cpp =================================================================== --- graphics/gnash/files/patch-libdevice-caapi-VaapiSurface.cpp (revision 0) +++ graphics/gnash/files/patch-libdevice-caapi-VaapiSurface.cpp (working copy) @@ -0,0 +1,11 @@ +--- libdevice/vaapi/VaapiSurface.cpp.orig 2012-01-19 20:17:48.000000000 +0100 ++++ libdevice/vaapi/VaapiSurface.cpp 2013-06-28 15:47:31.190987198 +0200 +@@ -63,7 +63,7 @@ + VASurfaceID surface_id; + status = vaCreateSurfaces(gvactx->display(), + width, height, VA_RT_FORMAT_YUV420, +- 1, &surface_id); ++ 1, &surface_id, NULL, 0); + if (!vaapi_check_status(status, "vaCreateSurfaces()")) { + return; + } Property changes on: graphics/gnash/files/patch-libdevice-caapi-VaapiSurface.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: multimedia/vlc/files/patch-modules-codec-avcodec-vaapi.c =================================================================== --- multimedia/vlc/files/patch-modules-codec-avcodec-vaapi.c (revision 0) +++ multimedia/vlc/files/patch-modules-codec-avcodec-vaapi.c (working copy) @@ -0,0 +1,11 @@ +--- modules/codec/avcodec/vaapi.c.orig 2013-01-22 10:51:40.000000000 +0100 ++++ modules/codec/avcodec/vaapi.c 2013-06-28 15:09:40.898143870 +0200 +@@ -247,7 +247,7 @@ + /* Create surfaces */ + VASurfaceID pi_surface_id[p_va->i_surface_count]; + if( vaCreateSurfaces( p_va->p_display, i_width, i_height, VA_RT_FORMAT_YUV420, +- p_va->i_surface_count, pi_surface_id ) ) ++ p_va->i_surface_count, pi_surface_id, NULL, 0 ) ) + { + for( int i = 0; i < p_va->i_surface_count; i++ ) + p_va->p_surface[i].i_id = VA_INVALID_SURFACE; Property changes on: multimedia/vlc/files/patch-modules-codec-avcodec-vaapi.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property --------------000204050607010204090802--