[PR PATCH] ffmpeg6: strip static libs fix for i686-musl

[PR PATCH] ffmpeg6: strip static libs fix for i686-musl

[xeroxslayer]

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

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

https://github.com/xeroxslayer/void-packages ffmpeg6
https://github.com/void-linux/void-packages/pull/51664

ffmpeg6: strip static libs fix for i686-musl
#### 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-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64
  - i686
  - i686-musl
  - aarch64
  - aarch64-musl
  - armv7l
  - armv7l-musl


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ffmpeg6-51664.patch --]
[-- Type: text/x-diff, Size: 881 bytes --]

From 06e816c6aef33707cbb8ab377be8f81b94d4c828 Mon Sep 17 00:00:00 2001
From: xeroxslayer <xeroxslayer@proton.me>
Date: Mon, 5 Aug 2024 13:23:43 +0200
Subject: [PATCH] ffmpeg6: strip static libs fix for i686-musl

---
 srcpkgs/ffmpeg6/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index 1dcdd089c5354c..44833d60dcecf5 100644
--- a/srcpkgs/ffmpeg6/template
+++ b/srcpkgs/ffmpeg6/template
@@ -196,7 +196,7 @@ ffmpeg6-devel_package() {
 	short_desc+=" - development files"
 	conflicts="ffmpeg-devel"
 	replaces="ffmpeg-devel>=0"
-	if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+	if [[ "$XBPS_TARGET_MACHINE" = "i686"* ]]; then
 		# /usr/bin/strip: error: the input file '/destdir//ffmpeg-devel-4.4.4/usr/lib/libavfilter.a(vf_atadenoise.o)' has no sections
 		nostrip_files="/usr/lib/libavfilter.a"
 	fi

Re: [PR PATCH] [Closed]: ffmpeg6: strip static libs fix for i686-musl

[ahesford]

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

There's a closed pull request on the void-packages repository

ffmpeg6: strip static libs fix for i686-musl
https://github.com/void-linux/void-packages/pull/51664

Description:
#### 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-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64
  - i686
  - i686-musl
  - aarch64
  - aarch64-musl
  - armv7l
  - armv7l-musl

Re: ffmpeg6: strip static libs fix for i686-musl

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/51664#issuecomment-2268849988

Comment:
Please don't open duplicate pull requests.

Re: ffmpeg6: strip static libs fix for i686-musl

[xeroxslayer]

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

New comment by xeroxslayer on void-packages repository

https://github.com/void-linux/void-packages/pull/51664#issuecomment-2268856389

Comment:
It's not a duplicate, one is for ffmpeg, the other for ffmpeg6, different templates.

Re: ffmpeg6: strip static libs fix for i686-musl

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/51664#issuecomment-2268866118

Comment:
Sorry, my mistake.

Re: [PR REVIEW] ffmpeg6: strip static libs fix for i686-musl

[ahesford]

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/51664#discussion_r1703984952

Comment:
As in the other template, please use a case block rather than the bash test operator here.

Re: [PR REVIEW] ffmpeg6: strip static libs fix for i686-musl

[xeroxslayer]

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

New review comment by xeroxslayer on void-packages repository

https://github.com/void-linux/void-packages/pull/51664#discussion_r1703998470

Comment:
OK, no prob.

Re: [PR PATCH] [Updated] ffmpeg6: strip static libs fix for i686-musl

[xeroxslayer]

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

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

https://github.com/xeroxslayer/void-packages ffmpeg6
https://github.com/void-linux/void-packages/pull/51664

ffmpeg6: strip static libs fix for i686-musl
#### 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-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64
  - i686
  - i686-musl
  - aarch64
  - aarch64-musl
  - armv7l
  - armv7l-musl


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ffmpeg6-51664.patch --]
[-- Type: text/x-diff, Size: 1893 bytes --]

From 06e816c6aef33707cbb8ab377be8f81b94d4c828 Mon Sep 17 00:00:00 2001
From: xeroxslayer <xeroxslayer@proton.me>
Date: Mon, 5 Aug 2024 13:23:43 +0200
Subject: [PATCH 1/2] ffmpeg6: strip static libs fix for i686-musl

---
 srcpkgs/ffmpeg6/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index 1dcdd089c5354c..44833d60dcecf5 100644
--- a/srcpkgs/ffmpeg6/template
+++ b/srcpkgs/ffmpeg6/template
@@ -196,7 +196,7 @@ ffmpeg6-devel_package() {
 	short_desc+=" - development files"
 	conflicts="ffmpeg-devel"
 	replaces="ffmpeg-devel>=0"
-	if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
+	if [[ "$XBPS_TARGET_MACHINE" = "i686"* ]]; then
 		# /usr/bin/strip: error: the input file '/destdir//ffmpeg-devel-4.4.4/usr/lib/libavfilter.a(vf_atadenoise.o)' has no sections
 		nostrip_files="/usr/lib/libavfilter.a"
 	fi

From 6b8c1633be62575248713513a9416e4f7a00d68f Mon Sep 17 00:00:00 2001
From: xeroxslayer <xeroxslayer@proton.me>
Date: Mon, 5 Aug 2024 14:10:10 +0200
Subject: [PATCH 2/2] ffmpeg6: strip static libs fix for i686-musl

---
 srcpkgs/ffmpeg6/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/ffmpeg6/template b/srcpkgs/ffmpeg6/template
index 44833d60dcecf5..a8460689f9752e 100644
--- a/srcpkgs/ffmpeg6/template
+++ b/srcpkgs/ffmpeg6/template
@@ -196,10 +196,11 @@ ffmpeg6-devel_package() {
 	short_desc+=" - development files"
 	conflicts="ffmpeg-devel"
 	replaces="ffmpeg-devel>=0"
-	if [[ "$XBPS_TARGET_MACHINE" = "i686"* ]]; then
+	case "$XBPS_TARGET_MACHINE" in
+		i686*)
 		# /usr/bin/strip: error: the input file '/destdir//ffmpeg-devel-4.4.4/usr/lib/libavfilter.a(vf_atadenoise.o)' has no sections
-		nostrip_files="/usr/lib/libavfilter.a"
-	fi
+		nostrip_files="/usr/lib/libavfilter.a";;
+	esac
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig

Re: [PR PATCH] [Closed]: ffmpeg6: strip static libs fix for i686-musl

[abenson]

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

There's a closed pull request on the void-packages repository

ffmpeg6: strip static libs fix for i686-musl
https://github.com/void-linux/void-packages/pull/51664

Description:
#### 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-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64
  - i686
  - i686-musl
  - aarch64
  - aarch64-musl
  - armv7l
  - armv7l-musl