* Re: [PR PATCH] [Updated] New packages: tageditor, tagparser and c++utilities
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-19844@inbox.vuxu.org>
@ 2020-03-30 22:59 ` ahesford
2020-03-30 23:15 ` ahesford
` (13 subsequent siblings)
14 siblings, 0 replies; 15+ messages in thread
From: ahesford @ 2020-03-30 22:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 636 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages tageditor
https://github.com/void-linux/void-packages/pull/19844
New packages: tageditor, tagparser and c++utilities
This PR introduces packages for `tageditor` and its dependencies, `tagparser` and `c++utilities`. `tageditor` is a utility to manipulate tags on audio and video files. This build enables an optional qt5 GUI but provides build options to package a CLI-only version to keep dependencies light.
A patch file from https://github.com/void-linux/void-packages/pull/19844.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tageditor-19844.patch --]
[-- Type: text/x-diff, Size: 10618 bytes --]
From 12f2dbc07468243b0af786f4089674c2854cde60 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Mar 2020 09:55:01 -0500
Subject: [PATCH 1/4] New package: cpp-utilities-5.2.0_1
---
common/shlibs | 2 ++
srcpkgs/cpp-utilities-devel | 1 +
srcpkgs/cpp-utilities/template | 36 ++++++++++++++++++++++++++++++++++
3 files changed, 39 insertions(+)
create mode 120000 srcpkgs/cpp-utilities-devel
create mode 100644 srcpkgs/cpp-utilities/template
diff --git a/common/shlibs b/common/shlibs
index 6d9745f8467..e7e93e79654 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3855,3 +3855,5 @@ libraven.so.0 budgie-desktop-10.5.1_1
libbudgie-private.so.0 budgie-desktop-10.5.1_1
libbudgietheme.so.0 budgie-desktop-10.5.1_1
libbudgie-plugin.so.0 budgie-desktop-10.5.1_1
+libc++utilities.so.5 cpp-utilities-5.2.0_1
+libtagparser.so.9 tagparser-9.1.2_1
diff --git a/srcpkgs/cpp-utilities-devel b/srcpkgs/cpp-utilities-devel
new file mode 120000
index 00000000000..1578dc70d85
--- /dev/null
+++ b/srcpkgs/cpp-utilities-devel
@@ -0,0 +1 @@
+cpp-utilities
\ No newline at end of file
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
new file mode 100644
index 00000000000..9334dc26286
--- /dev/null
+++ b/srcpkgs/cpp-utilities/template
@@ -0,0 +1,36 @@
+# Template file for 'cpp-utilities'
+pkgname=cpp-utilities
+version=5.2.0
+revision=1
+wrksrc="${pkgname}-${version}"
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON"
+short_desc="C++ library for argument parsing, IO, parsing and more"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/Martchus/cpp-utilities"
+distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
+checksum=34b4ef7b8d5ce04ebb4ce685ce6a51656e7bd26f902796c2b4b904f54a97871f
+
+cpp-utilities-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+
+ # Rename cmake modules to fit with the rest of the system
+ vmkdir usr/lib/cmake
+ cmake_source="${DESTDIR}/usr/share/c++utilities/cmake"
+ cmake_dest="${PKGDESTDIR}/usr/lib/cmake/c++utilities"
+ mv "$cmake_source" "$cmake_dest"
+
+ # Update cmake configuration to point to new location
+ vsed -i "${cmake_dest}/c++utilitiesConfig.cmake" \
+ -e "s@share/c++utilities/cmake@lib/cmake/c++utilities@g"
+
+ # The rest of share is just development-related stuff
+ vmove usr/share/c++utilities
+ }
+}
From 006b0ec9e7a39df4cd4e6d670a66a6b94c063d14 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Mar 2020 10:14:35 -0500
Subject: [PATCH 2/4] New package: tagparser-9.1.2_1
---
srcpkgs/cpp-utilities/template | 2 +-
srcpkgs/tagparser-devel | 1 +
srcpkgs/tagparser/template | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 36 insertions(+), 1 deletion(-)
create mode 120000 srcpkgs/tagparser-devel
create mode 100644 srcpkgs/tagparser/template
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index 9334dc26286..bb6e5a33183 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -4,7 +4,7 @@ version=5.2.0
revision=1
wrksrc="${pkgname}-${version}"
build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=ON"
+configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
short_desc="C++ library for argument parsing, IO, parsing and more"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-2.0-only"
diff --git a/srcpkgs/tagparser-devel b/srcpkgs/tagparser-devel
new file mode 120000
index 00000000000..d0a44486925
--- /dev/null
+++ b/srcpkgs/tagparser-devel
@@ -0,0 +1 @@
+tagparser
\ No newline at end of file
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
new file mode 100644
index 00000000000..9b588ecbbb3
--- /dev/null
+++ b/srcpkgs/tagparser/template
@@ -0,0 +1,34 @@
+# Template file for 'tagparser'
+pkgname=tagparser
+version=9.1.2
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
+makedepends="cpp-utilities-devel zlib-devel"
+short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/Martchus/tagparser"
+distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
+checksum=234987086ac0dff279a3888b0e965294fdca6adb7412b063ea36f2cc564fbce2
+
+tagparser-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} cpp-utilities-devel"
+
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+
+ # Rename cmake modules to fit with the rest of the system
+ vmkdir usr/lib/cmake
+ cmake_source="${DESTDIR}/usr/share/${sourcepkg}/cmake"
+ cmake_dest="${PKGDESTDIR}/usr/lib/cmake/${sourcepkg}"
+ mv "$cmake_source" "$cmake_dest"
+
+ # Update cmake configuration to point to new location
+ vsed -i "${cmake_dest}/${sourcepkg}Config.cmake" \
+ -e "s@share/${sourcepkg}/cmake@lib/cmake/${sourcepkg}@g"
+ }
+}
From bbd2d6a54d69db12956ad91d5bf6e79ec083e14c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 20 Mar 2020 13:44:02 -0400
Subject: [PATCH 3/4] New package: qtutilities-6.0.4
---
common/shlibs | 1 +
srcpkgs/qtutilities-devel | 1 +
srcpkgs/qtutilities/template | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 36 insertions(+)
create mode 120000 srcpkgs/qtutilities-devel
create mode 100644 srcpkgs/qtutilities/template
diff --git a/common/shlibs b/common/shlibs
index e7e93e79654..eb69384fad0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3857,3 +3857,4 @@ libbudgietheme.so.0 budgie-desktop-10.5.1_1
libbudgie-plugin.so.0 budgie-desktop-10.5.1_1
libc++utilities.so.5 cpp-utilities-5.2.0_1
libtagparser.so.9 tagparser-9.1.2_1
+libqtutilities.so.6 qtutilities-6.0.4_1
diff --git a/srcpkgs/qtutilities-devel b/srcpkgs/qtutilities-devel
new file mode 120000
index 00000000000..c74750f1460
--- /dev/null
+++ b/srcpkgs/qtutilities-devel
@@ -0,0 +1 @@
+qtutilities
\ No newline at end of file
diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
new file mode 100644
index 00000000000..419148f2708
--- /dev/null
+++ b/srcpkgs/qtutilities/template
@@ -0,0 +1,34 @@
+# Template file for 'qtutilities'
+pkgname=qtutilities
+version=6.0.4
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-tools-devel cpp-utilities-devel"
+short_desc="Qt helper routines, including dialogs, widgets, and models"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/Martchus/qtutilities"
+distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
+checksum=c5ffbeb96607212386077bad00818e0c21920e342e118a5f77e923d07018e20f
+
+qtutilities-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} cpp-utilities-devel"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+
+ # Rename cmake modules to fit with the rest of the system
+ vmkdir usr/lib/cmake
+ cmake_source="${DESTDIR}/usr/share/${sourcepkg}/cmake"
+ cmake_dest="${PKGDESTDIR}/usr/lib/cmake/${sourcepkg}"
+ mv "$cmake_source" "$cmake_dest"
+
+ # Update cmake configuration to point to new location
+ vsed -i "${cmake_dest}/${sourcepkg}Config.cmake" \
+ -e "s@share/${sourcepkg}/cmake@lib/cmake/${sourcepkg}@g"
+ }
+}
From 441b5cd9f8afa8f74e02db880f5025e4c1037dbf Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Mar 2020 10:49:22 -0500
Subject: [PATCH 4/4] New package: tageditor-3.3.4_1
---
srcpkgs/tageditor/template | 72 ++++++++++++++++++++++++++++++++++++++
1 file changed, 72 insertions(+)
create mode 100644 srcpkgs/tageditor/template
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
new file mode 100644
index 00000000000..bbdf7befc3f
--- /dev/null
+++ b/srcpkgs/tageditor/template
@@ -0,0 +1,72 @@
+# Template file for 'tageditor'
+pkgname=tageditor
+version=3.3.4
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
+makedepends="tagparser-devel cpp-utilities-devel"
+short_desc="Tag editor for AAC, ID3, Vorbis, Opus, FLAC and Matroska"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/Martchus/tageditor"
+distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
+checksum=0874301bd7644a312d259d54a8b60366c0db80e5b1179c1039cad9905c95463d
+
+build_options="qt webengine webkit script"
+build_options_default="qt"
+
+desc_option_webengine="Enable support for qt5-webengine file views (requires qt)"
+desc_option_webkit="Enable support for qt5-webkit file views (requires qt)"
+desc_option_script="Enable support for qt5-script javascript (requires qt)"
+
+# Prefer qt5-webengine to qt5-webkit, if it can be built
+case "$XBPS_TARGET_MACHINE" in
+ # qt5-webengine not supported on these architectures
+ ppc|ppc-musl|armv5tel*);;
+ *) if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
+ # webengine can be built only if word size matches
+ webview_backend="webengine"
+ fi;;
+esac
+build_options_default+=" ${webview_backend:-webkit}"
+
+vopt_conflict webengine webkit
+
+if [ "$build_option_qt" ]; then
+ hostmakedepends+=" qt5-host-tools qt5-qmake"
+ makedepends+=" qtutilities-devel qt5-tools-devel qt5-declarative-devel"
+
+ if [ "$build_option_webengine" ]; then
+ configure_args+=" -DWEBVIEW_PROVIDER=webengine"
+ makedepends+=" qt5-location-devel
+ qt5-webengine-devel qt5-webchannel-devel"
+ elif [ "$build_option_webkit" ]; then
+ configure_args+=" -DWEBVIEW_PROVIDER=webkit"
+ makedepends+=" qt5-webkit-devel"
+ else
+ configure_args+=" -DWEBVIEW_PROVIDER=none"
+ fi
+
+ if [ "$build_option_script" ]; then
+ configure_args+=" -DJS_PROVIDER=script"
+ makedepends+=" qt5-script-devel"
+ else
+ configure_args+=" -DJS_PROVIDER=qml"
+ fi
+else
+ configure_args+=" -DWIDGETS_GUI:BOOL=OFF -DQUICK_GUI:BOOL=OFF"
+fi
+
+pre_build() {
+ if [ -z "$build_option_qt" ]; then
+ vsed -i application/main.cpp -e "/^using namespace QtUtilities;$/s@^@//@"
+ fi
+}
+
+post_install() {
+ if [ -z "$build_option_qt" ]; then
+ rm -rf "${DESTDIR}/usr/share/metainfo"
+ rm -rf "${DESTDIR}/usr/share/icons"
+ rm -rf "${DESTDIR}/usr/share/applications"
+ fi
+}
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: New packages: tageditor, tagparser and c++utilities
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-19844@inbox.vuxu.org>
2020-03-30 22:59 ` [PR PATCH] [Updated] New packages: tageditor, tagparser and c++utilities ahesford
@ 2020-03-30 23:15 ` ahesford
2020-04-06 16:30 ` [PR PATCH] [Updated] " ahesford
` (12 subsequent siblings)
14 siblings, 0 replies; 15+ messages in thread
From: ahesford @ 2020-03-30 23:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 469 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/19844#issuecomment-606300844
Comment:
> Packages are usually named like tarball, not necessarily like content, so `cpp-utilities`. Otherwise looks ok. Build with webengine option passes.
That was my original name for the package, but in reworking everything I moved to `c++utilities` because of the contents. I've reverted back to `cpp-utilities` as recommended.
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PR PATCH] [Updated] New packages: tageditor, tagparser and c++utilities
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-19844@inbox.vuxu.org>
2020-03-30 22:59 ` [PR PATCH] [Updated] New packages: tageditor, tagparser and c++utilities ahesford
2020-03-30 23:15 ` ahesford
@ 2020-04-06 16:30 ` ahesford
2020-04-06 17:40 ` ahesford
` (11 subsequent siblings)
14 siblings, 0 replies; 15+ messages in thread
From: ahesford @ 2020-04-06 16:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 636 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages tageditor
https://github.com/void-linux/void-packages/pull/19844
New packages: tageditor, tagparser and c++utilities
This PR introduces packages for `tageditor` and its dependencies, `tagparser` and `c++utilities`. `tageditor` is a utility to manipulate tags on audio and video files. This build enables an optional qt5 GUI but provides build options to package a CLI-only version to keep dependencies light.
A patch file from https://github.com/void-linux/void-packages/pull/19844.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tageditor-19844.patch --]
[-- Type: text/x-diff, Size: 10598 bytes --]
From b4f12e1053b938c1e18c591be810495b9cd5fb5d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Mar 2020 09:55:01 -0500
Subject: [PATCH 1/4] New package: cpp-utilities-5.2.0_1
---
common/shlibs | 2 ++
srcpkgs/cpp-utilities-devel | 1 +
srcpkgs/cpp-utilities/template | 36 ++++++++++++++++++++++++++++++++++
3 files changed, 39 insertions(+)
create mode 120000 srcpkgs/cpp-utilities-devel
create mode 100644 srcpkgs/cpp-utilities/template
diff --git a/common/shlibs b/common/shlibs
index 24dfab3d01a..a2a5820a723 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3859,3 +3859,5 @@ libbudgie-private.so.0 budgie-desktop-10.5.1_1
libbudgietheme.so.0 budgie-desktop-10.5.1_1
libbudgie-plugin.so.0 budgie-desktop-10.5.1_1
libslirp.so.0 libslirp-4.2.0_1
+libc++utilities.so.5 cpp-utilities-5.2.0_1
+libtagparser.so.9 tagparser-9.1.2_1
diff --git a/srcpkgs/cpp-utilities-devel b/srcpkgs/cpp-utilities-devel
new file mode 120000
index 00000000000..1578dc70d85
--- /dev/null
+++ b/srcpkgs/cpp-utilities-devel
@@ -0,0 +1 @@
+cpp-utilities
\ No newline at end of file
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
new file mode 100644
index 00000000000..9334dc26286
--- /dev/null
+++ b/srcpkgs/cpp-utilities/template
@@ -0,0 +1,36 @@
+# Template file for 'cpp-utilities'
+pkgname=cpp-utilities
+version=5.2.0
+revision=1
+wrksrc="${pkgname}-${version}"
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON"
+short_desc="C++ library for argument parsing, IO, parsing and more"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/Martchus/cpp-utilities"
+distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
+checksum=34b4ef7b8d5ce04ebb4ce685ce6a51656e7bd26f902796c2b4b904f54a97871f
+
+cpp-utilities-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+
+ # Rename cmake modules to fit with the rest of the system
+ vmkdir usr/lib/cmake
+ cmake_source="${DESTDIR}/usr/share/c++utilities/cmake"
+ cmake_dest="${PKGDESTDIR}/usr/lib/cmake/c++utilities"
+ mv "$cmake_source" "$cmake_dest"
+
+ # Update cmake configuration to point to new location
+ vsed -i "${cmake_dest}/c++utilitiesConfig.cmake" \
+ -e "s@share/c++utilities/cmake@lib/cmake/c++utilities@g"
+
+ # The rest of share is just development-related stuff
+ vmove usr/share/c++utilities
+ }
+}
From b1dcc7e2003e8032798d0e8d96cf3cb973e488c9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Mar 2020 10:14:35 -0500
Subject: [PATCH 2/4] New package: tagparser-9.1.2_1
---
srcpkgs/cpp-utilities/template | 2 +-
srcpkgs/tagparser-devel | 1 +
srcpkgs/tagparser/template | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 36 insertions(+), 1 deletion(-)
create mode 120000 srcpkgs/tagparser-devel
create mode 100644 srcpkgs/tagparser/template
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index 9334dc26286..bb6e5a33183 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -4,7 +4,7 @@ version=5.2.0
revision=1
wrksrc="${pkgname}-${version}"
build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=ON"
+configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
short_desc="C++ library for argument parsing, IO, parsing and more"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-2.0-only"
diff --git a/srcpkgs/tagparser-devel b/srcpkgs/tagparser-devel
new file mode 120000
index 00000000000..d0a44486925
--- /dev/null
+++ b/srcpkgs/tagparser-devel
@@ -0,0 +1 @@
+tagparser
\ No newline at end of file
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
new file mode 100644
index 00000000000..9b588ecbbb3
--- /dev/null
+++ b/srcpkgs/tagparser/template
@@ -0,0 +1,34 @@
+# Template file for 'tagparser'
+pkgname=tagparser
+version=9.1.2
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
+makedepends="cpp-utilities-devel zlib-devel"
+short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/Martchus/tagparser"
+distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
+checksum=234987086ac0dff279a3888b0e965294fdca6adb7412b063ea36f2cc564fbce2
+
+tagparser-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} cpp-utilities-devel"
+
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+
+ # Rename cmake modules to fit with the rest of the system
+ vmkdir usr/lib/cmake
+ cmake_source="${DESTDIR}/usr/share/${sourcepkg}/cmake"
+ cmake_dest="${PKGDESTDIR}/usr/lib/cmake/${sourcepkg}"
+ mv "$cmake_source" "$cmake_dest"
+
+ # Update cmake configuration to point to new location
+ vsed -i "${cmake_dest}/${sourcepkg}Config.cmake" \
+ -e "s@share/${sourcepkg}/cmake@lib/cmake/${sourcepkg}@g"
+ }
+}
From 91dc27cf90045dc0868ba098ba24a43674fc5f39 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 20 Mar 2020 13:44:02 -0400
Subject: [PATCH 3/4] New package: qtutilities-6.0.4
---
common/shlibs | 1 +
srcpkgs/qtutilities-devel | 1 +
srcpkgs/qtutilities/template | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 36 insertions(+)
create mode 120000 srcpkgs/qtutilities-devel
create mode 100644 srcpkgs/qtutilities/template
diff --git a/common/shlibs b/common/shlibs
index a2a5820a723..53fedb92dda 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3861,3 +3861,4 @@ libbudgie-plugin.so.0 budgie-desktop-10.5.1_1
libslirp.so.0 libslirp-4.2.0_1
libc++utilities.so.5 cpp-utilities-5.2.0_1
libtagparser.so.9 tagparser-9.1.2_1
+libqtutilities.so.6 qtutilities-6.0.4_1
diff --git a/srcpkgs/qtutilities-devel b/srcpkgs/qtutilities-devel
new file mode 120000
index 00000000000..c74750f1460
--- /dev/null
+++ b/srcpkgs/qtutilities-devel
@@ -0,0 +1 @@
+qtutilities
\ No newline at end of file
diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
new file mode 100644
index 00000000000..419148f2708
--- /dev/null
+++ b/srcpkgs/qtutilities/template
@@ -0,0 +1,34 @@
+# Template file for 'qtutilities'
+pkgname=qtutilities
+version=6.0.4
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-tools-devel cpp-utilities-devel"
+short_desc="Qt helper routines, including dialogs, widgets, and models"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/Martchus/qtutilities"
+distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
+checksum=c5ffbeb96607212386077bad00818e0c21920e342e118a5f77e923d07018e20f
+
+qtutilities-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} cpp-utilities-devel"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+
+ # Rename cmake modules to fit with the rest of the system
+ vmkdir usr/lib/cmake
+ cmake_source="${DESTDIR}/usr/share/${sourcepkg}/cmake"
+ cmake_dest="${PKGDESTDIR}/usr/lib/cmake/${sourcepkg}"
+ mv "$cmake_source" "$cmake_dest"
+
+ # Update cmake configuration to point to new location
+ vsed -i "${cmake_dest}/${sourcepkg}Config.cmake" \
+ -e "s@share/${sourcepkg}/cmake@lib/cmake/${sourcepkg}@g"
+ }
+}
From dee44919f5f099b55f8ee2f62979426b2209566d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Mar 2020 10:49:22 -0500
Subject: [PATCH 4/4] New package: tageditor-3.3.4_1
---
srcpkgs/tageditor/template | 72 ++++++++++++++++++++++++++++++++++++++
1 file changed, 72 insertions(+)
create mode 100644 srcpkgs/tageditor/template
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
new file mode 100644
index 00000000000..bbdf7befc3f
--- /dev/null
+++ b/srcpkgs/tageditor/template
@@ -0,0 +1,72 @@
+# Template file for 'tageditor'
+pkgname=tageditor
+version=3.3.4
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
+makedepends="tagparser-devel cpp-utilities-devel"
+short_desc="Tag editor for AAC, ID3, Vorbis, Opus, FLAC and Matroska"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/Martchus/tageditor"
+distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
+checksum=0874301bd7644a312d259d54a8b60366c0db80e5b1179c1039cad9905c95463d
+
+build_options="qt webengine webkit script"
+build_options_default="qt"
+
+desc_option_webengine="Enable support for qt5-webengine file views (requires qt)"
+desc_option_webkit="Enable support for qt5-webkit file views (requires qt)"
+desc_option_script="Enable support for qt5-script javascript (requires qt)"
+
+# Prefer qt5-webengine to qt5-webkit, if it can be built
+case "$XBPS_TARGET_MACHINE" in
+ # qt5-webengine not supported on these architectures
+ ppc|ppc-musl|armv5tel*);;
+ *) if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
+ # webengine can be built only if word size matches
+ webview_backend="webengine"
+ fi;;
+esac
+build_options_default+=" ${webview_backend:-webkit}"
+
+vopt_conflict webengine webkit
+
+if [ "$build_option_qt" ]; then
+ hostmakedepends+=" qt5-host-tools qt5-qmake"
+ makedepends+=" qtutilities-devel qt5-tools-devel qt5-declarative-devel"
+
+ if [ "$build_option_webengine" ]; then
+ configure_args+=" -DWEBVIEW_PROVIDER=webengine"
+ makedepends+=" qt5-location-devel
+ qt5-webengine-devel qt5-webchannel-devel"
+ elif [ "$build_option_webkit" ]; then
+ configure_args+=" -DWEBVIEW_PROVIDER=webkit"
+ makedepends+=" qt5-webkit-devel"
+ else
+ configure_args+=" -DWEBVIEW_PROVIDER=none"
+ fi
+
+ if [ "$build_option_script" ]; then
+ configure_args+=" -DJS_PROVIDER=script"
+ makedepends+=" qt5-script-devel"
+ else
+ configure_args+=" -DJS_PROVIDER=qml"
+ fi
+else
+ configure_args+=" -DWIDGETS_GUI:BOOL=OFF -DQUICK_GUI:BOOL=OFF"
+fi
+
+pre_build() {
+ if [ -z "$build_option_qt" ]; then
+ vsed -i application/main.cpp -e "/^using namespace QtUtilities;$/s@^@//@"
+ fi
+}
+
+post_install() {
+ if [ -z "$build_option_qt" ]; then
+ rm -rf "${DESTDIR}/usr/share/metainfo"
+ rm -rf "${DESTDIR}/usr/share/icons"
+ rm -rf "${DESTDIR}/usr/share/applications"
+ fi
+}
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PR PATCH] [Updated] New packages: tageditor, tagparser and c++utilities
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-19844@inbox.vuxu.org>
` (2 preceding siblings ...)
2020-04-06 16:30 ` [PR PATCH] [Updated] " ahesford
@ 2020-04-06 17:40 ` ahesford
2020-04-07 17:34 ` ahesford
` (10 subsequent siblings)
14 siblings, 0 replies; 15+ messages in thread
From: ahesford @ 2020-04-06 17:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 636 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages tageditor
https://github.com/void-linux/void-packages/pull/19844
New packages: tageditor, tagparser and c++utilities
This PR introduces packages for `tageditor` and its dependencies, `tagparser` and `c++utilities`. `tageditor` is a utility to manipulate tags on audio and video files. This build enables an optional qt5 GUI but provides build options to package a CLI-only version to keep dependencies light.
A patch file from https://github.com/void-linux/void-packages/pull/19844.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tageditor-19844.patch --]
[-- Type: text/x-diff, Size: 10598 bytes --]
From b3341ba6e4fbb98b4fcca2bb0e84a91bf6edf0e4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Mar 2020 09:55:01 -0500
Subject: [PATCH 1/4] New package: cpp-utilities-5.2.0_1
---
common/shlibs | 2 ++
srcpkgs/cpp-utilities-devel | 1 +
srcpkgs/cpp-utilities/template | 36 ++++++++++++++++++++++++++++++++++
3 files changed, 39 insertions(+)
create mode 120000 srcpkgs/cpp-utilities-devel
create mode 100644 srcpkgs/cpp-utilities/template
diff --git a/common/shlibs b/common/shlibs
index 24dfab3d01a..a2a5820a723 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3859,3 +3859,5 @@ libbudgie-private.so.0 budgie-desktop-10.5.1_1
libbudgietheme.so.0 budgie-desktop-10.5.1_1
libbudgie-plugin.so.0 budgie-desktop-10.5.1_1
libslirp.so.0 libslirp-4.2.0_1
+libc++utilities.so.5 cpp-utilities-5.2.0_1
+libtagparser.so.9 tagparser-9.1.2_1
diff --git a/srcpkgs/cpp-utilities-devel b/srcpkgs/cpp-utilities-devel
new file mode 120000
index 00000000000..1578dc70d85
--- /dev/null
+++ b/srcpkgs/cpp-utilities-devel
@@ -0,0 +1 @@
+cpp-utilities
\ No newline at end of file
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
new file mode 100644
index 00000000000..9334dc26286
--- /dev/null
+++ b/srcpkgs/cpp-utilities/template
@@ -0,0 +1,36 @@
+# Template file for 'cpp-utilities'
+pkgname=cpp-utilities
+version=5.2.0
+revision=1
+wrksrc="${pkgname}-${version}"
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON"
+short_desc="C++ library for argument parsing, IO, parsing and more"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/Martchus/cpp-utilities"
+distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
+checksum=34b4ef7b8d5ce04ebb4ce685ce6a51656e7bd26f902796c2b4b904f54a97871f
+
+cpp-utilities-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+
+ # Rename cmake modules to fit with the rest of the system
+ vmkdir usr/lib/cmake
+ cmake_source="${DESTDIR}/usr/share/c++utilities/cmake"
+ cmake_dest="${PKGDESTDIR}/usr/lib/cmake/c++utilities"
+ mv "$cmake_source" "$cmake_dest"
+
+ # Update cmake configuration to point to new location
+ vsed -i "${cmake_dest}/c++utilitiesConfig.cmake" \
+ -e "s@share/c++utilities/cmake@lib/cmake/c++utilities@g"
+
+ # The rest of share is just development-related stuff
+ vmove usr/share/c++utilities
+ }
+}
From 285ede7ca152be3e9351c1f87f98d8596221f1db Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Mar 2020 10:14:35 -0500
Subject: [PATCH 2/4] New package: tagparser-9.1.2_1
---
srcpkgs/cpp-utilities/template | 2 +-
srcpkgs/tagparser-devel | 1 +
srcpkgs/tagparser/template | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 36 insertions(+), 1 deletion(-)
create mode 120000 srcpkgs/tagparser-devel
create mode 100644 srcpkgs/tagparser/template
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index 9334dc26286..bb6e5a33183 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -4,7 +4,7 @@ version=5.2.0
revision=1
wrksrc="${pkgname}-${version}"
build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=ON"
+configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
short_desc="C++ library for argument parsing, IO, parsing and more"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-2.0-only"
diff --git a/srcpkgs/tagparser-devel b/srcpkgs/tagparser-devel
new file mode 120000
index 00000000000..d0a44486925
--- /dev/null
+++ b/srcpkgs/tagparser-devel
@@ -0,0 +1 @@
+tagparser
\ No newline at end of file
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
new file mode 100644
index 00000000000..9b588ecbbb3
--- /dev/null
+++ b/srcpkgs/tagparser/template
@@ -0,0 +1,34 @@
+# Template file for 'tagparser'
+pkgname=tagparser
+version=9.1.2
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
+makedepends="cpp-utilities-devel zlib-devel"
+short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/Martchus/tagparser"
+distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
+checksum=234987086ac0dff279a3888b0e965294fdca6adb7412b063ea36f2cc564fbce2
+
+tagparser-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} cpp-utilities-devel"
+
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+
+ # Rename cmake modules to fit with the rest of the system
+ vmkdir usr/lib/cmake
+ cmake_source="${DESTDIR}/usr/share/${sourcepkg}/cmake"
+ cmake_dest="${PKGDESTDIR}/usr/lib/cmake/${sourcepkg}"
+ mv "$cmake_source" "$cmake_dest"
+
+ # Update cmake configuration to point to new location
+ vsed -i "${cmake_dest}/${sourcepkg}Config.cmake" \
+ -e "s@share/${sourcepkg}/cmake@lib/cmake/${sourcepkg}@g"
+ }
+}
From 9d4a05b13b8a36d2bb5aa316c862dc2c91a8a9a7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 20 Mar 2020 13:44:02 -0400
Subject: [PATCH 3/4] New package: qtutilities-6.0.4
---
common/shlibs | 1 +
srcpkgs/qtutilities-devel | 1 +
srcpkgs/qtutilities/template | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 36 insertions(+)
create mode 120000 srcpkgs/qtutilities-devel
create mode 100644 srcpkgs/qtutilities/template
diff --git a/common/shlibs b/common/shlibs
index a2a5820a723..53fedb92dda 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3861,3 +3861,4 @@ libbudgie-plugin.so.0 budgie-desktop-10.5.1_1
libslirp.so.0 libslirp-4.2.0_1
libc++utilities.so.5 cpp-utilities-5.2.0_1
libtagparser.so.9 tagparser-9.1.2_1
+libqtutilities.so.6 qtutilities-6.0.4_1
diff --git a/srcpkgs/qtutilities-devel b/srcpkgs/qtutilities-devel
new file mode 120000
index 00000000000..c74750f1460
--- /dev/null
+++ b/srcpkgs/qtutilities-devel
@@ -0,0 +1 @@
+qtutilities
\ No newline at end of file
diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
new file mode 100644
index 00000000000..419148f2708
--- /dev/null
+++ b/srcpkgs/qtutilities/template
@@ -0,0 +1,34 @@
+# Template file for 'qtutilities'
+pkgname=qtutilities
+version=6.0.4
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-tools-devel cpp-utilities-devel"
+short_desc="Qt helper routines, including dialogs, widgets, and models"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/Martchus/qtutilities"
+distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
+checksum=c5ffbeb96607212386077bad00818e0c21920e342e118a5f77e923d07018e20f
+
+qtutilities-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} cpp-utilities-devel"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+
+ # Rename cmake modules to fit with the rest of the system
+ vmkdir usr/lib/cmake
+ cmake_source="${DESTDIR}/usr/share/${sourcepkg}/cmake"
+ cmake_dest="${PKGDESTDIR}/usr/lib/cmake/${sourcepkg}"
+ mv "$cmake_source" "$cmake_dest"
+
+ # Update cmake configuration to point to new location
+ vsed -i "${cmake_dest}/${sourcepkg}Config.cmake" \
+ -e "s@share/${sourcepkg}/cmake@lib/cmake/${sourcepkg}@g"
+ }
+}
From 28dbbf142e0b3c9b0c9bd5eaf7d1321b9bfe37b0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Mar 2020 10:49:22 -0500
Subject: [PATCH 4/4] New package: tageditor-3.3.4_1
---
srcpkgs/tageditor/template | 72 ++++++++++++++++++++++++++++++++++++++
1 file changed, 72 insertions(+)
create mode 100644 srcpkgs/tageditor/template
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
new file mode 100644
index 00000000000..bbdf7befc3f
--- /dev/null
+++ b/srcpkgs/tageditor/template
@@ -0,0 +1,72 @@
+# Template file for 'tageditor'
+pkgname=tageditor
+version=3.3.4
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
+makedepends="tagparser-devel cpp-utilities-devel"
+short_desc="Tag editor for AAC, ID3, Vorbis, Opus, FLAC and Matroska"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/Martchus/tageditor"
+distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
+checksum=0874301bd7644a312d259d54a8b60366c0db80e5b1179c1039cad9905c95463d
+
+build_options="qt webengine webkit script"
+build_options_default="qt"
+
+desc_option_webengine="Enable support for qt5-webengine file views (requires qt)"
+desc_option_webkit="Enable support for qt5-webkit file views (requires qt)"
+desc_option_script="Enable support for qt5-script javascript (requires qt)"
+
+# Prefer qt5-webengine to qt5-webkit, if it can be built
+case "$XBPS_TARGET_MACHINE" in
+ # qt5-webengine not supported on these architectures
+ ppc|ppc-musl|armv5tel*);;
+ *) if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
+ # webengine can be built only if word size matches
+ webview_backend="webengine"
+ fi;;
+esac
+build_options_default+=" ${webview_backend:-webkit}"
+
+vopt_conflict webengine webkit
+
+if [ "$build_option_qt" ]; then
+ hostmakedepends+=" qt5-host-tools qt5-qmake"
+ makedepends+=" qtutilities-devel qt5-tools-devel qt5-declarative-devel"
+
+ if [ "$build_option_webengine" ]; then
+ configure_args+=" -DWEBVIEW_PROVIDER=webengine"
+ makedepends+=" qt5-location-devel
+ qt5-webengine-devel qt5-webchannel-devel"
+ elif [ "$build_option_webkit" ]; then
+ configure_args+=" -DWEBVIEW_PROVIDER=webkit"
+ makedepends+=" qt5-webkit-devel"
+ else
+ configure_args+=" -DWEBVIEW_PROVIDER=none"
+ fi
+
+ if [ "$build_option_script" ]; then
+ configure_args+=" -DJS_PROVIDER=script"
+ makedepends+=" qt5-script-devel"
+ else
+ configure_args+=" -DJS_PROVIDER=qml"
+ fi
+else
+ configure_args+=" -DWIDGETS_GUI:BOOL=OFF -DQUICK_GUI:BOOL=OFF"
+fi
+
+pre_build() {
+ if [ -z "$build_option_qt" ]; then
+ vsed -i application/main.cpp -e "/^using namespace QtUtilities;$/s@^@//@"
+ fi
+}
+
+post_install() {
+ if [ -z "$build_option_qt" ]; then
+ rm -rf "${DESTDIR}/usr/share/metainfo"
+ rm -rf "${DESTDIR}/usr/share/icons"
+ rm -rf "${DESTDIR}/usr/share/applications"
+ fi
+}
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PR PATCH] [Updated] New packages: tageditor, tagparser and c++utilities
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-19844@inbox.vuxu.org>
` (3 preceding siblings ...)
2020-04-06 17:40 ` ahesford
@ 2020-04-07 17:34 ` ahesford
2020-04-11 11:31 ` Chocimier
` (9 subsequent siblings)
14 siblings, 0 replies; 15+ messages in thread
From: ahesford @ 2020-04-07 17:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 636 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages tageditor
https://github.com/void-linux/void-packages/pull/19844
New packages: tageditor, tagparser and c++utilities
This PR introduces packages for `tageditor` and its dependencies, `tagparser` and `c++utilities`. `tageditor` is a utility to manipulate tags on audio and video files. This build enables an optional qt5 GUI but provides build options to package a CLI-only version to keep dependencies light.
A patch file from https://github.com/void-linux/void-packages/pull/19844.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tageditor-19844.patch --]
[-- Type: text/x-diff, Size: 10598 bytes --]
From 3298b7197dfaeb6db840c0e379e4a54b3aeb4089 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Mar 2020 09:55:01 -0500
Subject: [PATCH 1/4] New package: cpp-utilities-5.2.0_1
---
common/shlibs | 2 ++
srcpkgs/cpp-utilities-devel | 1 +
srcpkgs/cpp-utilities/template | 36 ++++++++++++++++++++++++++++++++++
3 files changed, 39 insertions(+)
create mode 120000 srcpkgs/cpp-utilities-devel
create mode 100644 srcpkgs/cpp-utilities/template
diff --git a/common/shlibs b/common/shlibs
index fc845f5ef47..a2cbdb978b0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3857,3 +3857,5 @@ libbudgie-private.so.0 budgie-desktop-10.5.1_1
libbudgietheme.so.0 budgie-desktop-10.5.1_1
libbudgie-plugin.so.0 budgie-desktop-10.5.1_1
libslirp.so.0 libslirp-4.2.0_1
+libc++utilities.so.5 cpp-utilities-5.2.0_1
+libtagparser.so.9 tagparser-9.1.2_1
diff --git a/srcpkgs/cpp-utilities-devel b/srcpkgs/cpp-utilities-devel
new file mode 120000
index 00000000000..1578dc70d85
--- /dev/null
+++ b/srcpkgs/cpp-utilities-devel
@@ -0,0 +1 @@
+cpp-utilities
\ No newline at end of file
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
new file mode 100644
index 00000000000..9334dc26286
--- /dev/null
+++ b/srcpkgs/cpp-utilities/template
@@ -0,0 +1,36 @@
+# Template file for 'cpp-utilities'
+pkgname=cpp-utilities
+version=5.2.0
+revision=1
+wrksrc="${pkgname}-${version}"
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON"
+short_desc="C++ library for argument parsing, IO, parsing and more"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/Martchus/cpp-utilities"
+distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
+checksum=34b4ef7b8d5ce04ebb4ce685ce6a51656e7bd26f902796c2b4b904f54a97871f
+
+cpp-utilities-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+
+ # Rename cmake modules to fit with the rest of the system
+ vmkdir usr/lib/cmake
+ cmake_source="${DESTDIR}/usr/share/c++utilities/cmake"
+ cmake_dest="${PKGDESTDIR}/usr/lib/cmake/c++utilities"
+ mv "$cmake_source" "$cmake_dest"
+
+ # Update cmake configuration to point to new location
+ vsed -i "${cmake_dest}/c++utilitiesConfig.cmake" \
+ -e "s@share/c++utilities/cmake@lib/cmake/c++utilities@g"
+
+ # The rest of share is just development-related stuff
+ vmove usr/share/c++utilities
+ }
+}
From c5fb6255bcdff0034c7e06305cf43c728c20d78d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Mar 2020 10:14:35 -0500
Subject: [PATCH 2/4] New package: tagparser-9.1.2_1
---
srcpkgs/cpp-utilities/template | 2 +-
srcpkgs/tagparser-devel | 1 +
srcpkgs/tagparser/template | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 36 insertions(+), 1 deletion(-)
create mode 120000 srcpkgs/tagparser-devel
create mode 100644 srcpkgs/tagparser/template
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index 9334dc26286..bb6e5a33183 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -4,7 +4,7 @@ version=5.2.0
revision=1
wrksrc="${pkgname}-${version}"
build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=ON"
+configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
short_desc="C++ library for argument parsing, IO, parsing and more"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-2.0-only"
diff --git a/srcpkgs/tagparser-devel b/srcpkgs/tagparser-devel
new file mode 120000
index 00000000000..d0a44486925
--- /dev/null
+++ b/srcpkgs/tagparser-devel
@@ -0,0 +1 @@
+tagparser
\ No newline at end of file
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
new file mode 100644
index 00000000000..9b588ecbbb3
--- /dev/null
+++ b/srcpkgs/tagparser/template
@@ -0,0 +1,34 @@
+# Template file for 'tagparser'
+pkgname=tagparser
+version=9.1.2
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
+makedepends="cpp-utilities-devel zlib-devel"
+short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/Martchus/tagparser"
+distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
+checksum=234987086ac0dff279a3888b0e965294fdca6adb7412b063ea36f2cc564fbce2
+
+tagparser-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} cpp-utilities-devel"
+
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+
+ # Rename cmake modules to fit with the rest of the system
+ vmkdir usr/lib/cmake
+ cmake_source="${DESTDIR}/usr/share/${sourcepkg}/cmake"
+ cmake_dest="${PKGDESTDIR}/usr/lib/cmake/${sourcepkg}"
+ mv "$cmake_source" "$cmake_dest"
+
+ # Update cmake configuration to point to new location
+ vsed -i "${cmake_dest}/${sourcepkg}Config.cmake" \
+ -e "s@share/${sourcepkg}/cmake@lib/cmake/${sourcepkg}@g"
+ }
+}
From a192d0bc343a3c5eab5e383753fab1a98bc7cc83 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 20 Mar 2020 13:44:02 -0400
Subject: [PATCH 3/4] New package: qtutilities-6.0.4
---
common/shlibs | 1 +
srcpkgs/qtutilities-devel | 1 +
srcpkgs/qtutilities/template | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 36 insertions(+)
create mode 120000 srcpkgs/qtutilities-devel
create mode 100644 srcpkgs/qtutilities/template
diff --git a/common/shlibs b/common/shlibs
index a2cbdb978b0..4ce03917b4a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3859,3 +3859,4 @@ libbudgie-plugin.so.0 budgie-desktop-10.5.1_1
libslirp.so.0 libslirp-4.2.0_1
libc++utilities.so.5 cpp-utilities-5.2.0_1
libtagparser.so.9 tagparser-9.1.2_1
+libqtutilities.so.6 qtutilities-6.0.4_1
diff --git a/srcpkgs/qtutilities-devel b/srcpkgs/qtutilities-devel
new file mode 120000
index 00000000000..c74750f1460
--- /dev/null
+++ b/srcpkgs/qtutilities-devel
@@ -0,0 +1 @@
+qtutilities
\ No newline at end of file
diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
new file mode 100644
index 00000000000..419148f2708
--- /dev/null
+++ b/srcpkgs/qtutilities/template
@@ -0,0 +1,34 @@
+# Template file for 'qtutilities'
+pkgname=qtutilities
+version=6.0.4
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-tools-devel cpp-utilities-devel"
+short_desc="Qt helper routines, including dialogs, widgets, and models"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/Martchus/qtutilities"
+distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
+checksum=c5ffbeb96607212386077bad00818e0c21920e342e118a5f77e923d07018e20f
+
+qtutilities-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} cpp-utilities-devel"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+
+ # Rename cmake modules to fit with the rest of the system
+ vmkdir usr/lib/cmake
+ cmake_source="${DESTDIR}/usr/share/${sourcepkg}/cmake"
+ cmake_dest="${PKGDESTDIR}/usr/lib/cmake/${sourcepkg}"
+ mv "$cmake_source" "$cmake_dest"
+
+ # Update cmake configuration to point to new location
+ vsed -i "${cmake_dest}/${sourcepkg}Config.cmake" \
+ -e "s@share/${sourcepkg}/cmake@lib/cmake/${sourcepkg}@g"
+ }
+}
From f0e3d53c47af0e565240984b3d9effe1527e7275 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Mar 2020 10:49:22 -0500
Subject: [PATCH 4/4] New package: tageditor-3.3.4_1
---
srcpkgs/tageditor/template | 72 ++++++++++++++++++++++++++++++++++++++
1 file changed, 72 insertions(+)
create mode 100644 srcpkgs/tageditor/template
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
new file mode 100644
index 00000000000..bbdf7befc3f
--- /dev/null
+++ b/srcpkgs/tageditor/template
@@ -0,0 +1,72 @@
+# Template file for 'tageditor'
+pkgname=tageditor
+version=3.3.4
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
+makedepends="tagparser-devel cpp-utilities-devel"
+short_desc="Tag editor for AAC, ID3, Vorbis, Opus, FLAC and Matroska"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/Martchus/tageditor"
+distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
+checksum=0874301bd7644a312d259d54a8b60366c0db80e5b1179c1039cad9905c95463d
+
+build_options="qt webengine webkit script"
+build_options_default="qt"
+
+desc_option_webengine="Enable support for qt5-webengine file views (requires qt)"
+desc_option_webkit="Enable support for qt5-webkit file views (requires qt)"
+desc_option_script="Enable support for qt5-script javascript (requires qt)"
+
+# Prefer qt5-webengine to qt5-webkit, if it can be built
+case "$XBPS_TARGET_MACHINE" in
+ # qt5-webengine not supported on these architectures
+ ppc|ppc-musl|armv5tel*);;
+ *) if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
+ # webengine can be built only if word size matches
+ webview_backend="webengine"
+ fi;;
+esac
+build_options_default+=" ${webview_backend:-webkit}"
+
+vopt_conflict webengine webkit
+
+if [ "$build_option_qt" ]; then
+ hostmakedepends+=" qt5-host-tools qt5-qmake"
+ makedepends+=" qtutilities-devel qt5-tools-devel qt5-declarative-devel"
+
+ if [ "$build_option_webengine" ]; then
+ configure_args+=" -DWEBVIEW_PROVIDER=webengine"
+ makedepends+=" qt5-location-devel
+ qt5-webengine-devel qt5-webchannel-devel"
+ elif [ "$build_option_webkit" ]; then
+ configure_args+=" -DWEBVIEW_PROVIDER=webkit"
+ makedepends+=" qt5-webkit-devel"
+ else
+ configure_args+=" -DWEBVIEW_PROVIDER=none"
+ fi
+
+ if [ "$build_option_script" ]; then
+ configure_args+=" -DJS_PROVIDER=script"
+ makedepends+=" qt5-script-devel"
+ else
+ configure_args+=" -DJS_PROVIDER=qml"
+ fi
+else
+ configure_args+=" -DWIDGETS_GUI:BOOL=OFF -DQUICK_GUI:BOOL=OFF"
+fi
+
+pre_build() {
+ if [ -z "$build_option_qt" ]; then
+ vsed -i application/main.cpp -e "/^using namespace QtUtilities;$/s@^@//@"
+ fi
+}
+
+post_install() {
+ if [ -z "$build_option_qt" ]; then
+ rm -rf "${DESTDIR}/usr/share/metainfo"
+ rm -rf "${DESTDIR}/usr/share/icons"
+ rm -rf "${DESTDIR}/usr/share/applications"
+ fi
+}
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: New packages: tageditor, tagparser and c++utilities
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-19844@inbox.vuxu.org>
` (4 preceding siblings ...)
2020-04-07 17:34 ` ahesford
@ 2020-04-11 11:31 ` Chocimier
2020-04-11 12:07 ` [PR PATCH] [Updated] " ahesford
` (8 subsequent siblings)
14 siblings, 0 replies; 15+ messages in thread
From: Chocimier @ 2020-04-11 11:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 156 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/19844#issuecomment-612399145
Comment:
Please rebase
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PR PATCH] [Updated] New packages: tageditor, tagparser and c++utilities
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-19844@inbox.vuxu.org>
` (5 preceding siblings ...)
2020-04-11 11:31 ` Chocimier
@ 2020-04-11 12:07 ` ahesford
2020-04-11 12:08 ` ahesford
` (7 subsequent siblings)
14 siblings, 0 replies; 15+ messages in thread
From: ahesford @ 2020-04-11 12:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 636 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages tageditor
https://github.com/void-linux/void-packages/pull/19844
New packages: tageditor, tagparser and c++utilities
This PR introduces packages for `tageditor` and its dependencies, `tagparser` and `c++utilities`. `tageditor` is a utility to manipulate tags on audio and video files. This build enables an optional qt5 GUI but provides build options to package a CLI-only version to keep dependencies light.
A patch file from https://github.com/void-linux/void-packages/pull/19844.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tageditor-19844.patch --]
[-- Type: text/x-diff, Size: 10567 bytes --]
From 8a4dc1677ab1c583991042e2320eec57233d2f68 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Mar 2020 09:55:01 -0500
Subject: [PATCH 1/4] New package: cpp-utilities-5.2.0_1
---
common/shlibs | 2 ++
srcpkgs/cpp-utilities-devel | 1 +
srcpkgs/cpp-utilities/template | 36 ++++++++++++++++++++++++++++++++++
3 files changed, 39 insertions(+)
create mode 120000 srcpkgs/cpp-utilities-devel
create mode 100644 srcpkgs/cpp-utilities/template
diff --git a/common/shlibs b/common/shlibs
index 2deca5d7cb0..14654fdc999 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3857,3 +3857,5 @@ libbudgietheme.so.0 budgie-desktop-10.5.1_1
libbudgie-plugin.so.0 budgie-desktop-10.5.1_1
libslirp.so.0 libslirp-4.2.0_1
libqpdf.so.28 libqpdf-10.0.0_1
+libc++utilities.so.5 cpp-utilities-5.2.0_1
+libtagparser.so.9 tagparser-9.1.2_1
diff --git a/srcpkgs/cpp-utilities-devel b/srcpkgs/cpp-utilities-devel
new file mode 120000
index 00000000000..1578dc70d85
--- /dev/null
+++ b/srcpkgs/cpp-utilities-devel
@@ -0,0 +1 @@
+cpp-utilities
\ No newline at end of file
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
new file mode 100644
index 00000000000..9334dc26286
--- /dev/null
+++ b/srcpkgs/cpp-utilities/template
@@ -0,0 +1,36 @@
+# Template file for 'cpp-utilities'
+pkgname=cpp-utilities
+version=5.2.0
+revision=1
+wrksrc="${pkgname}-${version}"
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON"
+short_desc="C++ library for argument parsing, IO, parsing and more"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/Martchus/cpp-utilities"
+distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
+checksum=34b4ef7b8d5ce04ebb4ce685ce6a51656e7bd26f902796c2b4b904f54a97871f
+
+cpp-utilities-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+
+ # Rename cmake modules to fit with the rest of the system
+ vmkdir usr/lib/cmake
+ cmake_source="${DESTDIR}/usr/share/c++utilities/cmake"
+ cmake_dest="${PKGDESTDIR}/usr/lib/cmake/c++utilities"
+ mv "$cmake_source" "$cmake_dest"
+
+ # Update cmake configuration to point to new location
+ vsed -i "${cmake_dest}/c++utilitiesConfig.cmake" \
+ -e "s@share/c++utilities/cmake@lib/cmake/c++utilities@g"
+
+ # The rest of share is just development-related stuff
+ vmove usr/share/c++utilities
+ }
+}
From 5f338efad19483596f988bc2b75c1b24d3e83cb7 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Mar 2020 10:14:35 -0500
Subject: [PATCH 2/4] New package: tagparser-9.1.2_1
---
srcpkgs/cpp-utilities/template | 2 +-
srcpkgs/tagparser-devel | 1 +
srcpkgs/tagparser/template | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 36 insertions(+), 1 deletion(-)
create mode 120000 srcpkgs/tagparser-devel
create mode 100644 srcpkgs/tagparser/template
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index 9334dc26286..bb6e5a33183 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -4,7 +4,7 @@ version=5.2.0
revision=1
wrksrc="${pkgname}-${version}"
build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=ON"
+configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
short_desc="C++ library for argument parsing, IO, parsing and more"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-2.0-only"
diff --git a/srcpkgs/tagparser-devel b/srcpkgs/tagparser-devel
new file mode 120000
index 00000000000..d0a44486925
--- /dev/null
+++ b/srcpkgs/tagparser-devel
@@ -0,0 +1 @@
+tagparser
\ No newline at end of file
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
new file mode 100644
index 00000000000..9b588ecbbb3
--- /dev/null
+++ b/srcpkgs/tagparser/template
@@ -0,0 +1,34 @@
+# Template file for 'tagparser'
+pkgname=tagparser
+version=9.1.2
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
+makedepends="cpp-utilities-devel zlib-devel"
+short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/Martchus/tagparser"
+distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
+checksum=234987086ac0dff279a3888b0e965294fdca6adb7412b063ea36f2cc564fbce2
+
+tagparser-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} cpp-utilities-devel"
+
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+
+ # Rename cmake modules to fit with the rest of the system
+ vmkdir usr/lib/cmake
+ cmake_source="${DESTDIR}/usr/share/${sourcepkg}/cmake"
+ cmake_dest="${PKGDESTDIR}/usr/lib/cmake/${sourcepkg}"
+ mv "$cmake_source" "$cmake_dest"
+
+ # Update cmake configuration to point to new location
+ vsed -i "${cmake_dest}/${sourcepkg}Config.cmake" \
+ -e "s@share/${sourcepkg}/cmake@lib/cmake/${sourcepkg}@g"
+ }
+}
From c531ebae5d852800774e4b7d7cf7feeca2400b7b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 20 Mar 2020 13:44:02 -0400
Subject: [PATCH 3/4] New package: qtutilities-6.0.4
---
common/shlibs | 1 +
srcpkgs/qtutilities-devel | 1 +
srcpkgs/qtutilities/template | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 36 insertions(+)
create mode 120000 srcpkgs/qtutilities-devel
create mode 100644 srcpkgs/qtutilities/template
diff --git a/common/shlibs b/common/shlibs
index 14654fdc999..335c65fc8e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3859,3 +3859,4 @@ libslirp.so.0 libslirp-4.2.0_1
libqpdf.so.28 libqpdf-10.0.0_1
libc++utilities.so.5 cpp-utilities-5.2.0_1
libtagparser.so.9 tagparser-9.1.2_1
+libqtutilities.so.6 qtutilities-6.0.4_1
diff --git a/srcpkgs/qtutilities-devel b/srcpkgs/qtutilities-devel
new file mode 120000
index 00000000000..c74750f1460
--- /dev/null
+++ b/srcpkgs/qtutilities-devel
@@ -0,0 +1 @@
+qtutilities
\ No newline at end of file
diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
new file mode 100644
index 00000000000..419148f2708
--- /dev/null
+++ b/srcpkgs/qtutilities/template
@@ -0,0 +1,34 @@
+# Template file for 'qtutilities'
+pkgname=qtutilities
+version=6.0.4
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-tools-devel cpp-utilities-devel"
+short_desc="Qt helper routines, including dialogs, widgets, and models"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/Martchus/qtutilities"
+distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
+checksum=c5ffbeb96607212386077bad00818e0c21920e342e118a5f77e923d07018e20f
+
+qtutilities-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} cpp-utilities-devel"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+
+ # Rename cmake modules to fit with the rest of the system
+ vmkdir usr/lib/cmake
+ cmake_source="${DESTDIR}/usr/share/${sourcepkg}/cmake"
+ cmake_dest="${PKGDESTDIR}/usr/lib/cmake/${sourcepkg}"
+ mv "$cmake_source" "$cmake_dest"
+
+ # Update cmake configuration to point to new location
+ vsed -i "${cmake_dest}/${sourcepkg}Config.cmake" \
+ -e "s@share/${sourcepkg}/cmake@lib/cmake/${sourcepkg}@g"
+ }
+}
From cb2de89acd8337982217a95c2bdeb10927eee9a5 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Mar 2020 10:49:22 -0500
Subject: [PATCH 4/4] New package: tageditor-3.3.4_1
---
srcpkgs/tageditor/template | 72 ++++++++++++++++++++++++++++++++++++++
1 file changed, 72 insertions(+)
create mode 100644 srcpkgs/tageditor/template
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
new file mode 100644
index 00000000000..bbdf7befc3f
--- /dev/null
+++ b/srcpkgs/tageditor/template
@@ -0,0 +1,72 @@
+# Template file for 'tageditor'
+pkgname=tageditor
+version=3.3.4
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
+makedepends="tagparser-devel cpp-utilities-devel"
+short_desc="Tag editor for AAC, ID3, Vorbis, Opus, FLAC and Matroska"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/Martchus/tageditor"
+distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
+checksum=0874301bd7644a312d259d54a8b60366c0db80e5b1179c1039cad9905c95463d
+
+build_options="qt webengine webkit script"
+build_options_default="qt"
+
+desc_option_webengine="Enable support for qt5-webengine file views (requires qt)"
+desc_option_webkit="Enable support for qt5-webkit file views (requires qt)"
+desc_option_script="Enable support for qt5-script javascript (requires qt)"
+
+# Prefer qt5-webengine to qt5-webkit, if it can be built
+case "$XBPS_TARGET_MACHINE" in
+ # qt5-webengine not supported on these architectures
+ ppc|ppc-musl|armv5tel*);;
+ *) if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
+ # webengine can be built only if word size matches
+ webview_backend="webengine"
+ fi;;
+esac
+build_options_default+=" ${webview_backend:-webkit}"
+
+vopt_conflict webengine webkit
+
+if [ "$build_option_qt" ]; then
+ hostmakedepends+=" qt5-host-tools qt5-qmake"
+ makedepends+=" qtutilities-devel qt5-tools-devel qt5-declarative-devel"
+
+ if [ "$build_option_webengine" ]; then
+ configure_args+=" -DWEBVIEW_PROVIDER=webengine"
+ makedepends+=" qt5-location-devel
+ qt5-webengine-devel qt5-webchannel-devel"
+ elif [ "$build_option_webkit" ]; then
+ configure_args+=" -DWEBVIEW_PROVIDER=webkit"
+ makedepends+=" qt5-webkit-devel"
+ else
+ configure_args+=" -DWEBVIEW_PROVIDER=none"
+ fi
+
+ if [ "$build_option_script" ]; then
+ configure_args+=" -DJS_PROVIDER=script"
+ makedepends+=" qt5-script-devel"
+ else
+ configure_args+=" -DJS_PROVIDER=qml"
+ fi
+else
+ configure_args+=" -DWIDGETS_GUI:BOOL=OFF -DQUICK_GUI:BOOL=OFF"
+fi
+
+pre_build() {
+ if [ -z "$build_option_qt" ]; then
+ vsed -i application/main.cpp -e "/^using namespace QtUtilities;$/s@^@//@"
+ fi
+}
+
+post_install() {
+ if [ -z "$build_option_qt" ]; then
+ rm -rf "${DESTDIR}/usr/share/metainfo"
+ rm -rf "${DESTDIR}/usr/share/icons"
+ rm -rf "${DESTDIR}/usr/share/applications"
+ fi
+}
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: New packages: tageditor, tagparser and c++utilities
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-19844@inbox.vuxu.org>
` (6 preceding siblings ...)
2020-04-11 12:07 ` [PR PATCH] [Updated] " ahesford
@ 2020-04-11 12:08 ` ahesford
2020-04-15 19:05 ` [PR PATCH] [Updated] " ahesford
` (6 subsequent siblings)
14 siblings, 0 replies; 15+ messages in thread
From: ahesford @ 2020-04-11 12:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/19844#issuecomment-612405996
Comment:
> Please rebase
Done, thanks!
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PR PATCH] [Updated] New packages: tageditor, tagparser and c++utilities
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-19844@inbox.vuxu.org>
` (7 preceding siblings ...)
2020-04-11 12:08 ` ahesford
@ 2020-04-15 19:05 ` ahesford
2020-04-15 20:25 ` Chocimier
` (5 subsequent siblings)
14 siblings, 0 replies; 15+ messages in thread
From: ahesford @ 2020-04-15 19:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 636 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages tageditor
https://github.com/void-linux/void-packages/pull/19844
New packages: tageditor, tagparser and c++utilities
This PR introduces packages for `tageditor` and its dependencies, `tagparser` and `c++utilities`. `tageditor` is a utility to manipulate tags on audio and video files. This build enables an optional qt5 GUI but provides build options to package a CLI-only version to keep dependencies light.
A patch file from https://github.com/void-linux/void-packages/pull/19844.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tageditor-19844.patch --]
[-- Type: text/x-diff, Size: 10554 bytes --]
From 0feb68211e4cedf183897dd1b9569c3611465a65 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Mar 2020 09:55:01 -0500
Subject: [PATCH 1/4] New package: cpp-utilities-5.2.0_1
---
common/shlibs | 2 ++
srcpkgs/cpp-utilities-devel | 1 +
srcpkgs/cpp-utilities/template | 36 ++++++++++++++++++++++++++++++++++
3 files changed, 39 insertions(+)
create mode 120000 srcpkgs/cpp-utilities-devel
create mode 100644 srcpkgs/cpp-utilities/template
diff --git a/common/shlibs b/common/shlibs
index c484babac23..5c87b25fe62 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3859,3 +3859,5 @@ libbudgie-plugin.so.0 budgie-desktop-10.5.1_1
libslirp.so.0 libslirp-4.2.0_1
libqpdf.so.28 libqpdf-10.0.0_1
libstk-4.6.1.so libstk-4.6.1_1
+libc++utilities.so.5 cpp-utilities-5.2.0_1
+libtagparser.so.9 tagparser-9.1.2_1
diff --git a/srcpkgs/cpp-utilities-devel b/srcpkgs/cpp-utilities-devel
new file mode 120000
index 00000000000..1578dc70d85
--- /dev/null
+++ b/srcpkgs/cpp-utilities-devel
@@ -0,0 +1 @@
+cpp-utilities
\ No newline at end of file
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
new file mode 100644
index 00000000000..9334dc26286
--- /dev/null
+++ b/srcpkgs/cpp-utilities/template
@@ -0,0 +1,36 @@
+# Template file for 'cpp-utilities'
+pkgname=cpp-utilities
+version=5.2.0
+revision=1
+wrksrc="${pkgname}-${version}"
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS=ON"
+short_desc="C++ library for argument parsing, IO, parsing and more"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/Martchus/cpp-utilities"
+distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
+checksum=34b4ef7b8d5ce04ebb4ce685ce6a51656e7bd26f902796c2b4b904f54a97871f
+
+cpp-utilities-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+
+ # Rename cmake modules to fit with the rest of the system
+ vmkdir usr/lib/cmake
+ cmake_source="${DESTDIR}/usr/share/c++utilities/cmake"
+ cmake_dest="${PKGDESTDIR}/usr/lib/cmake/c++utilities"
+ mv "$cmake_source" "$cmake_dest"
+
+ # Update cmake configuration to point to new location
+ vsed -i "${cmake_dest}/c++utilitiesConfig.cmake" \
+ -e "s@share/c++utilities/cmake@lib/cmake/c++utilities@g"
+
+ # The rest of share is just development-related stuff
+ vmove usr/share/c++utilities
+ }
+}
From 1a88641dd9a4aaa4bfdbc4b998ebc6fa03a6badb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Mar 2020 10:14:35 -0500
Subject: [PATCH 2/4] New package: tagparser-9.1.2_1
---
srcpkgs/cpp-utilities/template | 2 +-
srcpkgs/tagparser-devel | 1 +
srcpkgs/tagparser/template | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 36 insertions(+), 1 deletion(-)
create mode 120000 srcpkgs/tagparser-devel
create mode 100644 srcpkgs/tagparser/template
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index 9334dc26286..bb6e5a33183 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -4,7 +4,7 @@ version=5.2.0
revision=1
wrksrc="${pkgname}-${version}"
build_style=cmake
-configure_args="-DBUILD_SHARED_LIBS=ON"
+configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
short_desc="C++ library for argument parsing, IO, parsing and more"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-2.0-only"
diff --git a/srcpkgs/tagparser-devel b/srcpkgs/tagparser-devel
new file mode 120000
index 00000000000..d0a44486925
--- /dev/null
+++ b/srcpkgs/tagparser-devel
@@ -0,0 +1 @@
+tagparser
\ No newline at end of file
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
new file mode 100644
index 00000000000..9b588ecbbb3
--- /dev/null
+++ b/srcpkgs/tagparser/template
@@ -0,0 +1,34 @@
+# Template file for 'tagparser'
+pkgname=tagparser
+version=9.1.2
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
+makedepends="cpp-utilities-devel zlib-devel"
+short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/Martchus/tagparser"
+distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
+checksum=234987086ac0dff279a3888b0e965294fdca6adb7412b063ea36f2cc564fbce2
+
+tagparser-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} cpp-utilities-devel"
+
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+
+ # Rename cmake modules to fit with the rest of the system
+ vmkdir usr/lib/cmake
+ cmake_source="${DESTDIR}/usr/share/${sourcepkg}/cmake"
+ cmake_dest="${PKGDESTDIR}/usr/lib/cmake/${sourcepkg}"
+ mv "$cmake_source" "$cmake_dest"
+
+ # Update cmake configuration to point to new location
+ vsed -i "${cmake_dest}/${sourcepkg}Config.cmake" \
+ -e "s@share/${sourcepkg}/cmake@lib/cmake/${sourcepkg}@g"
+ }
+}
From 1bcf469bc3e2e9c0d568e94f48a3e42bdaaa88f3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 20 Mar 2020 13:44:02 -0400
Subject: [PATCH 3/4] New package: qtutilities-6.0.4
---
common/shlibs | 1 +
srcpkgs/qtutilities-devel | 1 +
srcpkgs/qtutilities/template | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 36 insertions(+)
create mode 120000 srcpkgs/qtutilities-devel
create mode 100644 srcpkgs/qtutilities/template
diff --git a/common/shlibs b/common/shlibs
index 5c87b25fe62..08ddbc903bd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3861,3 +3861,4 @@ libqpdf.so.28 libqpdf-10.0.0_1
libstk-4.6.1.so libstk-4.6.1_1
libc++utilities.so.5 cpp-utilities-5.2.0_1
libtagparser.so.9 tagparser-9.1.2_1
+libqtutilities.so.6 qtutilities-6.0.4_1
diff --git a/srcpkgs/qtutilities-devel b/srcpkgs/qtutilities-devel
new file mode 120000
index 00000000000..c74750f1460
--- /dev/null
+++ b/srcpkgs/qtutilities-devel
@@ -0,0 +1 @@
+qtutilities
\ No newline at end of file
diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
new file mode 100644
index 00000000000..419148f2708
--- /dev/null
+++ b/srcpkgs/qtutilities/template
@@ -0,0 +1,34 @@
+# Template file for 'qtutilities'
+pkgname=qtutilities
+version=6.0.4
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-tools-devel cpp-utilities-devel"
+short_desc="Qt helper routines, including dialogs, widgets, and models"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/Martchus/qtutilities"
+distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
+checksum=c5ffbeb96607212386077bad00818e0c21920e342e118a5f77e923d07018e20f
+
+qtutilities-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} cpp-utilities-devel"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+
+ # Rename cmake modules to fit with the rest of the system
+ vmkdir usr/lib/cmake
+ cmake_source="${DESTDIR}/usr/share/${sourcepkg}/cmake"
+ cmake_dest="${PKGDESTDIR}/usr/lib/cmake/${sourcepkg}"
+ mv "$cmake_source" "$cmake_dest"
+
+ # Update cmake configuration to point to new location
+ vsed -i "${cmake_dest}/${sourcepkg}Config.cmake" \
+ -e "s@share/${sourcepkg}/cmake@lib/cmake/${sourcepkg}@g"
+ }
+}
From 6d27af6174d7d9111ebe28d94e60c692ffb66616 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Mar 2020 10:49:22 -0500
Subject: [PATCH 4/4] New package: tageditor-3.3.4_1
---
srcpkgs/tageditor/template | 72 ++++++++++++++++++++++++++++++++++++++
1 file changed, 72 insertions(+)
create mode 100644 srcpkgs/tageditor/template
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
new file mode 100644
index 00000000000..bbdf7befc3f
--- /dev/null
+++ b/srcpkgs/tageditor/template
@@ -0,0 +1,72 @@
+# Template file for 'tageditor'
+pkgname=tageditor
+version=3.3.4
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
+makedepends="tagparser-devel cpp-utilities-devel"
+short_desc="Tag editor for AAC, ID3, Vorbis, Opus, FLAC and Matroska"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/Martchus/tageditor"
+distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
+checksum=0874301bd7644a312d259d54a8b60366c0db80e5b1179c1039cad9905c95463d
+
+build_options="qt webengine webkit script"
+build_options_default="qt"
+
+desc_option_webengine="Enable support for qt5-webengine file views (requires qt)"
+desc_option_webkit="Enable support for qt5-webkit file views (requires qt)"
+desc_option_script="Enable support for qt5-script javascript (requires qt)"
+
+# Prefer qt5-webengine to qt5-webkit, if it can be built
+case "$XBPS_TARGET_MACHINE" in
+ # qt5-webengine not supported on these architectures
+ ppc|ppc-musl|armv5tel*);;
+ *) if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
+ # webengine can be built only if word size matches
+ webview_backend="webengine"
+ fi;;
+esac
+build_options_default+=" ${webview_backend:-webkit}"
+
+vopt_conflict webengine webkit
+
+if [ "$build_option_qt" ]; then
+ hostmakedepends+=" qt5-host-tools qt5-qmake"
+ makedepends+=" qtutilities-devel qt5-tools-devel qt5-declarative-devel"
+
+ if [ "$build_option_webengine" ]; then
+ configure_args+=" -DWEBVIEW_PROVIDER=webengine"
+ makedepends+=" qt5-location-devel
+ qt5-webengine-devel qt5-webchannel-devel"
+ elif [ "$build_option_webkit" ]; then
+ configure_args+=" -DWEBVIEW_PROVIDER=webkit"
+ makedepends+=" qt5-webkit-devel"
+ else
+ configure_args+=" -DWEBVIEW_PROVIDER=none"
+ fi
+
+ if [ "$build_option_script" ]; then
+ configure_args+=" -DJS_PROVIDER=script"
+ makedepends+=" qt5-script-devel"
+ else
+ configure_args+=" -DJS_PROVIDER=qml"
+ fi
+else
+ configure_args+=" -DWIDGETS_GUI:BOOL=OFF -DQUICK_GUI:BOOL=OFF"
+fi
+
+pre_build() {
+ if [ -z "$build_option_qt" ]; then
+ vsed -i application/main.cpp -e "/^using namespace QtUtilities;$/s@^@//@"
+ fi
+}
+
+post_install() {
+ if [ -z "$build_option_qt" ]; then
+ rm -rf "${DESTDIR}/usr/share/metainfo"
+ rm -rf "${DESTDIR}/usr/share/icons"
+ rm -rf "${DESTDIR}/usr/share/applications"
+ fi
+}
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: New packages: tageditor, tagparser and c++utilities
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-19844@inbox.vuxu.org>
` (8 preceding siblings ...)
2020-04-15 19:05 ` [PR PATCH] [Updated] " ahesford
@ 2020-04-15 20:25 ` Chocimier
2020-04-15 20:54 ` [PR PATCH] [Updated] " ahesford
` (4 subsequent siblings)
14 siblings, 0 replies; 15+ messages in thread
From: Chocimier @ 2020-04-15 20:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 481 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/19844#issuecomment-614262318
Comment:
Tested, works. But please move changes to [proper commits](https://github.com/void-linux/void-packages/pull/19844/commits/1a88641dd9a4aaa4bfdbc4b998ebc6fa03a6badb#diff-816e5624e093eafd5fac2aa7b3b46e83R7), reorder so deps go before package using it, fix commit titles - no revision, remove `wrksrc="${pkgname}-${version}"` that is default.
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PR PATCH] [Updated] New packages: tageditor, tagparser and c++utilities
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-19844@inbox.vuxu.org>
` (9 preceding siblings ...)
2020-04-15 20:25 ` Chocimier
@ 2020-04-15 20:54 ` ahesford
2020-04-15 21:09 ` ahesford
` (3 subsequent siblings)
14 siblings, 0 replies; 15+ messages in thread
From: ahesford @ 2020-04-15 20:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 636 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages tageditor
https://github.com/void-linux/void-packages/pull/19844
New packages: tageditor, tagparser and c++utilities
This PR introduces packages for `tageditor` and its dependencies, `tagparser` and `c++utilities`. `tageditor` is a utility to manipulate tags on audio and video files. This build enables an optional qt5 GUI but provides build options to package a CLI-only version to keep dependencies light.
A patch file from https://github.com/void-linux/void-packages/pull/19844.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-tageditor-19844.patch --]
[-- Type: text/x-diff, Size: 10261 bytes --]
From ceba59ce8d19e52f35ccd28dfdb6bd9c4cc11a0d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Mar 2020 09:55:01 -0500
Subject: [PATCH 1/4] New package: cpp-utilities-5.2.0
---
common/shlibs | 1 +
srcpkgs/cpp-utilities-devel | 1 +
srcpkgs/cpp-utilities/template | 35 ++++++++++++++++++++++++++++++++++
3 files changed, 37 insertions(+)
create mode 120000 srcpkgs/cpp-utilities-devel
create mode 100644 srcpkgs/cpp-utilities/template
diff --git a/common/shlibs b/common/shlibs
index c484babac23..6231e0fecc3 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3859,3 +3859,4 @@ libbudgie-plugin.so.0 budgie-desktop-10.5.1_1
libslirp.so.0 libslirp-4.2.0_1
libqpdf.so.28 libqpdf-10.0.0_1
libstk-4.6.1.so libstk-4.6.1_1
+libc++utilities.so.5 cpp-utilities-5.2.0_1
diff --git a/srcpkgs/cpp-utilities-devel b/srcpkgs/cpp-utilities-devel
new file mode 120000
index 00000000000..1578dc70d85
--- /dev/null
+++ b/srcpkgs/cpp-utilities-devel
@@ -0,0 +1 @@
+cpp-utilities
\ No newline at end of file
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
new file mode 100644
index 00000000000..ba069cbacf7
--- /dev/null
+++ b/srcpkgs/cpp-utilities/template
@@ -0,0 +1,35 @@
+# Template file for 'cpp-utilities'
+pkgname=cpp-utilities
+version=5.2.0
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
+short_desc="C++ library for argument parsing, IO, parsing and more"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/Martchus/cpp-utilities"
+distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
+checksum=34b4ef7b8d5ce04ebb4ce685ce6a51656e7bd26f902796c2b4b904f54a97871f
+
+cpp-utilities-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+
+ # Rename cmake modules to fit with the rest of the system
+ vmkdir usr/lib/cmake
+ cmake_source="${DESTDIR}/usr/share/c++utilities/cmake"
+ cmake_dest="${PKGDESTDIR}/usr/lib/cmake/c++utilities"
+ mv "$cmake_source" "$cmake_dest"
+
+ # Update cmake configuration to point to new location
+ vsed -i "${cmake_dest}/c++utilitiesConfig.cmake" \
+ -e "s@share/c++utilities/cmake@lib/cmake/c++utilities@g"
+
+ # The rest of share is just development-related stuff
+ vmove usr/share/c++utilities
+ }
+}
From 27460db7ea6fea201f1a59d12cc396f1d915271f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Mar 2020 10:14:35 -0500
Subject: [PATCH 2/4] New package: tagparser-9.1.2
---
common/shlibs | 1 +
srcpkgs/tagparser-devel | 1 +
srcpkgs/tagparser/template | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 36 insertions(+)
create mode 120000 srcpkgs/tagparser-devel
create mode 100644 srcpkgs/tagparser/template
diff --git a/common/shlibs b/common/shlibs
index 6231e0fecc3..5c87b25fe62 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3860,3 +3860,4 @@ libslirp.so.0 libslirp-4.2.0_1
libqpdf.so.28 libqpdf-10.0.0_1
libstk-4.6.1.so libstk-4.6.1_1
libc++utilities.so.5 cpp-utilities-5.2.0_1
+libtagparser.so.9 tagparser-9.1.2_1
diff --git a/srcpkgs/tagparser-devel b/srcpkgs/tagparser-devel
new file mode 120000
index 00000000000..d0a44486925
--- /dev/null
+++ b/srcpkgs/tagparser-devel
@@ -0,0 +1 @@
+tagparser
\ No newline at end of file
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
new file mode 100644
index 00000000000..9b588ecbbb3
--- /dev/null
+++ b/srcpkgs/tagparser/template
@@ -0,0 +1,34 @@
+# Template file for 'tagparser'
+pkgname=tagparser
+version=9.1.2
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
+makedepends="cpp-utilities-devel zlib-devel"
+short_desc="C++ library for handling AAC, ID3, Vorbis, Opus, FLAC and Matroska tags"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/Martchus/tagparser"
+distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
+checksum=234987086ac0dff279a3888b0e965294fdca6adb7412b063ea36f2cc564fbce2
+
+tagparser-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} cpp-utilities-devel"
+
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+
+ # Rename cmake modules to fit with the rest of the system
+ vmkdir usr/lib/cmake
+ cmake_source="${DESTDIR}/usr/share/${sourcepkg}/cmake"
+ cmake_dest="${PKGDESTDIR}/usr/lib/cmake/${sourcepkg}"
+ mv "$cmake_source" "$cmake_dest"
+
+ # Update cmake configuration to point to new location
+ vsed -i "${cmake_dest}/${sourcepkg}Config.cmake" \
+ -e "s@share/${sourcepkg}/cmake@lib/cmake/${sourcepkg}@g"
+ }
+}
From 02c1ac24cadf403bb89279e50972ab4564b25508 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 20 Mar 2020 13:44:02 -0400
Subject: [PATCH 3/4] New package: qtutilities-6.0.4
---
common/shlibs | 1 +
srcpkgs/qtutilities-devel | 1 +
srcpkgs/qtutilities/template | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 36 insertions(+)
create mode 120000 srcpkgs/qtutilities-devel
create mode 100644 srcpkgs/qtutilities/template
diff --git a/common/shlibs b/common/shlibs
index 5c87b25fe62..08ddbc903bd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3861,3 +3861,4 @@ libqpdf.so.28 libqpdf-10.0.0_1
libstk-4.6.1.so libstk-4.6.1_1
libc++utilities.so.5 cpp-utilities-5.2.0_1
libtagparser.so.9 tagparser-9.1.2_1
+libqtutilities.so.6 qtutilities-6.0.4_1
diff --git a/srcpkgs/qtutilities-devel b/srcpkgs/qtutilities-devel
new file mode 120000
index 00000000000..c74750f1460
--- /dev/null
+++ b/srcpkgs/qtutilities-devel
@@ -0,0 +1 @@
+qtutilities
\ No newline at end of file
diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
new file mode 100644
index 00000000000..419148f2708
--- /dev/null
+++ b/srcpkgs/qtutilities/template
@@ -0,0 +1,34 @@
+# Template file for 'qtutilities'
+pkgname=qtutilities
+version=6.0.4
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
+hostmakedepends="qt5-qmake qt5-host-tools"
+makedepends="qt5-tools-devel cpp-utilities-devel"
+short_desc="Qt helper routines, including dialogs, widgets, and models"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/Martchus/qtutilities"
+distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
+checksum=c5ffbeb96607212386077bad00818e0c21920e342e118a5f77e923d07018e20f
+
+qtutilities-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision} cpp-utilities-devel"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+
+ # Rename cmake modules to fit with the rest of the system
+ vmkdir usr/lib/cmake
+ cmake_source="${DESTDIR}/usr/share/${sourcepkg}/cmake"
+ cmake_dest="${PKGDESTDIR}/usr/lib/cmake/${sourcepkg}"
+ mv "$cmake_source" "$cmake_dest"
+
+ # Update cmake configuration to point to new location
+ vsed -i "${cmake_dest}/${sourcepkg}Config.cmake" \
+ -e "s@share/${sourcepkg}/cmake@lib/cmake/${sourcepkg}@g"
+ }
+}
From 926e663ace2a1ab81ae344cd52014115c757bb13 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 6 Mar 2020 10:49:22 -0500
Subject: [PATCH 4/4] New package: tageditor-3.3.4
---
srcpkgs/tageditor/template | 72 ++++++++++++++++++++++++++++++++++++++
1 file changed, 72 insertions(+)
create mode 100644 srcpkgs/tageditor/template
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
new file mode 100644
index 00000000000..bbdf7befc3f
--- /dev/null
+++ b/srcpkgs/tageditor/template
@@ -0,0 +1,72 @@
+# Template file for 'tageditor'
+pkgname=tageditor
+version=3.3.4
+revision=1
+build_style=cmake
+configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
+makedepends="tagparser-devel cpp-utilities-devel"
+short_desc="Tag editor for AAC, ID3, Vorbis, Opus, FLAC and Matroska"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="GPL-2.0-only"
+homepage="https://github.com/Martchus/tageditor"
+distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
+checksum=0874301bd7644a312d259d54a8b60366c0db80e5b1179c1039cad9905c95463d
+
+build_options="qt webengine webkit script"
+build_options_default="qt"
+
+desc_option_webengine="Enable support for qt5-webengine file views (requires qt)"
+desc_option_webkit="Enable support for qt5-webkit file views (requires qt)"
+desc_option_script="Enable support for qt5-script javascript (requires qt)"
+
+# Prefer qt5-webengine to qt5-webkit, if it can be built
+case "$XBPS_TARGET_MACHINE" in
+ # qt5-webengine not supported on these architectures
+ ppc|ppc-musl|armv5tel*);;
+ *) if [ "$XBPS_WORDSIZE" = "$XBPS_TARGET_WORDSIZE" ]; then
+ # webengine can be built only if word size matches
+ webview_backend="webengine"
+ fi;;
+esac
+build_options_default+=" ${webview_backend:-webkit}"
+
+vopt_conflict webengine webkit
+
+if [ "$build_option_qt" ]; then
+ hostmakedepends+=" qt5-host-tools qt5-qmake"
+ makedepends+=" qtutilities-devel qt5-tools-devel qt5-declarative-devel"
+
+ if [ "$build_option_webengine" ]; then
+ configure_args+=" -DWEBVIEW_PROVIDER=webengine"
+ makedepends+=" qt5-location-devel
+ qt5-webengine-devel qt5-webchannel-devel"
+ elif [ "$build_option_webkit" ]; then
+ configure_args+=" -DWEBVIEW_PROVIDER=webkit"
+ makedepends+=" qt5-webkit-devel"
+ else
+ configure_args+=" -DWEBVIEW_PROVIDER=none"
+ fi
+
+ if [ "$build_option_script" ]; then
+ configure_args+=" -DJS_PROVIDER=script"
+ makedepends+=" qt5-script-devel"
+ else
+ configure_args+=" -DJS_PROVIDER=qml"
+ fi
+else
+ configure_args+=" -DWIDGETS_GUI:BOOL=OFF -DQUICK_GUI:BOOL=OFF"
+fi
+
+pre_build() {
+ if [ -z "$build_option_qt" ]; then
+ vsed -i application/main.cpp -e "/^using namespace QtUtilities;$/s@^@//@"
+ fi
+}
+
+post_install() {
+ if [ -z "$build_option_qt" ]; then
+ rm -rf "${DESTDIR}/usr/share/metainfo"
+ rm -rf "${DESTDIR}/usr/share/icons"
+ rm -rf "${DESTDIR}/usr/share/applications"
+ fi
+}
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: New packages: tageditor, tagparser and c++utilities
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-19844@inbox.vuxu.org>
` (10 preceding siblings ...)
2020-04-15 20:54 ` [PR PATCH] [Updated] " ahesford
@ 2020-04-15 21:09 ` ahesford
2020-04-15 21:11 ` ahesford
` (2 subsequent siblings)
14 siblings, 0 replies; 15+ messages in thread
From: ahesford @ 2020-04-15 21:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1120 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/19844#issuecomment-614281242
Comment:
> Tested, works. But please move changes to [proper commits](https://github.com/void-linux/void-packages/pull/19844/commits/1a88641dd9a4aaa4bfdbc4b998ebc6fa03a6badb#diff-816e5624e093eafd5fac2aa7b3b46e83R7), reorder so deps go before package using it, fix commit titles - no revision, remove `wrksrc="${pkgname}-${version}"` that is default.
Thanks for catching these mistakes. I've reworded the commit messages, moved the misplaced change to its proper commit (an artifact of an earlier rebase), and removed the unnecessary `wrksrc` definition (an artifact of the `c++utilities` to `cpp-utilities` rename).
The Github comment thread seems to be sorting the commit messages alphabetically, but the commits are ordered properly in `git log`. If you view history for commit [`926e663`](https://github.com/void-linux/void-packages/commits/926e663ace2a1ab81ae344cd52014115c757bb13/srcpkgs), you should see that the `qtutilities` commit is listed before the `tageditor` commit.
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: New packages: tageditor, tagparser and c++utilities
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-19844@inbox.vuxu.org>
` (11 preceding siblings ...)
2020-04-15 21:09 ` ahesford
@ 2020-04-15 21:11 ` ahesford
2020-04-15 21:19 ` Chocimier
2020-04-15 21:19 ` [PR PATCH] [Merged]: " Chocimier
14 siblings, 0 replies; 15+ messages in thread
From: ahesford @ 2020-04-15 21:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1162 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/19844#issuecomment-614281242
Comment:
> Tested, works. But please move changes to [proper commits](https://github.com/void-linux/void-packages/pull/19844/commits/1a88641dd9a4aaa4bfdbc4b998ebc6fa03a6badb#diff-816e5624e093eafd5fac2aa7b3b46e83R7), reorder so deps go before package using it, fix commit titles - no revision, remove `wrksrc="${pkgname}-${version}"` that is default.
Thanks for catching these mistakes. I've reworded the commit messages, moved the misplaced change to its proper commit (an artifact of an earlier rebase), and removed the unnecessary `wrksrc` definition (an artifact of the `c++utilities` to `cpp-utilities` rename).
The Github comment thread seems to be sorting the commit messages according to the order I originally added these packages, but the commits are ordered properly in `git log`. If you view history for commit [`926e663`](https://github.com/void-linux/void-packages/commits/926e663ace2a1ab81ae344cd52014115c757bb13/srcpkgs), you should see that the `qtutilities` commit is listed before the `tageditor` commit.
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: New packages: tageditor, tagparser and c++utilities
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-19844@inbox.vuxu.org>
` (12 preceding siblings ...)
2020-04-15 21:11 ` ahesford
@ 2020-04-15 21:19 ` Chocimier
2020-04-15 21:19 ` [PR PATCH] [Merged]: " Chocimier
14 siblings, 0 replies; 15+ messages in thread
From: Chocimier @ 2020-04-15 21:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 152 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/19844#issuecomment-614285596
Comment:
Good job!
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PR PATCH] [Merged]: New packages: tageditor, tagparser and c++utilities
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-19844@inbox.vuxu.org>
` (13 preceding siblings ...)
2020-04-15 21:19 ` Chocimier
@ 2020-04-15 21:19 ` Chocimier
14 siblings, 0 replies; 15+ messages in thread
From: Chocimier @ 2020-04-15 21:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 476 bytes --]
There's a merged pull request on the void-packages repository
New packages: tageditor, tagparser and c++utilities
https://github.com/void-linux/void-packages/pull/19844
Description:
This PR introduces packages for `tageditor` and its dependencies, `tagparser` and `c++utilities`. `tageditor` is a utility to manipulate tags on audio and video files. This build enables an optional qt5 GUI but provides build options to package a CLI-only version to keep dependencies light.
^ permalink raw reply [flat|nested] 15+ messages in thread