rpms / intel-media-driver-free

Clone
Source Code
GIT

#2 Drop conflicts with package from RPM Fusion
Merged 4 months ago by kwizart. Opened 5 months ago by kwizart.
rpms/ kwizart/intel-media-driver-free drop_conflict  into  rawhide

file modified
+2 -5 
@@ -49,9 +49,6 @@ 
 

  %package -n     libva-intel-media-driver
 

  Summary:        The Intel Media Driver for VAAPI.
 

  

- # The full intel-media-driver and this "free" variant in Fedora repos aren't co-installable
 

- Conflicts: intel-media-driver
 

- 

  %description -n libva-intel-media-driver
 

  %{description}
 

  
@@ -112,7 +109,7 @@ 
 

  

  # install AppData and add modalias provides
 

  mkdir -p %{buildroot}%{_metainfodir}
 

- install -pm 0644 %{SOURCE1} %{buildroot}%{_metainfodir}
 

+ install -pm 0644 %{SOURCE1} %{buildroot}%{_metainfodir}/%{name}.metainfo.xml
 

  

  # TODO - have pci based hw detection
 

  %if 0
 
@@ -124,7 +121,7 @@ 
 

  %doc README.md
 

  %license LICENSE.md
 

  %{_libdir}/dri/iHD_drv_video.so
 

- %{_metainfodir}/intel-media-driver.metainfo.xml
 

+ %{_metainfodir}/%{name}.metainfo.xml
 

  

  %files -n libigfxcmrt
 

  %{_libdir}/libigfxcmrt.so.*

Current problem is that since this package is integrated and enforced by default in fedora comps despite the full featured version is already installed, this creates an unneeded conflicts on end-users systems.

Best would be to word the fedora-comps addition using a virtual provide that could be both satisfied by the fedora and the rpmfusion-nonfree implementation, but that will not solve the conflict issue.

This is f40+ material.

Avoiding a conflicts is known:

  • Rename the driver so that both version could co-exist (we need to find an implementation to add a dedicated directory along the default one)
    This should be implemented in one version or another. But since there is no change in the fedora package, I'm selecting this path at this step.

  • Using updates-alternatives.
    It would means changing both fedora and rpmfusion-nonfree packages to implement it in a compatible way.
    I'm still open to this solution if this is proven to be safe for ostree based systems.

The RPM Fusion implementation will be provided at a later step (hopefully to be made available in f40+ repositories before the end of the week). The idea is just to move the iHD driver into a dedicated _libdir/dri-nonfree directory.

The libva counterpart:
https://src.fedoraproject.org/rpms/libva/pull-request/5
Edited 5 months ago by kwizart

rebased onto e2732d3
5 months ago

rebased onto 30123b0
5 months ago

Overall, I really like this solution, seems far less invasive than the alternatives, and guaranteed to work on ostree. Thanks a lot!

Did you try out which one gets a preference? It's also great to start out with rawhide, try it out, and fetch the changes to f40 after the freeze lift (or request an exception, it'd make sense in this case, can handle that). I'll give it a shot either this Sunday or next week.

@ngompa Can you peak here a bit? (For context, the f39 to f40 upgrade path is broken for intel-media-driver users even with --allowerasing).

Best would be to word the fedora-comps addition using a virtual provide that could be both satisfied by the fedora and the rpmfusion-nonfree implementation, but that will not solve the conflict issue.

Comps does not support virtual package names, which is a big part of the problem for a lot of things. :frowning:

As mentioned by frantisekz , I will merge in f41 for now (actually I've merged the libva/intel-media-driver for f40+ already). So we can have this problem behind us.

Pull-Request has been merged by kwizart
4 months ago

As mentioned by frantisekz , I will merge in f41 for now (actually I've merged the libva/intel-media-driver for f40+ already). So we can have this problem behind us.

Thanks a lot, I guess it'd make sense and ask for f40 freeze exception for this one?

As mentioned by frantisekz , I will merge in f41 for now (actually I've merged the libva/intel-media-driver for f40+ already). So we can have this problem behind us.

Thanks a lot, I guess it'd make sense and ask for f40 freeze exception for this one?

OK then let's build it for f40, you can use this PR as reference and
Packages to request freeze exception:
libva-2.20.0-5.fc40
intel-media-driver-free-24.1.3-3.fc40

Bodhi update counterpart:
https://bodhi.fedoraproject.org/updates/FEDORA-2024-d7326adac4

Hopefully we will have a short windows until the rpmfusion counterpart lands in repositories. Hopefully by the end of the week. So we can accomodate this delay.
Metadata
None
No Tags
Changes Summary 1
+2 -5
file changed
intel-media-driver-free.spec
Powered by Pagure 5.14.1
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.