Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add X11 detect support #494

Merged
merged 1 commit into from Jan 16, 2019
Merged

Add X11 detect support #494

merged 1 commit into from Jan 16, 2019

Conversation

azharsha
Copy link
Contributor

This is an updated version of the original PR #492

Signed-off-by: Azhar Shaikh azhar.shaikh@intel.com

This is an updated version of the original PR intel#492

Signed-off-by: Azhar Shaikh <azhar.shaikh@intel.com>
@@ -32,7 +32,7 @@
#include <sys/ioctl.h>
#include <unistd.h>

#ifndef ANDROID
#if !defined(ANDROID) && defined(X11_FOUND)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we use just:
#ifdef X11_FOUND
and assure that build system don't set this for Android path? Smaller number of defines and code, the better.

@@ -176,6 +176,10 @@ set(MEDIA_COMPILER_FLAGS_DEBUG
-DINSTR_GTUNE_EXT
)

if(X11_FOUND)
add_definitions(-DX11_FOUND)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To me passing -DHAVE_X11=1 seems better since it is aligned with what people are accustomed to with autotools. In this case Android should explicitly set -DHAVE_X11=0 and checks below should look like:
#if HAVE_X11

@dvrogozh
Copy link
Contributor

What if someone will want to build the driver without X11? Are we going to provide a build option to disable X11 support?

@Sherry-Lin Sherry-Lin merged commit 5abb730 into intel:master Jan 16, 2019
azharsha added a commit to azharsha/media-driver that referenced this pull request Jan 17, 2019
PR intel#494 set vaPutSurface as NULL, libva throws an error
and iHD driver is not initialized.

Signed-off-by: Azhar Shaikh <azhar.shaikh@intel.com>
@azharsha azharsha mentioned this pull request Jan 17, 2019
Sherry-Lin pushed a commit that referenced this pull request Jan 25, 2019
PR #494 set vaPutSurface as NULL, libva throws an error
and iHD driver is not initialized.

Signed-off-by: Azhar Shaikh <azhar.shaikh@intel.com>
Sherry-Lin pushed a commit that referenced this pull request Jan 29, 2019
PR #494 set vaPutSurface as NULL, libva throws an error
and iHD driver is not initialized.

Signed-off-by: Azhar Shaikh <azhar.shaikh@intel.com>
@jbeich jbeich mentioned this pull request Mar 12, 2019
djie1 pushed a commit to djie1/media-driver that referenced this pull request May 20, 2019
PR intel#494 set vaPutSurface as NULL, libva throws an error
and iHD driver is not initialized.

Signed-off-by: Azhar Shaikh <azhar.shaikh@intel.com>
dyang23 pushed a commit to dyang23/media-driver-intel- that referenced this pull request May 14, 2020
PR intel#494 set vaPutSurface as NULL, libva throws an error
and iHD driver is not initialized.

Signed-off-by: Azhar Shaikh <azhar.shaikh@intel.com>
buildroot-auto-update pushed a commit to buildroot/buildroot that referenced this pull request Jul 3, 2021
Rebased patch 0001 and removed another hardening flag.
Removed patch 0002 which was backported from upstream commit.
Renumbered and rebased patch 0003.
Reformatted hashes.

Reworked X11 support as it is an optional dependency:
intel/media-driver#494

Release notes:
https://github.com/intel/media-driver/releases/tag/intel-media-21.2.3

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants