* Re: [PR PATCH] [Updated] Mixxx 2.3
2022-01-02 14:34 [PR PATCH] Mixxx 2.3 prez
@ 2022-01-02 14:49 ` prez
2022-01-02 14:49 ` prez
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: prez @ 2022-01-02 14:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
There is an updated pull request by prez against master on the void-packages repository
https://github.com/prez/void-packages mixxx
https://github.com/void-linux/void-packages/pull/34808
Mixxx 2.3
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: Yes*
#### Local build testing
- I built this PR locally for my native architecture (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/34808.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mixxx-34808.patch --]
[-- Type: text/x-diff, Size: 3234 bytes --]
From 26ab7f66f8925f72253679546f478ab369f60881 Mon Sep 17 00:00:00 2001
From: prez <prez@national.shitposting.agency>
Date: Sun, 2 Jan 2022 15:13:08 +0100
Subject: [PATCH] mixxx: update to 2.3.1.
---
srcpkgs/mixxx/template | 55 ++++++++++--------------------------------
1 file changed, 13 insertions(+), 42 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 75e4921b1347..8cbeffec5f48 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,51 +1,22 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.2.4
-revision=10
-wrksrc="mixxx-release-${version}"
-build_style=scons
-hostmakedepends="pkg-config protobuf"
+version=2.3.1
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-devel"
makedepends="chromaprint-devel faad2-devel ffmpeg-devel fftw-devel glu-devel
- libid3tag-devel libmad-devel libmp4v2-devel libshout-devel libusb-devel
- opusfile-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
+ lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
+ opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel
- libtheora-devel speex-devel soundtouch-devel"
+ vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
+ speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
+ qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libkeyfinder-devel libebur128-devel"
depends="qt5-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
-distfiles="https://github.com/mixxxdj/mixxx/archive/release-${version}.tar.gz"
-checksum=9372b43d5ec882845b4fe2350ef50dabb3f1e0cc029f182b0ed8aa4f4f3b2afa
-_scons_args="shoutcast=1 faad=1 tuned=0 prefix=/usr qt5=1 qtdir=/usr/include/qt5"
-
-nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/7882/steps/shell_3/logs/stdio
-
-do_build() {
- case "$XBPS_TARGET_MACHINE" in
- *-musl) find plugins -type f -exec sed -i "{}" \
- -e "s;u_int8_t;uint8_t;g" -e "s;u_int32_t;uint32_t;g" \;
- ;;
- esac
- if [ "${XBPS_TARGET_MACHINE%-musl}" = "i686" ]; then
- export CFLAGS+=" -msse"
- export CXXFLAGS+=" -msse"
- fi
- sed -i \
- -e 's/branch_name = .*/branch_name = "mixxx"/' \
- -e 's/vcs_revision = .*/vcs_revision = "'$version'"/' \
- src/SConscript
-
- sed -i -e 's/vamp-plugin-sdk/vamp-sdk/g' build/features.py vamp-plugins/SConscript
-
- MAKEFLAGS="${makejobs}" scons ${makejobs} ${_scons_args}
-}
-
-do_install() {
- if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
- export CFLAGS+=" -msse"
- export CXXFLAGS+=" -msse"
- fi
- scons ${_scons_args} install_root=${DESTDIR}/usr install
-}
+distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
+checksum=35cff9acece5f651af472c11952ba59d5bc22e36225e6cb65c931afe0bc25b71
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] Mixxx 2.3
2022-01-02 14:34 [PR PATCH] Mixxx 2.3 prez
2022-01-02 14:49 ` [PR PATCH] [Updated] " prez
@ 2022-01-02 14:49 ` prez
2022-01-05 18:24 ` prez
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: prez @ 2022-01-02 14:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
There is an updated pull request by prez against master on the void-packages repository
https://github.com/prez/void-packages mixxx
https://github.com/void-linux/void-packages/pull/34808
Mixxx 2.3
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: Yes*
#### Local build testing
- I built this PR locally for my native architecture (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/34808.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mixxx-34808.patch --]
[-- Type: text/x-diff, Size: 3215 bytes --]
From 9a9f4b9b0d09284ae260de7ef008a73e3681227d Mon Sep 17 00:00:00 2001
From: prez <prez@national.shitposting.agency>
Date: Sun, 2 Jan 2022 15:13:08 +0100
Subject: [PATCH] mixxx: update to 2.3.1.
---
srcpkgs/mixxx/template | 55 ++++++++++--------------------------------
1 file changed, 13 insertions(+), 42 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 75e4921b1347..91349e724be6 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,51 +1,22 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.2.4
-revision=10
-wrksrc="mixxx-release-${version}"
-build_style=scons
-hostmakedepends="pkg-config protobuf"
+version=2.3.1
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-devel"
makedepends="chromaprint-devel faad2-devel ffmpeg-devel fftw-devel glu-devel
- libid3tag-devel libmad-devel libmp4v2-devel libshout-devel libusb-devel
- opusfile-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
+ lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
+ opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel
- libtheora-devel speex-devel soundtouch-devel"
+ vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
+ speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
+ qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
depends="qt5-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
-distfiles="https://github.com/mixxxdj/mixxx/archive/release-${version}.tar.gz"
-checksum=9372b43d5ec882845b4fe2350ef50dabb3f1e0cc029f182b0ed8aa4f4f3b2afa
-_scons_args="shoutcast=1 faad=1 tuned=0 prefix=/usr qt5=1 qtdir=/usr/include/qt5"
-
-nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/7882/steps/shell_3/logs/stdio
-
-do_build() {
- case "$XBPS_TARGET_MACHINE" in
- *-musl) find plugins -type f -exec sed -i "{}" \
- -e "s;u_int8_t;uint8_t;g" -e "s;u_int32_t;uint32_t;g" \;
- ;;
- esac
- if [ "${XBPS_TARGET_MACHINE%-musl}" = "i686" ]; then
- export CFLAGS+=" -msse"
- export CXXFLAGS+=" -msse"
- fi
- sed -i \
- -e 's/branch_name = .*/branch_name = "mixxx"/' \
- -e 's/vcs_revision = .*/vcs_revision = "'$version'"/' \
- src/SConscript
-
- sed -i -e 's/vamp-plugin-sdk/vamp-sdk/g' build/features.py vamp-plugins/SConscript
-
- MAKEFLAGS="${makejobs}" scons ${makejobs} ${_scons_args}
-}
-
-do_install() {
- if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
- export CFLAGS+=" -msse"
- export CXXFLAGS+=" -msse"
- fi
- scons ${_scons_args} install_root=${DESTDIR}/usr install
-}
+distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
+checksum=35cff9acece5f651af472c11952ba59d5bc22e36225e6cb65c931afe0bc25b71
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: Mixxx 2.3
2022-01-02 14:34 [PR PATCH] Mixxx 2.3 prez
2022-01-02 14:49 ` [PR PATCH] [Updated] " prez
2022-01-02 14:49 ` prez
@ 2022-01-05 18:24 ` prez
2022-03-13 23:36 ` [PR PATCH] [Updated] " prez
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: prez @ 2022-01-05 18:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 171 bytes --]
New comment by prez on void-packages repository
https://github.com/void-linux/void-packages/pull/34808#issuecomment-1005971874
Comment:
Pinging the maintainer, @Gottox
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] Mixxx 2.3
2022-01-02 14:34 [PR PATCH] Mixxx 2.3 prez
` (2 preceding siblings ...)
2022-01-05 18:24 ` prez
@ 2022-03-13 23:36 ` prez
2022-04-22 11:14 ` prez
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: prez @ 2022-03-13 23:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
There is an updated pull request by prez against master on the void-packages repository
https://github.com/prez/void-packages mixxx
https://github.com/void-linux/void-packages/pull/34808
Mixxx 2.3
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: Yes*
#### Local build testing
- I built this PR locally for my native architecture (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/34808.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mixxx-34808.patch --]
[-- Type: text/x-diff, Size: 3215 bytes --]
From a55c37b5e87c6dcb53d85a21eea55cfe1494e984 Mon Sep 17 00:00:00 2001
From: prez <prez@national.shitposting.agency>
Date: Sun, 2 Jan 2022 15:13:08 +0100
Subject: [PATCH] mixxx: update to 2.3.2.
---
srcpkgs/mixxx/template | 55 ++++++++++--------------------------------
1 file changed, 13 insertions(+), 42 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 9eedd269bc7e..eaefc1e042e0 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,51 +1,22 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.2.4
-revision=11
-wrksrc="mixxx-release-${version}"
-build_style=scons
-hostmakedepends="pkg-config protobuf"
+version=2.3.2
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-devel"
makedepends="chromaprint-devel faad2-devel ffmpeg-devel fftw-devel glu-devel
- libid3tag-devel libmad-devel libmp4v2-devel libshout-devel libusb-devel
- opusfile-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
+ lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
+ opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel
- libtheora-devel speex-devel soundtouch-devel"
+ vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
+ speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
+ qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
depends="qt5-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
-distfiles="https://github.com/mixxxdj/mixxx/archive/release-${version}.tar.gz"
-checksum=9372b43d5ec882845b4fe2350ef50dabb3f1e0cc029f182b0ed8aa4f4f3b2afa
-_scons_args="shoutcast=1 faad=1 tuned=0 prefix=/usr qt5=1 qtdir=/usr/include/qt5"
-
-nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/7882/steps/shell_3/logs/stdio
-
-do_build() {
- case "$XBPS_TARGET_MACHINE" in
- *-musl) find plugins -type f -exec sed -i "{}" \
- -e "s;u_int8_t;uint8_t;g" -e "s;u_int32_t;uint32_t;g" \;
- ;;
- esac
- if [ "${XBPS_TARGET_MACHINE%-musl}" = "i686" ]; then
- export CFLAGS+=" -msse"
- export CXXFLAGS+=" -msse"
- fi
- sed -i \
- -e 's/branch_name = .*/branch_name = "mixxx"/' \
- -e 's/vcs_revision = .*/vcs_revision = "'$version'"/' \
- src/SConscript
-
- sed -i -e 's/vamp-plugin-sdk/vamp-sdk/g' build/features.py vamp-plugins/SConscript
-
- MAKEFLAGS="${makejobs}" scons ${makejobs} ${_scons_args}
-}
-
-do_install() {
- if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
- export CFLAGS+=" -msse"
- export CXXFLAGS+=" -msse"
- fi
- scons ${_scons_args} install_root=${DESTDIR}/usr install
-}
+distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
+checksum=b6a0ed80bfbda5b65014e75ffd132f8a7474b260ef18d1e4e2c203e21bb28695
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] Mixxx 2.3
2022-01-02 14:34 [PR PATCH] Mixxx 2.3 prez
` (3 preceding siblings ...)
2022-03-13 23:36 ` [PR PATCH] [Updated] " prez
@ 2022-04-22 11:14 ` prez
2022-04-22 11:16 ` prez
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: prez @ 2022-04-22 11:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
There is an updated pull request by prez against master on the void-packages repository
https://github.com/prez/void-packages mixxx
https://github.com/void-linux/void-packages/pull/34808
Mixxx 2.3
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: Yes*
#### Local build testing
- I built this PR locally for my native architecture (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/34808.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mixxx-34808.patch --]
[-- Type: text/x-diff, Size: 3276 bytes --]
From e620441221514ad211dea01ec38704678cb8618b Mon Sep 17 00:00:00 2001
From: prez <prez@national.shitposting.agency>
Date: Sun, 2 Jan 2022 15:13:08 +0100
Subject: [PATCH] mixxx: update to 2.3.2, adopt.
---
srcpkgs/mixxx/template | 57 +++++++++++-------------------------------
1 file changed, 14 insertions(+), 43 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 9eedd269bc7e..59bc568308e1 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,51 +1,22 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.2.4
-revision=11
-wrksrc="mixxx-release-${version}"
-build_style=scons
-hostmakedepends="pkg-config protobuf"
+version=2.3.2
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-devel"
makedepends="chromaprint-devel faad2-devel ffmpeg-devel fftw-devel glu-devel
- libid3tag-devel libmad-devel libmp4v2-devel libshout-devel libusb-devel
- opusfile-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
+ lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
+ opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel
- libtheora-devel speex-devel soundtouch-devel"
+ vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
+ speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
+ qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
depends="qt5-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
-distfiles="https://github.com/mixxxdj/mixxx/archive/release-${version}.tar.gz"
-checksum=9372b43d5ec882845b4fe2350ef50dabb3f1e0cc029f182b0ed8aa4f4f3b2afa
-_scons_args="shoutcast=1 faad=1 tuned=0 prefix=/usr qt5=1 qtdir=/usr/include/qt5"
-
-nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/7882/steps/shell_3/logs/stdio
-
-do_build() {
- case "$XBPS_TARGET_MACHINE" in
- *-musl) find plugins -type f -exec sed -i "{}" \
- -e "s;u_int8_t;uint8_t;g" -e "s;u_int32_t;uint32_t;g" \;
- ;;
- esac
- if [ "${XBPS_TARGET_MACHINE%-musl}" = "i686" ]; then
- export CFLAGS+=" -msse"
- export CXXFLAGS+=" -msse"
- fi
- sed -i \
- -e 's/branch_name = .*/branch_name = "mixxx"/' \
- -e 's/vcs_revision = .*/vcs_revision = "'$version'"/' \
- src/SConscript
-
- sed -i -e 's/vamp-plugin-sdk/vamp-sdk/g' build/features.py vamp-plugins/SConscript
-
- MAKEFLAGS="${makejobs}" scons ${makejobs} ${_scons_args}
-}
-
-do_install() {
- if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
- export CFLAGS+=" -msse"
- export CXXFLAGS+=" -msse"
- fi
- scons ${_scons_args} install_root=${DESTDIR}/usr install
-}
+distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
+checksum=b6a0ed80bfbda5b65014e75ffd132f8a7474b260ef18d1e4e2c203e21bb28695
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: Mixxx 2.3
2022-01-02 14:34 [PR PATCH] Mixxx 2.3 prez
` (4 preceding siblings ...)
2022-04-22 11:14 ` prez
@ 2022-04-22 11:16 ` prez
2022-06-18 21:59 ` chilledfrogs
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: prez @ 2022-04-22 11:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 212 bytes --]
New comment by prez on void-packages repository
https://github.com/void-linux/void-packages/pull/34808#issuecomment-1106412521
Comment:
No response from @Gottox in over 2 1/2 months. Claiming maintainership.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: Mixxx 2.3
2022-01-02 14:34 [PR PATCH] Mixxx 2.3 prez
` (5 preceding siblings ...)
2022-04-22 11:16 ` prez
@ 2022-06-18 21:59 ` chilledfrogs
2022-06-19 9:01 ` [PR PATCH] [Updated] " prez
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: chilledfrogs @ 2022-06-18 21:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 371 bytes --]
New comment by chilledfrogs on void-packages repository
https://github.com/void-linux/void-packages/pull/34808#issuecomment-1159571700
Comment:
I just built this locally, it seems to work, would be great to have it finally merged; could you please rebase it against the current master so that CI passes and perhaps rename the GitHub PR title to match the commit title?
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] Mixxx 2.3
2022-01-02 14:34 [PR PATCH] Mixxx 2.3 prez
` (6 preceding siblings ...)
2022-06-18 21:59 ` chilledfrogs
@ 2022-06-19 9:01 ` prez
2022-07-31 21:53 ` mixxx: update to 2.3.2 prez
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: prez @ 2022-06-19 9:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
There is an updated pull request by prez against master on the void-packages repository
https://github.com/prez/void-packages mixxx
https://github.com/void-linux/void-packages/pull/34808
Mixxx 2.3
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: Yes*
#### Local build testing
- I built this PR locally for my native architecture (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/34808.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mixxx-34808.patch --]
[-- Type: text/x-diff, Size: 3276 bytes --]
From 7be0eb70c03be859702dad2534ba5b1177117a3c Mon Sep 17 00:00:00 2001
From: prez <prez@national.shitposting.agency>
Date: Sun, 2 Jan 2022 15:13:08 +0100
Subject: [PATCH] mixxx: update to 2.3.2, adopt.
---
srcpkgs/mixxx/template | 57 +++++++++++-------------------------------
1 file changed, 14 insertions(+), 43 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index 712ce645098b..59bc568308e1 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,51 +1,22 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.2.4
-revision=12
-wrksrc="mixxx-release-${version}"
-build_style=scons
-hostmakedepends="pkg-config protobuf"
+version=2.3.2
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-devel"
makedepends="chromaprint-devel faad2-devel ffmpeg-devel fftw-devel glu-devel
- libid3tag-devel libmad-devel libmp4v2-devel libshout-devel libusb-devel
- opusfile-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
+ lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
+ opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel
- libtheora-devel speex-devel soundtouch-devel"
+ vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
+ speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
+ qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
depends="qt5-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
-distfiles="https://github.com/mixxxdj/mixxx/archive/release-${version}.tar.gz"
-checksum=9372b43d5ec882845b4fe2350ef50dabb3f1e0cc029f182b0ed8aa4f4f3b2afa
-_scons_args="shoutcast=1 faad=1 tuned=0 prefix=/usr qt5=1 qtdir=/usr/include/qt5"
-
-nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/7882/steps/shell_3/logs/stdio
-
-do_build() {
- case "$XBPS_TARGET_MACHINE" in
- *-musl) find plugins -type f -exec sed -i "{}" \
- -e "s;u_int8_t;uint8_t;g" -e "s;u_int32_t;uint32_t;g" \;
- ;;
- esac
- if [ "${XBPS_TARGET_MACHINE%-musl}" = "i686" ]; then
- export CFLAGS+=" -msse"
- export CXXFLAGS+=" -msse"
- fi
- sed -i \
- -e 's/branch_name = .*/branch_name = "mixxx"/' \
- -e 's/vcs_revision = .*/vcs_revision = "'$version'"/' \
- src/SConscript
-
- sed -i -e 's/vamp-plugin-sdk/vamp-sdk/g' build/features.py vamp-plugins/SConscript
-
- MAKEFLAGS="${makejobs}" scons ${makejobs} ${_scons_args}
-}
-
-do_install() {
- if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
- export CFLAGS+=" -msse"
- export CXXFLAGS+=" -msse"
- fi
- scons ${_scons_args} install_root=${DESTDIR}/usr install
-}
+distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
+checksum=b6a0ed80bfbda5b65014e75ffd132f8a7474b260ef18d1e4e2c203e21bb28695
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: mixxx: update to 2.3.2.
2022-01-02 14:34 [PR PATCH] Mixxx 2.3 prez
` (7 preceding siblings ...)
2022-06-19 9:01 ` [PR PATCH] [Updated] " prez
@ 2022-07-31 21:53 ` prez
2022-08-01 11:08 ` chilledfrogs
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: prez @ 2022-07-31 21:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 311 bytes --]
New comment by prez on void-packages repository
https://github.com/void-linux/void-packages/pull/34808#issuecomment-1200507466
Comment:
@Johnnynator you've merged a mixxx PR in the past, can I ask you to please review and merge this too?
Fyi, I've used this version of mixxx for multiple shows I played at.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: mixxx: update to 2.3.2.
2022-01-02 14:34 [PR PATCH] Mixxx 2.3 prez
` (8 preceding siblings ...)
2022-07-31 21:53 ` mixxx: update to 2.3.2 prez
@ 2022-08-01 11:08 ` chilledfrogs
2022-08-01 12:50 ` [PR PATCH] [Updated] " prez
2022-08-02 18:05 ` [PR PATCH] [Merged]: mixxx: update to 2.3.3 abenson
11 siblings, 0 replies; 13+ messages in thread
From: chilledfrogs @ 2022-08-01 11:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 281 bytes --]
New comment by chilledfrogs on void-packages repository
https://github.com/void-linux/void-packages/pull/34808#issuecomment-1201054029
Comment:
Could you rebase again on the latest master @prez? I tried the failing builds locally and they somehow work so yeah, worth another try
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] mixxx: update to 2.3.2.
2022-01-02 14:34 [PR PATCH] Mixxx 2.3 prez
` (9 preceding siblings ...)
2022-08-01 11:08 ` chilledfrogs
@ 2022-08-01 12:50 ` prez
2022-08-02 18:05 ` [PR PATCH] [Merged]: mixxx: update to 2.3.3 abenson
11 siblings, 0 replies; 13+ messages in thread
From: prez @ 2022-08-01 12:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 557 bytes --]
There is an updated pull request by prez against master on the void-packages repository
https://github.com/prez/void-packages mixxx
https://github.com/void-linux/void-packages/pull/34808
mixxx: update to 2.3.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: Yes*
#### Local build testing
- I built this PR locally for my native architecture (x86_64-glibc)
A patch file from https://github.com/void-linux/void-packages/pull/34808.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-mixxx-34808.patch --]
[-- Type: text/x-diff, Size: 3276 bytes --]
From ae0bba8d8f2c6c857f9d0e274bc1c1f5c3bbe223 Mon Sep 17 00:00:00 2001
From: prez <prez@national.shitposting.agency>
Date: Sun, 2 Jan 2022 15:13:08 +0100
Subject: [PATCH] mixxx: update to 2.3.3, adopt.
---
srcpkgs/mixxx/template | 57 +++++++++++-------------------------------
1 file changed, 14 insertions(+), 43 deletions(-)
diff --git a/srcpkgs/mixxx/template b/srcpkgs/mixxx/template
index e5912b482fa1..619ddca0d332 100644
--- a/srcpkgs/mixxx/template
+++ b/srcpkgs/mixxx/template
@@ -1,51 +1,22 @@
# Template file for 'mixxx'
pkgname=mixxx
-version=2.2.4
-revision=13
-wrksrc="mixxx-release-${version}"
-build_style=scons
-hostmakedepends="pkg-config protobuf"
+version=2.3.3
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release"
+hostmakedepends="extra-cmake-modules pkg-config protobuf qt5-host-tools qt5-devel"
makedepends="chromaprint-devel faad2-devel ffmpeg-devel fftw-devel glu-devel
- libid3tag-devel libmad-devel libmp4v2-devel libshout-devel libusb-devel
- opusfile-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
+ lame-devel libid3tag-devel libmad-devel libmodplug-devel libusb-devel
+ opusfile-devel libflac-devel libogg-devel libsndfile-devel libvorbis-devel
+ wavpack-devel portaudio-devel portmidi-devel protobuf-devel qt5-script-devel
qt5-svg-devel qt5-xmlpatterns-devel rubberband-devel taglib-devel upower-devel
- vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel
- libtheora-devel speex-devel soundtouch-devel"
+ vamp-plugin-sdk-devel lv2 lilv-devel qt5-x11extras-devel hidapi-devel libtheora-devel
+ speex-devel soundtouch-devel qtkeychain-qt5-devel qt5-plugin-mysql qt5-plugin-odbc
+ qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds libebur128-devel"
depends="qt5-plugin-sqlite"
short_desc="Open source digital DJing software that allows mixing music"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+maintainer="prez <prez@national.shitposting.agency>"
license="GPL-2.0-or-later"
homepage="https://www.mixxx.org"
-distfiles="https://github.com/mixxxdj/mixxx/archive/release-${version}.tar.gz"
-checksum=9372b43d5ec882845b4fe2350ef50dabb3f1e0cc029f182b0ed8aa4f4f3b2afa
-_scons_args="shoutcast=1 faad=1 tuned=0 prefix=/usr qt5=1 qtdir=/usr/include/qt5"
-
-nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/7882/steps/shell_3/logs/stdio
-
-do_build() {
- case "$XBPS_TARGET_MACHINE" in
- *-musl) find plugins -type f -exec sed -i "{}" \
- -e "s;u_int8_t;uint8_t;g" -e "s;u_int32_t;uint32_t;g" \;
- ;;
- esac
- if [ "${XBPS_TARGET_MACHINE%-musl}" = "i686" ]; then
- export CFLAGS+=" -msse"
- export CXXFLAGS+=" -msse"
- fi
- sed -i \
- -e 's/branch_name = .*/branch_name = "mixxx"/' \
- -e 's/vcs_revision = .*/vcs_revision = "'$version'"/' \
- src/SConscript
-
- sed -i -e 's/vamp-plugin-sdk/vamp-sdk/g' build/features.py vamp-plugins/SConscript
-
- MAKEFLAGS="${makejobs}" scons ${makejobs} ${_scons_args}
-}
-
-do_install() {
- if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
- export CFLAGS+=" -msse"
- export CXXFLAGS+=" -msse"
- fi
- scons ${_scons_args} install_root=${DESTDIR}/usr install
-}
+distfiles="https://github.com/mixxxdj/mixxx/archive/${version}.tar.gz"
+checksum=8e3a5a545175982336bb07c81a3839897a007c43689b93641242db662f6beb9c
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Merged]: mixxx: update to 2.3.3.
2022-01-02 14:34 [PR PATCH] Mixxx 2.3 prez
` (10 preceding siblings ...)
2022-08-01 12:50 ` [PR PATCH] [Updated] " prez
@ 2022-08-02 18:05 ` abenson
11 siblings, 0 replies; 13+ messages in thread
From: abenson @ 2022-08-02 18:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 409 bytes --]
There's a merged pull request on the void-packages repository
mixxx: update to 2.3.3.
https://github.com/void-linux/void-packages/pull/34808
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: Yes*
#### Local build testing
- I built this PR locally for my native architecture (x86_64-glibc)
^ permalink raw reply [flat|nested] 13+ messages in thread