From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 11 Nov 2022 15:32:05 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1otV4f-004IRQ-6N for lore@lore.pengutronix.de; Fri, 11 Nov 2022 15:32:05 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1otV4e-00072D-9T; Fri, 11 Nov 2022 15:32:04 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1otV3l-0006m7-EH; Fri, 11 Nov 2022 15:31:09 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1otV3j-003fbD-TC; Fri, 11 Nov 2022 15:31:08 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1otV3j-003k8n-RO; Fri, 11 Nov 2022 15:31:07 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 11 Nov 2022 15:31:07 +0100 Message-Id: <20221111143107.892306-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221024134505.2041999-1-p.zabel@pengutronix.de> References: <20221024134505.2041999-1-p.zabel@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] mesalib: allow enabling patent encumbered video codecs X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Philipp Zabel Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 9244d1961690c8738c53d8c0647cd0f67d92bd2c. Michael [sent from post-receive hook] On Fri, 11 Nov 2022 15:31:07 +0100, Philipp Zabel wrote: > Add a menu with options to enable the VC-1, H.264, and H.265 codecs > when VA-API support is enabled. > > Signed-off-by: Philipp Zabel > Message-Id: <20221024134505.2041999-1-p.zabel@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/mesalib.in b/rules/mesalib.in > index 1f505b9dcc90..5e89907ed955 100644 > --- a/rules/mesalib.in > +++ b/rules/mesalib.in > @@ -156,6 +156,34 @@ config MESALIB_VA > depends on MESALIB_DRI_RADEONSI || MESALIB_DRI_R600 || MESALIB_DRI_NOUVEAU > prompt "VA" > > +if MESALIB_VA > + > +menu "Patent encumbered video codecs" > + > +config MESALIB_VIDEO_VC1DEC > + bool > + prompt "VC-1 decoding" > + > +config MESALIB_VIDEO_H264DEC > + bool > + prompt "H.264 decoding" > + > +config MESALIB_VIDEO_H264ENC > + bool > + prompt "H.264 encoding" > + > +config MESALIB_VIDEO_H265DEC > + bool > + prompt "H.265 decoding" > + > +config MESALIB_VIDEO_H265ENC > + bool > + prompt "H.265 encoding" > + > +endmenu > + > +endif > + > comment "Platforms" > > config MESALIB_EGL_X11 > diff --git a/rules/mesalib.make b/rules/mesalib.make > index dfbb0d11ae73..6395e1384261 100644 > --- a/rules/mesalib.make > +++ b/rules/mesalib.make > @@ -92,6 +92,12 @@ MESALIB_DRI_GALLIUM_LIBS-y = \ > ,$(MESALIB_GALLIUM_DRIVERS-y) \ > )))) > > +MESALIB_VIDEO_CODECS-$(PTXCONF_MESALIB_VIDEO_VC1DEC) += vc1dec > +MESALIB_VIDEO_CODECS-$(PTXCONF_MESALIB_VIDEO_H264DEC) += h264dec > +MESALIB_VIDEO_CODECS-$(PTXCONF_MESALIB_VIDEO_H264ENC) += h264enc > +MESALIB_VIDEO_CODECS-$(PTXCONF_MESALIB_VIDEO_H265DEC) += h265dec > +MESALIB_VIDEO_CODECS-$(PTXCONF_MESALIB_VIDEO_H265ENC) += h265enc > + > ifdef PTXCONF_ARCH_X86 > MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_AMD) += amd > MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_INTEL) += intel > @@ -203,7 +209,7 @@ MESALIB_CONF_OPT := \ > -Dva-libs-path=/usr/lib/dri \ > -Dvalgrind=disabled \ > -Dvdpau-libs-path=/usr/lib/vdpau \ > - -Dvideo-codecs=[] \ > + -Dvideo-codecs=$(subst $(space),$(comma),$(MESALIB_VIDEO_CODECS-y)) \ > -Dvmware-mks-stats=false \ > -Dvulkan-beta=false \ > -Dvulkan-drivers=$(subst $(space),$(comma),$(MESALIB_VULKAN_DRIVERS-y)) \