Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 23 Aug 2020 14:31:47 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r545823 - head/multimedia/libva-intel-hybrid-driver
Message-ID:  <202008231431.07NEVlml079121@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Sun Aug 23 14:31:47 2020
New Revision: 545823
URL: https://svnweb.freebsd.org/changeset/ports/545823

Log:
  multimedia/libva-intel-hybrid-driver: unbreak with Clang 11
  
  ld: error: duplicate symbol: ME_CURBE_INIT_DATA
  >>> defined at media_drv_common.c
  >>>            .libs/hybrid_drv_video_la-media_drv_common.o:(ME_CURBE_INIT_DATA)
  >>> defined at media_drv_hw_g75.c
  >>>            .libs/hybrid_drv_video_la-media_drv_hw_g75.o:(.bss+0x0)
  
  ld: error: duplicate symbol: SEARCH_PATH_TABLE
  >>> defined at media_drv_common.c
  >>>            .libs/hybrid_drv_video_la-media_drv_common.o:(SEARCH_PATH_TABLE)
  >>> defined at media_drv_hw_g75.c
  >>>            .libs/hybrid_drv_video_la-media_drv_hw_g75.o:(.bss+0x80)
  
  Reported by:	pkg-fallout

Modified:
  head/multimedia/libva-intel-hybrid-driver/Makefile   (contents, props changed)
  head/multimedia/libva-intel-hybrid-driver/distinfo   (contents, props changed)

Modified: head/multimedia/libva-intel-hybrid-driver/Makefile
==============================================================================
--- head/multimedia/libva-intel-hybrid-driver/Makefile	Sun Aug 23 14:31:20 2020	(r545822)
+++ head/multimedia/libva-intel-hybrid-driver/Makefile	Sun Aug 23 14:31:47 2020	(r545823)
@@ -7,7 +7,9 @@ CATEGORIES=	multimedia
 PKGNAMEPREFIX=	libva-
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES=	dfa9c8eba295.patch:-p1 b3b4d9a3a08d.patch:-p1
+PATCHFILES+=	dfa9c8eba295.patch:-p1
+PATCHFILES+=	b3b4d9a3a08d.patch:-p1 # https://github.com/intel/intel-hybrid-driver/pull/26
+PATCHFILES+=	821f87129662.patch:-p1 # https://github.com/intel/intel-hybrid-driver/pull/28
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Hybrid VP8 encoder and VP9 decoder for Intel GPUs

Modified: head/multimedia/libva-intel-hybrid-driver/distinfo
==============================================================================
--- head/multimedia/libva-intel-hybrid-driver/distinfo	Sun Aug 23 14:31:20 2020	(r545822)
+++ head/multimedia/libva-intel-hybrid-driver/distinfo	Sun Aug 23 14:31:47 2020	(r545823)
@@ -5,3 +5,5 @@ SHA256 (dfa9c8eba295.patch) = 0c5a2501f6a467cc88c04367
 SIZE (dfa9c8eba295.patch) = 1679
 SHA256 (b3b4d9a3a08d.patch) = acb0acf2a83632358ccb3b02a4b74184149312863fa15bab4686df41abb1fd9b
 SIZE (b3b4d9a3a08d.patch) = 1917
+SHA256 (821f87129662.patch) = ae4cbf4401a540693a0e1c5b3940d546faf6d4d880bbd3f0fa9ea5c7624c5794
+SIZE (821f87129662.patch) = 1100



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008231431.07NEVlml079121>