* Re: avidemux: update to 2.7.8.
2021-10-27 8:35 [PR PATCH] avidemux: update to 2.7.8 jhe2
@ 2021-10-27 20:19 ` dmarto
2021-10-27 20:20 ` dmarto
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: dmarto @ 2021-10-27 20:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 369 bytes --]
New comment by dmarto on void-packages repository
https://github.com/void-linux/void-packages/pull/33783#issuecomment-953278519
Comment:
_Suggestion_ that I had in my todo for some time, but it seems I am never going to get to it.
Avidemux does not actually require/depends `python`, it comes with tinypy bundled inside, and this is what is used for the scripts.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: avidemux: update to 2.7.8.
2021-10-27 8:35 [PR PATCH] avidemux: update to 2.7.8 jhe2
2021-10-27 20:19 ` dmarto
@ 2021-10-27 20:20 ` dmarto
2021-10-28 7:26 ` [PR PATCH] [Updated] " jhe2
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: dmarto @ 2021-10-27 20:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 372 bytes --]
New comment by dmarto on void-packages repository
https://github.com/void-linux/void-packages/pull/33783#issuecomment-953278519
Comment:
_Suggestion_ that I had in my todo for some time, but it seems I am never going to get to it.
Avidemux does not actually require/depends on `python`, it comes with tinypy bundled inside, and this is what is used for the scripts.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] avidemux: update to 2.7.8.
2021-10-27 8:35 [PR PATCH] avidemux: update to 2.7.8 jhe2
2021-10-27 20:19 ` dmarto
2021-10-27 20:20 ` dmarto
@ 2021-10-28 7:26 ` jhe2
2021-10-28 7:28 ` jhe2
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: jhe2 @ 2021-10-28 7:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1588 bytes --]
There is an updated pull request by jhe2 against master on the void-packages repository
https://github.com/jhe2/void-packages avidemux
https://github.com/void-linux/void-packages/pull/33783
avidemux: update to 2.7.8.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/33783.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-avidemux-33783.patch --]
[-- Type: text/x-diff, Size: 2049 bytes --]
From 43ea5ef9075e589df8fe0cb41e1a99fd180383e7 Mon Sep 17 00:00:00 2001
From: Johannes Heimansberg <git@jhe.dedyn.io>
Date: Wed, 27 Oct 2021 10:34:40 +0200
Subject: [PATCH] avidemux: update to 2.7.8.
---
srcpkgs/avidemux/template | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index c4936a930e7f..cf1f3a3e4eb8 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
# Template file for 'avidemux'
pkgname=avidemux
-version=2.7.6
-revision=2
+version=2.7.8
+revision=1
# Can't be compiled for aarch64, arm* or mips*
archs="x86_64* i686*"
wrksrc="${pkgname}_${version}"
@@ -11,14 +11,20 @@ makedepends="alsa-lib-devel faac-devel faad2-devel gettext-devel jack-devel glu-
vapoursynth-devel libmp4v2-devel sqlite-devel libva-devel libvdpau-devel
qt5-multimedia-devel qt5-script-devel qt5-tools-devel ffmpeg-devel
liba52-devel libmad-devel x264-devel x265-devel xvidcore-devel"
-depends="python"
short_desc="Video editing and processing application"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://avidemux.sourceforge.net/"
changelog="http://avidemux.sourceforge.net/news.html"
distfiles="${SOURCEFORGE_SITE}/avidemux/avidemux/${version}/${pkgname}_${version}.tar.gz"
-checksum=9a88741f3535443d4bde35d4207ca2ff96d3b136db2e7232cb50dd6b4eb293cf
+checksum=628a404f521ff2812760700ae3e2aa78e5816b0ff3fb6fd05ac3e75248d97401
+
+# On i686 the build fails with "error: 'asm' operand has impossible constraints"
+# due to not enough available CPU registers. Using -fomit-frame-pointer and
+# -fno-PIC each free up one register for the compiler/assembler to use.
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CFLAGS="-fomit-frame-pointer -fno-PIC";;
+esac
do_configure() {
MAKEFLAGS=${makejobs} \
@@ -29,6 +35,7 @@ do_configure() {
--with-system-libmp4v2 \
${cross_compile}
}
+
do_install() {
mv install/usr/lib{${XBPS_TARGET_WORDSIZE},}
cp -aR install/usr ${DESTDIR}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: avidemux: update to 2.7.8.
2021-10-27 8:35 [PR PATCH] avidemux: update to 2.7.8 jhe2
` (2 preceding siblings ...)
2021-10-28 7:26 ` [PR PATCH] [Updated] " jhe2
@ 2021-10-28 7:28 ` jhe2
2021-10-29 4:08 ` [PR REVIEW] " ericonr
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: jhe2 @ 2021-10-28 7:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 383 bytes --]
New comment by jhe2 on void-packages repository
https://github.com/void-linux/void-packages/pull/33783#issuecomment-953575003
Comment:
Thanks dmarto, avidemux does indeed work fine without that python dependency. I briefly checked avidemux's scripting shell and it appears to be working just fine without the python package installed. I've removed the dependency from the package.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR REVIEW] avidemux: update to 2.7.8.
2021-10-27 8:35 [PR PATCH] avidemux: update to 2.7.8 jhe2
` (3 preceding siblings ...)
2021-10-28 7:28 ` jhe2
@ 2021-10-29 4:08 ` ericonr
2021-10-29 7:06 ` [PR PATCH] [Updated] " jhe2
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2021-10-29 4:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 250 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/33783#discussion_r738918939
Comment:
Hm, I thought our toolchains had `-fomit-frame-pointer` already. Can you check if `-fno-PIC` is enough?
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] avidemux: update to 2.7.8.
2021-10-27 8:35 [PR PATCH] avidemux: update to 2.7.8 jhe2
` (4 preceding siblings ...)
2021-10-29 4:08 ` [PR REVIEW] " ericonr
@ 2021-10-29 7:06 ` jhe2
2021-10-29 7:07 ` [PR REVIEW] " jhe2
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: jhe2 @ 2021-10-29 7:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1588 bytes --]
There is an updated pull request by jhe2 against master on the void-packages repository
https://github.com/jhe2/void-packages avidemux
https://github.com/void-linux/void-packages/pull/33783
avidemux: update to 2.7.8.
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/33783.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-avidemux-33783.patch --]
[-- Type: text/x-diff, Size: 2019 bytes --]
From c18546c780f0bfc02df99accb841bcfcd6f0ffad Mon Sep 17 00:00:00 2001
From: Johannes Heimansberg <git@jhe.dedyn.io>
Date: Wed, 27 Oct 2021 10:34:40 +0200
Subject: [PATCH] avidemux: update to 2.7.8.
---
srcpkgs/avidemux/template | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/avidemux/template b/srcpkgs/avidemux/template
index c4936a930e7f..81774db15fe4 100644
--- a/srcpkgs/avidemux/template
+++ b/srcpkgs/avidemux/template
@@ -1,7 +1,7 @@
# Template file for 'avidemux'
pkgname=avidemux
-version=2.7.6
-revision=2
+version=2.7.8
+revision=1
# Can't be compiled for aarch64, arm* or mips*
archs="x86_64* i686*"
wrksrc="${pkgname}_${version}"
@@ -11,14 +11,20 @@ makedepends="alsa-lib-devel faac-devel faad2-devel gettext-devel jack-devel glu-
vapoursynth-devel libmp4v2-devel sqlite-devel libva-devel libvdpau-devel
qt5-multimedia-devel qt5-script-devel qt5-tools-devel ffmpeg-devel
liba52-devel libmad-devel x264-devel x265-devel xvidcore-devel"
-depends="python"
short_desc="Video editing and processing application"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://avidemux.sourceforge.net/"
changelog="http://avidemux.sourceforge.net/news.html"
distfiles="${SOURCEFORGE_SITE}/avidemux/avidemux/${version}/${pkgname}_${version}.tar.gz"
-checksum=9a88741f3535443d4bde35d4207ca2ff96d3b136db2e7232cb50dd6b4eb293cf
+checksum=628a404f521ff2812760700ae3e2aa78e5816b0ff3fb6fd05ac3e75248d97401
+
+# On i686 the build fails with "error: 'asm' operand has impossible constraints"
+# due to not enough available CPU registers. Using the -fno-PIC flag frees up
+# one additional register for the compiler/assembler to use.
+case "${XBPS_TARGET_MACHINE}" in
+ i686*) CFLAGS="-fno-PIC";;
+esac
do_configure() {
MAKEFLAGS=${makejobs} \
@@ -29,6 +35,7 @@ do_configure() {
--with-system-libmp4v2 \
${cross_compile}
}
+
do_install() {
mv install/usr/lib{${XBPS_TARGET_WORDSIZE},}
cp -aR install/usr ${DESTDIR}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR REVIEW] avidemux: update to 2.7.8.
2021-10-27 8:35 [PR PATCH] avidemux: update to 2.7.8 jhe2
` (5 preceding siblings ...)
2021-10-29 7:06 ` [PR PATCH] [Updated] " jhe2
@ 2021-10-29 7:07 ` jhe2
2021-10-29 7:09 ` jhe2
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: jhe2 @ 2021-10-29 7:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 363 bytes --]
New review comment by jhe2 on void-packages repository
https://github.com/void-linux/void-packages/pull/33783#discussion_r738983622
Comment:
You are right, ``-fno-PIC`` is enough. I first added the more obvious ``-fomit-frame-pointer`` and after that was not enough, I added the ``-fno-PIC`` flag, so I didn't notice. I've updated the pull request accordingly.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: avidemux: update to 2.7.8.
2021-10-27 8:35 [PR PATCH] avidemux: update to 2.7.8 jhe2
` (6 preceding siblings ...)
2021-10-29 7:07 ` [PR REVIEW] " jhe2
@ 2021-10-29 7:09 ` jhe2
2021-10-29 11:12 ` dmarto
2021-10-30 18:13 ` [PR PATCH] [Merged]: " ericonr
9 siblings, 0 replies; 11+ messages in thread
From: jhe2 @ 2021-10-29 7:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 381 bytes --]
New comment by jhe2 on void-packages repository
https://github.com/void-linux/void-packages/pull/33783#issuecomment-954485721
Comment:
> tinypy makes me sad. If it can be made to use external python, that'd be generally speaking preferable.
Yes, it is unfortunate, but I didn't see any obvious way to make it use external python. Same is true for the other bundled libraries.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: avidemux: update to 2.7.8.
2021-10-27 8:35 [PR PATCH] avidemux: update to 2.7.8 jhe2
` (7 preceding siblings ...)
2021-10-29 7:09 ` jhe2
@ 2021-10-29 11:12 ` dmarto
2021-10-30 18:13 ` [PR PATCH] [Merged]: " ericonr
9 siblings, 0 replies; 11+ messages in thread
From: dmarto @ 2021-10-29 11:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 293 bytes --]
New comment by dmarto on void-packages repository
https://github.com/void-linux/void-packages/pull/33783#issuecomment-954658157
Comment:
@ericonr I can confirm that it can't. Well at least not inside it, I guess you can always "shell out" and use a tinypy script as a proxy to the avi API.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Merged]: avidemux: update to 2.7.8.
2021-10-27 8:35 [PR PATCH] avidemux: update to 2.7.8 jhe2
` (8 preceding siblings ...)
2021-10-29 11:12 ` dmarto
@ 2021-10-30 18:13 ` ericonr
9 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2021-10-30 18:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1437 bytes --]
There's a merged pull request on the void-packages repository
avidemux: update to 2.7.8.
https://github.com/void-linux/void-packages/pull/33783
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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
- [ ] armv7l
- [ ] armv6l-musl
-->
^ permalink raw reply [flat|nested] 11+ messages in thread