* [PR PATCH] mkvtoolnix: update to 79.0
@ 2023-08-22 16:11 mvf
2023-09-24 16:53 ` [PR PATCH] [Updated] " mvf
` (18 more replies)
0 siblings, 19 replies; 20+ messages in thread
From: mvf @ 2023-08-22 16:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]
There is a new pull request by mvf against master on the void-packages repository
https://github.com/mvf/void-packages pr/mkvtoolnix
https://github.com/void-linux/void-packages/pull/45712
mkvtoolnix: update to 79.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### 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
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45712.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr/mkvtoolnix-45712.patch --]
[-- Type: text/x-diff, Size: 1072 bytes --]
From a68b2256dc333d0a1b775ce5b3c4bb46777d087d Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Tue, 22 Aug 2023 18:09:34 +0200
Subject: [PATCH] mkvtoolnix: update to 79.0
---
srcpkgs/mkvtoolnix/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 0f7967faa664c..6c79949c4010a 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,6 +1,6 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
-version=78.0
+version=79.0
revision=1
build_style=gnu-configure
build_helper=qmake
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
homepage="https://mkvtoolnix.download"
changelog="https://mkvtoolnix.download/doc/NEWS.md"
distfiles="https://mkvtoolnix.download/sources/mkvtoolnix-${version}.tar.xz"
-checksum=6a50fce8c66c55410e0df2a6952f0bab7a3c92914db7feb285b9f1bb03fcd0d3
+checksum=f039c27b0dfe4a4d1aa870ad32e20a28a5f254de6121cb12a42328130be3afbc
if [ "$CROSS_BUILD" ]; then
configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] mkvtoolnix: update to 79.0
2023-08-22 16:11 [PR PATCH] mkvtoolnix: update to 79.0 mvf
@ 2023-09-24 16:53 ` mvf
2023-09-25 8:13 ` mvf
` (17 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: mvf @ 2023-09-24 16:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1245 bytes --]
There is an updated pull request by mvf against master on the void-packages repository
https://github.com/mvf/void-packages pr/mkvtoolnix
https://github.com/void-linux/void-packages/pull/45712
mkvtoolnix: update to 79.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### 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
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45712.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr/mkvtoolnix-45712.patch --]
[-- Type: text/x-diff, Size: 1162 bytes --]
From ef26b614770a693ffcbf98c82b256b31bee717b8 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Tue, 22 Aug 2023 18:09:34 +0200
Subject: [PATCH] mkvtoolnix: update to 79.0
---
srcpkgs/mkvtoolnix/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index f1e233ef86422..6c79949c4010a 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
-version=78.0
-revision=2
+version=79.0
+revision=1
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
homepage="https://mkvtoolnix.download"
changelog="https://mkvtoolnix.download/doc/NEWS.md"
distfiles="https://mkvtoolnix.download/sources/mkvtoolnix-${version}.tar.xz"
-checksum=6a50fce8c66c55410e0df2a6952f0bab7a3c92914db7feb285b9f1bb03fcd0d3
+checksum=f039c27b0dfe4a4d1aa870ad32e20a28a5f254de6121cb12a42328130be3afbc
if [ "$CROSS_BUILD" ]; then
configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: mkvtoolnix: update to 79.0
2023-08-22 16:11 [PR PATCH] mkvtoolnix: update to 79.0 mvf
2023-09-24 16:53 ` [PR PATCH] [Updated] " mvf
@ 2023-09-25 8:13 ` mvf
2023-11-06 15:57 ` [PR PATCH] [Updated] " mvf
` (16 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: mvf @ 2023-09-25 8:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 146 bytes --]
New comment by mvf on void-packages repository
https://github.com/void-linux/void-packages/pull/45712#issuecomment-1733142281
Comment:
resolved
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] mkvtoolnix: update to 79.0
2023-08-22 16:11 [PR PATCH] mkvtoolnix: update to 79.0 mvf
2023-09-24 16:53 ` [PR PATCH] [Updated] " mvf
2023-09-25 8:13 ` mvf
@ 2023-11-06 15:57 ` mvf
2023-11-13 6:45 ` [PR PATCH] [Updated] mkvtoolnix: update to 80.0 mvf
` (15 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: mvf @ 2023-11-06 15:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1245 bytes --]
There is an updated pull request by mvf against master on the void-packages repository
https://github.com/mvf/void-packages pr/mkvtoolnix
https://github.com/void-linux/void-packages/pull/45712
mkvtoolnix: update to 79.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### 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
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45712.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr/mkvtoolnix-45712.patch --]
[-- Type: text/x-diff, Size: 1161 bytes --]
From 1f37750067b719c58934dbd7563fdaadb79458ae Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Mon, 6 Nov 2023 16:56:03 +0100
Subject: [PATCH] mkvtoolnix: update to 80.0
---
srcpkgs/mkvtoolnix/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index f1e233ef86422..4ebeb49fdae61 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
-version=78.0
-revision=2
+version=80.0
+revision=1
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
homepage="https://mkvtoolnix.download"
changelog="https://mkvtoolnix.download/doc/NEWS.md"
distfiles="https://mkvtoolnix.download/sources/mkvtoolnix-${version}.tar.xz"
-checksum=6a50fce8c66c55410e0df2a6952f0bab7a3c92914db7feb285b9f1bb03fcd0d3
+checksum=bb08cdaf9afd472738b9655ae5704c3749da0a51a188baab12f5d7c3eb4d33f5
if [ "$CROSS_BUILD" ]; then
configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] mkvtoolnix: update to 80.0
2023-08-22 16:11 [PR PATCH] mkvtoolnix: update to 79.0 mvf
` (2 preceding siblings ...)
2023-11-06 15:57 ` [PR PATCH] [Updated] " mvf
@ 2023-11-13 6:45 ` mvf
2023-12-11 8:10 ` mvf
` (14 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: mvf @ 2023-11-13 6:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1245 bytes --]
There is an updated pull request by mvf against master on the void-packages repository
https://github.com/mvf/void-packages pr/mkvtoolnix
https://github.com/void-linux/void-packages/pull/45712
mkvtoolnix: update to 80.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### 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
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45712.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr/mkvtoolnix-45712.patch --]
[-- Type: text/x-diff, Size: 1161 bytes --]
From 80f3324d1081b4637eb34e0cad1b46f1062a4733 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Mon, 6 Nov 2023 16:56:03 +0100
Subject: [PATCH] mkvtoolnix: update to 80.0
---
srcpkgs/mkvtoolnix/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index be8653644a339..4ebeb49fdae61 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
-version=78.0
-revision=3
+version=80.0
+revision=1
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
homepage="https://mkvtoolnix.download"
changelog="https://mkvtoolnix.download/doc/NEWS.md"
distfiles="https://mkvtoolnix.download/sources/mkvtoolnix-${version}.tar.xz"
-checksum=6a50fce8c66c55410e0df2a6952f0bab7a3c92914db7feb285b9f1bb03fcd0d3
+checksum=bb08cdaf9afd472738b9655ae5704c3749da0a51a188baab12f5d7c3eb4d33f5
if [ "$CROSS_BUILD" ]; then
configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] mkvtoolnix: update to 80.0
2023-08-22 16:11 [PR PATCH] mkvtoolnix: update to 79.0 mvf
` (3 preceding siblings ...)
2023-11-13 6:45 ` [PR PATCH] [Updated] mkvtoolnix: update to 80.0 mvf
@ 2023-12-11 8:10 ` mvf
2023-12-12 9:57 ` [PR PATCH] [Updated] mkvtoolnix: update to 81.0 mvf
` (13 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: mvf @ 2023-12-11 8:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1245 bytes --]
There is an updated pull request by mvf against master on the void-packages repository
https://github.com/mvf/void-packages pr/mkvtoolnix
https://github.com/void-linux/void-packages/pull/45712
mkvtoolnix: update to 80.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### 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
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45712.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr/mkvtoolnix-45712.patch --]
[-- Type: text/x-diff, Size: 1161 bytes --]
From 5568b57a22a40821cfb5766a6444093ee4859ccc Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Thu, 7 Dec 2023 19:26:55 +0100
Subject: [PATCH] mkvtoolnix: update to 81.0
---
srcpkgs/mkvtoolnix/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index be8653644a339..a4370a9571d5d 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
-version=78.0
-revision=3
+version=81.0
+revision=1
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
homepage="https://mkvtoolnix.download"
changelog="https://mkvtoolnix.download/doc/NEWS.md"
distfiles="https://mkvtoolnix.download/sources/mkvtoolnix-${version}.tar.xz"
-checksum=6a50fce8c66c55410e0df2a6952f0bab7a3c92914db7feb285b9f1bb03fcd0d3
+checksum=422f2bec88d5d93547df0c3e1399272a6dc4c23050b45d34343bbdd6d55e5ad6
if [ "$CROSS_BUILD" ]; then
configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] mkvtoolnix: update to 81.0
2023-08-22 16:11 [PR PATCH] mkvtoolnix: update to 79.0 mvf
` (4 preceding siblings ...)
2023-12-11 8:10 ` mvf
@ 2023-12-12 9:57 ` mvf
2024-03-12 1:44 ` github-actions
` (12 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: mvf @ 2023-12-12 9:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1245 bytes --]
There is an updated pull request by mvf against master on the void-packages repository
https://github.com/mvf/void-packages pr/mkvtoolnix
https://github.com/void-linux/void-packages/pull/45712
mkvtoolnix: update to 81.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### 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
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45712.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr/mkvtoolnix-45712.patch --]
[-- Type: text/x-diff, Size: 1161 bytes --]
From 3ee11d61eacd1e17626dcc31e1baa46c15ed13c4 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Thu, 7 Dec 2023 19:26:55 +0100
Subject: [PATCH] mkvtoolnix: update to 81.0
---
srcpkgs/mkvtoolnix/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index be8653644a339..a4370a9571d5d 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
-version=78.0
-revision=3
+version=81.0
+revision=1
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
@@ -17,7 +17,7 @@ license="GPL-2.0-only"
homepage="https://mkvtoolnix.download"
changelog="https://mkvtoolnix.download/doc/NEWS.md"
distfiles="https://mkvtoolnix.download/sources/mkvtoolnix-${version}.tar.xz"
-checksum=6a50fce8c66c55410e0df2a6952f0bab7a3c92914db7feb285b9f1bb03fcd0d3
+checksum=422f2bec88d5d93547df0c3e1399272a6dc4c23050b45d34343bbdd6d55e5ad6
if [ "$CROSS_BUILD" ]; then
configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: mkvtoolnix: update to 81.0
2023-08-22 16:11 [PR PATCH] mkvtoolnix: update to 79.0 mvf
` (5 preceding siblings ...)
2023-12-12 9:57 ` [PR PATCH] [Updated] mkvtoolnix: update to 81.0 mvf
@ 2024-03-12 1:44 ` github-actions
2024-03-15 22:47 ` [PR PATCH] [Updated] " mvf
` (11 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: github-actions @ 2024-03-12 1:44 UTC (permalink / raw)
To: ml
[-- 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/45712#issuecomment-1989764189
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.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] mkvtoolnix: update to 81.0
2023-08-22 16:11 [PR PATCH] mkvtoolnix: update to 79.0 mvf
` (6 preceding siblings ...)
2024-03-12 1:44 ` github-actions
@ 2024-03-15 22:47 ` mvf
2024-03-16 7:55 ` mkvtoolnix: update to 83.0 mvf
` (10 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: mvf @ 2024-03-15 22:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1245 bytes --]
There is an updated pull request by mvf against master on the void-packages repository
https://github.com/mvf/void-packages pr/mkvtoolnix
https://github.com/void-linux/void-packages/pull/45712
mkvtoolnix: update to 81.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### 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
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45712.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr/mkvtoolnix-45712.patch --]
[-- Type: text/x-diff, Size: 6651 bytes --]
From 07b4e242917f84551284708e6f29b1b594a61dd2 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Thu, 14 Mar 2024 19:40:57 +0100
Subject: [PATCH 1/2] New build-helper: qmake6
---
common/build-helper/qmake6.sh | 97 +++++++++++++++++++++++++++++++++++
1 file changed, 97 insertions(+)
create mode 100644 common/build-helper/qmake6.sh
diff --git a/common/build-helper/qmake6.sh b/common/build-helper/qmake6.sh
new file mode 100644
index 00000000000000..945110b94ea58e
--- /dev/null
+++ b/common/build-helper/qmake6.sh
@@ -0,0 +1,97 @@
+# This build-helper sets up qmake’s cross environment
+# in cases the build-style is mixed,
+# e.g. when in a gnu-configure style the configure
+# script calls qmake or a makefile in a gnu-makefile style,
+# respectively.
+
+if [ "$CROSS_BUILD" ]; then
+ mkdir -p "${XBPS_WRAPPERDIR}/target-spec/linux-g++"
+ cat > "${XBPS_WRAPPERDIR}/target-spec/linux-g++/qmake.conf" <<_EOF
+MAKEFILE_GENERATOR = UNIX
+CONFIG += incremental no_qt_rpath
+QMAKE_INCREMENTAL_STYLE = sublib
+
+include(/usr/lib/qt6/mkspecs/common/linux.conf)
+include(/usr/lib/qt6/mkspecs/common/gcc-base-unix.conf)
+include(/usr/lib/qt6/mkspecs/common/g++-unix.conf)
+
+QMAKE_TARGET_CONFIG = ${XBPS_CROSS_BASE}/usr/lib/qt6/mkspecs/qconfig.pri
+QMAKE_TARGET_MODULE = ${XBPS_CROSS_BASE}/usr/lib/qt6/mkspecs/qmodule.pri
+QMAKEMODULES = ${XBPS_CROSS_BASE}/usr/lib/qt6/mkspecs/modules
+QMAKE_CC = ${CC}
+QMAKE_CXX = ${CXX}
+QMAKE_LINK = ${CXX}
+QMAKE_LINK_C = ${CC}
+QMAKE_LINK_SHLIB = ${CXX}
+
+QMAKE_AR = ${XBPS_CROSS_TRIPLET}-gcc-ar cqs
+QMAKE_OBJCOPY = ${OBJCOPY}
+QMAKE_NM = ${NM} -P
+QMAKE_STRIP = ${STRIP}
+
+QMAKE_CFLAGS = ${CFLAGS}
+QMAKE_CXXFLAGS = ${CXXFLAGS}
+QMAKE_LFLAGS = ${LDFLAGS}
+load(qt_config)
+_EOF
+ echo "#include \"${XBPS_CROSS_BASE}/usr/lib/qt6/mkspecs/linux-g++/qplatformdefs.h\"" > "${XBPS_WRAPPERDIR}/target-spec/linux-g++/qplatformdefs.h"
+
+ cat > "${XBPS_WRAPPERDIR}/qt.conf" <<_EOF
+[Paths]
+Sysroot=${XBPS_CROSS_BASE}
+Prefix=${XBPS_CROSS_BASE}/usr
+ArchData=${XBPS_CROSS_BASE}/usr/lib/qt6
+Data=${XBPS_CROSS_BASE}/usr/share/qt6
+Documentation=${XBPS_CROSS_BASE}/usr/share/doc/qt6
+Headers=${XBPS_CROSS_BASE}/usr/include/qt6
+Libraries=${XBPS_CROSS_BASE}/usr/lib
+LibraryExecutables=/usr/lib/qt6/libexec
+Binaries=/usr/lib/qt6/bin
+Tests=${XBPS_CROSS_BASE}/usr/tests
+Plugins=/usr/lib/qt6/plugins
+Imports=${XBPS_CROSS_BASE}/usr/lib/qt6/imports
+Qml2Imports=${XBPS_CROSS_BASE}/usr/lib/qt6/qml
+Translations=${XBPS_CROSS_BASE}/usr/share/qt6/translations
+Settings=${XBPS_CROSS_BASE}/etc/xdg
+Examples=${XBPS_CROSS_BASE}/usr/lib/qt6/examples
+HostPrefix=/usr
+HostData=/usr/lib/qt6
+HostBinaries=/usr/lib/qt6/bin
+HostLibraries=/usr/lib
+HostLibraryExecutables=/usr/lib/qt6/libexec
+Spec=linux-g++
+TargetSpec=$XBPS_WRAPPERDIR/target-spec/linux-g++
+_EOF
+
+ # create the qmake-wrapper here because it only
+ # makes sense together with the qmake build-helper
+ # and not to interfere with e.g. the qmake build-style
+ #
+ # + base flags will be picked up from QMAKE_{C,CXX,LD}FLAGS
+ # + hardening flags will be picked up from environment variables
+ cat > "${XBPS_WRAPPERDIR}/qmake" <<_EOF
+#!/bin/sh
+exec /usr/lib/qt6/bin/qmake "\$@" -qtconf "${XBPS_WRAPPERDIR}/qt.conf" \\
+ QMAKE_CFLAGS+="\${CFLAGS}" \\
+ QMAKE_CXXFLAGS+="\${CXXFLAGS}" \\
+ QMAKE_LFLAGS+="\${LDFLAGS}"
+_EOF
+else
+ cat > "${XBPS_WRAPPERDIR}/qmake" <<_EOF
+#!/bin/sh
+exec /usr/lib/qt6/bin/qmake \
+ "\$@" \
+ PREFIX=/usr \
+ QT_INSTALL_PREFIX=/usr \
+ LIB=/usr/lib \
+ QMAKE_CC="$CC" QMAKE_CXX="$CXX" \
+ QMAKE_LINK="$CXX" QMAKE_LINK_C="$CC" \
+ QMAKE_CFLAGS+="\${CFLAGS}" \
+ QMAKE_CXXFLAGS+="\${CXXFLAGS}" \
+ QMAKE_LFLAGS+="\${LDFLAGS}" \
+ CONFIG+=no_qt_rpath
+_EOF
+fi
+chmod 755 ${XBPS_WRAPPERDIR}/qmake
+cp -p ${XBPS_WRAPPERDIR}/qmake{,-qt6}
+cp -p ${XBPS_WRAPPERDIR}/qmake{,6}
From 9d9abd7fa8ac558479ec99290342100eed1490f1 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Thu, 14 Mar 2024 19:41:01 +0100
Subject: [PATCH 2/2] mkvtoolnix: update to 83.0
---
srcpkgs/mkvtoolnix/template | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index be8653644a339c..8c26881504b623 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,15 +1,14 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
-version=78.0
-revision=3
+version=83.0
+revision=1
build_style=gnu-configure
-build_helper=qmake
-configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
- --disable-update-check"
-hostmakedepends="autoconf docbook-xsl gettext libxslt pkg-config qt5-tools-devel ruby"
+build_helper=qmake6
+configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --disable-update-check"
+hostmakedepends="autoconf docbook-xsl gettext libxslt pkg-config po4a qt6-base qt6-tools ruby"
makedepends="boost-devel cmark-devel file-devel fmt-devel gmp-devel json-c++
libdvdread-devel libflac-devel libmatroska-devel libvorbis-devel pcre2-devel
- pugixml-devel qt5-multimedia-devel qt5-svg-devel qt5-tools-devel"
+ pugixml-devel qt6-base-devel qt6-multimedia-devel qt6-svg-devel qt6-tools-devel"
checkdepends="gtest-devel"
short_desc="Create, alter and inspect Matroska videos"
maintainer="Matthias von Faber <mvf@gmx.eu>"
@@ -17,7 +16,7 @@ license="GPL-2.0-only"
homepage="https://mkvtoolnix.download"
changelog="https://mkvtoolnix.download/doc/NEWS.md"
distfiles="https://mkvtoolnix.download/sources/mkvtoolnix-${version}.tar.xz"
-checksum=6a50fce8c66c55410e0df2a6952f0bab7a3c92914db7feb285b9f1bb03fcd0d3
+checksum=6a8615436406c7fa45bfb2b6270da1bf06ea54cfcd13c3699643833e1d73ecbc
if [ "$CROSS_BUILD" ]; then
configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
@@ -43,16 +42,19 @@ do_install() {
mkvtoolnix-gui_package() {
short_desc+=" - Qt GUI"
- depends="${sourcepkg}-${version}_${revision}"
+ depends="${sourcepkg}-${version}_${revision} qt6-svg"
pkg_install() {
vmove usr/bin/mkvtoolnix-gui
vmove usr/share/applications
for file in "${DESTDIR}"/usr/share/icons/hicolor/*/apps/mkvtoolnix-gui.png; do
vmove "${file/${DESTDIR}\//}"
done
+ for file in "${DESTDIR}"/usr/share/man/*/man1/mkvtoolnix-gui.1; do
+ vmove "${file/${DESTDIR}\//}"
+ done
vmove usr/share/man/man1/mkvtoolnix-gui.1
vmove usr/share/metainfo
vmove usr/share/mime/packages
- vmove usr/share/mkvtoolnix/sounds
+ vmove usr/share/mkvtoolnix
}
}
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: mkvtoolnix: update to 83.0
2023-08-22 16:11 [PR PATCH] mkvtoolnix: update to 79.0 mvf
` (7 preceding siblings ...)
2024-03-15 22:47 ` [PR PATCH] [Updated] " mvf
@ 2024-03-16 7:55 ` mvf
2024-04-30 9:40 ` [PR PATCH] [Updated] " mvf
` (9 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: mvf @ 2024-03-16 7:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 694 bytes --]
New comment by mvf on void-packages repository
https://github.com/void-linux/void-packages/pull/45712#issuecomment-2001897977
Comment:
@Duncaen Any chance you could review this? `mkvtoolnix` is built with [Rake](https://github.com/ruby/rake) and now requires Qt6, so I had to add a new `qmake6` build helper. Changes from the Qt5 `qmake` build helper (in top-down order in the file):
- `qt.conf`: `examples` now sit under `/usr/lib` (previously `/usr/share`)
- `qt.conf`: New key `HostLibraryExecutables` points to `moc` & friends that were moved from `bin` to `libexec`
- Additional `qmake6` alias to match the one in `/usr/lib/qt6/bin` (Debian even has a `/usr/bin/qmake6`)
Thanks!
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] mkvtoolnix: update to 83.0
2023-08-22 16:11 [PR PATCH] mkvtoolnix: update to 79.0 mvf
` (8 preceding siblings ...)
2024-03-16 7:55 ` mkvtoolnix: update to 83.0 mvf
@ 2024-04-30 9:40 ` mvf
2024-06-03 19:01 ` [PR PATCH] [Updated] mkvtoolnix: update to 84.0 mvf
` (8 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: mvf @ 2024-04-30 9:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
There is an updated pull request by mvf against master on the void-packages repository
https://github.com/mvf/void-packages pr/mkvtoolnix
https://github.com/void-linux/void-packages/pull/45712
mkvtoolnix: update to 83.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### 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
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45712.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr/mkvtoolnix-45712.patch --]
[-- Type: text/x-diff, Size: 6651 bytes --]
From 7ac68c076075474967e5fbd6b5244093567c5d58 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Thu, 14 Mar 2024 19:40:57 +0100
Subject: [PATCH 1/2] New build-helper: qmake6
---
common/build-helper/qmake6.sh | 97 +++++++++++++++++++++++++++++++++++
1 file changed, 97 insertions(+)
create mode 100644 common/build-helper/qmake6.sh
diff --git a/common/build-helper/qmake6.sh b/common/build-helper/qmake6.sh
new file mode 100644
index 00000000000000..945110b94ea58e
--- /dev/null
+++ b/common/build-helper/qmake6.sh
@@ -0,0 +1,97 @@
+# This build-helper sets up qmake’s cross environment
+# in cases the build-style is mixed,
+# e.g. when in a gnu-configure style the configure
+# script calls qmake or a makefile in a gnu-makefile style,
+# respectively.
+
+if [ "$CROSS_BUILD" ]; then
+ mkdir -p "${XBPS_WRAPPERDIR}/target-spec/linux-g++"
+ cat > "${XBPS_WRAPPERDIR}/target-spec/linux-g++/qmake.conf" <<_EOF
+MAKEFILE_GENERATOR = UNIX
+CONFIG += incremental no_qt_rpath
+QMAKE_INCREMENTAL_STYLE = sublib
+
+include(/usr/lib/qt6/mkspecs/common/linux.conf)
+include(/usr/lib/qt6/mkspecs/common/gcc-base-unix.conf)
+include(/usr/lib/qt6/mkspecs/common/g++-unix.conf)
+
+QMAKE_TARGET_CONFIG = ${XBPS_CROSS_BASE}/usr/lib/qt6/mkspecs/qconfig.pri
+QMAKE_TARGET_MODULE = ${XBPS_CROSS_BASE}/usr/lib/qt6/mkspecs/qmodule.pri
+QMAKEMODULES = ${XBPS_CROSS_BASE}/usr/lib/qt6/mkspecs/modules
+QMAKE_CC = ${CC}
+QMAKE_CXX = ${CXX}
+QMAKE_LINK = ${CXX}
+QMAKE_LINK_C = ${CC}
+QMAKE_LINK_SHLIB = ${CXX}
+
+QMAKE_AR = ${XBPS_CROSS_TRIPLET}-gcc-ar cqs
+QMAKE_OBJCOPY = ${OBJCOPY}
+QMAKE_NM = ${NM} -P
+QMAKE_STRIP = ${STRIP}
+
+QMAKE_CFLAGS = ${CFLAGS}
+QMAKE_CXXFLAGS = ${CXXFLAGS}
+QMAKE_LFLAGS = ${LDFLAGS}
+load(qt_config)
+_EOF
+ echo "#include \"${XBPS_CROSS_BASE}/usr/lib/qt6/mkspecs/linux-g++/qplatformdefs.h\"" > "${XBPS_WRAPPERDIR}/target-spec/linux-g++/qplatformdefs.h"
+
+ cat > "${XBPS_WRAPPERDIR}/qt.conf" <<_EOF
+[Paths]
+Sysroot=${XBPS_CROSS_BASE}
+Prefix=${XBPS_CROSS_BASE}/usr
+ArchData=${XBPS_CROSS_BASE}/usr/lib/qt6
+Data=${XBPS_CROSS_BASE}/usr/share/qt6
+Documentation=${XBPS_CROSS_BASE}/usr/share/doc/qt6
+Headers=${XBPS_CROSS_BASE}/usr/include/qt6
+Libraries=${XBPS_CROSS_BASE}/usr/lib
+LibraryExecutables=/usr/lib/qt6/libexec
+Binaries=/usr/lib/qt6/bin
+Tests=${XBPS_CROSS_BASE}/usr/tests
+Plugins=/usr/lib/qt6/plugins
+Imports=${XBPS_CROSS_BASE}/usr/lib/qt6/imports
+Qml2Imports=${XBPS_CROSS_BASE}/usr/lib/qt6/qml
+Translations=${XBPS_CROSS_BASE}/usr/share/qt6/translations
+Settings=${XBPS_CROSS_BASE}/etc/xdg
+Examples=${XBPS_CROSS_BASE}/usr/lib/qt6/examples
+HostPrefix=/usr
+HostData=/usr/lib/qt6
+HostBinaries=/usr/lib/qt6/bin
+HostLibraries=/usr/lib
+HostLibraryExecutables=/usr/lib/qt6/libexec
+Spec=linux-g++
+TargetSpec=$XBPS_WRAPPERDIR/target-spec/linux-g++
+_EOF
+
+ # create the qmake-wrapper here because it only
+ # makes sense together with the qmake build-helper
+ # and not to interfere with e.g. the qmake build-style
+ #
+ # + base flags will be picked up from QMAKE_{C,CXX,LD}FLAGS
+ # + hardening flags will be picked up from environment variables
+ cat > "${XBPS_WRAPPERDIR}/qmake" <<_EOF
+#!/bin/sh
+exec /usr/lib/qt6/bin/qmake "\$@" -qtconf "${XBPS_WRAPPERDIR}/qt.conf" \\
+ QMAKE_CFLAGS+="\${CFLAGS}" \\
+ QMAKE_CXXFLAGS+="\${CXXFLAGS}" \\
+ QMAKE_LFLAGS+="\${LDFLAGS}"
+_EOF
+else
+ cat > "${XBPS_WRAPPERDIR}/qmake" <<_EOF
+#!/bin/sh
+exec /usr/lib/qt6/bin/qmake \
+ "\$@" \
+ PREFIX=/usr \
+ QT_INSTALL_PREFIX=/usr \
+ LIB=/usr/lib \
+ QMAKE_CC="$CC" QMAKE_CXX="$CXX" \
+ QMAKE_LINK="$CXX" QMAKE_LINK_C="$CC" \
+ QMAKE_CFLAGS+="\${CFLAGS}" \
+ QMAKE_CXXFLAGS+="\${CXXFLAGS}" \
+ QMAKE_LFLAGS+="\${LDFLAGS}" \
+ CONFIG+=no_qt_rpath
+_EOF
+fi
+chmod 755 ${XBPS_WRAPPERDIR}/qmake
+cp -p ${XBPS_WRAPPERDIR}/qmake{,-qt6}
+cp -p ${XBPS_WRAPPERDIR}/qmake{,6}
From edb2142c2b822e91fec4abfc75ac7884ef69417c Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Tue, 30 Apr 2024 09:35:07 +0200
Subject: [PATCH 2/2] mkvtoolnix: update to 84.0
---
srcpkgs/mkvtoolnix/template | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index be8653644a339c..a2a57c51e57681 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,15 +1,14 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
-version=78.0
-revision=3
+version=84.0
+revision=1
build_style=gnu-configure
-build_helper=qmake
-configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
- --disable-update-check"
-hostmakedepends="autoconf docbook-xsl gettext libxslt pkg-config qt5-tools-devel ruby"
+build_helper=qmake6
+configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --disable-update-check"
+hostmakedepends="autoconf docbook-xsl gettext libxslt pkg-config po4a qt6-base qt6-tools ruby"
makedepends="boost-devel cmark-devel file-devel fmt-devel gmp-devel json-c++
libdvdread-devel libflac-devel libmatroska-devel libvorbis-devel pcre2-devel
- pugixml-devel qt5-multimedia-devel qt5-svg-devel qt5-tools-devel"
+ pugixml-devel qt6-base-devel qt6-multimedia-devel qt6-svg-devel qt6-tools-devel"
checkdepends="gtest-devel"
short_desc="Create, alter and inspect Matroska videos"
maintainer="Matthias von Faber <mvf@gmx.eu>"
@@ -17,7 +16,7 @@ license="GPL-2.0-only"
homepage="https://mkvtoolnix.download"
changelog="https://mkvtoolnix.download/doc/NEWS.md"
distfiles="https://mkvtoolnix.download/sources/mkvtoolnix-${version}.tar.xz"
-checksum=6a50fce8c66c55410e0df2a6952f0bab7a3c92914db7feb285b9f1bb03fcd0d3
+checksum=e9176dea435c3b06b4716fb131d53c8f2621977576ccc4aee8ff9050c0d9ea7a
if [ "$CROSS_BUILD" ]; then
configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
@@ -43,16 +42,19 @@ do_install() {
mkvtoolnix-gui_package() {
short_desc+=" - Qt GUI"
- depends="${sourcepkg}-${version}_${revision}"
+ depends="${sourcepkg}-${version}_${revision} qt6-svg"
pkg_install() {
vmove usr/bin/mkvtoolnix-gui
vmove usr/share/applications
for file in "${DESTDIR}"/usr/share/icons/hicolor/*/apps/mkvtoolnix-gui.png; do
vmove "${file/${DESTDIR}\//}"
done
+ for file in "${DESTDIR}"/usr/share/man/*/man1/mkvtoolnix-gui.1; do
+ vmove "${file/${DESTDIR}\//}"
+ done
vmove usr/share/man/man1/mkvtoolnix-gui.1
vmove usr/share/metainfo
vmove usr/share/mime/packages
- vmove usr/share/mkvtoolnix/sounds
+ vmove usr/share/mkvtoolnix
}
}
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] mkvtoolnix: update to 84.0
2023-08-22 16:11 [PR PATCH] mkvtoolnix: update to 79.0 mvf
` (9 preceding siblings ...)
2024-04-30 9:40 ` [PR PATCH] [Updated] " mvf
@ 2024-06-03 19:01 ` mvf
2024-06-22 0:26 ` [PR REVIEW] mkvtoolnix: update to 85.0 classabbyamp
` (7 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: mvf @ 2024-06-03 19:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
There is an updated pull request by mvf against master on the void-packages repository
https://github.com/mvf/void-packages pr/mkvtoolnix
https://github.com/void-linux/void-packages/pull/45712
mkvtoolnix: update to 84.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### 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
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45712.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr/mkvtoolnix-45712.patch --]
[-- Type: text/x-diff, Size: 6651 bytes --]
From 9f7d0851e639264c0f7b91854d925b2436cb115b Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Thu, 14 Mar 2024 19:40:57 +0100
Subject: [PATCH 1/2] New build-helper: qmake6
---
common/build-helper/qmake6.sh | 97 +++++++++++++++++++++++++++++++++++
1 file changed, 97 insertions(+)
create mode 100644 common/build-helper/qmake6.sh
diff --git a/common/build-helper/qmake6.sh b/common/build-helper/qmake6.sh
new file mode 100644
index 00000000000000..945110b94ea58e
--- /dev/null
+++ b/common/build-helper/qmake6.sh
@@ -0,0 +1,97 @@
+# This build-helper sets up qmake’s cross environment
+# in cases the build-style is mixed,
+# e.g. when in a gnu-configure style the configure
+# script calls qmake or a makefile in a gnu-makefile style,
+# respectively.
+
+if [ "$CROSS_BUILD" ]; then
+ mkdir -p "${XBPS_WRAPPERDIR}/target-spec/linux-g++"
+ cat > "${XBPS_WRAPPERDIR}/target-spec/linux-g++/qmake.conf" <<_EOF
+MAKEFILE_GENERATOR = UNIX
+CONFIG += incremental no_qt_rpath
+QMAKE_INCREMENTAL_STYLE = sublib
+
+include(/usr/lib/qt6/mkspecs/common/linux.conf)
+include(/usr/lib/qt6/mkspecs/common/gcc-base-unix.conf)
+include(/usr/lib/qt6/mkspecs/common/g++-unix.conf)
+
+QMAKE_TARGET_CONFIG = ${XBPS_CROSS_BASE}/usr/lib/qt6/mkspecs/qconfig.pri
+QMAKE_TARGET_MODULE = ${XBPS_CROSS_BASE}/usr/lib/qt6/mkspecs/qmodule.pri
+QMAKEMODULES = ${XBPS_CROSS_BASE}/usr/lib/qt6/mkspecs/modules
+QMAKE_CC = ${CC}
+QMAKE_CXX = ${CXX}
+QMAKE_LINK = ${CXX}
+QMAKE_LINK_C = ${CC}
+QMAKE_LINK_SHLIB = ${CXX}
+
+QMAKE_AR = ${XBPS_CROSS_TRIPLET}-gcc-ar cqs
+QMAKE_OBJCOPY = ${OBJCOPY}
+QMAKE_NM = ${NM} -P
+QMAKE_STRIP = ${STRIP}
+
+QMAKE_CFLAGS = ${CFLAGS}
+QMAKE_CXXFLAGS = ${CXXFLAGS}
+QMAKE_LFLAGS = ${LDFLAGS}
+load(qt_config)
+_EOF
+ echo "#include \"${XBPS_CROSS_BASE}/usr/lib/qt6/mkspecs/linux-g++/qplatformdefs.h\"" > "${XBPS_WRAPPERDIR}/target-spec/linux-g++/qplatformdefs.h"
+
+ cat > "${XBPS_WRAPPERDIR}/qt.conf" <<_EOF
+[Paths]
+Sysroot=${XBPS_CROSS_BASE}
+Prefix=${XBPS_CROSS_BASE}/usr
+ArchData=${XBPS_CROSS_BASE}/usr/lib/qt6
+Data=${XBPS_CROSS_BASE}/usr/share/qt6
+Documentation=${XBPS_CROSS_BASE}/usr/share/doc/qt6
+Headers=${XBPS_CROSS_BASE}/usr/include/qt6
+Libraries=${XBPS_CROSS_BASE}/usr/lib
+LibraryExecutables=/usr/lib/qt6/libexec
+Binaries=/usr/lib/qt6/bin
+Tests=${XBPS_CROSS_BASE}/usr/tests
+Plugins=/usr/lib/qt6/plugins
+Imports=${XBPS_CROSS_BASE}/usr/lib/qt6/imports
+Qml2Imports=${XBPS_CROSS_BASE}/usr/lib/qt6/qml
+Translations=${XBPS_CROSS_BASE}/usr/share/qt6/translations
+Settings=${XBPS_CROSS_BASE}/etc/xdg
+Examples=${XBPS_CROSS_BASE}/usr/lib/qt6/examples
+HostPrefix=/usr
+HostData=/usr/lib/qt6
+HostBinaries=/usr/lib/qt6/bin
+HostLibraries=/usr/lib
+HostLibraryExecutables=/usr/lib/qt6/libexec
+Spec=linux-g++
+TargetSpec=$XBPS_WRAPPERDIR/target-spec/linux-g++
+_EOF
+
+ # create the qmake-wrapper here because it only
+ # makes sense together with the qmake build-helper
+ # and not to interfere with e.g. the qmake build-style
+ #
+ # + base flags will be picked up from QMAKE_{C,CXX,LD}FLAGS
+ # + hardening flags will be picked up from environment variables
+ cat > "${XBPS_WRAPPERDIR}/qmake" <<_EOF
+#!/bin/sh
+exec /usr/lib/qt6/bin/qmake "\$@" -qtconf "${XBPS_WRAPPERDIR}/qt.conf" \\
+ QMAKE_CFLAGS+="\${CFLAGS}" \\
+ QMAKE_CXXFLAGS+="\${CXXFLAGS}" \\
+ QMAKE_LFLAGS+="\${LDFLAGS}"
+_EOF
+else
+ cat > "${XBPS_WRAPPERDIR}/qmake" <<_EOF
+#!/bin/sh
+exec /usr/lib/qt6/bin/qmake \
+ "\$@" \
+ PREFIX=/usr \
+ QT_INSTALL_PREFIX=/usr \
+ LIB=/usr/lib \
+ QMAKE_CC="$CC" QMAKE_CXX="$CXX" \
+ QMAKE_LINK="$CXX" QMAKE_LINK_C="$CC" \
+ QMAKE_CFLAGS+="\${CFLAGS}" \
+ QMAKE_CXXFLAGS+="\${CXXFLAGS}" \
+ QMAKE_LFLAGS+="\${LDFLAGS}" \
+ CONFIG+=no_qt_rpath
+_EOF
+fi
+chmod 755 ${XBPS_WRAPPERDIR}/qmake
+cp -p ${XBPS_WRAPPERDIR}/qmake{,-qt6}
+cp -p ${XBPS_WRAPPERDIR}/qmake{,6}
From 4b3f8250bcd6cb5cef1e7ee7aa0345d6c5601a52 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Tue, 30 Apr 2024 09:35:07 +0200
Subject: [PATCH 2/2] mkvtoolnix: update to 85.0
---
srcpkgs/mkvtoolnix/template | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index be8653644a339c..8e79f409dab250 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,15 +1,14 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
-version=78.0
-revision=3
+version=85.0
+revision=1
build_style=gnu-configure
-build_helper=qmake
-configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
- --disable-update-check"
-hostmakedepends="autoconf docbook-xsl gettext libxslt pkg-config qt5-tools-devel ruby"
+build_helper=qmake6
+configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --disable-update-check"
+hostmakedepends="autoconf docbook-xsl gettext libxslt pkg-config po4a qt6-base qt6-tools ruby"
makedepends="boost-devel cmark-devel file-devel fmt-devel gmp-devel json-c++
libdvdread-devel libflac-devel libmatroska-devel libvorbis-devel pcre2-devel
- pugixml-devel qt5-multimedia-devel qt5-svg-devel qt5-tools-devel"
+ pugixml-devel qt6-base-devel qt6-multimedia-devel qt6-svg-devel qt6-tools-devel"
checkdepends="gtest-devel"
short_desc="Create, alter and inspect Matroska videos"
maintainer="Matthias von Faber <mvf@gmx.eu>"
@@ -17,7 +16,7 @@ license="GPL-2.0-only"
homepage="https://mkvtoolnix.download"
changelog="https://mkvtoolnix.download/doc/NEWS.md"
distfiles="https://mkvtoolnix.download/sources/mkvtoolnix-${version}.tar.xz"
-checksum=6a50fce8c66c55410e0df2a6952f0bab7a3c92914db7feb285b9f1bb03fcd0d3
+checksum=702442c80706c7c770ac04f7b4eed7a57e9e03ead6c5e6e90b9655dd84c8d829
if [ "$CROSS_BUILD" ]; then
configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
@@ -43,16 +42,19 @@ do_install() {
mkvtoolnix-gui_package() {
short_desc+=" - Qt GUI"
- depends="${sourcepkg}-${version}_${revision}"
+ depends="${sourcepkg}-${version}_${revision} qt6-svg"
pkg_install() {
vmove usr/bin/mkvtoolnix-gui
vmove usr/share/applications
for file in "${DESTDIR}"/usr/share/icons/hicolor/*/apps/mkvtoolnix-gui.png; do
vmove "${file/${DESTDIR}\//}"
done
+ for file in "${DESTDIR}"/usr/share/man/*/man1/mkvtoolnix-gui.1; do
+ vmove "${file/${DESTDIR}\//}"
+ done
vmove usr/share/man/man1/mkvtoolnix-gui.1
vmove usr/share/metainfo
vmove usr/share/mime/packages
- vmove usr/share/mkvtoolnix/sounds
+ vmove usr/share/mkvtoolnix
}
}
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR REVIEW] mkvtoolnix: update to 85.0
2023-08-22 16:11 [PR PATCH] mkvtoolnix: update to 79.0 mvf
` (10 preceding siblings ...)
2024-06-03 19:01 ` [PR PATCH] [Updated] mkvtoolnix: update to 84.0 mvf
@ 2024-06-22 0:26 ` classabbyamp
2024-06-22 5:10 ` [PR PATCH] [Updated] " mvf
` (6 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: classabbyamp @ 2024-06-22 0:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 194 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/45712#discussion_r1649510804
Comment:
```suggestion
build_helper="qmake6"
```
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] mkvtoolnix: update to 85.0
2023-08-22 16:11 [PR PATCH] mkvtoolnix: update to 79.0 mvf
` (11 preceding siblings ...)
2024-06-22 0:26 ` [PR REVIEW] mkvtoolnix: update to 85.0 classabbyamp
@ 2024-06-22 5:10 ` mvf
2024-06-22 5:32 ` [PR REVIEW] " mvf
` (5 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: mvf @ 2024-06-22 5:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1241 bytes --]
There is an updated pull request by mvf against master on the void-packages repository
https://github.com/mvf/void-packages pr/mkvtoolnix
https://github.com/void-linux/void-packages/pull/45712
mkvtoolnix: update to 85.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### 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
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45712.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr/mkvtoolnix-45712.patch --]
[-- Type: text/x-diff, Size: 6653 bytes --]
From 553652a4e0f7e2f00508200f10fa2aa76ec86c3b Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Thu, 14 Mar 2024 19:40:57 +0100
Subject: [PATCH 1/2] New build-helper: qmake6
---
common/build-helper/qmake6.sh | 97 +++++++++++++++++++++++++++++++++++
1 file changed, 97 insertions(+)
create mode 100644 common/build-helper/qmake6.sh
diff --git a/common/build-helper/qmake6.sh b/common/build-helper/qmake6.sh
new file mode 100644
index 00000000000000..945110b94ea58e
--- /dev/null
+++ b/common/build-helper/qmake6.sh
@@ -0,0 +1,97 @@
+# This build-helper sets up qmake’s cross environment
+# in cases the build-style is mixed,
+# e.g. when in a gnu-configure style the configure
+# script calls qmake or a makefile in a gnu-makefile style,
+# respectively.
+
+if [ "$CROSS_BUILD" ]; then
+ mkdir -p "${XBPS_WRAPPERDIR}/target-spec/linux-g++"
+ cat > "${XBPS_WRAPPERDIR}/target-spec/linux-g++/qmake.conf" <<_EOF
+MAKEFILE_GENERATOR = UNIX
+CONFIG += incremental no_qt_rpath
+QMAKE_INCREMENTAL_STYLE = sublib
+
+include(/usr/lib/qt6/mkspecs/common/linux.conf)
+include(/usr/lib/qt6/mkspecs/common/gcc-base-unix.conf)
+include(/usr/lib/qt6/mkspecs/common/g++-unix.conf)
+
+QMAKE_TARGET_CONFIG = ${XBPS_CROSS_BASE}/usr/lib/qt6/mkspecs/qconfig.pri
+QMAKE_TARGET_MODULE = ${XBPS_CROSS_BASE}/usr/lib/qt6/mkspecs/qmodule.pri
+QMAKEMODULES = ${XBPS_CROSS_BASE}/usr/lib/qt6/mkspecs/modules
+QMAKE_CC = ${CC}
+QMAKE_CXX = ${CXX}
+QMAKE_LINK = ${CXX}
+QMAKE_LINK_C = ${CC}
+QMAKE_LINK_SHLIB = ${CXX}
+
+QMAKE_AR = ${XBPS_CROSS_TRIPLET}-gcc-ar cqs
+QMAKE_OBJCOPY = ${OBJCOPY}
+QMAKE_NM = ${NM} -P
+QMAKE_STRIP = ${STRIP}
+
+QMAKE_CFLAGS = ${CFLAGS}
+QMAKE_CXXFLAGS = ${CXXFLAGS}
+QMAKE_LFLAGS = ${LDFLAGS}
+load(qt_config)
+_EOF
+ echo "#include \"${XBPS_CROSS_BASE}/usr/lib/qt6/mkspecs/linux-g++/qplatformdefs.h\"" > "${XBPS_WRAPPERDIR}/target-spec/linux-g++/qplatformdefs.h"
+
+ cat > "${XBPS_WRAPPERDIR}/qt.conf" <<_EOF
+[Paths]
+Sysroot=${XBPS_CROSS_BASE}
+Prefix=${XBPS_CROSS_BASE}/usr
+ArchData=${XBPS_CROSS_BASE}/usr/lib/qt6
+Data=${XBPS_CROSS_BASE}/usr/share/qt6
+Documentation=${XBPS_CROSS_BASE}/usr/share/doc/qt6
+Headers=${XBPS_CROSS_BASE}/usr/include/qt6
+Libraries=${XBPS_CROSS_BASE}/usr/lib
+LibraryExecutables=/usr/lib/qt6/libexec
+Binaries=/usr/lib/qt6/bin
+Tests=${XBPS_CROSS_BASE}/usr/tests
+Plugins=/usr/lib/qt6/plugins
+Imports=${XBPS_CROSS_BASE}/usr/lib/qt6/imports
+Qml2Imports=${XBPS_CROSS_BASE}/usr/lib/qt6/qml
+Translations=${XBPS_CROSS_BASE}/usr/share/qt6/translations
+Settings=${XBPS_CROSS_BASE}/etc/xdg
+Examples=${XBPS_CROSS_BASE}/usr/lib/qt6/examples
+HostPrefix=/usr
+HostData=/usr/lib/qt6
+HostBinaries=/usr/lib/qt6/bin
+HostLibraries=/usr/lib
+HostLibraryExecutables=/usr/lib/qt6/libexec
+Spec=linux-g++
+TargetSpec=$XBPS_WRAPPERDIR/target-spec/linux-g++
+_EOF
+
+ # create the qmake-wrapper here because it only
+ # makes sense together with the qmake build-helper
+ # and not to interfere with e.g. the qmake build-style
+ #
+ # + base flags will be picked up from QMAKE_{C,CXX,LD}FLAGS
+ # + hardening flags will be picked up from environment variables
+ cat > "${XBPS_WRAPPERDIR}/qmake" <<_EOF
+#!/bin/sh
+exec /usr/lib/qt6/bin/qmake "\$@" -qtconf "${XBPS_WRAPPERDIR}/qt.conf" \\
+ QMAKE_CFLAGS+="\${CFLAGS}" \\
+ QMAKE_CXXFLAGS+="\${CXXFLAGS}" \\
+ QMAKE_LFLAGS+="\${LDFLAGS}"
+_EOF
+else
+ cat > "${XBPS_WRAPPERDIR}/qmake" <<_EOF
+#!/bin/sh
+exec /usr/lib/qt6/bin/qmake \
+ "\$@" \
+ PREFIX=/usr \
+ QT_INSTALL_PREFIX=/usr \
+ LIB=/usr/lib \
+ QMAKE_CC="$CC" QMAKE_CXX="$CXX" \
+ QMAKE_LINK="$CXX" QMAKE_LINK_C="$CC" \
+ QMAKE_CFLAGS+="\${CFLAGS}" \
+ QMAKE_CXXFLAGS+="\${CXXFLAGS}" \
+ QMAKE_LFLAGS+="\${LDFLAGS}" \
+ CONFIG+=no_qt_rpath
+_EOF
+fi
+chmod 755 ${XBPS_WRAPPERDIR}/qmake
+cp -p ${XBPS_WRAPPERDIR}/qmake{,-qt6}
+cp -p ${XBPS_WRAPPERDIR}/qmake{,6}
From 0997406c2dec79fc34a2d97867fb215ee7514bf3 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Tue, 30 Apr 2024 09:35:07 +0200
Subject: [PATCH 2/2] mkvtoolnix: update to 85.0
---
srcpkgs/mkvtoolnix/template | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index be8653644a339c..f0a54058327a68 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,15 +1,14 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
-version=78.0
-revision=3
+version=85.0
+revision=1
build_style=gnu-configure
-build_helper=qmake
-configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
- --disable-update-check"
-hostmakedepends="autoconf docbook-xsl gettext libxslt pkg-config qt5-tools-devel ruby"
+build_helper="qmake6"
+configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --disable-update-check"
+hostmakedepends="autoconf docbook-xsl gettext libxslt pkg-config po4a qt6-base qt6-tools ruby"
makedepends="boost-devel cmark-devel file-devel fmt-devel gmp-devel json-c++
libdvdread-devel libflac-devel libmatroska-devel libvorbis-devel pcre2-devel
- pugixml-devel qt5-multimedia-devel qt5-svg-devel qt5-tools-devel"
+ pugixml-devel qt6-base-devel qt6-multimedia-devel qt6-svg-devel qt6-tools-devel"
checkdepends="gtest-devel"
short_desc="Create, alter and inspect Matroska videos"
maintainer="Matthias von Faber <mvf@gmx.eu>"
@@ -17,7 +16,7 @@ license="GPL-2.0-only"
homepage="https://mkvtoolnix.download"
changelog="https://mkvtoolnix.download/doc/NEWS.md"
distfiles="https://mkvtoolnix.download/sources/mkvtoolnix-${version}.tar.xz"
-checksum=6a50fce8c66c55410e0df2a6952f0bab7a3c92914db7feb285b9f1bb03fcd0d3
+checksum=702442c80706c7c770ac04f7b4eed7a57e9e03ead6c5e6e90b9655dd84c8d829
if [ "$CROSS_BUILD" ]; then
configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
@@ -43,16 +42,19 @@ do_install() {
mkvtoolnix-gui_package() {
short_desc+=" - Qt GUI"
- depends="${sourcepkg}-${version}_${revision}"
+ depends="${sourcepkg}-${version}_${revision} qt6-svg"
pkg_install() {
vmove usr/bin/mkvtoolnix-gui
vmove usr/share/applications
for file in "${DESTDIR}"/usr/share/icons/hicolor/*/apps/mkvtoolnix-gui.png; do
vmove "${file/${DESTDIR}\//}"
done
+ for file in "${DESTDIR}"/usr/share/man/*/man1/mkvtoolnix-gui.1; do
+ vmove "${file/${DESTDIR}\//}"
+ done
vmove usr/share/man/man1/mkvtoolnix-gui.1
vmove usr/share/metainfo
vmove usr/share/mime/packages
- vmove usr/share/mkvtoolnix/sounds
+ vmove usr/share/mkvtoolnix
}
}
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR REVIEW] mkvtoolnix: update to 85.0
2023-08-22 16:11 [PR PATCH] mkvtoolnix: update to 79.0 mvf
` (12 preceding siblings ...)
2024-06-22 5:10 ` [PR PATCH] [Updated] " mvf
@ 2024-06-22 5:32 ` mvf
2024-06-22 6:09 ` [PR PATCH] [Updated] " classabbyamp
` (4 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: mvf @ 2024-06-22 5:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 177 bytes --]
New review comment by mvf on void-packages repository
https://github.com/void-linux/void-packages/pull/45712#discussion_r1649567779
Comment:
Thanks for taking a look. Pushed!
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] mkvtoolnix: update to 85.0
2023-08-22 16:11 [PR PATCH] mkvtoolnix: update to 79.0 mvf
` (13 preceding siblings ...)
2024-06-22 5:32 ` [PR REVIEW] " mvf
@ 2024-06-22 6:09 ` classabbyamp
2024-06-22 6:12 ` classabbyamp
` (3 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: classabbyamp @ 2024-06-22 6:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1266 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/mvf/void-packages pr/mkvtoolnix
https://github.com/void-linux/void-packages/pull/45712
mkvtoolnix: update to 85.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
Fixes #50897
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### 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
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45712.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr/mkvtoolnix-45712.patch --]
[-- Type: text/x-diff, Size: 8377 bytes --]
From 553652a4e0f7e2f00508200f10fa2aa76ec86c3b Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Thu, 14 Mar 2024 19:40:57 +0100
Subject: [PATCH 1/3] New build-helper: qmake6
---
common/build-helper/qmake6.sh | 97 +++++++++++++++++++++++++++++++++++
1 file changed, 97 insertions(+)
create mode 100644 common/build-helper/qmake6.sh
diff --git a/common/build-helper/qmake6.sh b/common/build-helper/qmake6.sh
new file mode 100644
index 00000000000000..945110b94ea58e
--- /dev/null
+++ b/common/build-helper/qmake6.sh
@@ -0,0 +1,97 @@
+# This build-helper sets up qmake’s cross environment
+# in cases the build-style is mixed,
+# e.g. when in a gnu-configure style the configure
+# script calls qmake or a makefile in a gnu-makefile style,
+# respectively.
+
+if [ "$CROSS_BUILD" ]; then
+ mkdir -p "${XBPS_WRAPPERDIR}/target-spec/linux-g++"
+ cat > "${XBPS_WRAPPERDIR}/target-spec/linux-g++/qmake.conf" <<_EOF
+MAKEFILE_GENERATOR = UNIX
+CONFIG += incremental no_qt_rpath
+QMAKE_INCREMENTAL_STYLE = sublib
+
+include(/usr/lib/qt6/mkspecs/common/linux.conf)
+include(/usr/lib/qt6/mkspecs/common/gcc-base-unix.conf)
+include(/usr/lib/qt6/mkspecs/common/g++-unix.conf)
+
+QMAKE_TARGET_CONFIG = ${XBPS_CROSS_BASE}/usr/lib/qt6/mkspecs/qconfig.pri
+QMAKE_TARGET_MODULE = ${XBPS_CROSS_BASE}/usr/lib/qt6/mkspecs/qmodule.pri
+QMAKEMODULES = ${XBPS_CROSS_BASE}/usr/lib/qt6/mkspecs/modules
+QMAKE_CC = ${CC}
+QMAKE_CXX = ${CXX}
+QMAKE_LINK = ${CXX}
+QMAKE_LINK_C = ${CC}
+QMAKE_LINK_SHLIB = ${CXX}
+
+QMAKE_AR = ${XBPS_CROSS_TRIPLET}-gcc-ar cqs
+QMAKE_OBJCOPY = ${OBJCOPY}
+QMAKE_NM = ${NM} -P
+QMAKE_STRIP = ${STRIP}
+
+QMAKE_CFLAGS = ${CFLAGS}
+QMAKE_CXXFLAGS = ${CXXFLAGS}
+QMAKE_LFLAGS = ${LDFLAGS}
+load(qt_config)
+_EOF
+ echo "#include \"${XBPS_CROSS_BASE}/usr/lib/qt6/mkspecs/linux-g++/qplatformdefs.h\"" > "${XBPS_WRAPPERDIR}/target-spec/linux-g++/qplatformdefs.h"
+
+ cat > "${XBPS_WRAPPERDIR}/qt.conf" <<_EOF
+[Paths]
+Sysroot=${XBPS_CROSS_BASE}
+Prefix=${XBPS_CROSS_BASE}/usr
+ArchData=${XBPS_CROSS_BASE}/usr/lib/qt6
+Data=${XBPS_CROSS_BASE}/usr/share/qt6
+Documentation=${XBPS_CROSS_BASE}/usr/share/doc/qt6
+Headers=${XBPS_CROSS_BASE}/usr/include/qt6
+Libraries=${XBPS_CROSS_BASE}/usr/lib
+LibraryExecutables=/usr/lib/qt6/libexec
+Binaries=/usr/lib/qt6/bin
+Tests=${XBPS_CROSS_BASE}/usr/tests
+Plugins=/usr/lib/qt6/plugins
+Imports=${XBPS_CROSS_BASE}/usr/lib/qt6/imports
+Qml2Imports=${XBPS_CROSS_BASE}/usr/lib/qt6/qml
+Translations=${XBPS_CROSS_BASE}/usr/share/qt6/translations
+Settings=${XBPS_CROSS_BASE}/etc/xdg
+Examples=${XBPS_CROSS_BASE}/usr/lib/qt6/examples
+HostPrefix=/usr
+HostData=/usr/lib/qt6
+HostBinaries=/usr/lib/qt6/bin
+HostLibraries=/usr/lib
+HostLibraryExecutables=/usr/lib/qt6/libexec
+Spec=linux-g++
+TargetSpec=$XBPS_WRAPPERDIR/target-spec/linux-g++
+_EOF
+
+ # create the qmake-wrapper here because it only
+ # makes sense together with the qmake build-helper
+ # and not to interfere with e.g. the qmake build-style
+ #
+ # + base flags will be picked up from QMAKE_{C,CXX,LD}FLAGS
+ # + hardening flags will be picked up from environment variables
+ cat > "${XBPS_WRAPPERDIR}/qmake" <<_EOF
+#!/bin/sh
+exec /usr/lib/qt6/bin/qmake "\$@" -qtconf "${XBPS_WRAPPERDIR}/qt.conf" \\
+ QMAKE_CFLAGS+="\${CFLAGS}" \\
+ QMAKE_CXXFLAGS+="\${CXXFLAGS}" \\
+ QMAKE_LFLAGS+="\${LDFLAGS}"
+_EOF
+else
+ cat > "${XBPS_WRAPPERDIR}/qmake" <<_EOF
+#!/bin/sh
+exec /usr/lib/qt6/bin/qmake \
+ "\$@" \
+ PREFIX=/usr \
+ QT_INSTALL_PREFIX=/usr \
+ LIB=/usr/lib \
+ QMAKE_CC="$CC" QMAKE_CXX="$CXX" \
+ QMAKE_LINK="$CXX" QMAKE_LINK_C="$CC" \
+ QMAKE_CFLAGS+="\${CFLAGS}" \
+ QMAKE_CXXFLAGS+="\${CXXFLAGS}" \
+ QMAKE_LFLAGS+="\${LDFLAGS}" \
+ CONFIG+=no_qt_rpath
+_EOF
+fi
+chmod 755 ${XBPS_WRAPPERDIR}/qmake
+cp -p ${XBPS_WRAPPERDIR}/qmake{,-qt6}
+cp -p ${XBPS_WRAPPERDIR}/qmake{,6}
From 0997406c2dec79fc34a2d97867fb215ee7514bf3 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Tue, 30 Apr 2024 09:35:07 +0200
Subject: [PATCH 2/3] mkvtoolnix: update to 85.0
---
srcpkgs/mkvtoolnix/template | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index be8653644a339c..f0a54058327a68 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,15 +1,14 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
-version=78.0
-revision=3
+version=85.0
+revision=1
build_style=gnu-configure
-build_helper=qmake
-configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
- --disable-update-check"
-hostmakedepends="autoconf docbook-xsl gettext libxslt pkg-config qt5-tools-devel ruby"
+build_helper="qmake6"
+configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --disable-update-check"
+hostmakedepends="autoconf docbook-xsl gettext libxslt pkg-config po4a qt6-base qt6-tools ruby"
makedepends="boost-devel cmark-devel file-devel fmt-devel gmp-devel json-c++
libdvdread-devel libflac-devel libmatroska-devel libvorbis-devel pcre2-devel
- pugixml-devel qt5-multimedia-devel qt5-svg-devel qt5-tools-devel"
+ pugixml-devel qt6-base-devel qt6-multimedia-devel qt6-svg-devel qt6-tools-devel"
checkdepends="gtest-devel"
short_desc="Create, alter and inspect Matroska videos"
maintainer="Matthias von Faber <mvf@gmx.eu>"
@@ -17,7 +16,7 @@ license="GPL-2.0-only"
homepage="https://mkvtoolnix.download"
changelog="https://mkvtoolnix.download/doc/NEWS.md"
distfiles="https://mkvtoolnix.download/sources/mkvtoolnix-${version}.tar.xz"
-checksum=6a50fce8c66c55410e0df2a6952f0bab7a3c92914db7feb285b9f1bb03fcd0d3
+checksum=702442c80706c7c770ac04f7b4eed7a57e9e03ead6c5e6e90b9655dd84c8d829
if [ "$CROSS_BUILD" ]; then
configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
@@ -43,16 +42,19 @@ do_install() {
mkvtoolnix-gui_package() {
short_desc+=" - Qt GUI"
- depends="${sourcepkg}-${version}_${revision}"
+ depends="${sourcepkg}-${version}_${revision} qt6-svg"
pkg_install() {
vmove usr/bin/mkvtoolnix-gui
vmove usr/share/applications
for file in "${DESTDIR}"/usr/share/icons/hicolor/*/apps/mkvtoolnix-gui.png; do
vmove "${file/${DESTDIR}\//}"
done
+ for file in "${DESTDIR}"/usr/share/man/*/man1/mkvtoolnix-gui.1; do
+ vmove "${file/${DESTDIR}\//}"
+ done
vmove usr/share/man/man1/mkvtoolnix-gui.1
vmove usr/share/metainfo
vmove usr/share/mime/packages
- vmove usr/share/mkvtoolnix/sounds
+ vmove usr/share/mkvtoolnix
}
}
From 0b7eaa83766e9642f0941c61d4abce19ec62be67 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 22 Jun 2024 02:08:12 -0400
Subject: [PATCH 3/3] Manual.md: document qmake6 build-helper
---
Manual.md | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Manual.md b/Manual.md
index 96b6a3fcacaadb..f0f479411e212e 100644
--- a/Manual.md
+++ b/Manual.md
@@ -1047,7 +1047,7 @@ Additional install arguments can be specified via `make_install_args`.
- `slashpackage` For packages that use the /package hierarchy and package/compile to build,
such as `daemontools` or any `djb` software.
-- `qmake` For packages that use Qt4/Qt5 qmake profiles (`*.pro`), qmake arguments
+- `qmake` For packages that use Qt5/Qt6 qmake profiles (`*.pro`), qmake arguments
for the configure phase can be passed in via `configure_args`, make build arguments can
be passed in via `make_build_args` and install arguments via `make_install_args`. The build
target can be overridden via `make_build_target` and the install target
@@ -1130,7 +1130,9 @@ It also creates the `vtargetrun` function to wrap commands in a call to
needed for cross builds and a qmake-wrapper to make `qmake` use this configuration.
This aims to fix cross-builds for when the build-style is mixed: e.g. when in a
`gnu-configure` style the configure script calls `qmake` or a `Makefile` in
-`gnu-makefile` style, respectively.
+`gnu-makefile` style, respectively. This is for Qt5 packages.
+
+- `qmake6` is like `qmake` but for Qt6.
- `rust` specifies environment variables required for cross-compiling crates via cargo and
for compiling cargo -sys crates. This helper is added by default for packages that use the
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: mkvtoolnix: update to 85.0
2023-08-22 16:11 [PR PATCH] mkvtoolnix: update to 79.0 mvf
` (14 preceding siblings ...)
2024-06-22 6:09 ` [PR PATCH] [Updated] " classabbyamp
@ 2024-06-22 6:12 ` classabbyamp
2024-06-24 7:25 ` [PR PATCH] [Updated] " mvf
` (2 subsequent siblings)
18 siblings, 0 replies; 20+ messages in thread
From: classabbyamp @ 2024-06-22 6:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 166 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/45712#issuecomment-2183830732
Comment:
added a little docs
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Updated] mkvtoolnix: update to 85.0
2023-08-22 16:11 [PR PATCH] mkvtoolnix: update to 79.0 mvf
` (15 preceding siblings ...)
2024-06-22 6:12 ` classabbyamp
@ 2024-06-24 7:25 ` mvf
2024-06-24 7:28 ` mvf
2024-07-02 5:20 ` [PR PATCH] [Merged]: " classabbyamp
18 siblings, 0 replies; 20+ messages in thread
From: mvf @ 2024-06-24 7:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1257 bytes --]
There is an updated pull request by mvf against master on the void-packages repository
https://github.com/mvf/void-packages pr/mkvtoolnix
https://github.com/void-linux/void-packages/pull/45712
mkvtoolnix: update to 85.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
Fixes #50897
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### 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
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/45712.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr/mkvtoolnix-45712.patch --]
[-- Type: text/x-diff, Size: 8377 bytes --]
From b3d798a03fc6c8a44057351f30864cf8f4a833c3 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Thu, 14 Mar 2024 19:40:57 +0100
Subject: [PATCH 1/3] New build-helper: qmake6
---
common/build-helper/qmake6.sh | 97 +++++++++++++++++++++++++++++++++++
1 file changed, 97 insertions(+)
create mode 100644 common/build-helper/qmake6.sh
diff --git a/common/build-helper/qmake6.sh b/common/build-helper/qmake6.sh
new file mode 100644
index 00000000000000..945110b94ea58e
--- /dev/null
+++ b/common/build-helper/qmake6.sh
@@ -0,0 +1,97 @@
+# This build-helper sets up qmake’s cross environment
+# in cases the build-style is mixed,
+# e.g. when in a gnu-configure style the configure
+# script calls qmake or a makefile in a gnu-makefile style,
+# respectively.
+
+if [ "$CROSS_BUILD" ]; then
+ mkdir -p "${XBPS_WRAPPERDIR}/target-spec/linux-g++"
+ cat > "${XBPS_WRAPPERDIR}/target-spec/linux-g++/qmake.conf" <<_EOF
+MAKEFILE_GENERATOR = UNIX
+CONFIG += incremental no_qt_rpath
+QMAKE_INCREMENTAL_STYLE = sublib
+
+include(/usr/lib/qt6/mkspecs/common/linux.conf)
+include(/usr/lib/qt6/mkspecs/common/gcc-base-unix.conf)
+include(/usr/lib/qt6/mkspecs/common/g++-unix.conf)
+
+QMAKE_TARGET_CONFIG = ${XBPS_CROSS_BASE}/usr/lib/qt6/mkspecs/qconfig.pri
+QMAKE_TARGET_MODULE = ${XBPS_CROSS_BASE}/usr/lib/qt6/mkspecs/qmodule.pri
+QMAKEMODULES = ${XBPS_CROSS_BASE}/usr/lib/qt6/mkspecs/modules
+QMAKE_CC = ${CC}
+QMAKE_CXX = ${CXX}
+QMAKE_LINK = ${CXX}
+QMAKE_LINK_C = ${CC}
+QMAKE_LINK_SHLIB = ${CXX}
+
+QMAKE_AR = ${XBPS_CROSS_TRIPLET}-gcc-ar cqs
+QMAKE_OBJCOPY = ${OBJCOPY}
+QMAKE_NM = ${NM} -P
+QMAKE_STRIP = ${STRIP}
+
+QMAKE_CFLAGS = ${CFLAGS}
+QMAKE_CXXFLAGS = ${CXXFLAGS}
+QMAKE_LFLAGS = ${LDFLAGS}
+load(qt_config)
+_EOF
+ echo "#include \"${XBPS_CROSS_BASE}/usr/lib/qt6/mkspecs/linux-g++/qplatformdefs.h\"" > "${XBPS_WRAPPERDIR}/target-spec/linux-g++/qplatformdefs.h"
+
+ cat > "${XBPS_WRAPPERDIR}/qt.conf" <<_EOF
+[Paths]
+Sysroot=${XBPS_CROSS_BASE}
+Prefix=${XBPS_CROSS_BASE}/usr
+ArchData=${XBPS_CROSS_BASE}/usr/lib/qt6
+Data=${XBPS_CROSS_BASE}/usr/share/qt6
+Documentation=${XBPS_CROSS_BASE}/usr/share/doc/qt6
+Headers=${XBPS_CROSS_BASE}/usr/include/qt6
+Libraries=${XBPS_CROSS_BASE}/usr/lib
+LibraryExecutables=/usr/lib/qt6/libexec
+Binaries=/usr/lib/qt6/bin
+Tests=${XBPS_CROSS_BASE}/usr/tests
+Plugins=/usr/lib/qt6/plugins
+Imports=${XBPS_CROSS_BASE}/usr/lib/qt6/imports
+Qml2Imports=${XBPS_CROSS_BASE}/usr/lib/qt6/qml
+Translations=${XBPS_CROSS_BASE}/usr/share/qt6/translations
+Settings=${XBPS_CROSS_BASE}/etc/xdg
+Examples=${XBPS_CROSS_BASE}/usr/lib/qt6/examples
+HostPrefix=/usr
+HostData=/usr/lib/qt6
+HostBinaries=/usr/lib/qt6/bin
+HostLibraries=/usr/lib
+HostLibraryExecutables=/usr/lib/qt6/libexec
+Spec=linux-g++
+TargetSpec=$XBPS_WRAPPERDIR/target-spec/linux-g++
+_EOF
+
+ # create the qmake-wrapper here because it only
+ # makes sense together with the qmake build-helper
+ # and not to interfere with e.g. the qmake build-style
+ #
+ # + base flags will be picked up from QMAKE_{C,CXX,LD}FLAGS
+ # + hardening flags will be picked up from environment variables
+ cat > "${XBPS_WRAPPERDIR}/qmake" <<_EOF
+#!/bin/sh
+exec /usr/lib/qt6/bin/qmake "\$@" -qtconf "${XBPS_WRAPPERDIR}/qt.conf" \\
+ QMAKE_CFLAGS+="\${CFLAGS}" \\
+ QMAKE_CXXFLAGS+="\${CXXFLAGS}" \\
+ QMAKE_LFLAGS+="\${LDFLAGS}"
+_EOF
+else
+ cat > "${XBPS_WRAPPERDIR}/qmake" <<_EOF
+#!/bin/sh
+exec /usr/lib/qt6/bin/qmake \
+ "\$@" \
+ PREFIX=/usr \
+ QT_INSTALL_PREFIX=/usr \
+ LIB=/usr/lib \
+ QMAKE_CC="$CC" QMAKE_CXX="$CXX" \
+ QMAKE_LINK="$CXX" QMAKE_LINK_C="$CC" \
+ QMAKE_CFLAGS+="\${CFLAGS}" \
+ QMAKE_CXXFLAGS+="\${CXXFLAGS}" \
+ QMAKE_LFLAGS+="\${LDFLAGS}" \
+ CONFIG+=no_qt_rpath
+_EOF
+fi
+chmod 755 ${XBPS_WRAPPERDIR}/qmake
+cp -p ${XBPS_WRAPPERDIR}/qmake{,-qt6}
+cp -p ${XBPS_WRAPPERDIR}/qmake{,6}
From 2741661eceb3f8d8af557080b8b3726986387b76 Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Tue, 30 Apr 2024 09:35:07 +0200
Subject: [PATCH 2/3] mkvtoolnix: update to 85.0
---
srcpkgs/mkvtoolnix/template | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index be8653644a339c..f0a54058327a68 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,15 +1,14 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
-version=78.0
-revision=3
+version=85.0
+revision=1
build_style=gnu-configure
-build_helper=qmake
-configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
- --disable-update-check"
-hostmakedepends="autoconf docbook-xsl gettext libxslt pkg-config qt5-tools-devel ruby"
+build_helper="qmake6"
+configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --disable-update-check"
+hostmakedepends="autoconf docbook-xsl gettext libxslt pkg-config po4a qt6-base qt6-tools ruby"
makedepends="boost-devel cmark-devel file-devel fmt-devel gmp-devel json-c++
libdvdread-devel libflac-devel libmatroska-devel libvorbis-devel pcre2-devel
- pugixml-devel qt5-multimedia-devel qt5-svg-devel qt5-tools-devel"
+ pugixml-devel qt6-base-devel qt6-multimedia-devel qt6-svg-devel qt6-tools-devel"
checkdepends="gtest-devel"
short_desc="Create, alter and inspect Matroska videos"
maintainer="Matthias von Faber <mvf@gmx.eu>"
@@ -17,7 +16,7 @@ license="GPL-2.0-only"
homepage="https://mkvtoolnix.download"
changelog="https://mkvtoolnix.download/doc/NEWS.md"
distfiles="https://mkvtoolnix.download/sources/mkvtoolnix-${version}.tar.xz"
-checksum=6a50fce8c66c55410e0df2a6952f0bab7a3c92914db7feb285b9f1bb03fcd0d3
+checksum=702442c80706c7c770ac04f7b4eed7a57e9e03ead6c5e6e90b9655dd84c8d829
if [ "$CROSS_BUILD" ]; then
configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
@@ -43,16 +42,19 @@ do_install() {
mkvtoolnix-gui_package() {
short_desc+=" - Qt GUI"
- depends="${sourcepkg}-${version}_${revision}"
+ depends="${sourcepkg}-${version}_${revision} qt6-svg"
pkg_install() {
vmove usr/bin/mkvtoolnix-gui
vmove usr/share/applications
for file in "${DESTDIR}"/usr/share/icons/hicolor/*/apps/mkvtoolnix-gui.png; do
vmove "${file/${DESTDIR}\//}"
done
+ for file in "${DESTDIR}"/usr/share/man/*/man1/mkvtoolnix-gui.1; do
+ vmove "${file/${DESTDIR}\//}"
+ done
vmove usr/share/man/man1/mkvtoolnix-gui.1
vmove usr/share/metainfo
vmove usr/share/mime/packages
- vmove usr/share/mkvtoolnix/sounds
+ vmove usr/share/mkvtoolnix
}
}
From e871a51c749c3b59d1d3b3521b63a495f1a36a17 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sat, 22 Jun 2024 02:08:12 -0400
Subject: [PATCH 3/3] Manual.md: document qmake6 build-helper
---
Manual.md | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Manual.md b/Manual.md
index 96b6a3fcacaadb..f0f479411e212e 100644
--- a/Manual.md
+++ b/Manual.md
@@ -1047,7 +1047,7 @@ Additional install arguments can be specified via `make_install_args`.
- `slashpackage` For packages that use the /package hierarchy and package/compile to build,
such as `daemontools` or any `djb` software.
-- `qmake` For packages that use Qt4/Qt5 qmake profiles (`*.pro`), qmake arguments
+- `qmake` For packages that use Qt5/Qt6 qmake profiles (`*.pro`), qmake arguments
for the configure phase can be passed in via `configure_args`, make build arguments can
be passed in via `make_build_args` and install arguments via `make_install_args`. The build
target can be overridden via `make_build_target` and the install target
@@ -1130,7 +1130,9 @@ It also creates the `vtargetrun` function to wrap commands in a call to
needed for cross builds and a qmake-wrapper to make `qmake` use this configuration.
This aims to fix cross-builds for when the build-style is mixed: e.g. when in a
`gnu-configure` style the configure script calls `qmake` or a `Makefile` in
-`gnu-makefile` style, respectively.
+`gnu-makefile` style, respectively. This is for Qt5 packages.
+
+- `qmake6` is like `qmake` but for Qt6.
- `rust` specifies environment variables required for cross-compiling crates via cargo and
for compiling cargo -sys crates. This helper is added by default for packages that use the
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: mkvtoolnix: update to 85.0
2023-08-22 16:11 [PR PATCH] mkvtoolnix: update to 79.0 mvf
` (16 preceding siblings ...)
2024-06-24 7:25 ` [PR PATCH] [Updated] " mvf
@ 2024-06-24 7:28 ` mvf
2024-07-02 5:20 ` [PR PATCH] [Merged]: " classabbyamp
18 siblings, 0 replies; 20+ messages in thread
From: mvf @ 2024-06-24 7:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 178 bytes --]
New comment by mvf on void-packages repository
https://github.com/void-linux/void-packages/pull/45712#issuecomment-2185800455
Comment:
Rebased, verified working with Qt 6.7.2.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PR PATCH] [Merged]: mkvtoolnix: update to 85.0
2023-08-22 16:11 [PR PATCH] mkvtoolnix: update to 79.0 mvf
` (17 preceding siblings ...)
2024-06-24 7:28 ` mvf
@ 2024-07-02 5:20 ` classabbyamp
18 siblings, 0 replies; 20+ messages in thread
From: classabbyamp @ 2024-07-02 5:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1103 bytes --]
There's a merged pull request on the void-packages repository
mkvtoolnix: update to 85.0
https://github.com/void-linux/void-packages/pull/45712
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
Fixes #50897
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### 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
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2024-07-02 5:20 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-08-22 16:11 [PR PATCH] mkvtoolnix: update to 79.0 mvf
2023-09-24 16:53 ` [PR PATCH] [Updated] " mvf
2023-09-25 8:13 ` mvf
2023-11-06 15:57 ` [PR PATCH] [Updated] " mvf
2023-11-13 6:45 ` [PR PATCH] [Updated] mkvtoolnix: update to 80.0 mvf
2023-12-11 8:10 ` mvf
2023-12-12 9:57 ` [PR PATCH] [Updated] mkvtoolnix: update to 81.0 mvf
2024-03-12 1:44 ` github-actions
2024-03-15 22:47 ` [PR PATCH] [Updated] " mvf
2024-03-16 7:55 ` mkvtoolnix: update to 83.0 mvf
2024-04-30 9:40 ` [PR PATCH] [Updated] " mvf
2024-06-03 19:01 ` [PR PATCH] [Updated] mkvtoolnix: update to 84.0 mvf
2024-06-22 0:26 ` [PR REVIEW] mkvtoolnix: update to 85.0 classabbyamp
2024-06-22 5:10 ` [PR PATCH] [Updated] " mvf
2024-06-22 5:32 ` [PR REVIEW] " mvf
2024-06-22 6:09 ` [PR PATCH] [Updated] " classabbyamp
2024-06-22 6:12 ` classabbyamp
2024-06-24 7:25 ` [PR PATCH] [Updated] " mvf
2024-06-24 7:28 ` mvf
2024-07-02 5:20 ` [PR PATCH] [Merged]: " classabbyamp
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).