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

X 201610 Part 5: libvdpau #2450

Closed
wants to merge 2 commits into from
Closed

Conversation

@alarcher
Copy link
Contributor

alarcher commented Oct 2, 2016

  • Adding libvdpau in /usr/lib/xorg to avoid clash with Nvidia driver.
  • Nvidia driver's symlinks in /usr/include are removed as libvdpau has priority over it.
  • Removed glamor 0.6.0 from the PR.
@alarcher alarcher changed the title X 201610 Part 5 X 201610 Part 5: libvdpau and glamor Oct 2, 2016
@alarcher alarcher added the needs_work label Oct 2, 2016
@alarcher alarcher force-pushed the alarcher:X_S12_201610_5 branch from 0f66c81 to a4021d0 Oct 18, 2016
@alarcher
Copy link
Contributor Author

alarcher commented Nov 9, 2016

@pyhalov Since you already bumped nvidia , should we merge this PR without glamor or wait until Ken provides his fix?

@pyhalov
Copy link
Contributor

pyhalov commented Nov 9, 2016

if you think that it's fine

@pyhalov
Copy link
Contributor

pyhalov commented Dec 15, 2016

@alarcher What's the current status of this PR? What was/is wrong with glamor (sorry, don't remember)?

@alarcher
Copy link
Contributor Author

alarcher commented Dec 15, 2016

@pyhalov Requires patching one line in glamor but Ken did not send it. We can remove glamor for now and merge libvdpau. Tell me if I should change anything in the libvdpau commits. I will remove my Nvidia bump from the PR.

@alarcher alarcher force-pushed the alarcher:X_S12_201610_5 branch from 5ffe905 to 2eee19b Dec 15, 2016
@pyhalov
Copy link
Contributor

pyhalov commented Dec 16, 2016

Why do we need glamor? What are known consumers?

@alarcher
Copy link
Contributor Author

alarcher commented Dec 16, 2016

@pyhalov xorg-video-ati and xorg-video-intel can use it to accelerate 2D rendering.

@pyhalov
Copy link
Contributor

pyhalov commented Dec 17, 2016

Note, that if you integrate it before #2669 , we can remove ffmpeg dependency on nvidia

@pyhalov
Copy link
Contributor

pyhalov commented Dec 17, 2016

BTW, can we remove nvidia's vdpau and leave only this one? Are they compatible?

@tomww
Copy link

tomww commented Dec 18, 2016

Nvidia writes in a release doc that vdpau will be removed from the driver package.
While this version looks like still including the wrapper library:
http://us.download.nvidia.com/solaris/352.79/README/vdpausupport.html
Then this version writes aout the external available wrapper library:
http://us.download.nvidia.com/solaris/375.26/README/vdpausupport.html
(not necessarily at the version in the URL above removed the vdpau wrapper lib)

Which version of the Nvidia driver will be in the repo? Depending on this version we need the external wrapper library jumping in.

If OI should include an older driver with the wrapper, then it could be an idea to remove vdpau files from the OI delivered nvidia package at the time when the new vdpau wrapper goes in. Including a new required dependency in nvida driver would be necessary.
If users install their own copy of the nvidia driver (some need to for older Chips), then they would need to install the OI -vdpau package on their own. I would not make a dependency in the consuming packages like vlc.

@alarcher
Copy link
Contributor Author

alarcher commented Dec 19, 2016

@pyhalov @tomww As a first step we should keep libvdpau with 34x drivers and mediate the symlinks in the common directories. The NVIDIA libraries do not bother anyone as they live in their own directory, only the symlinks are to blame.
The new libvdpau is already installed in another prefix together with other Xorg libs.
We already discussed that we want to leave the possibility to install 34x even after 36x because fairly common Quadro adapters are not supported by 36x

@alarcher alarcher force-pushed the alarcher:X_S12_201610_5 branch from 2eee19b to 86510fd Dec 19, 2016
@alarcher alarcher changed the title X 201610 Part 5: libvdpau and glamor X 201610 Part 5: libvdpau Dec 19, 2016
@@ -243,7 +243,6 @@ link path=usr/X11/lib/modules/NVIDIA/libnvidia-wfb.so \
link path=usr/X11/lib/modules/extensions/NVIDIA/$(MACH64)/libglx.so \
target=libglx.so.1
link path=usr/X11/lib/modules/extensions/NVIDIA/libglx.so target=libglx.so.1
link path=usr/include/vdpau target=../X11/include/NVIDIA/vdpau

This comment has been minimized.

Copy link
@pyhalov

pyhalov Dec 19, 2016

Contributor

Please, bump COMPONENT_REVISION for nvidia component

install: $(INSTALL_32_and_64)

test: $(NO_TESTS)

This comment has been minimized.

Copy link
@pyhalov

pyhalov Dec 19, 2016

Contributor

REQUIRED_PACKAGES?

@pyhalov
Copy link
Contributor

pyhalov commented Dec 19, 2016

You spoke about mediated symlinks. Are you going to add them in this PR or later?

@alarcher
Copy link
Contributor Author

alarcher commented Dec 20, 2016

I am working on the links for this PR to be able to merge before the ffmpeg PR as you suggested earlier.

@pyhalov
Copy link
Contributor

pyhalov commented Jan 10, 2017

@alarcher : what's the current status of this PR?

license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'

file path=etc/vdpau_wrapper.cfg
file path=usr/etc/vdpau_wrapper.cfg

This comment has been minimized.

Copy link
@pyhalov

pyhalov Jan 16, 2017

Contributor

usr/etc/ ? Is something misconfigured?

@pyhalov
Copy link
Contributor

pyhalov commented Jan 18, 2017

Superseded by #2732

@pyhalov pyhalov closed this Jan 18, 2017
@alarcher alarcher deleted the alarcher:X_S12_201610_5 branch May 31, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.