Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Mixxx 2.3
@ 2022-01-02 14:34 prez
  2022-01-02 14:49 ` [PR PATCH] [Updated] " prez
                   ` (11 more replies)
  0 siblings, 12 replies; 13+ messages in thread
From: prez @ 2022-01-02 14:34 UTC (permalink / raw)
  To: ml

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

There is a new 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: 5421 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 1/2] 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

From b61dc56623566b3494bd600e51c6e297582dd20c Mon Sep 17 00:00:00 2001
From: prez <prez@national.shitposting.agency>
Date: Sun, 2 Jan 2022 15:14:59 +0100
Subject: [PATCH 2/2] New package: libkeyfinder-2.2.5

---
 common/shlibs                 |  1 +
 srcpkgs/libkeyfinder-devel    |  1 +
 srcpkgs/libkeyfinder/template | 25 +++++++++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 120000 srcpkgs/libkeyfinder-devel
 create mode 100644 srcpkgs/libkeyfinder/template

diff --git a/common/shlibs b/common/shlibs
index e1a175684656..b4dd0446f2df 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1870,6 +1870,7 @@ libepubgen-0.1.so.1 libepubgen-0.1.0_1
 libqxp-0.0.so.0 libqxp-0.0.1_1
 libetonyek-0.1.so.1 libetonyek-0.1.1_1
 libodfgen-0.1.so.1 libodfgen-0.1.1_1
+libkeyfinder.so.2 libkeyfinder-2.2.5_1
 libKF5SonnetUi.so.5 sonnet-5.26.0_1
 libKF5SonnetCore.so.5 sonnet-5.26.0_1
 libcdr-0.1.so.1 libcdr-0.1.0_1
diff --git a/srcpkgs/libkeyfinder-devel b/srcpkgs/libkeyfinder-devel
new file mode 120000
index 000000000000..ce2ff8fde5f1
--- /dev/null
+++ b/srcpkgs/libkeyfinder-devel
@@ -0,0 +1 @@
+libkeyfinder
\ No newline at end of file
diff --git a/srcpkgs/libkeyfinder/template b/srcpkgs/libkeyfinder/template
new file mode 100644
index 000000000000..284c53e6e24a
--- /dev/null
+++ b/srcpkgs/libkeyfinder/template
@@ -0,0 +1,25 @@
+# Template file for 'libkeyfinder'
+pkgname=libkeyfinder
+version=2.2.5
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF"
+hostmakedepends="pkg-config qt5-host-tools"
+makedepends="qt5-devel fftw-devel"
+short_desc="Musical key detection for digital audio"
+maintainer="prez <prez@national.shitposting.agency>"
+license="GPL-3.0-or-later"
+homepage="https://www.ibrahimshaath.co.uk/keyfinder/"
+distfiles="https://github.com/mixxxdj/libKeyFinder/archive/v${version}.tar.gz"
+checksum=516570e310f5bb5d87146fbefb129eb972dab3347987783554001e2cac26d9d6
+
+libkeyfinder-devel_package() {
+	short_desc+=" - development files"
+	depends="libkeyfinder-${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
+	}
+}

^ permalink raw reply	[flat|nested] 13+ messages in thread
end of thread, other threads:[~2022-08-02 18:05 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
2022-04-22 11:14 ` prez
2022-04-22 11:16 ` prez
2022-06-18 21:59 ` chilledfrogs
2022-06-19  9:01 ` [PR PATCH] [Updated] " prez
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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).