* [PR PATCH] linux-firmware-dvb: remove conflicts with official linux-firmware
@ 2022-08-15 10:17 dataCobra
2022-08-16 18:41 ` [PR PATCH] [Updated] " dataCobra
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: dataCobra @ 2022-08-15 10:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1142 bytes --]
There is a new pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages linux-firmware-dvb_revision5
https://github.com/void-linux/void-packages/pull/38683
linux-firmware-dvb: remove conflicts with official linux-firmware
#### Testing the changes
- I tested the changes in this PR: **No**
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (crossbuild)
- armv7l (crossbuild)
- armv6l-musl (crossbuild)
#### Explanation:
While trying to get the new linux-firmware #38103 working, conflicts are found with this
package. This is because some firmware is now also available in the official linux-firmware.
Since linux-firmware-dvb is still on version 20170329 and it seems there is no version that
is more recent than the official linux-firmware. I've removed all firmware that conflicts with
the linux-firmware-20220708 version.
A patch file from https://github.com/void-linux/void-packages/pull/38683.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-linux-firmware-dvb_revision5-38683.patch --]
[-- Type: text/x-diff, Size: 7291 bytes --]
From c938037793c619b0c0ae926485de1be880957b1a Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Mon, 15 Aug 2022 12:09:37 +0200
Subject: [PATCH] linux-firmware-dvb: remove conflicts with official
linux-firmware
---
srcpkgs/linux-firmware-dvb/template | 72 +----------------------------
1 file changed, 1 insertion(+), 71 deletions(-)
diff --git a/srcpkgs/linux-firmware-dvb/template b/srcpkgs/linux-firmware-dvb/template
index 332ee32405dc..58b3b14345d9 100644
--- a/srcpkgs/linux-firmware-dvb/template
+++ b/srcpkgs/linux-firmware-dvb/template
@@ -1,7 +1,7 @@
# Template file for 'linux-firmware-dvb'
pkgname=linux-firmware-dvb
version=20170329
-revision=4
+revision=5
_gitrev=3fef04a4a4bfeba88ae3b20aff9d3a1fabf1c159
short_desc="Linux TV firmware package"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -37,15 +37,10 @@ do_install() {
firmwares+=" NXP7164-2010-04-01.1.fw"
licenses+=" README.as102"
firmwares+=" af9005.fw"
- firmwares+=" as102_data1_st.hex"
- firmwares+=" as102_data2_st.hex"
firmwares+=" bootcode.bin"
- firmwares+=" cmmb_vega_12mhz.inp"
- firmwares+=" cmmb_venice_12mhz.inp"
firmwares+=" drxd-a2-1.1.fw"
firmwares+=" drxd-b1-1.1.fw"
firmwares+=" drxk_a3.mc"
- firmwares+=" dspbootcode.bin"
firmwares+=" dvb-demod-drxk-01.fw"
firmwares+=" dvb-demod-drxk-pctv.fw"
firmwares+=" dvb-demod-m88ds3103.fw"
@@ -73,10 +68,7 @@ do_install() {
firmwares+=" dvb-fe-tda10046.fw"
firmwares+=" dvb-fe-tda10048-1.0.fw"
firmwares+=" dvb-fe-tda10071.fw"
- firmwares+=" dvb-fe-xc4000-1.4.1.fw"
firmwares+=" dvb-fe-xc4000-1.4.fw"
- firmwares+=" dvb-fe-xc5000-1.6.114.fw"
- firmwares+=" dvb-fe-xc5000c-4.1.30.7.fw"
firmwares+=" dvb-ttpci-01.fw"
firmwares+=" dvb-ttpci-01.fw-261a"
firmwares+=" dvb-ttpci-01.fw-261b"
@@ -95,7 +87,6 @@ do_install() {
firmwares+=" dvb-usb-az6027-03.fw"
firmwares+=" dvb-usb-bluebird-01.fw"
firmwares+=" dvb-usb-bluebird-02.fw"
- firmwares+=" dvb-usb-dib0700-1.20.fw"
firmwares+=" dvb-usb-dibusb-5.0.0.11.fw"
firmwares+=" dvb-usb-dibusb-6.0.0.8.fw"
firmwares+=" dvb-usb-dtt200u-01.fw"
@@ -106,8 +97,6 @@ do_install() {
firmwares+=" dvb-usb-gp8psk-01.fw"
firmwares+=" dvb-usb-gp8psk-02.fw"
firmwares+=" dvb-usb-hauppauge-hvr930c-drxk.fw"
- firmwares+=" dvb-usb-it9135-01.fw"
- firmwares+=" dvb-usb-it9135-02.fw"
firmwares+=" dvb-usb-it9137-01.fw"
firmwares+=" dvb-usb-it9303-01.fw"
firmwares+=" dvb-usb-nova-t-usb2-02.fw"
@@ -117,7 +106,6 @@ do_install() {
firmwares+=" dvb-usb-pctv-452e-01.fw"
firmwares+=" dvb-usb-s630.fw"
firmwares+=" dvb-usb-s660.fw"
- firmwares+=" dvb-usb-terratec-h5-drxk.fw"
firmwares+=" dvb-usb-terratec-h7-az6007.fw"
firmwares+=" dvb-usb-terratec-h7-drxk.fw"
firmwares+=" dvb-usb-terratec-htc-stick-drxk.fw"
@@ -130,15 +118,9 @@ do_install() {
firmwares+=" dvb-usb-wt220u-fc03.fw"
firmwares+=" dvb-usb-wt220u-miglia-01.fw"
firmwares+=" dvb-usb-wt220u-zl0353-01.fw"
- firmwares+=" dvb_nova_12mhz.inp"
- firmwares+=" dvb_nova_12mhz_b0.inp"
firmwares+=" dvb_rio.inp"
firmwares+=" firmware/Boot.S"
licenses+=" firmware/README"
- firmwares+=" firmware/as102_data1_st.hex"
- firmwares+=" firmware/as102_data2_st.hex"
- firmwares+=" firmware/cmmb_vega_12mhz.inp"
- firmwares+=" firmware/cmmb_venice_12mhz.inp"
firmwares+=" firmware/dvb-fe-bcm3510-01.fw"
firmwares+=" firmware/dvb-fe-drxj-mc-1.0.8.fw"
firmwares+=" firmware/dvb-fe-drxj-mc-vsb-1.0.8.fw"
@@ -146,9 +128,6 @@ do_install() {
firmwares+=" firmware/dvb-fe-or51132-qam.fw"
firmwares+=" firmware/dvb-fe-or51132-vsb.fw"
firmwares+=" firmware/dvb-fe-or51211.fw"
- firmwares+=" firmware/dvb-fe-xc4000-1.4.1.fw"
- firmwares+=" firmware/dvb-fe-xc5000-1.6.114.fw"
- firmwares+=" firmware/dvb-fe-xc5000c-4.1.30.7.fw"
firmwares+=" firmware/dvb-ttpci-01.fw-261a"
firmwares+=" firmware/dvb-ttpci-01.fw-261b"
firmwares+=" firmware/dvb-ttpci-01.fw-261c"
@@ -157,13 +136,9 @@ do_install() {
firmwares+=" firmware/dvb-ttpci-01.fw-2622"
firmwares+=" firmware/dvb-usb-avertv-a800-02.fw"
firmwares+=" firmware/dvb-usb-bluebird-01.fw"
- firmwares+=" firmware/dvb-usb-dib0700-1.20.fw"
firmwares+=" firmware/dvb-usb-dibusb-5.0.0.11.fw"
firmwares+=" firmware/dvb-usb-dibusb-6.0.0.8.fw"
firmwares+=" firmware/dvb-usb-dtt200u-01.fw"
- firmwares+=" firmware/dvb-usb-it9135-01.fw"
- firmwares+=" firmware/dvb-usb-it9135-02.fw"
- firmwares+=" firmware/dvb-usb-terratec-h5-drxk.fw"
firmwares+=" firmware/dvb-usb-terratec-h7-az6007.fw"
firmwares+=" firmware/dvb-usb-terratec-h7-drxk.fw"
firmwares+=" firmware/dvb-usb-umt-010-02.fw"
@@ -171,67 +146,22 @@ do_install() {
firmwares+=" firmware/dvb-usb-vp7045-01.fw"
firmwares+=" firmware/dvb-usb-wt220u-01.fw"
firmwares+=" firmware/dvb-usb-wt220u-02.fw"
- firmwares+=" firmware/dvb_nova_12mhz.inp"
- firmwares+=" firmware/dvb_nova_12mhz_b0.inp"
- firmwares+=" firmware/isdbt_nova_12mhz.inp"
- firmwares+=" firmware/isdbt_nova_12mhz_b0.inp"
- firmwares+=" firmware/isdbt_rio.inp"
- firmwares+=" firmware/sms1xxx-hcw-55xxx-dvbt-02.fw"
- firmwares+=" firmware/sms1xxx-hcw-55xxx-isdbt-02.fw"
- firmwares+=" firmware/sms1xxx-nova-a-dvbt-01.fw"
- firmwares+=" firmware/sms1xxx-nova-b-dvbt-01.fw"
- firmwares+=" firmware/sms1xxx-stellar-dvbt-01.fw"
- firmwares+=" firmware/tdmb_nova_12mhz.inp"
- firmwares+=" firmware/v4l-cx231xx-avcore-01.fw"
- firmwares+=" firmware/v4l-cx23418-apu.fw"
- firmwares+=" firmware/v4l-cx23418-cpu.fw"
- firmwares+=" firmware/v4l-cx23418-dig.fw"
- firmwares+=" firmware/v4l-cx23885-avcore-01.fw"
firmwares+=" firmware/v4l-cx23885-enc-broken.fw"
firmwares+=" firmware/v4l-cx23885-enc.fw"
- firmwares+=" firmware/v4l-cx25840.fw"
- firmwares+=" go7007/go7007fw.bin"
- firmwares+=" go7007/go7007tv.bin"
- firmwares+=" go7007/lr192.fw"
- firmwares+=" go7007/px-m402u.fw"
- firmwares+=" go7007/px-tv402u.fw"
- firmwares+=" go7007/s2250-1.fw"
- firmwares+=" go7007/s2250-2.fw"
- firmwares+=" go7007/wis-startrek.fw"
- firmwares+=" isdbt_nova_12mhz.inp"
- firmwares+=" isdbt_nova_12mhz_b0.inp"
- firmwares+=" isdbt_rio.inp"
- firmwares+=" lgs8g75.fw"
licenses+=" license-end-user.txt"
licenses+=" license-oemihvisv.txt"
firmwares+=" ngene_15.fw"
firmwares+=" ngene_16.fw"
firmwares+=" ngene_17.fw"
firmwares+=" ngene_18.fw"
- firmwares+=" s2250.fw"
- firmwares+=" s2250_loader.fw"
firmwares+=" sms1xxx-hcw-114xxx-cmmb-01.fw"
firmwares+=" sms1xxx-hcw-55xxx-dvbt-01.fw"
- firmwares+=" sms1xxx-hcw-55xxx-dvbt-02.fw"
firmwares+=" sms1xxx-hcw-55xxx-dvbt-03.fw"
- firmwares+=" sms1xxx-hcw-55xxx-isdbt-02.fw"
firmwares+=" sms1xxx-hcw-55xxx-isdbt-03.fw"
- firmwares+=" sms1xxx-nova-a-dvbt-01.fw"
- firmwares+=" sms1xxx-nova-b-dvbt-01.fw"
- firmwares+=" sms1xxx-stellar-dvbt-01.fw"
- firmwares+=" tdmb_nova_12mhz.inp"
- firmwares+=" tlg2300_firmware.bin"
- firmwares+=" ttusb-budget/dspbootcode.bin"
- firmwares+=" v4l-cx231xx-avcore-01.fw"
- firmwares+=" v4l-cx23418-apu.fw"
- firmwares+=" v4l-cx23418-cpu.fw"
- firmwares+=" v4l-cx23418-dig.fw"
firmwares+=" v4l-cx2341x-dec.fw"
firmwares+=" v4l-cx2341x-enc.fw"
firmwares+=" v4l-cx2341x-init.mpg"
- firmwares+=" v4l-cx23885-avcore-01.fw"
firmwares+=" v4l-cx23885-enc.fw"
- firmwares+=" v4l-cx25840.fw"
firmwares+=" v4l-pvrusb2-24xxx-01.fw"
firmwares+=" v4l-pvrusb2-29xxx-01.fw"
firmwares+=" v4l-pvrusb2-73xxx-01.fw"
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] linux-firmware-dvb: remove conflicts with official linux-firmware
2022-08-15 10:17 [PR PATCH] linux-firmware-dvb: remove conflicts with official linux-firmware dataCobra
@ 2022-08-16 18:41 ` dataCobra
2022-08-17 4:55 ` dataCobra
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: dataCobra @ 2022-08-16 18:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1143 bytes --]
There is an updated pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages linux-firmware-dvb_revision5
https://github.com/void-linux/void-packages/pull/38683
linux-firmware-dvb: remove conflicts with official linux-firmware
#### Testing the changes
- I tested the changes in this PR: **No**
#### 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):
- aarch64-musl (crossbuild)
- armv7l (crossbuild)
- armv6l-musl (crossbuild)
#### Explanation
While trying to get the new linux-firmware #38103 working, conflicts are found with this
package. This is because some firmware is now also available in the official linux-firmware.
Since linux-firmware-dvb is still on version 20170329 and it seems there is no version that
is more recent than the official linux-firmware. I've removed all firmware that conflicts with
the linux-firmware-20220708 version.
A patch file from https://github.com/void-linux/void-packages/pull/38683.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-linux-firmware-dvb_revision5-38683.patch --]
[-- Type: text/x-diff, Size: 7291 bytes --]
From c7ecd73ef76242463531dde0852a85f87e6b2a68 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Mon, 15 Aug 2022 12:09:37 +0200
Subject: [PATCH] linux-firmware-dvb: remove conflicts with official
linux-firmware
---
srcpkgs/linux-firmware-dvb/template | 72 +----------------------------
1 file changed, 1 insertion(+), 71 deletions(-)
diff --git a/srcpkgs/linux-firmware-dvb/template b/srcpkgs/linux-firmware-dvb/template
index 332ee32405dc..58b3b14345d9 100644
--- a/srcpkgs/linux-firmware-dvb/template
+++ b/srcpkgs/linux-firmware-dvb/template
@@ -1,7 +1,7 @@
# Template file for 'linux-firmware-dvb'
pkgname=linux-firmware-dvb
version=20170329
-revision=4
+revision=5
_gitrev=3fef04a4a4bfeba88ae3b20aff9d3a1fabf1c159
short_desc="Linux TV firmware package"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -37,15 +37,10 @@ do_install() {
firmwares+=" NXP7164-2010-04-01.1.fw"
licenses+=" README.as102"
firmwares+=" af9005.fw"
- firmwares+=" as102_data1_st.hex"
- firmwares+=" as102_data2_st.hex"
firmwares+=" bootcode.bin"
- firmwares+=" cmmb_vega_12mhz.inp"
- firmwares+=" cmmb_venice_12mhz.inp"
firmwares+=" drxd-a2-1.1.fw"
firmwares+=" drxd-b1-1.1.fw"
firmwares+=" drxk_a3.mc"
- firmwares+=" dspbootcode.bin"
firmwares+=" dvb-demod-drxk-01.fw"
firmwares+=" dvb-demod-drxk-pctv.fw"
firmwares+=" dvb-demod-m88ds3103.fw"
@@ -73,10 +68,7 @@ do_install() {
firmwares+=" dvb-fe-tda10046.fw"
firmwares+=" dvb-fe-tda10048-1.0.fw"
firmwares+=" dvb-fe-tda10071.fw"
- firmwares+=" dvb-fe-xc4000-1.4.1.fw"
firmwares+=" dvb-fe-xc4000-1.4.fw"
- firmwares+=" dvb-fe-xc5000-1.6.114.fw"
- firmwares+=" dvb-fe-xc5000c-4.1.30.7.fw"
firmwares+=" dvb-ttpci-01.fw"
firmwares+=" dvb-ttpci-01.fw-261a"
firmwares+=" dvb-ttpci-01.fw-261b"
@@ -95,7 +87,6 @@ do_install() {
firmwares+=" dvb-usb-az6027-03.fw"
firmwares+=" dvb-usb-bluebird-01.fw"
firmwares+=" dvb-usb-bluebird-02.fw"
- firmwares+=" dvb-usb-dib0700-1.20.fw"
firmwares+=" dvb-usb-dibusb-5.0.0.11.fw"
firmwares+=" dvb-usb-dibusb-6.0.0.8.fw"
firmwares+=" dvb-usb-dtt200u-01.fw"
@@ -106,8 +97,6 @@ do_install() {
firmwares+=" dvb-usb-gp8psk-01.fw"
firmwares+=" dvb-usb-gp8psk-02.fw"
firmwares+=" dvb-usb-hauppauge-hvr930c-drxk.fw"
- firmwares+=" dvb-usb-it9135-01.fw"
- firmwares+=" dvb-usb-it9135-02.fw"
firmwares+=" dvb-usb-it9137-01.fw"
firmwares+=" dvb-usb-it9303-01.fw"
firmwares+=" dvb-usb-nova-t-usb2-02.fw"
@@ -117,7 +106,6 @@ do_install() {
firmwares+=" dvb-usb-pctv-452e-01.fw"
firmwares+=" dvb-usb-s630.fw"
firmwares+=" dvb-usb-s660.fw"
- firmwares+=" dvb-usb-terratec-h5-drxk.fw"
firmwares+=" dvb-usb-terratec-h7-az6007.fw"
firmwares+=" dvb-usb-terratec-h7-drxk.fw"
firmwares+=" dvb-usb-terratec-htc-stick-drxk.fw"
@@ -130,15 +118,9 @@ do_install() {
firmwares+=" dvb-usb-wt220u-fc03.fw"
firmwares+=" dvb-usb-wt220u-miglia-01.fw"
firmwares+=" dvb-usb-wt220u-zl0353-01.fw"
- firmwares+=" dvb_nova_12mhz.inp"
- firmwares+=" dvb_nova_12mhz_b0.inp"
firmwares+=" dvb_rio.inp"
firmwares+=" firmware/Boot.S"
licenses+=" firmware/README"
- firmwares+=" firmware/as102_data1_st.hex"
- firmwares+=" firmware/as102_data2_st.hex"
- firmwares+=" firmware/cmmb_vega_12mhz.inp"
- firmwares+=" firmware/cmmb_venice_12mhz.inp"
firmwares+=" firmware/dvb-fe-bcm3510-01.fw"
firmwares+=" firmware/dvb-fe-drxj-mc-1.0.8.fw"
firmwares+=" firmware/dvb-fe-drxj-mc-vsb-1.0.8.fw"
@@ -146,9 +128,6 @@ do_install() {
firmwares+=" firmware/dvb-fe-or51132-qam.fw"
firmwares+=" firmware/dvb-fe-or51132-vsb.fw"
firmwares+=" firmware/dvb-fe-or51211.fw"
- firmwares+=" firmware/dvb-fe-xc4000-1.4.1.fw"
- firmwares+=" firmware/dvb-fe-xc5000-1.6.114.fw"
- firmwares+=" firmware/dvb-fe-xc5000c-4.1.30.7.fw"
firmwares+=" firmware/dvb-ttpci-01.fw-261a"
firmwares+=" firmware/dvb-ttpci-01.fw-261b"
firmwares+=" firmware/dvb-ttpci-01.fw-261c"
@@ -157,13 +136,9 @@ do_install() {
firmwares+=" firmware/dvb-ttpci-01.fw-2622"
firmwares+=" firmware/dvb-usb-avertv-a800-02.fw"
firmwares+=" firmware/dvb-usb-bluebird-01.fw"
- firmwares+=" firmware/dvb-usb-dib0700-1.20.fw"
firmwares+=" firmware/dvb-usb-dibusb-5.0.0.11.fw"
firmwares+=" firmware/dvb-usb-dibusb-6.0.0.8.fw"
firmwares+=" firmware/dvb-usb-dtt200u-01.fw"
- firmwares+=" firmware/dvb-usb-it9135-01.fw"
- firmwares+=" firmware/dvb-usb-it9135-02.fw"
- firmwares+=" firmware/dvb-usb-terratec-h5-drxk.fw"
firmwares+=" firmware/dvb-usb-terratec-h7-az6007.fw"
firmwares+=" firmware/dvb-usb-terratec-h7-drxk.fw"
firmwares+=" firmware/dvb-usb-umt-010-02.fw"
@@ -171,67 +146,22 @@ do_install() {
firmwares+=" firmware/dvb-usb-vp7045-01.fw"
firmwares+=" firmware/dvb-usb-wt220u-01.fw"
firmwares+=" firmware/dvb-usb-wt220u-02.fw"
- firmwares+=" firmware/dvb_nova_12mhz.inp"
- firmwares+=" firmware/dvb_nova_12mhz_b0.inp"
- firmwares+=" firmware/isdbt_nova_12mhz.inp"
- firmwares+=" firmware/isdbt_nova_12mhz_b0.inp"
- firmwares+=" firmware/isdbt_rio.inp"
- firmwares+=" firmware/sms1xxx-hcw-55xxx-dvbt-02.fw"
- firmwares+=" firmware/sms1xxx-hcw-55xxx-isdbt-02.fw"
- firmwares+=" firmware/sms1xxx-nova-a-dvbt-01.fw"
- firmwares+=" firmware/sms1xxx-nova-b-dvbt-01.fw"
- firmwares+=" firmware/sms1xxx-stellar-dvbt-01.fw"
- firmwares+=" firmware/tdmb_nova_12mhz.inp"
- firmwares+=" firmware/v4l-cx231xx-avcore-01.fw"
- firmwares+=" firmware/v4l-cx23418-apu.fw"
- firmwares+=" firmware/v4l-cx23418-cpu.fw"
- firmwares+=" firmware/v4l-cx23418-dig.fw"
- firmwares+=" firmware/v4l-cx23885-avcore-01.fw"
firmwares+=" firmware/v4l-cx23885-enc-broken.fw"
firmwares+=" firmware/v4l-cx23885-enc.fw"
- firmwares+=" firmware/v4l-cx25840.fw"
- firmwares+=" go7007/go7007fw.bin"
- firmwares+=" go7007/go7007tv.bin"
- firmwares+=" go7007/lr192.fw"
- firmwares+=" go7007/px-m402u.fw"
- firmwares+=" go7007/px-tv402u.fw"
- firmwares+=" go7007/s2250-1.fw"
- firmwares+=" go7007/s2250-2.fw"
- firmwares+=" go7007/wis-startrek.fw"
- firmwares+=" isdbt_nova_12mhz.inp"
- firmwares+=" isdbt_nova_12mhz_b0.inp"
- firmwares+=" isdbt_rio.inp"
- firmwares+=" lgs8g75.fw"
licenses+=" license-end-user.txt"
licenses+=" license-oemihvisv.txt"
firmwares+=" ngene_15.fw"
firmwares+=" ngene_16.fw"
firmwares+=" ngene_17.fw"
firmwares+=" ngene_18.fw"
- firmwares+=" s2250.fw"
- firmwares+=" s2250_loader.fw"
firmwares+=" sms1xxx-hcw-114xxx-cmmb-01.fw"
firmwares+=" sms1xxx-hcw-55xxx-dvbt-01.fw"
- firmwares+=" sms1xxx-hcw-55xxx-dvbt-02.fw"
firmwares+=" sms1xxx-hcw-55xxx-dvbt-03.fw"
- firmwares+=" sms1xxx-hcw-55xxx-isdbt-02.fw"
firmwares+=" sms1xxx-hcw-55xxx-isdbt-03.fw"
- firmwares+=" sms1xxx-nova-a-dvbt-01.fw"
- firmwares+=" sms1xxx-nova-b-dvbt-01.fw"
- firmwares+=" sms1xxx-stellar-dvbt-01.fw"
- firmwares+=" tdmb_nova_12mhz.inp"
- firmwares+=" tlg2300_firmware.bin"
- firmwares+=" ttusb-budget/dspbootcode.bin"
- firmwares+=" v4l-cx231xx-avcore-01.fw"
- firmwares+=" v4l-cx23418-apu.fw"
- firmwares+=" v4l-cx23418-cpu.fw"
- firmwares+=" v4l-cx23418-dig.fw"
firmwares+=" v4l-cx2341x-dec.fw"
firmwares+=" v4l-cx2341x-enc.fw"
firmwares+=" v4l-cx2341x-init.mpg"
- firmwares+=" v4l-cx23885-avcore-01.fw"
firmwares+=" v4l-cx23885-enc.fw"
- firmwares+=" v4l-cx25840.fw"
firmwares+=" v4l-pvrusb2-24xxx-01.fw"
firmwares+=" v4l-pvrusb2-29xxx-01.fw"
firmwares+=" v4l-pvrusb2-73xxx-01.fw"
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] linux-firmware-dvb: remove conflicts with official linux-firmware
2022-08-15 10:17 [PR PATCH] linux-firmware-dvb: remove conflicts with official linux-firmware dataCobra
2022-08-16 18:41 ` [PR PATCH] [Updated] " dataCobra
@ 2022-08-17 4:55 ` dataCobra
2022-09-14 4:51 ` dataCobra
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: dataCobra @ 2022-08-17 4:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1143 bytes --]
There is an updated pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages linux-firmware-dvb_revision5
https://github.com/void-linux/void-packages/pull/38683
linux-firmware-dvb: remove conflicts with official linux-firmware
#### Testing the changes
- I tested the changes in this PR: **No**
#### 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):
- aarch64-musl (crossbuild)
- armv7l (crossbuild)
- armv6l-musl (crossbuild)
#### Explanation
While trying to get the new linux-firmware #38103 working, conflicts are found with this
package. This is because some firmware is now also available in the official linux-firmware.
Since linux-firmware-dvb is still on version 20170329 and it seems there is no version that
is more recent than the official linux-firmware. I've removed all firmware that conflicts with
the linux-firmware-20220708 version.
A patch file from https://github.com/void-linux/void-packages/pull/38683.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-linux-firmware-dvb_revision5-38683.patch --]
[-- Type: text/x-diff, Size: 7291 bytes --]
From ca77147096520cca361af461ca47f546acd4ddfb Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Mon, 15 Aug 2022 12:09:37 +0200
Subject: [PATCH] linux-firmware-dvb: remove conflicts with official
linux-firmware
---
srcpkgs/linux-firmware-dvb/template | 72 +----------------------------
1 file changed, 1 insertion(+), 71 deletions(-)
diff --git a/srcpkgs/linux-firmware-dvb/template b/srcpkgs/linux-firmware-dvb/template
index 332ee32405dc..58b3b14345d9 100644
--- a/srcpkgs/linux-firmware-dvb/template
+++ b/srcpkgs/linux-firmware-dvb/template
@@ -1,7 +1,7 @@
# Template file for 'linux-firmware-dvb'
pkgname=linux-firmware-dvb
version=20170329
-revision=4
+revision=5
_gitrev=3fef04a4a4bfeba88ae3b20aff9d3a1fabf1c159
short_desc="Linux TV firmware package"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -37,15 +37,10 @@ do_install() {
firmwares+=" NXP7164-2010-04-01.1.fw"
licenses+=" README.as102"
firmwares+=" af9005.fw"
- firmwares+=" as102_data1_st.hex"
- firmwares+=" as102_data2_st.hex"
firmwares+=" bootcode.bin"
- firmwares+=" cmmb_vega_12mhz.inp"
- firmwares+=" cmmb_venice_12mhz.inp"
firmwares+=" drxd-a2-1.1.fw"
firmwares+=" drxd-b1-1.1.fw"
firmwares+=" drxk_a3.mc"
- firmwares+=" dspbootcode.bin"
firmwares+=" dvb-demod-drxk-01.fw"
firmwares+=" dvb-demod-drxk-pctv.fw"
firmwares+=" dvb-demod-m88ds3103.fw"
@@ -73,10 +68,7 @@ do_install() {
firmwares+=" dvb-fe-tda10046.fw"
firmwares+=" dvb-fe-tda10048-1.0.fw"
firmwares+=" dvb-fe-tda10071.fw"
- firmwares+=" dvb-fe-xc4000-1.4.1.fw"
firmwares+=" dvb-fe-xc4000-1.4.fw"
- firmwares+=" dvb-fe-xc5000-1.6.114.fw"
- firmwares+=" dvb-fe-xc5000c-4.1.30.7.fw"
firmwares+=" dvb-ttpci-01.fw"
firmwares+=" dvb-ttpci-01.fw-261a"
firmwares+=" dvb-ttpci-01.fw-261b"
@@ -95,7 +87,6 @@ do_install() {
firmwares+=" dvb-usb-az6027-03.fw"
firmwares+=" dvb-usb-bluebird-01.fw"
firmwares+=" dvb-usb-bluebird-02.fw"
- firmwares+=" dvb-usb-dib0700-1.20.fw"
firmwares+=" dvb-usb-dibusb-5.0.0.11.fw"
firmwares+=" dvb-usb-dibusb-6.0.0.8.fw"
firmwares+=" dvb-usb-dtt200u-01.fw"
@@ -106,8 +97,6 @@ do_install() {
firmwares+=" dvb-usb-gp8psk-01.fw"
firmwares+=" dvb-usb-gp8psk-02.fw"
firmwares+=" dvb-usb-hauppauge-hvr930c-drxk.fw"
- firmwares+=" dvb-usb-it9135-01.fw"
- firmwares+=" dvb-usb-it9135-02.fw"
firmwares+=" dvb-usb-it9137-01.fw"
firmwares+=" dvb-usb-it9303-01.fw"
firmwares+=" dvb-usb-nova-t-usb2-02.fw"
@@ -117,7 +106,6 @@ do_install() {
firmwares+=" dvb-usb-pctv-452e-01.fw"
firmwares+=" dvb-usb-s630.fw"
firmwares+=" dvb-usb-s660.fw"
- firmwares+=" dvb-usb-terratec-h5-drxk.fw"
firmwares+=" dvb-usb-terratec-h7-az6007.fw"
firmwares+=" dvb-usb-terratec-h7-drxk.fw"
firmwares+=" dvb-usb-terratec-htc-stick-drxk.fw"
@@ -130,15 +118,9 @@ do_install() {
firmwares+=" dvb-usb-wt220u-fc03.fw"
firmwares+=" dvb-usb-wt220u-miglia-01.fw"
firmwares+=" dvb-usb-wt220u-zl0353-01.fw"
- firmwares+=" dvb_nova_12mhz.inp"
- firmwares+=" dvb_nova_12mhz_b0.inp"
firmwares+=" dvb_rio.inp"
firmwares+=" firmware/Boot.S"
licenses+=" firmware/README"
- firmwares+=" firmware/as102_data1_st.hex"
- firmwares+=" firmware/as102_data2_st.hex"
- firmwares+=" firmware/cmmb_vega_12mhz.inp"
- firmwares+=" firmware/cmmb_venice_12mhz.inp"
firmwares+=" firmware/dvb-fe-bcm3510-01.fw"
firmwares+=" firmware/dvb-fe-drxj-mc-1.0.8.fw"
firmwares+=" firmware/dvb-fe-drxj-mc-vsb-1.0.8.fw"
@@ -146,9 +128,6 @@ do_install() {
firmwares+=" firmware/dvb-fe-or51132-qam.fw"
firmwares+=" firmware/dvb-fe-or51132-vsb.fw"
firmwares+=" firmware/dvb-fe-or51211.fw"
- firmwares+=" firmware/dvb-fe-xc4000-1.4.1.fw"
- firmwares+=" firmware/dvb-fe-xc5000-1.6.114.fw"
- firmwares+=" firmware/dvb-fe-xc5000c-4.1.30.7.fw"
firmwares+=" firmware/dvb-ttpci-01.fw-261a"
firmwares+=" firmware/dvb-ttpci-01.fw-261b"
firmwares+=" firmware/dvb-ttpci-01.fw-261c"
@@ -157,13 +136,9 @@ do_install() {
firmwares+=" firmware/dvb-ttpci-01.fw-2622"
firmwares+=" firmware/dvb-usb-avertv-a800-02.fw"
firmwares+=" firmware/dvb-usb-bluebird-01.fw"
- firmwares+=" firmware/dvb-usb-dib0700-1.20.fw"
firmwares+=" firmware/dvb-usb-dibusb-5.0.0.11.fw"
firmwares+=" firmware/dvb-usb-dibusb-6.0.0.8.fw"
firmwares+=" firmware/dvb-usb-dtt200u-01.fw"
- firmwares+=" firmware/dvb-usb-it9135-01.fw"
- firmwares+=" firmware/dvb-usb-it9135-02.fw"
- firmwares+=" firmware/dvb-usb-terratec-h5-drxk.fw"
firmwares+=" firmware/dvb-usb-terratec-h7-az6007.fw"
firmwares+=" firmware/dvb-usb-terratec-h7-drxk.fw"
firmwares+=" firmware/dvb-usb-umt-010-02.fw"
@@ -171,67 +146,22 @@ do_install() {
firmwares+=" firmware/dvb-usb-vp7045-01.fw"
firmwares+=" firmware/dvb-usb-wt220u-01.fw"
firmwares+=" firmware/dvb-usb-wt220u-02.fw"
- firmwares+=" firmware/dvb_nova_12mhz.inp"
- firmwares+=" firmware/dvb_nova_12mhz_b0.inp"
- firmwares+=" firmware/isdbt_nova_12mhz.inp"
- firmwares+=" firmware/isdbt_nova_12mhz_b0.inp"
- firmwares+=" firmware/isdbt_rio.inp"
- firmwares+=" firmware/sms1xxx-hcw-55xxx-dvbt-02.fw"
- firmwares+=" firmware/sms1xxx-hcw-55xxx-isdbt-02.fw"
- firmwares+=" firmware/sms1xxx-nova-a-dvbt-01.fw"
- firmwares+=" firmware/sms1xxx-nova-b-dvbt-01.fw"
- firmwares+=" firmware/sms1xxx-stellar-dvbt-01.fw"
- firmwares+=" firmware/tdmb_nova_12mhz.inp"
- firmwares+=" firmware/v4l-cx231xx-avcore-01.fw"
- firmwares+=" firmware/v4l-cx23418-apu.fw"
- firmwares+=" firmware/v4l-cx23418-cpu.fw"
- firmwares+=" firmware/v4l-cx23418-dig.fw"
- firmwares+=" firmware/v4l-cx23885-avcore-01.fw"
firmwares+=" firmware/v4l-cx23885-enc-broken.fw"
firmwares+=" firmware/v4l-cx23885-enc.fw"
- firmwares+=" firmware/v4l-cx25840.fw"
- firmwares+=" go7007/go7007fw.bin"
- firmwares+=" go7007/go7007tv.bin"
- firmwares+=" go7007/lr192.fw"
- firmwares+=" go7007/px-m402u.fw"
- firmwares+=" go7007/px-tv402u.fw"
- firmwares+=" go7007/s2250-1.fw"
- firmwares+=" go7007/s2250-2.fw"
- firmwares+=" go7007/wis-startrek.fw"
- firmwares+=" isdbt_nova_12mhz.inp"
- firmwares+=" isdbt_nova_12mhz_b0.inp"
- firmwares+=" isdbt_rio.inp"
- firmwares+=" lgs8g75.fw"
licenses+=" license-end-user.txt"
licenses+=" license-oemihvisv.txt"
firmwares+=" ngene_15.fw"
firmwares+=" ngene_16.fw"
firmwares+=" ngene_17.fw"
firmwares+=" ngene_18.fw"
- firmwares+=" s2250.fw"
- firmwares+=" s2250_loader.fw"
firmwares+=" sms1xxx-hcw-114xxx-cmmb-01.fw"
firmwares+=" sms1xxx-hcw-55xxx-dvbt-01.fw"
- firmwares+=" sms1xxx-hcw-55xxx-dvbt-02.fw"
firmwares+=" sms1xxx-hcw-55xxx-dvbt-03.fw"
- firmwares+=" sms1xxx-hcw-55xxx-isdbt-02.fw"
firmwares+=" sms1xxx-hcw-55xxx-isdbt-03.fw"
- firmwares+=" sms1xxx-nova-a-dvbt-01.fw"
- firmwares+=" sms1xxx-nova-b-dvbt-01.fw"
- firmwares+=" sms1xxx-stellar-dvbt-01.fw"
- firmwares+=" tdmb_nova_12mhz.inp"
- firmwares+=" tlg2300_firmware.bin"
- firmwares+=" ttusb-budget/dspbootcode.bin"
- firmwares+=" v4l-cx231xx-avcore-01.fw"
- firmwares+=" v4l-cx23418-apu.fw"
- firmwares+=" v4l-cx23418-cpu.fw"
- firmwares+=" v4l-cx23418-dig.fw"
firmwares+=" v4l-cx2341x-dec.fw"
firmwares+=" v4l-cx2341x-enc.fw"
firmwares+=" v4l-cx2341x-init.mpg"
- firmwares+=" v4l-cx23885-avcore-01.fw"
firmwares+=" v4l-cx23885-enc.fw"
- firmwares+=" v4l-cx25840.fw"
firmwares+=" v4l-pvrusb2-24xxx-01.fw"
firmwares+=" v4l-pvrusb2-29xxx-01.fw"
firmwares+=" v4l-pvrusb2-73xxx-01.fw"
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] linux-firmware-dvb: remove conflicts with official linux-firmware
2022-08-15 10:17 [PR PATCH] linux-firmware-dvb: remove conflicts with official linux-firmware dataCobra
2022-08-16 18:41 ` [PR PATCH] [Updated] " dataCobra
2022-08-17 4:55 ` dataCobra
@ 2022-09-14 4:51 ` dataCobra
2022-10-06 19:31 ` dataCobra
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: dataCobra @ 2022-09-14 4:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1143 bytes --]
There is an updated pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages linux-firmware-dvb_revision5
https://github.com/void-linux/void-packages/pull/38683
linux-firmware-dvb: remove conflicts with official linux-firmware
#### Testing the changes
- I tested the changes in this PR: **No**
#### 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):
- aarch64-musl (crossbuild)
- armv7l (crossbuild)
- armv6l-musl (crossbuild)
#### Explanation
While trying to get the new linux-firmware #37081 working, conflicts are found with this
package. This is because some firmware is now also available in the official linux-firmware.
Since linux-firmware-dvb is still on version 20170329 and it seems there is no version that
is more recent than the official linux-firmware. I've removed all firmware that conflicts with
the linux-firmware-20220815 version.
A patch file from https://github.com/void-linux/void-packages/pull/38683.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-linux-firmware-dvb_revision5-38683.patch --]
[-- Type: text/x-diff, Size: 7291 bytes --]
From bcdc05e060bcc1a0867172aea44d9d30fee65b6d Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Mon, 15 Aug 2022 12:09:37 +0200
Subject: [PATCH] linux-firmware-dvb: remove conflicts with official
linux-firmware
---
srcpkgs/linux-firmware-dvb/template | 72 +----------------------------
1 file changed, 1 insertion(+), 71 deletions(-)
diff --git a/srcpkgs/linux-firmware-dvb/template b/srcpkgs/linux-firmware-dvb/template
index 332ee32405dc..58b3b14345d9 100644
--- a/srcpkgs/linux-firmware-dvb/template
+++ b/srcpkgs/linux-firmware-dvb/template
@@ -1,7 +1,7 @@
# Template file for 'linux-firmware-dvb'
pkgname=linux-firmware-dvb
version=20170329
-revision=4
+revision=5
_gitrev=3fef04a4a4bfeba88ae3b20aff9d3a1fabf1c159
short_desc="Linux TV firmware package"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -37,15 +37,10 @@ do_install() {
firmwares+=" NXP7164-2010-04-01.1.fw"
licenses+=" README.as102"
firmwares+=" af9005.fw"
- firmwares+=" as102_data1_st.hex"
- firmwares+=" as102_data2_st.hex"
firmwares+=" bootcode.bin"
- firmwares+=" cmmb_vega_12mhz.inp"
- firmwares+=" cmmb_venice_12mhz.inp"
firmwares+=" drxd-a2-1.1.fw"
firmwares+=" drxd-b1-1.1.fw"
firmwares+=" drxk_a3.mc"
- firmwares+=" dspbootcode.bin"
firmwares+=" dvb-demod-drxk-01.fw"
firmwares+=" dvb-demod-drxk-pctv.fw"
firmwares+=" dvb-demod-m88ds3103.fw"
@@ -73,10 +68,7 @@ do_install() {
firmwares+=" dvb-fe-tda10046.fw"
firmwares+=" dvb-fe-tda10048-1.0.fw"
firmwares+=" dvb-fe-tda10071.fw"
- firmwares+=" dvb-fe-xc4000-1.4.1.fw"
firmwares+=" dvb-fe-xc4000-1.4.fw"
- firmwares+=" dvb-fe-xc5000-1.6.114.fw"
- firmwares+=" dvb-fe-xc5000c-4.1.30.7.fw"
firmwares+=" dvb-ttpci-01.fw"
firmwares+=" dvb-ttpci-01.fw-261a"
firmwares+=" dvb-ttpci-01.fw-261b"
@@ -95,7 +87,6 @@ do_install() {
firmwares+=" dvb-usb-az6027-03.fw"
firmwares+=" dvb-usb-bluebird-01.fw"
firmwares+=" dvb-usb-bluebird-02.fw"
- firmwares+=" dvb-usb-dib0700-1.20.fw"
firmwares+=" dvb-usb-dibusb-5.0.0.11.fw"
firmwares+=" dvb-usb-dibusb-6.0.0.8.fw"
firmwares+=" dvb-usb-dtt200u-01.fw"
@@ -106,8 +97,6 @@ do_install() {
firmwares+=" dvb-usb-gp8psk-01.fw"
firmwares+=" dvb-usb-gp8psk-02.fw"
firmwares+=" dvb-usb-hauppauge-hvr930c-drxk.fw"
- firmwares+=" dvb-usb-it9135-01.fw"
- firmwares+=" dvb-usb-it9135-02.fw"
firmwares+=" dvb-usb-it9137-01.fw"
firmwares+=" dvb-usb-it9303-01.fw"
firmwares+=" dvb-usb-nova-t-usb2-02.fw"
@@ -117,7 +106,6 @@ do_install() {
firmwares+=" dvb-usb-pctv-452e-01.fw"
firmwares+=" dvb-usb-s630.fw"
firmwares+=" dvb-usb-s660.fw"
- firmwares+=" dvb-usb-terratec-h5-drxk.fw"
firmwares+=" dvb-usb-terratec-h7-az6007.fw"
firmwares+=" dvb-usb-terratec-h7-drxk.fw"
firmwares+=" dvb-usb-terratec-htc-stick-drxk.fw"
@@ -130,15 +118,9 @@ do_install() {
firmwares+=" dvb-usb-wt220u-fc03.fw"
firmwares+=" dvb-usb-wt220u-miglia-01.fw"
firmwares+=" dvb-usb-wt220u-zl0353-01.fw"
- firmwares+=" dvb_nova_12mhz.inp"
- firmwares+=" dvb_nova_12mhz_b0.inp"
firmwares+=" dvb_rio.inp"
firmwares+=" firmware/Boot.S"
licenses+=" firmware/README"
- firmwares+=" firmware/as102_data1_st.hex"
- firmwares+=" firmware/as102_data2_st.hex"
- firmwares+=" firmware/cmmb_vega_12mhz.inp"
- firmwares+=" firmware/cmmb_venice_12mhz.inp"
firmwares+=" firmware/dvb-fe-bcm3510-01.fw"
firmwares+=" firmware/dvb-fe-drxj-mc-1.0.8.fw"
firmwares+=" firmware/dvb-fe-drxj-mc-vsb-1.0.8.fw"
@@ -146,9 +128,6 @@ do_install() {
firmwares+=" firmware/dvb-fe-or51132-qam.fw"
firmwares+=" firmware/dvb-fe-or51132-vsb.fw"
firmwares+=" firmware/dvb-fe-or51211.fw"
- firmwares+=" firmware/dvb-fe-xc4000-1.4.1.fw"
- firmwares+=" firmware/dvb-fe-xc5000-1.6.114.fw"
- firmwares+=" firmware/dvb-fe-xc5000c-4.1.30.7.fw"
firmwares+=" firmware/dvb-ttpci-01.fw-261a"
firmwares+=" firmware/dvb-ttpci-01.fw-261b"
firmwares+=" firmware/dvb-ttpci-01.fw-261c"
@@ -157,13 +136,9 @@ do_install() {
firmwares+=" firmware/dvb-ttpci-01.fw-2622"
firmwares+=" firmware/dvb-usb-avertv-a800-02.fw"
firmwares+=" firmware/dvb-usb-bluebird-01.fw"
- firmwares+=" firmware/dvb-usb-dib0700-1.20.fw"
firmwares+=" firmware/dvb-usb-dibusb-5.0.0.11.fw"
firmwares+=" firmware/dvb-usb-dibusb-6.0.0.8.fw"
firmwares+=" firmware/dvb-usb-dtt200u-01.fw"
- firmwares+=" firmware/dvb-usb-it9135-01.fw"
- firmwares+=" firmware/dvb-usb-it9135-02.fw"
- firmwares+=" firmware/dvb-usb-terratec-h5-drxk.fw"
firmwares+=" firmware/dvb-usb-terratec-h7-az6007.fw"
firmwares+=" firmware/dvb-usb-terratec-h7-drxk.fw"
firmwares+=" firmware/dvb-usb-umt-010-02.fw"
@@ -171,67 +146,22 @@ do_install() {
firmwares+=" firmware/dvb-usb-vp7045-01.fw"
firmwares+=" firmware/dvb-usb-wt220u-01.fw"
firmwares+=" firmware/dvb-usb-wt220u-02.fw"
- firmwares+=" firmware/dvb_nova_12mhz.inp"
- firmwares+=" firmware/dvb_nova_12mhz_b0.inp"
- firmwares+=" firmware/isdbt_nova_12mhz.inp"
- firmwares+=" firmware/isdbt_nova_12mhz_b0.inp"
- firmwares+=" firmware/isdbt_rio.inp"
- firmwares+=" firmware/sms1xxx-hcw-55xxx-dvbt-02.fw"
- firmwares+=" firmware/sms1xxx-hcw-55xxx-isdbt-02.fw"
- firmwares+=" firmware/sms1xxx-nova-a-dvbt-01.fw"
- firmwares+=" firmware/sms1xxx-nova-b-dvbt-01.fw"
- firmwares+=" firmware/sms1xxx-stellar-dvbt-01.fw"
- firmwares+=" firmware/tdmb_nova_12mhz.inp"
- firmwares+=" firmware/v4l-cx231xx-avcore-01.fw"
- firmwares+=" firmware/v4l-cx23418-apu.fw"
- firmwares+=" firmware/v4l-cx23418-cpu.fw"
- firmwares+=" firmware/v4l-cx23418-dig.fw"
- firmwares+=" firmware/v4l-cx23885-avcore-01.fw"
firmwares+=" firmware/v4l-cx23885-enc-broken.fw"
firmwares+=" firmware/v4l-cx23885-enc.fw"
- firmwares+=" firmware/v4l-cx25840.fw"
- firmwares+=" go7007/go7007fw.bin"
- firmwares+=" go7007/go7007tv.bin"
- firmwares+=" go7007/lr192.fw"
- firmwares+=" go7007/px-m402u.fw"
- firmwares+=" go7007/px-tv402u.fw"
- firmwares+=" go7007/s2250-1.fw"
- firmwares+=" go7007/s2250-2.fw"
- firmwares+=" go7007/wis-startrek.fw"
- firmwares+=" isdbt_nova_12mhz.inp"
- firmwares+=" isdbt_nova_12mhz_b0.inp"
- firmwares+=" isdbt_rio.inp"
- firmwares+=" lgs8g75.fw"
licenses+=" license-end-user.txt"
licenses+=" license-oemihvisv.txt"
firmwares+=" ngene_15.fw"
firmwares+=" ngene_16.fw"
firmwares+=" ngene_17.fw"
firmwares+=" ngene_18.fw"
- firmwares+=" s2250.fw"
- firmwares+=" s2250_loader.fw"
firmwares+=" sms1xxx-hcw-114xxx-cmmb-01.fw"
firmwares+=" sms1xxx-hcw-55xxx-dvbt-01.fw"
- firmwares+=" sms1xxx-hcw-55xxx-dvbt-02.fw"
firmwares+=" sms1xxx-hcw-55xxx-dvbt-03.fw"
- firmwares+=" sms1xxx-hcw-55xxx-isdbt-02.fw"
firmwares+=" sms1xxx-hcw-55xxx-isdbt-03.fw"
- firmwares+=" sms1xxx-nova-a-dvbt-01.fw"
- firmwares+=" sms1xxx-nova-b-dvbt-01.fw"
- firmwares+=" sms1xxx-stellar-dvbt-01.fw"
- firmwares+=" tdmb_nova_12mhz.inp"
- firmwares+=" tlg2300_firmware.bin"
- firmwares+=" ttusb-budget/dspbootcode.bin"
- firmwares+=" v4l-cx231xx-avcore-01.fw"
- firmwares+=" v4l-cx23418-apu.fw"
- firmwares+=" v4l-cx23418-cpu.fw"
- firmwares+=" v4l-cx23418-dig.fw"
firmwares+=" v4l-cx2341x-dec.fw"
firmwares+=" v4l-cx2341x-enc.fw"
firmwares+=" v4l-cx2341x-init.mpg"
- firmwares+=" v4l-cx23885-avcore-01.fw"
firmwares+=" v4l-cx23885-enc.fw"
- firmwares+=" v4l-cx25840.fw"
firmwares+=" v4l-pvrusb2-24xxx-01.fw"
firmwares+=" v4l-pvrusb2-29xxx-01.fw"
firmwares+=" v4l-pvrusb2-73xxx-01.fw"
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-firmware-dvb: remove conflicts with official linux-firmware
2022-08-15 10:17 [PR PATCH] linux-firmware-dvb: remove conflicts with official linux-firmware dataCobra
` (2 preceding siblings ...)
2022-09-14 4:51 ` dataCobra
@ 2022-10-06 19:31 ` dataCobra
2022-10-13 6:09 ` [PR PATCH] [Updated] " dataCobra
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: dataCobra @ 2022-10-06 19:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 376 bytes --]
New comment by dataCobra on void-packages repository
https://github.com/void-linux/void-packages/pull/38683#issuecomment-1270583753
Comment:
Hey, it's now almost two months since I've created this PR.
I really want to help get things working and resolved.
Am I doing something wrong or why is nobody paying attention?
This is a PR to resolve the conflicts in #37081.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] linux-firmware-dvb: remove conflicts with official linux-firmware
2022-08-15 10:17 [PR PATCH] linux-firmware-dvb: remove conflicts with official linux-firmware dataCobra
` (3 preceding siblings ...)
2022-10-06 19:31 ` dataCobra
@ 2022-10-13 6:09 ` dataCobra
2022-10-14 8:02 ` dataCobra
2022-11-23 6:31 ` [PR PATCH] [Merged]: " the-maldridge
6 siblings, 0 replies; 8+ messages in thread
From: dataCobra @ 2022-10-13 6:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1143 bytes --]
There is an updated pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages linux-firmware-dvb_revision5
https://github.com/void-linux/void-packages/pull/38683
linux-firmware-dvb: remove conflicts with official linux-firmware
#### Testing the changes
- I tested the changes in this PR: **No**
#### 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):
- aarch64-musl (crossbuild)
- armv7l (crossbuild)
- armv6l-musl (crossbuild)
#### Explanation
While trying to get the new linux-firmware #37081 working, conflicts are found with this
package. This is because some firmware is now also available in the official linux-firmware.
Since linux-firmware-dvb is still on version 20170329 and it seems there is no version that
is more recent than the official linux-firmware. I've removed all firmware that conflicts with
the linux-firmware-20220815 version.
A patch file from https://github.com/void-linux/void-packages/pull/38683.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-linux-firmware-dvb_revision5-38683.patch --]
[-- Type: text/x-diff, Size: 7291 bytes --]
From 46e04ad4883cbbdfd5908eab481ce1f1d7747d79 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Mon, 15 Aug 2022 12:09:37 +0200
Subject: [PATCH] linux-firmware-dvb: remove conflicts with official
linux-firmware
---
srcpkgs/linux-firmware-dvb/template | 72 +----------------------------
1 file changed, 1 insertion(+), 71 deletions(-)
diff --git a/srcpkgs/linux-firmware-dvb/template b/srcpkgs/linux-firmware-dvb/template
index 332ee32405dc..58b3b14345d9 100644
--- a/srcpkgs/linux-firmware-dvb/template
+++ b/srcpkgs/linux-firmware-dvb/template
@@ -1,7 +1,7 @@
# Template file for 'linux-firmware-dvb'
pkgname=linux-firmware-dvb
version=20170329
-revision=4
+revision=5
_gitrev=3fef04a4a4bfeba88ae3b20aff9d3a1fabf1c159
short_desc="Linux TV firmware package"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -37,15 +37,10 @@ do_install() {
firmwares+=" NXP7164-2010-04-01.1.fw"
licenses+=" README.as102"
firmwares+=" af9005.fw"
- firmwares+=" as102_data1_st.hex"
- firmwares+=" as102_data2_st.hex"
firmwares+=" bootcode.bin"
- firmwares+=" cmmb_vega_12mhz.inp"
- firmwares+=" cmmb_venice_12mhz.inp"
firmwares+=" drxd-a2-1.1.fw"
firmwares+=" drxd-b1-1.1.fw"
firmwares+=" drxk_a3.mc"
- firmwares+=" dspbootcode.bin"
firmwares+=" dvb-demod-drxk-01.fw"
firmwares+=" dvb-demod-drxk-pctv.fw"
firmwares+=" dvb-demod-m88ds3103.fw"
@@ -73,10 +68,7 @@ do_install() {
firmwares+=" dvb-fe-tda10046.fw"
firmwares+=" dvb-fe-tda10048-1.0.fw"
firmwares+=" dvb-fe-tda10071.fw"
- firmwares+=" dvb-fe-xc4000-1.4.1.fw"
firmwares+=" dvb-fe-xc4000-1.4.fw"
- firmwares+=" dvb-fe-xc5000-1.6.114.fw"
- firmwares+=" dvb-fe-xc5000c-4.1.30.7.fw"
firmwares+=" dvb-ttpci-01.fw"
firmwares+=" dvb-ttpci-01.fw-261a"
firmwares+=" dvb-ttpci-01.fw-261b"
@@ -95,7 +87,6 @@ do_install() {
firmwares+=" dvb-usb-az6027-03.fw"
firmwares+=" dvb-usb-bluebird-01.fw"
firmwares+=" dvb-usb-bluebird-02.fw"
- firmwares+=" dvb-usb-dib0700-1.20.fw"
firmwares+=" dvb-usb-dibusb-5.0.0.11.fw"
firmwares+=" dvb-usb-dibusb-6.0.0.8.fw"
firmwares+=" dvb-usb-dtt200u-01.fw"
@@ -106,8 +97,6 @@ do_install() {
firmwares+=" dvb-usb-gp8psk-01.fw"
firmwares+=" dvb-usb-gp8psk-02.fw"
firmwares+=" dvb-usb-hauppauge-hvr930c-drxk.fw"
- firmwares+=" dvb-usb-it9135-01.fw"
- firmwares+=" dvb-usb-it9135-02.fw"
firmwares+=" dvb-usb-it9137-01.fw"
firmwares+=" dvb-usb-it9303-01.fw"
firmwares+=" dvb-usb-nova-t-usb2-02.fw"
@@ -117,7 +106,6 @@ do_install() {
firmwares+=" dvb-usb-pctv-452e-01.fw"
firmwares+=" dvb-usb-s630.fw"
firmwares+=" dvb-usb-s660.fw"
- firmwares+=" dvb-usb-terratec-h5-drxk.fw"
firmwares+=" dvb-usb-terratec-h7-az6007.fw"
firmwares+=" dvb-usb-terratec-h7-drxk.fw"
firmwares+=" dvb-usb-terratec-htc-stick-drxk.fw"
@@ -130,15 +118,9 @@ do_install() {
firmwares+=" dvb-usb-wt220u-fc03.fw"
firmwares+=" dvb-usb-wt220u-miglia-01.fw"
firmwares+=" dvb-usb-wt220u-zl0353-01.fw"
- firmwares+=" dvb_nova_12mhz.inp"
- firmwares+=" dvb_nova_12mhz_b0.inp"
firmwares+=" dvb_rio.inp"
firmwares+=" firmware/Boot.S"
licenses+=" firmware/README"
- firmwares+=" firmware/as102_data1_st.hex"
- firmwares+=" firmware/as102_data2_st.hex"
- firmwares+=" firmware/cmmb_vega_12mhz.inp"
- firmwares+=" firmware/cmmb_venice_12mhz.inp"
firmwares+=" firmware/dvb-fe-bcm3510-01.fw"
firmwares+=" firmware/dvb-fe-drxj-mc-1.0.8.fw"
firmwares+=" firmware/dvb-fe-drxj-mc-vsb-1.0.8.fw"
@@ -146,9 +128,6 @@ do_install() {
firmwares+=" firmware/dvb-fe-or51132-qam.fw"
firmwares+=" firmware/dvb-fe-or51132-vsb.fw"
firmwares+=" firmware/dvb-fe-or51211.fw"
- firmwares+=" firmware/dvb-fe-xc4000-1.4.1.fw"
- firmwares+=" firmware/dvb-fe-xc5000-1.6.114.fw"
- firmwares+=" firmware/dvb-fe-xc5000c-4.1.30.7.fw"
firmwares+=" firmware/dvb-ttpci-01.fw-261a"
firmwares+=" firmware/dvb-ttpci-01.fw-261b"
firmwares+=" firmware/dvb-ttpci-01.fw-261c"
@@ -157,13 +136,9 @@ do_install() {
firmwares+=" firmware/dvb-ttpci-01.fw-2622"
firmwares+=" firmware/dvb-usb-avertv-a800-02.fw"
firmwares+=" firmware/dvb-usb-bluebird-01.fw"
- firmwares+=" firmware/dvb-usb-dib0700-1.20.fw"
firmwares+=" firmware/dvb-usb-dibusb-5.0.0.11.fw"
firmwares+=" firmware/dvb-usb-dibusb-6.0.0.8.fw"
firmwares+=" firmware/dvb-usb-dtt200u-01.fw"
- firmwares+=" firmware/dvb-usb-it9135-01.fw"
- firmwares+=" firmware/dvb-usb-it9135-02.fw"
- firmwares+=" firmware/dvb-usb-terratec-h5-drxk.fw"
firmwares+=" firmware/dvb-usb-terratec-h7-az6007.fw"
firmwares+=" firmware/dvb-usb-terratec-h7-drxk.fw"
firmwares+=" firmware/dvb-usb-umt-010-02.fw"
@@ -171,67 +146,22 @@ do_install() {
firmwares+=" firmware/dvb-usb-vp7045-01.fw"
firmwares+=" firmware/dvb-usb-wt220u-01.fw"
firmwares+=" firmware/dvb-usb-wt220u-02.fw"
- firmwares+=" firmware/dvb_nova_12mhz.inp"
- firmwares+=" firmware/dvb_nova_12mhz_b0.inp"
- firmwares+=" firmware/isdbt_nova_12mhz.inp"
- firmwares+=" firmware/isdbt_nova_12mhz_b0.inp"
- firmwares+=" firmware/isdbt_rio.inp"
- firmwares+=" firmware/sms1xxx-hcw-55xxx-dvbt-02.fw"
- firmwares+=" firmware/sms1xxx-hcw-55xxx-isdbt-02.fw"
- firmwares+=" firmware/sms1xxx-nova-a-dvbt-01.fw"
- firmwares+=" firmware/sms1xxx-nova-b-dvbt-01.fw"
- firmwares+=" firmware/sms1xxx-stellar-dvbt-01.fw"
- firmwares+=" firmware/tdmb_nova_12mhz.inp"
- firmwares+=" firmware/v4l-cx231xx-avcore-01.fw"
- firmwares+=" firmware/v4l-cx23418-apu.fw"
- firmwares+=" firmware/v4l-cx23418-cpu.fw"
- firmwares+=" firmware/v4l-cx23418-dig.fw"
- firmwares+=" firmware/v4l-cx23885-avcore-01.fw"
firmwares+=" firmware/v4l-cx23885-enc-broken.fw"
firmwares+=" firmware/v4l-cx23885-enc.fw"
- firmwares+=" firmware/v4l-cx25840.fw"
- firmwares+=" go7007/go7007fw.bin"
- firmwares+=" go7007/go7007tv.bin"
- firmwares+=" go7007/lr192.fw"
- firmwares+=" go7007/px-m402u.fw"
- firmwares+=" go7007/px-tv402u.fw"
- firmwares+=" go7007/s2250-1.fw"
- firmwares+=" go7007/s2250-2.fw"
- firmwares+=" go7007/wis-startrek.fw"
- firmwares+=" isdbt_nova_12mhz.inp"
- firmwares+=" isdbt_nova_12mhz_b0.inp"
- firmwares+=" isdbt_rio.inp"
- firmwares+=" lgs8g75.fw"
licenses+=" license-end-user.txt"
licenses+=" license-oemihvisv.txt"
firmwares+=" ngene_15.fw"
firmwares+=" ngene_16.fw"
firmwares+=" ngene_17.fw"
firmwares+=" ngene_18.fw"
- firmwares+=" s2250.fw"
- firmwares+=" s2250_loader.fw"
firmwares+=" sms1xxx-hcw-114xxx-cmmb-01.fw"
firmwares+=" sms1xxx-hcw-55xxx-dvbt-01.fw"
- firmwares+=" sms1xxx-hcw-55xxx-dvbt-02.fw"
firmwares+=" sms1xxx-hcw-55xxx-dvbt-03.fw"
- firmwares+=" sms1xxx-hcw-55xxx-isdbt-02.fw"
firmwares+=" sms1xxx-hcw-55xxx-isdbt-03.fw"
- firmwares+=" sms1xxx-nova-a-dvbt-01.fw"
- firmwares+=" sms1xxx-nova-b-dvbt-01.fw"
- firmwares+=" sms1xxx-stellar-dvbt-01.fw"
- firmwares+=" tdmb_nova_12mhz.inp"
- firmwares+=" tlg2300_firmware.bin"
- firmwares+=" ttusb-budget/dspbootcode.bin"
- firmwares+=" v4l-cx231xx-avcore-01.fw"
- firmwares+=" v4l-cx23418-apu.fw"
- firmwares+=" v4l-cx23418-cpu.fw"
- firmwares+=" v4l-cx23418-dig.fw"
firmwares+=" v4l-cx2341x-dec.fw"
firmwares+=" v4l-cx2341x-enc.fw"
firmwares+=" v4l-cx2341x-init.mpg"
- firmwares+=" v4l-cx23885-avcore-01.fw"
firmwares+=" v4l-cx23885-enc.fw"
- firmwares+=" v4l-cx25840.fw"
firmwares+=" v4l-pvrusb2-24xxx-01.fw"
firmwares+=" v4l-pvrusb2-29xxx-01.fw"
firmwares+=" v4l-pvrusb2-73xxx-01.fw"
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Updated] linux-firmware-dvb: remove conflicts with official linux-firmware
2022-08-15 10:17 [PR PATCH] linux-firmware-dvb: remove conflicts with official linux-firmware dataCobra
` (4 preceding siblings ...)
2022-10-13 6:09 ` [PR PATCH] [Updated] " dataCobra
@ 2022-10-14 8:02 ` dataCobra
2022-11-23 6:31 ` [PR PATCH] [Merged]: " the-maldridge
6 siblings, 0 replies; 8+ messages in thread
From: dataCobra @ 2022-10-14 8:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1143 bytes --]
There is an updated pull request by dataCobra against master on the void-packages repository
https://github.com/dataCobra/void-packages linux-firmware-dvb_revision5
https://github.com/void-linux/void-packages/pull/38683
linux-firmware-dvb: remove conflicts with official linux-firmware
#### Testing the changes
- I tested the changes in this PR: **No**
#### 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):
- aarch64-musl (crossbuild)
- armv7l (crossbuild)
- armv6l-musl (crossbuild)
#### Explanation
While trying to get the new linux-firmware #37081 working, conflicts are found with this
package. This is because some firmware is now also available in the official linux-firmware.
Since linux-firmware-dvb is still on version 20170329 and it seems there is no version that
is more recent than the official linux-firmware. I've removed all firmware that conflicts with
the linux-firmware-20220815 version.
A patch file from https://github.com/void-linux/void-packages/pull/38683.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-linux-firmware-dvb_revision5-38683.patch --]
[-- Type: text/x-diff, Size: 7291 bytes --]
From 4f12d61ffbae0b9c70ce58350e81d65f6589bc64 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Mon, 15 Aug 2022 12:09:37 +0200
Subject: [PATCH] linux-firmware-dvb: remove conflicts with official
linux-firmware
---
srcpkgs/linux-firmware-dvb/template | 72 +----------------------------
1 file changed, 1 insertion(+), 71 deletions(-)
diff --git a/srcpkgs/linux-firmware-dvb/template b/srcpkgs/linux-firmware-dvb/template
index 332ee32405dc..58b3b14345d9 100644
--- a/srcpkgs/linux-firmware-dvb/template
+++ b/srcpkgs/linux-firmware-dvb/template
@@ -1,7 +1,7 @@
# Template file for 'linux-firmware-dvb'
pkgname=linux-firmware-dvb
version=20170329
-revision=4
+revision=5
_gitrev=3fef04a4a4bfeba88ae3b20aff9d3a1fabf1c159
short_desc="Linux TV firmware package"
maintainer="Orphaned <orphan@voidlinux.org>"
@@ -37,15 +37,10 @@ do_install() {
firmwares+=" NXP7164-2010-04-01.1.fw"
licenses+=" README.as102"
firmwares+=" af9005.fw"
- firmwares+=" as102_data1_st.hex"
- firmwares+=" as102_data2_st.hex"
firmwares+=" bootcode.bin"
- firmwares+=" cmmb_vega_12mhz.inp"
- firmwares+=" cmmb_venice_12mhz.inp"
firmwares+=" drxd-a2-1.1.fw"
firmwares+=" drxd-b1-1.1.fw"
firmwares+=" drxk_a3.mc"
- firmwares+=" dspbootcode.bin"
firmwares+=" dvb-demod-drxk-01.fw"
firmwares+=" dvb-demod-drxk-pctv.fw"
firmwares+=" dvb-demod-m88ds3103.fw"
@@ -73,10 +68,7 @@ do_install() {
firmwares+=" dvb-fe-tda10046.fw"
firmwares+=" dvb-fe-tda10048-1.0.fw"
firmwares+=" dvb-fe-tda10071.fw"
- firmwares+=" dvb-fe-xc4000-1.4.1.fw"
firmwares+=" dvb-fe-xc4000-1.4.fw"
- firmwares+=" dvb-fe-xc5000-1.6.114.fw"
- firmwares+=" dvb-fe-xc5000c-4.1.30.7.fw"
firmwares+=" dvb-ttpci-01.fw"
firmwares+=" dvb-ttpci-01.fw-261a"
firmwares+=" dvb-ttpci-01.fw-261b"
@@ -95,7 +87,6 @@ do_install() {
firmwares+=" dvb-usb-az6027-03.fw"
firmwares+=" dvb-usb-bluebird-01.fw"
firmwares+=" dvb-usb-bluebird-02.fw"
- firmwares+=" dvb-usb-dib0700-1.20.fw"
firmwares+=" dvb-usb-dibusb-5.0.0.11.fw"
firmwares+=" dvb-usb-dibusb-6.0.0.8.fw"
firmwares+=" dvb-usb-dtt200u-01.fw"
@@ -106,8 +97,6 @@ do_install() {
firmwares+=" dvb-usb-gp8psk-01.fw"
firmwares+=" dvb-usb-gp8psk-02.fw"
firmwares+=" dvb-usb-hauppauge-hvr930c-drxk.fw"
- firmwares+=" dvb-usb-it9135-01.fw"
- firmwares+=" dvb-usb-it9135-02.fw"
firmwares+=" dvb-usb-it9137-01.fw"
firmwares+=" dvb-usb-it9303-01.fw"
firmwares+=" dvb-usb-nova-t-usb2-02.fw"
@@ -117,7 +106,6 @@ do_install() {
firmwares+=" dvb-usb-pctv-452e-01.fw"
firmwares+=" dvb-usb-s630.fw"
firmwares+=" dvb-usb-s660.fw"
- firmwares+=" dvb-usb-terratec-h5-drxk.fw"
firmwares+=" dvb-usb-terratec-h7-az6007.fw"
firmwares+=" dvb-usb-terratec-h7-drxk.fw"
firmwares+=" dvb-usb-terratec-htc-stick-drxk.fw"
@@ -130,15 +118,9 @@ do_install() {
firmwares+=" dvb-usb-wt220u-fc03.fw"
firmwares+=" dvb-usb-wt220u-miglia-01.fw"
firmwares+=" dvb-usb-wt220u-zl0353-01.fw"
- firmwares+=" dvb_nova_12mhz.inp"
- firmwares+=" dvb_nova_12mhz_b0.inp"
firmwares+=" dvb_rio.inp"
firmwares+=" firmware/Boot.S"
licenses+=" firmware/README"
- firmwares+=" firmware/as102_data1_st.hex"
- firmwares+=" firmware/as102_data2_st.hex"
- firmwares+=" firmware/cmmb_vega_12mhz.inp"
- firmwares+=" firmware/cmmb_venice_12mhz.inp"
firmwares+=" firmware/dvb-fe-bcm3510-01.fw"
firmwares+=" firmware/dvb-fe-drxj-mc-1.0.8.fw"
firmwares+=" firmware/dvb-fe-drxj-mc-vsb-1.0.8.fw"
@@ -146,9 +128,6 @@ do_install() {
firmwares+=" firmware/dvb-fe-or51132-qam.fw"
firmwares+=" firmware/dvb-fe-or51132-vsb.fw"
firmwares+=" firmware/dvb-fe-or51211.fw"
- firmwares+=" firmware/dvb-fe-xc4000-1.4.1.fw"
- firmwares+=" firmware/dvb-fe-xc5000-1.6.114.fw"
- firmwares+=" firmware/dvb-fe-xc5000c-4.1.30.7.fw"
firmwares+=" firmware/dvb-ttpci-01.fw-261a"
firmwares+=" firmware/dvb-ttpci-01.fw-261b"
firmwares+=" firmware/dvb-ttpci-01.fw-261c"
@@ -157,13 +136,9 @@ do_install() {
firmwares+=" firmware/dvb-ttpci-01.fw-2622"
firmwares+=" firmware/dvb-usb-avertv-a800-02.fw"
firmwares+=" firmware/dvb-usb-bluebird-01.fw"
- firmwares+=" firmware/dvb-usb-dib0700-1.20.fw"
firmwares+=" firmware/dvb-usb-dibusb-5.0.0.11.fw"
firmwares+=" firmware/dvb-usb-dibusb-6.0.0.8.fw"
firmwares+=" firmware/dvb-usb-dtt200u-01.fw"
- firmwares+=" firmware/dvb-usb-it9135-01.fw"
- firmwares+=" firmware/dvb-usb-it9135-02.fw"
- firmwares+=" firmware/dvb-usb-terratec-h5-drxk.fw"
firmwares+=" firmware/dvb-usb-terratec-h7-az6007.fw"
firmwares+=" firmware/dvb-usb-terratec-h7-drxk.fw"
firmwares+=" firmware/dvb-usb-umt-010-02.fw"
@@ -171,67 +146,22 @@ do_install() {
firmwares+=" firmware/dvb-usb-vp7045-01.fw"
firmwares+=" firmware/dvb-usb-wt220u-01.fw"
firmwares+=" firmware/dvb-usb-wt220u-02.fw"
- firmwares+=" firmware/dvb_nova_12mhz.inp"
- firmwares+=" firmware/dvb_nova_12mhz_b0.inp"
- firmwares+=" firmware/isdbt_nova_12mhz.inp"
- firmwares+=" firmware/isdbt_nova_12mhz_b0.inp"
- firmwares+=" firmware/isdbt_rio.inp"
- firmwares+=" firmware/sms1xxx-hcw-55xxx-dvbt-02.fw"
- firmwares+=" firmware/sms1xxx-hcw-55xxx-isdbt-02.fw"
- firmwares+=" firmware/sms1xxx-nova-a-dvbt-01.fw"
- firmwares+=" firmware/sms1xxx-nova-b-dvbt-01.fw"
- firmwares+=" firmware/sms1xxx-stellar-dvbt-01.fw"
- firmwares+=" firmware/tdmb_nova_12mhz.inp"
- firmwares+=" firmware/v4l-cx231xx-avcore-01.fw"
- firmwares+=" firmware/v4l-cx23418-apu.fw"
- firmwares+=" firmware/v4l-cx23418-cpu.fw"
- firmwares+=" firmware/v4l-cx23418-dig.fw"
- firmwares+=" firmware/v4l-cx23885-avcore-01.fw"
firmwares+=" firmware/v4l-cx23885-enc-broken.fw"
firmwares+=" firmware/v4l-cx23885-enc.fw"
- firmwares+=" firmware/v4l-cx25840.fw"
- firmwares+=" go7007/go7007fw.bin"
- firmwares+=" go7007/go7007tv.bin"
- firmwares+=" go7007/lr192.fw"
- firmwares+=" go7007/px-m402u.fw"
- firmwares+=" go7007/px-tv402u.fw"
- firmwares+=" go7007/s2250-1.fw"
- firmwares+=" go7007/s2250-2.fw"
- firmwares+=" go7007/wis-startrek.fw"
- firmwares+=" isdbt_nova_12mhz.inp"
- firmwares+=" isdbt_nova_12mhz_b0.inp"
- firmwares+=" isdbt_rio.inp"
- firmwares+=" lgs8g75.fw"
licenses+=" license-end-user.txt"
licenses+=" license-oemihvisv.txt"
firmwares+=" ngene_15.fw"
firmwares+=" ngene_16.fw"
firmwares+=" ngene_17.fw"
firmwares+=" ngene_18.fw"
- firmwares+=" s2250.fw"
- firmwares+=" s2250_loader.fw"
firmwares+=" sms1xxx-hcw-114xxx-cmmb-01.fw"
firmwares+=" sms1xxx-hcw-55xxx-dvbt-01.fw"
- firmwares+=" sms1xxx-hcw-55xxx-dvbt-02.fw"
firmwares+=" sms1xxx-hcw-55xxx-dvbt-03.fw"
- firmwares+=" sms1xxx-hcw-55xxx-isdbt-02.fw"
firmwares+=" sms1xxx-hcw-55xxx-isdbt-03.fw"
- firmwares+=" sms1xxx-nova-a-dvbt-01.fw"
- firmwares+=" sms1xxx-nova-b-dvbt-01.fw"
- firmwares+=" sms1xxx-stellar-dvbt-01.fw"
- firmwares+=" tdmb_nova_12mhz.inp"
- firmwares+=" tlg2300_firmware.bin"
- firmwares+=" ttusb-budget/dspbootcode.bin"
- firmwares+=" v4l-cx231xx-avcore-01.fw"
- firmwares+=" v4l-cx23418-apu.fw"
- firmwares+=" v4l-cx23418-cpu.fw"
- firmwares+=" v4l-cx23418-dig.fw"
firmwares+=" v4l-cx2341x-dec.fw"
firmwares+=" v4l-cx2341x-enc.fw"
firmwares+=" v4l-cx2341x-init.mpg"
- firmwares+=" v4l-cx23885-avcore-01.fw"
firmwares+=" v4l-cx23885-enc.fw"
- firmwares+=" v4l-cx25840.fw"
firmwares+=" v4l-pvrusb2-24xxx-01.fw"
firmwares+=" v4l-pvrusb2-29xxx-01.fw"
firmwares+=" v4l-pvrusb2-73xxx-01.fw"
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PR PATCH] [Merged]: linux-firmware-dvb: remove conflicts with official linux-firmware
2022-08-15 10:17 [PR PATCH] linux-firmware-dvb: remove conflicts with official linux-firmware dataCobra
` (5 preceding siblings ...)
2022-10-14 8:02 ` dataCobra
@ 2022-11-23 6:31 ` the-maldridge
6 siblings, 0 replies; 8+ messages in thread
From: the-maldridge @ 2022-11-23 6:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 962 bytes --]
There's a merged pull request on the void-packages repository
linux-firmware-dvb: remove conflicts with official linux-firmware
https://github.com/void-linux/void-packages/pull/38683
Description:
#### Testing the changes
- I tested the changes in this PR: **No**
#### 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):
- aarch64-musl (crossbuild)
- armv7l (crossbuild)
- armv6l-musl (crossbuild)
#### Explanation
While trying to get the new linux-firmware #37081 working, conflicts are found with this
package. This is because some firmware is now also available in the official linux-firmware.
Since linux-firmware-dvb is still on version 20170329 and it seems there is no version that
is more recent than the official linux-firmware. I've removed all firmware that conflicts with
the linux-firmware-20220815 version.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-11-23 6:31 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-15 10:17 [PR PATCH] linux-firmware-dvb: remove conflicts with official linux-firmware dataCobra
2022-08-16 18:41 ` [PR PATCH] [Updated] " dataCobra
2022-08-17 4:55 ` dataCobra
2022-09-14 4:51 ` dataCobra
2022-10-06 19:31 ` dataCobra
2022-10-13 6:09 ` [PR PATCH] [Updated] " dataCobra
2022-10-14 8:02 ` dataCobra
2022-11-23 6:31 ` [PR PATCH] [Merged]: " the-maldridge
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).