[PR PATCH] New package: intel-media-driver-nonfree-24.2.5

[PR PATCH] New package: intel-media-driver-nonfree-24.2.5

[zlice]

[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]

There is a new pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages intel-media-drivers-nonfree
https://github.com/void-linux/void-packages/pull/51387

New package: intel-media-driver-nonfree-24.2.5
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - **x86_64-musl**

#### Comments

Add a `nonfree` package for `intel-media-driver`. This builds twice, similar to conky, and adds support for nonfree codecs to the repos (such as AV1 decode on Intel Arc A770 / DG2).

I'm unsure why `lib` and `lib64` are mixed up for the `-nonfree` subpackage. If anyone can tell me why or how to get rid of the hacky workaround rm/ln, let me know.

The `-devel` packages are the same files, so I went with `replace` and `intel-media-driver-nonfree` installs fine when you already have `intel-media-driver` and `intel-media-driver-devel` installed.

Could possibly add a `intel-video-accel-nonfree`.

A patch file from https://github.com/void-linux/void-packages/pull/51387.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-intel-media-drivers-nonfree-51387.patch --]
[-- Type: text/x-diff, Size: 2200 bytes --]

From 0aeb5cffde90766f465488eca37de52f2f7d2e04 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 22 Jul 2024 14:23:22 -0400
Subject: [PATCH] New package: intel-media-driver-nonfree-24.2.5

---
 srcpkgs/intel-media-driver-nonfree  |  1 +
 srcpkgs/intel-media-driver/template | 39 +++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 120000 srcpkgs/intel-media-driver-nonfree

diff --git a/srcpkgs/intel-media-driver-nonfree b/srcpkgs/intel-media-driver-nonfree
new file mode 120000
index 00000000000000..d10a41ca64b9e6
--- /dev/null
+++ b/srcpkgs/intel-media-driver-nonfree
@@ -0,0 +1 @@
+intel-media-driver
\ No newline at end of file
diff --git a/srcpkgs/intel-media-driver/template b/srcpkgs/intel-media-driver/template
index ecce22207b0ec7..369cccebd5f648 100644
--- a/srcpkgs/intel-media-driver/template
+++ b/srcpkgs/intel-media-driver/template
@@ -18,10 +18,49 @@ checksum=dec2210c1f824a721e4ea6f66f5899e300801b3e7fae232d3f8a94db38c2edd1
 build_options="nonfree"
 desc_option_nonfree="Enable nonfree kernels"
 
+post_configure() {
+	configure_args="${configure_args/KERNELS=OFF/KERNELS=ON}"
+	(
+		cmake_builddir="nonfree-build"
+		do_configure
+	)
+}
+
+post_build() {
+  (
+		DESTDIR=${DESTDIR/${sourcepkg}/${sourcepkg}-nonfree}
+		cmake_builddir="nonfree-build"
+		do_build
+  )
+}
+
+# for some reason, lib installs to lib64 instead of symlinking?
 post_install() {
 	vlicense LICENSE.md
+	(
+		DESTDIR=${DESTDIR/${sourcepkg}/${sourcepkg}-nonfree}
+		cmake_builddir="nonfree-build"
+		do_install
+		rm -rf ${DESTDIR}/usr/lib ${DESTDIR}/usr/lib64/lib
+		mv ${DESTDIR}/usr/lib64 ${DESTDIR}/usr/lib
+		ln -s ${DESTDIR}/usr/lib ${DESTDIR}/usr/lib64
+	)
+}
+
+intel-media-driver-nonfree_package() {
+	short_desc+=" - nonfree codecs"
+	replaces="intel-media-driver"
+	repository=nonfree
+	pkg_install() {
+		DESTDIR=${DESTDIR/${sourcepkg}/${sourcepkg}-nonfree}
+		vlicense LICENSE.md
+		rm -rf usr/include
+		rm -rf usr/lib/pkgconfig
+		rm -f "usr/lib/*.so"
+	}
 }
 
+# devel files are the same for nonfree package
 intel-media-driver-devel_package() {
 	depends="${makedepends} ${sourcepkg}-${version}_${revision}"
 	short_desc+=" - development files"

Re: [PR REVIEW] New package: intel-media-driver-nonfree-24.2.5

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51387#discussion_r1686993907

Comment:
this symlink is in base-files, it does not need to be here

Re: [PR REVIEW] New package: intel-media-driver-nonfree-24.2.5

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 235 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51387#discussion_r1686994393

Comment:
```suggestion
	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
```

Re: [PR REVIEW] New package: intel-media-driver-nonfree-24.2.5

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 236 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51387#discussion_r1686995519

Comment:
better to do this in the pkg_install() function because you have `PKGDESTDIR` there

Re: [PR REVIEW] New package: intel-media-driver-nonfree-24.2.5

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 236 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51387#discussion_r1686995659

Comment:
better to do this in the pkg_install() function because you have `PKGDESTDIR` there

Re: [PR PATCH] [Updated] New package: intel-media-driver-nonfree-24.2.5

[zlice]

[-- Attachment #1: Type: text/plain, Size: 1245 bytes --]

There is an updated pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages intel-media-drivers-nonfree
https://github.com/void-linux/void-packages/pull/51387

New package: intel-media-driver-nonfree-24.2.5
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - **x86_64-musl**

#### Comments

Add a `nonfree` package for `intel-media-driver`. This builds twice, similar to conky, and adds support for nonfree codecs to the repos (such as AV1 decode on Intel Arc A770 / DG2).

I'm unsure why `lib` and `lib64` are mixed up for the `-nonfree` subpackage. If anyone can tell me why or how to get rid of the hacky workaround rm/ln, let me know.

The `-devel` packages are the same files, so I went with `replace` and `intel-media-driver-nonfree` installs fine when you already have `intel-media-driver` and `intel-media-driver-devel` installed.

Could possibly add a `intel-video-accel-nonfree`.

A patch file from https://github.com/void-linux/void-packages/pull/51387.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-intel-media-drivers-nonfree-51387.patch --]
[-- Type: text/x-diff, Size: 2114 bytes --]

From df957519cd7682b546388787ef95d60157324a27 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 22 Jul 2024 14:23:22 -0400
Subject: [PATCH] New package: intel-media-driver-nonfree-24.2.5

---
 srcpkgs/intel-media-driver-nonfree  |  1 +
 srcpkgs/intel-media-driver/template | 37 ++++++++++++++++++++++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/intel-media-driver-nonfree

diff --git a/srcpkgs/intel-media-driver-nonfree b/srcpkgs/intel-media-driver-nonfree
new file mode 120000
index 00000000000000..d10a41ca64b9e6
--- /dev/null
+++ b/srcpkgs/intel-media-driver-nonfree
@@ -0,0 +1 @@
+intel-media-driver
\ No newline at end of file
diff --git a/srcpkgs/intel-media-driver/template b/srcpkgs/intel-media-driver/template
index ecce22207b0ec7..7a2fa1f254da18 100644
--- a/srcpkgs/intel-media-driver/template
+++ b/srcpkgs/intel-media-driver/template
@@ -18,12 +18,47 @@ checksum=dec2210c1f824a721e4ea6f66f5899e300801b3e7fae232d3f8a94db38c2edd1
 build_options="nonfree"
 desc_option_nonfree="Enable nonfree kernels"
 
+post_configure() {
+	configure_args="${configure_args/KERNELS=OFF/KERNELS=ON}"
+	(
+		cmake_builddir="nonfree-build"
+		do_configure
+	)
+}
+
+post_build() {
+	(
+		DESTDIR=${DESTDIR/${sourcepkg}/${sourcepkg}-nonfree}
+		cmake_builddir="nonfree-build"
+		do_build
+	)
+}
+
+# for some reason, lib installs to lib64 instead of symlinking?
 post_install() {
 	vlicense LICENSE.md
+	(
+		cmake_builddir="nonfree-build"
+		do_install
+	)
+}
+
+intel-media-driver-nonfree_package() {
+	short_desc+=" - nonfree codecs"
+	replaces="intel-media-driver>=0"
+	repository=nonfree
+	pkg_install() {
+		DESTDIR=${DESTDIR/${sourcepkg}/${sourcepkg}-nonfree}
+		vlicense LICENSE.md
+		rm -rf usr/include
+		rm -rf usr/lib/pkgconfig
+		rm -f "usr/lib/*.so"
+	}
 }
 
+# devel files are the same for nonfree package
 intel-media-driver-devel_package() {
-	depends="${makedepends} ${sourcepkg}-${version}_${revision}"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

Re: New package: intel-media-driver-nonfree-24.2.5

[github-actions]

[-- Attachment #1: Type: text/plain, Size: 305 bytes --]

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/51387#issuecomment-2425404748

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

Re: [PR PATCH] [Updated] New package: intel-media-driver-nonfree-24.2.5

[zlice]

[-- Attachment #1: Type: text/plain, Size: 1245 bytes --]

There is an updated pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages intel-media-drivers-nonfree
https://github.com/void-linux/void-packages/pull/51387

New package: intel-media-driver-nonfree-24.2.5
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - **x86_64-musl**

#### Comments

Add a `nonfree` package for `intel-media-driver`. This builds twice, similar to conky, and adds support for nonfree codecs to the repos (such as AV1 decode on Intel Arc A770 / DG2).

I'm unsure why `lib` and `lib64` are mixed up for the `-nonfree` subpackage. If anyone can tell me why or how to get rid of the hacky workaround rm/ln, let me know.

The `-devel` packages are the same files, so I went with `replace` and `intel-media-driver-nonfree` installs fine when you already have `intel-media-driver` and `intel-media-driver-devel` installed.

Could possibly add a `intel-video-accel-nonfree`.

A patch file from https://github.com/void-linux/void-packages/pull/51387.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-intel-media-drivers-nonfree-51387.patch --]
[-- Type: text/x-diff, Size: 2114 bytes --]

From 6fcd7e2e7935ff56457e48a14e7eb20cd8a910ec Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 22 Jul 2024 14:23:22 -0400
Subject: [PATCH] New package: intel-media-driver-nonfree-24.2.5

---
 srcpkgs/intel-media-driver-nonfree  |  1 +
 srcpkgs/intel-media-driver/template | 37 ++++++++++++++++++++++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/intel-media-driver-nonfree

diff --git a/srcpkgs/intel-media-driver-nonfree b/srcpkgs/intel-media-driver-nonfree
new file mode 120000
index 00000000000000..d10a41ca64b9e6
--- /dev/null
+++ b/srcpkgs/intel-media-driver-nonfree
@@ -0,0 +1 @@
+intel-media-driver
\ No newline at end of file
diff --git a/srcpkgs/intel-media-driver/template b/srcpkgs/intel-media-driver/template
index 30ce9c511371f3..c4383fdf7151bb 100644
--- a/srcpkgs/intel-media-driver/template
+++ b/srcpkgs/intel-media-driver/template
@@ -18,12 +18,47 @@ checksum=58978f9ee4981532e60be2f2768673b1f3825db09971ebb98fbd7e8819cab6eb
 build_options="nonfree"
 desc_option_nonfree="Enable nonfree kernels"
 
+post_configure() {
+	configure_args="${configure_args/KERNELS=OFF/KERNELS=ON}"
+	(
+		cmake_builddir="nonfree-build"
+		do_configure
+	)
+}
+
+post_build() {
+	(
+		DESTDIR=${DESTDIR/${sourcepkg}/${sourcepkg}-nonfree}
+		cmake_builddir="nonfree-build"
+		do_build
+	)
+}
+
+# for some reason, lib installs to lib64 instead of symlinking?
 post_install() {
 	vlicense LICENSE.md
+	(
+		cmake_builddir="nonfree-build"
+		do_install
+	)
+}
+
+intel-media-driver-nonfree_package() {
+	short_desc+=" - nonfree codecs"
+	replaces="intel-media-driver>=0"
+	repository=nonfree
+	pkg_install() {
+		DESTDIR=${DESTDIR/${sourcepkg}/${sourcepkg}-nonfree}
+		vlicense LICENSE.md
+		rm -rf usr/include
+		rm -rf usr/lib/pkgconfig
+		rm -f "usr/lib/*.so"
+	}
 }
 
+# devel files are the same for nonfree package
 intel-media-driver-devel_package() {
-	depends="${makedepends} ${sourcepkg}-${version}_${revision}"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

Re: [PR PATCH] [Updated] New package: intel-media-driver-nonfree-24.2.5

[zlice]

[-- Attachment #1: Type: text/plain, Size: 1245 bytes --]

There is an updated pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages intel-media-drivers-nonfree
https://github.com/void-linux/void-packages/pull/51387

New package: intel-media-driver-nonfree-24.2.5
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - **x86_64-musl**

#### Comments

Add a `nonfree` package for `intel-media-driver`. This builds twice, similar to conky, and adds support for nonfree codecs to the repos (such as AV1 decode on Intel Arc A770 / DG2).

I'm unsure why `lib` and `lib64` are mixed up for the `-nonfree` subpackage. If anyone can tell me why or how to get rid of the hacky workaround rm/ln, let me know.

The `-devel` packages are the same files, so I went with `replace` and `intel-media-driver-nonfree` installs fine when you already have `intel-media-driver` and `intel-media-driver-devel` installed.

Could possibly add a `intel-video-accel-nonfree`.

A patch file from https://github.com/void-linux/void-packages/pull/51387.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-intel-media-drivers-nonfree-51387.patch --]
[-- Type: text/x-diff, Size: 2114 bytes --]

From f2e83a30fa06f9c662136bed5e744f3c0fc4e03c Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 22 Jul 2024 14:23:22 -0400
Subject: [PATCH] New package: intel-media-driver-nonfree-24.2.5

---
 srcpkgs/intel-media-driver-nonfree  |  1 +
 srcpkgs/intel-media-driver/template | 37 ++++++++++++++++++++++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/intel-media-driver-nonfree

diff --git a/srcpkgs/intel-media-driver-nonfree b/srcpkgs/intel-media-driver-nonfree
new file mode 120000
index 00000000000000..d10a41ca64b9e6
--- /dev/null
+++ b/srcpkgs/intel-media-driver-nonfree
@@ -0,0 +1 @@
+intel-media-driver
\ No newline at end of file
diff --git a/srcpkgs/intel-media-driver/template b/srcpkgs/intel-media-driver/template
index 30ce9c511371f3..c4383fdf7151bb 100644
--- a/srcpkgs/intel-media-driver/template
+++ b/srcpkgs/intel-media-driver/template
@@ -18,12 +18,47 @@ checksum=58978f9ee4981532e60be2f2768673b1f3825db09971ebb98fbd7e8819cab6eb
 build_options="nonfree"
 desc_option_nonfree="Enable nonfree kernels"
 
+post_configure() {
+	configure_args="${configure_args/KERNELS=OFF/KERNELS=ON}"
+	(
+		cmake_builddir="nonfree-build"
+		do_configure
+	)
+}
+
+post_build() {
+	(
+		DESTDIR=${DESTDIR/${sourcepkg}/${sourcepkg}-nonfree}
+		cmake_builddir="nonfree-build"
+		do_build
+	)
+}
+
+# for some reason, lib installs to lib64 instead of symlinking?
 post_install() {
 	vlicense LICENSE.md
+	(
+		cmake_builddir="nonfree-build"
+		do_install
+	)
+}
+
+intel-media-driver-nonfree_package() {
+	short_desc+=" - nonfree codecs"
+	replaces="intel-media-driver>=0"
+	repository=nonfree
+	pkg_install() {
+		DESTDIR=${DESTDIR/${sourcepkg}/${sourcepkg}-nonfree}
+		vlicense LICENSE.md
+		rm -rf usr/include
+		rm -rf usr/lib/pkgconfig
+		rm -f "usr/lib/*.so"
+	}
 }
 
+# devel files are the same for nonfree package
 intel-media-driver-devel_package() {
-	depends="${makedepends} ${sourcepkg}-${version}_${revision}"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

Re: New package: intel-media-driver-nonfree-24.3.4

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 182 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51387#issuecomment-2555124527

Comment:
this just ignores the build option?

Re: New package: intel-media-driver-nonfree-24.3.4

[zlice]

[-- Attachment #1: Type: text/plain, Size: 386 bytes --]

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/51387#issuecomment-2555157434

Comment:
pretty much ya, just rebuilds with `configure_args="${configure_args/KERNELS=OFF/KERNELS=ON}"`

a few ppl wanted it (me included), just because it's a bit lengthy to build and some codecs are not supported at all in free version like AV1 decode

Re: New package: intel-media-driver-nonfree-24.3.4

[zlice]

[-- Attachment #1: Type: text/plain, Size: 217 bytes --]

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/51387#issuecomment-2555193091

Comment:
now that i think of you saying that. should the build option just be removed?

Re: New package: intel-media-driver-nonfree-24.3.4

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 181 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51387#issuecomment-2555253070

Comment:
gate this behind the build option 

Re: [PR REVIEW] New package: intel-media-driver-nonfree-24.3.4

[zlice]

[-- Attachment #1: Type: text/plain, Size: 509 bytes --]

New review comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/51387#discussion_r1892946322

Comment:
i'm glad you said something about the build option. it seems removing this doesn't work. there is nothing in the nonfree package but empty directories (and that's why it didn't need the lib64 move)

but i also don't see nonfree build as nonfree (args are the same, total cmake steps is 1548 for both) if i use `build_options_default` instead of `configure_args`

Re: [PR PATCH] [Updated] New package: intel-media-driver-nonfree-24.3.4

[zlice]

[-- Attachment #1: Type: text/plain, Size: 1245 bytes --]

There is an updated pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages intel-media-drivers-nonfree
https://github.com/void-linux/void-packages/pull/51387

New package: intel-media-driver-nonfree-24.3.4
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - **x86_64-musl**

#### Comments

Add a `nonfree` package for `intel-media-driver`. This builds twice, similar to conky, and adds support for nonfree codecs to the repos (such as AV1 decode on Intel Arc A770 / DG2).

I'm unsure why `lib` and `lib64` are mixed up for the `-nonfree` subpackage. If anyone can tell me why or how to get rid of the hacky workaround rm/ln, let me know.

The `-devel` packages are the same files, so I went with `replace` and `intel-media-driver-nonfree` installs fine when you already have `intel-media-driver` and `intel-media-driver-devel` installed.

Could possibly add a `intel-video-accel-nonfree`.

A patch file from https://github.com/void-linux/void-packages/pull/51387.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-intel-media-drivers-nonfree-51387.patch --]
[-- Type: text/x-diff, Size: 2203 bytes --]

From 54196282d80b5faf13ec6eceb72cf8533ce625ce Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 22 Jul 2024 14:23:22 -0400
Subject: [PATCH] New package: intel-media-driver-nonfree-24.3.4

---
 srcpkgs/intel-media-driver-nonfree  |  1 +
 srcpkgs/intel-media-driver/template | 39 ++++++++++++++++++++++++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/intel-media-driver-nonfree

diff --git a/srcpkgs/intel-media-driver-nonfree b/srcpkgs/intel-media-driver-nonfree
new file mode 120000
index 00000000000000..d10a41ca64b9e6
--- /dev/null
+++ b/srcpkgs/intel-media-driver-nonfree
@@ -0,0 +1 @@
+intel-media-driver
\ No newline at end of file
diff --git a/srcpkgs/intel-media-driver/template b/srcpkgs/intel-media-driver/template
index 30ce9c511371f3..008a626a883fd2 100644
--- a/srcpkgs/intel-media-driver/template
+++ b/srcpkgs/intel-media-driver/template
@@ -18,12 +18,49 @@ checksum=58978f9ee4981532e60be2f2768673b1f3825db09971ebb98fbd7e8819cab6eb
 build_options="nonfree"
 desc_option_nonfree="Enable nonfree kernels"
 
+post_configure() {
+	(
+		configure_args="${configure_args/KERNELS=OFF/KERNELS=ON}"
+		cmake_builddir="nonfree-build"
+		do_configure
+	)
+}
+
+post_build() {
+	(
+		DESTDIR=${DESTDIR/${sourcepkg}/${sourcepkg}-nonfree}
+		cmake_builddir="nonfree-build"
+		do_build
+	)
+}
+
+# for some reason, lib installs to lib64 instead of symlinking?
 post_install() {
 	vlicense LICENSE.md
+	(
+		DESTDIR=${DESTDIR/${sourcepkg}/${sourcepkg}-nonfree}
+		cmake_builddir="nonfree-build"
+		do_install
+	)
+}
+
+intel-media-driver-nonfree_package() {
+	short_desc+=" - nonfree codecs"
+	replaces="intel-media-driver>=0"
+	repository=nonfree
+	pkg_install() {
+		vlicense LICENSE.md
+		mv ${PKGDESTDIR}/usr/lib64/* ${PKGDESTDIR}/usr/lib/
+		rmdir ${PKGDESTDIR}/usr/lib64
+		rm -rf usr/include
+		rm -rf usr/lib/pkgconfig
+		rm -f "usr/lib/*.so"
+	}
 }
 
+# devel files are the same for nonfree package
 intel-media-driver-devel_package() {
-	depends="${makedepends} ${sourcepkg}-${version}_${revision}"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

Re: [PR PATCH] [Updated] New package: intel-media-driver-nonfree-24.3.4

[zlice]

[-- Attachment #1: Type: text/plain, Size: 1245 bytes --]

There is an updated pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages intel-media-drivers-nonfree
https://github.com/void-linux/void-packages/pull/51387

New package: intel-media-driver-nonfree-24.3.4
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - **x86_64-musl**

#### Comments

Add a `nonfree` package for `intel-media-driver`. This builds twice, similar to conky, and adds support for nonfree codecs to the repos (such as AV1 decode on Intel Arc A770 / DG2).

I'm unsure why `lib` and `lib64` are mixed up for the `-nonfree` subpackage. If anyone can tell me why or how to get rid of the hacky workaround rm/ln, let me know.

The `-devel` packages are the same files, so I went with `replace` and `intel-media-driver-nonfree` installs fine when you already have `intel-media-driver` and `intel-media-driver-devel` installed.

Could possibly add a `intel-video-accel-nonfree`.

A patch file from https://github.com/void-linux/void-packages/pull/51387.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-intel-media-drivers-nonfree-51387.patch --]
[-- Type: text/x-diff, Size: 2244 bytes --]

From 82de7ad4d56d214ec29e1bb3432fe961e42d9d92 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 22 Jul 2024 14:23:22 -0400
Subject: [PATCH] New package: intel-media-driver-nonfree-24.3.4

---
 srcpkgs/intel-media-driver-nonfree  |  1 +
 srcpkgs/intel-media-driver/template | 39 ++++++++++++++++++++++++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/intel-media-driver-nonfree

diff --git a/srcpkgs/intel-media-driver-nonfree b/srcpkgs/intel-media-driver-nonfree
new file mode 120000
index 00000000000000..d10a41ca64b9e6
--- /dev/null
+++ b/srcpkgs/intel-media-driver-nonfree
@@ -0,0 +1 @@
+intel-media-driver
\ No newline at end of file
diff --git a/srcpkgs/intel-media-driver/template b/srcpkgs/intel-media-driver/template
index 30ce9c511371f3..448b662f3cc892 100644
--- a/srcpkgs/intel-media-driver/template
+++ b/srcpkgs/intel-media-driver/template
@@ -18,12 +18,49 @@ checksum=58978f9ee4981532e60be2f2768673b1f3825db09971ebb98fbd7e8819cab6eb
 build_options="nonfree"
 desc_option_nonfree="Enable nonfree kernels"
 
+post_configure() {
+	(
+		configure_args="${configure_args/KERNELS=OFF/KERNELS=ON}"
+		cmake_builddir="nonfree-build"
+		do_configure
+	)
+}
+
+post_build() {
+	(
+		DESTDIR=${DESTDIR/${sourcepkg}/${sourcepkg}-nonfree}
+		cmake_builddir="nonfree-build"
+		do_build
+	)
+}
+
+# for some reason, lib installs to lib64 instead of symlinking?
 post_install() {
 	vlicense LICENSE.md
+	(
+		DESTDIR=${DESTDIR/${sourcepkg}/${sourcepkg}-nonfree}
+		cmake_builddir="nonfree-build"
+		do_install
+	)
+}
+
+intel-media-driver-nonfree_package() {
+	short_desc+=" - nonfree codecs"
+	replaces="intel-media-driver>=0"
+	repository=nonfree
+	pkg_install() {
+		vlicense LICENSE.md
+		mv ${PKGDESTDIR}/usr/lib64/* ${PKGDESTDIR}/usr/lib/
+		rmdir ${PKGDESTDIR}/usr/lib64
+		rm -rf ${PKGDESTDIR}/usr/include
+		rm -rf ${PKGDESTDIR}/usr/lib/pkgconfig
+		rm -f "${PKGDESTDIR}usr/lib/*.so"
+	}
 }
 
+# devel files are the same for nonfree package
 intel-media-driver-devel_package() {
-	depends="${makedepends} ${sourcepkg}-${version}_${revision}"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

Re: New package: intel-media-driver-nonfree-24.3.4

[zlice]

[-- Attachment #1: Type: text/plain, Size: 392 bytes --]

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/51387#issuecomment-2555657913

Comment:
should be like it was originally. as mentioned i don't know that using the build option works, or if there's some other function you have to call besides do_configure to get it to take. tested https://bitmovin.com/demos/av1/ and it looks good on 24.3.4

Re: [PR PATCH] [Updated] New package: intel-media-driver-nonfree-24.3.4

[zlice]

[-- Attachment #1: Type: text/plain, Size: 1245 bytes --]

There is an updated pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages intel-media-drivers-nonfree
https://github.com/void-linux/void-packages/pull/51387

New package: intel-media-driver-nonfree-24.3.4
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - **x86_64-musl**

#### Comments

Add a `nonfree` package for `intel-media-driver`. This builds twice, similar to conky, and adds support for nonfree codecs to the repos (such as AV1 decode on Intel Arc A770 / DG2).

I'm unsure why `lib` and `lib64` are mixed up for the `-nonfree` subpackage. If anyone can tell me why or how to get rid of the hacky workaround rm/ln, let me know.

The `-devel` packages are the same files, so I went with `replace` and `intel-media-driver-nonfree` installs fine when you already have `intel-media-driver` and `intel-media-driver-devel` installed.

Could possibly add a `intel-video-accel-nonfree`.

A patch file from https://github.com/void-linux/void-packages/pull/51387.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-intel-media-drivers-nonfree-51387.patch --]
[-- Type: text/x-diff, Size: 2245 bytes --]

From dc3636a644801af36346eb45b84ec487e45ed8e7 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 22 Jul 2024 14:23:22 -0400
Subject: [PATCH] New package: intel-media-driver-nonfree-24.3.4

---
 srcpkgs/intel-media-driver-nonfree  |  1 +
 srcpkgs/intel-media-driver/template | 39 ++++++++++++++++++++++++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/intel-media-driver-nonfree

diff --git a/srcpkgs/intel-media-driver-nonfree b/srcpkgs/intel-media-driver-nonfree
new file mode 120000
index 00000000000000..d10a41ca64b9e6
--- /dev/null
+++ b/srcpkgs/intel-media-driver-nonfree
@@ -0,0 +1 @@
+intel-media-driver
\ No newline at end of file
diff --git a/srcpkgs/intel-media-driver/template b/srcpkgs/intel-media-driver/template
index 30ce9c511371f3..85322c55320322 100644
--- a/srcpkgs/intel-media-driver/template
+++ b/srcpkgs/intel-media-driver/template
@@ -18,12 +18,49 @@ checksum=58978f9ee4981532e60be2f2768673b1f3825db09971ebb98fbd7e8819cab6eb
 build_options="nonfree"
 desc_option_nonfree="Enable nonfree kernels"
 
+post_configure() {
+	(
+		configure_args="${configure_args/KERNELS=OFF/KERNELS=ON}"
+		cmake_builddir="nonfree-build"
+		do_configure
+	)
+}
+
+post_build() {
+	(
+		DESTDIR=${DESTDIR/${sourcepkg}/${sourcepkg}-nonfree}
+		cmake_builddir="nonfree-build"
+		do_build
+	)
+}
+
+# for some reason, lib installs to lib64 instead of symlinking?
 post_install() {
 	vlicense LICENSE.md
+	(
+		DESTDIR=${DESTDIR/${sourcepkg}/${sourcepkg}-nonfree}
+		cmake_builddir="nonfree-build"
+		do_install
+	)
+}
+
+intel-media-driver-nonfree_package() {
+	short_desc+=" - nonfree codecs"
+	replaces="intel-media-driver>=0"
+	repository=nonfree
+	pkg_install() {
+		vlicense LICENSE.md
+		mv ${PKGDESTDIR}/usr/lib64/* ${PKGDESTDIR}/usr/lib/
+		rmdir ${PKGDESTDIR}/usr/lib64
+		rm -rf ${PKGDESTDIR}/usr/include
+		rm -rf ${PKGDESTDIR}/usr/lib/pkgconfig
+		rm -f "${PKGDESTDIR}/usr/lib/*.so"
+	}
 }
 
+# devel files are the same for nonfree package
 intel-media-driver-devel_package() {
-	depends="${makedepends} ${sourcepkg}-${version}_${revision}"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

Re: [PR PATCH] [Updated] New package: intel-media-driver-nonfree-24.3.4

[zlice]

[-- Attachment #1: Type: text/plain, Size: 1245 bytes --]

There is an updated pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages intel-media-drivers-nonfree
https://github.com/void-linux/void-packages/pull/51387

New package: intel-media-driver-nonfree-24.3.4
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - **x86_64-musl**

#### Comments

Add a `nonfree` package for `intel-media-driver`. This builds twice, similar to conky, and adds support for nonfree codecs to the repos (such as AV1 decode on Intel Arc A770 / DG2).

I'm unsure why `lib` and `lib64` are mixed up for the `-nonfree` subpackage. If anyone can tell me why or how to get rid of the hacky workaround rm/ln, let me know.

The `-devel` packages are the same files, so I went with `replace` and `intel-media-driver-nonfree` installs fine when you already have `intel-media-driver` and `intel-media-driver-devel` installed.

Could possibly add a `intel-video-accel-nonfree`.

A patch file from https://github.com/void-linux/void-packages/pull/51387.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-intel-media-drivers-nonfree-51387.patch --]
[-- Type: text/x-diff, Size: 2281 bytes --]

From 300ee2676afa9d9bd7cb64e54085065495f02782 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 22 Jul 2024 14:23:22 -0400
Subject: [PATCH] New package: intel-media-driver-nonfree-24.3.4

---
 srcpkgs/intel-media-driver-nonfree  |  1 +
 srcpkgs/intel-media-driver/template | 40 ++++++++++++++++++++++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/intel-media-driver-nonfree

diff --git a/srcpkgs/intel-media-driver-nonfree b/srcpkgs/intel-media-driver-nonfree
new file mode 120000
index 00000000000000..d10a41ca64b9e6
--- /dev/null
+++ b/srcpkgs/intel-media-driver-nonfree
@@ -0,0 +1 @@
+intel-media-driver
\ No newline at end of file
diff --git a/srcpkgs/intel-media-driver/template b/srcpkgs/intel-media-driver/template
index 30ce9c511371f3..fcddfb2397b793 100644
--- a/srcpkgs/intel-media-driver/template
+++ b/srcpkgs/intel-media-driver/template
@@ -18,12 +18,50 @@ checksum=58978f9ee4981532e60be2f2768673b1f3825db09971ebb98fbd7e8819cab6eb
 build_options="nonfree"
 desc_option_nonfree="Enable nonfree kernels"
 
+post_configure() {
+	(
+		configure_args="${configure_args/KERNELS=OFF/KERNELS=ON}"
+		cmake_builddir="nonfree-build"
+		do_configure
+	)
+}
+
+post_build() {
+	(
+		DESTDIR=${DESTDIR/${sourcepkg}/${sourcepkg}-nonfree}
+		cmake_builddir="nonfree-build"
+		do_build
+	)
+}
+
+# for some reason, lib installs to lib64 instead of symlinking?
 post_install() {
 	vlicense LICENSE.md
+	(
+		DESTDIR=${DESTDIR/${sourcepkg}/${sourcepkg}-nonfree}
+		cmake_builddir="nonfree-build"
+		do_install
+		rm -f "${DESTDIR}/usr/lib*/*.so"
+	)
+}
+
+intel-media-driver-nonfree_package() {
+	short_desc+=" - nonfree codecs"
+	replaces="intel-media-driver>=0"
+	repository=nonfree
+	pkg_install() {
+		vlicense LICENSE.md
+		mv ${PKGDESTDIR}/usr/lib64/* ${PKGDESTDIR}/usr/lib/
+		rmdir ${PKGDESTDIR}/usr/lib64
+		rm -rf ${PKGDESTDIR}/usr/include
+		rm -rf ${PKGDESTDIR}/usr/lib/pkgconfig
+		rm -f "${PKGDESTDIR}/usr/lib/*.so"
+	}
 }
 
+# devel files are the same for nonfree package
 intel-media-driver-devel_package() {
-	depends="${makedepends} ${sourcepkg}-${version}_${revision}"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

Re: [PR PATCH] [Updated] New package: intel-media-driver-nonfree-24.3.4

[zlice]

[-- Attachment #1: Type: text/plain, Size: 1245 bytes --]

There is an updated pull request by zlice against master on the void-packages repository

https://github.com/zlice/void-packages intel-media-drivers-nonfree
https://github.com/void-linux/void-packages/pull/51387

New package: intel-media-driver-nonfree-24.3.4
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, **x86_64**
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - **x86_64-musl**

#### Comments

Add a `nonfree` package for `intel-media-driver`. This builds twice, similar to conky, and adds support for nonfree codecs to the repos (such as AV1 decode on Intel Arc A770 / DG2).

I'm unsure why `lib` and `lib64` are mixed up for the `-nonfree` subpackage. If anyone can tell me why or how to get rid of the hacky workaround rm/ln, let me know.

The `-devel` packages are the same files, so I went with `replace` and `intel-media-driver-nonfree` installs fine when you already have `intel-media-driver` and `intel-media-driver-devel` installed.

Could possibly add a `intel-video-accel-nonfree`.

A patch file from https://github.com/void-linux/void-packages/pull/51387.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-intel-media-drivers-nonfree-51387.patch --]
[-- Type: text/x-diff, Size: 2512 bytes --]

From c1f38adbe4daaba829c8eeb44f2c87669f1f8ca3 Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Mon, 22 Jul 2024 14:23:22 -0400
Subject: [PATCH] New package: intel-media-driver-nonfree-24.3.4

---
 srcpkgs/intel-media-driver-nonfree  |  1 +
 srcpkgs/intel-media-driver/template | 44 ++++++++++++++++++++++++++++-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/intel-media-driver-nonfree

diff --git a/srcpkgs/intel-media-driver-nonfree b/srcpkgs/intel-media-driver-nonfree
new file mode 120000
index 00000000000000..d10a41ca64b9e6
--- /dev/null
+++ b/srcpkgs/intel-media-driver-nonfree
@@ -0,0 +1 @@
+intel-media-driver
\ No newline at end of file
diff --git a/srcpkgs/intel-media-driver/template b/srcpkgs/intel-media-driver/template
index 30ce9c511371f3..77ca81ec5e429b 100644
--- a/srcpkgs/intel-media-driver/template
+++ b/srcpkgs/intel-media-driver/template
@@ -18,12 +18,54 @@ checksum=58978f9ee4981532e60be2f2768673b1f3825db09971ebb98fbd7e8819cab6eb
 build_options="nonfree"
 desc_option_nonfree="Enable nonfree kernels"
 
+post_configure() {
+	(
+		configure_args="${configure_args/KERNELS=OFF/KERNELS=ON}"
+		cmake_builddir="nonfree-build"
+		do_configure
+	)
+}
+
+post_build() {
+	(
+		DESTDIR=${DESTDIR/${pkgname}/${pkgname}-nonfree}
+		cmake_builddir="nonfree-build"
+		do_build
+	)
+}
+
+# for some reason, lib installs to lib64 instead of symlinking?
+# wildcard for libigfxcmrt.so did not work - use direct name to unlink
+# or else it gets detected as a conflict of the main (free) package
 post_install() {
 	vlicense LICENSE.md
+	(
+		DESTDIR=${DESTDIR/${pkgname}/${pkgname}-nonfree}
+		cmake_builddir="nonfree-build"
+		do_install
+		unlink ${DESTDIR}/usr/lib64/libigfxcmrt.so
+	)
+}
+
+intel-media-driver-nonfree_package() {
+	short_desc+=" - nonfree codecs"
+	provides="intel-media-driver-${version}_${revision}"
+	conflicts="intel-media-driver>=0"
+	repository=nonfree
+	pkg_install() {
+		DESTDIR="${pkgname}-${version}"
+		vlicense LICENSE.md
+		mv ${PKGDESTDIR}/usr/lib64/* ${PKGDESTDIR}/usr/lib/
+		rmdir ${PKGDESTDIR}/usr/lib64
+		rm -f ${PKGDESTDIR}/usr/lib/lib
+		rm -rf ${PKGDESTDIR}/usr/include
+		rm -rf ${PKGDESTDIR}/usr/lib/pkgconfig
+	}
 }
 
+# devel files are the same for nonfree package
 intel-media-driver-devel_package() {
-	depends="${makedepends} ${sourcepkg}-${version}_${revision}"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include

Re: New package: intel-media-driver-nonfree-24.3.4

[zlice]

[-- Attachment #1: Type: text/plain, Size: 696 bytes --]

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/51387#issuecomment-2556006660

Comment:
- switched to `conflict` instead of replace
- `unlink` the `.so` **directly** with full name, wildcard was not working
- `rm` the `lib` dir symlink **directly** (still not sure why this is here, must be something with the non-standard `post_install()` calling `install()` )
- verified nonfree is larger than its free counterpart (much bigger than i'd expect, but strip did not change the size
- use DESTDIR in post_install()
- build option is unused now

![sizediff](https://github.com/user-attachments/assets/01beb4a9-eabc-4ebb-8b72-c50db0af1b63)

Re: New package: intel-media-driver-nonfree-24.3.4

[zlice]

[-- Attachment #1: Type: text/plain, Size: 237 bytes --]

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/51387#issuecomment-2701167632

Comment:
updated to 24.4.4 - requires gmmlib 22.5.5 https://github.com/void-linux/void-packages/pull/54583