From 0699b96c8eb59b807b72b52e3f56269c0a67b2a9 Mon Sep 17 00:00:00 2001 From: q66 Date: Thu, 3 Jan 2019 23:03:15 +0100 Subject: [PATCH] New package: strawberry-0.4.2 This is a fork of Clementine based on Qt5. It supports roughly the same featureset and has the same UI, except it uses Qt5 instead of Qt4 and certain features are different (e.g. no Spotify support, but there is Tidal streaming support). For now, we are building without Deezer support (missing support packages in repo). --- srcpkgs/strawberry/patches/musl.patch | 20 +++++++++++ srcpkgs/strawberry/patches/sentinel.patch | 42 +++++++++++++++++++++++ srcpkgs/strawberry/template | 18 ++++++++++ 3 files changed, 80 insertions(+) create mode 100644 srcpkgs/strawberry/patches/musl.patch create mode 100644 srcpkgs/strawberry/patches/sentinel.patch create mode 100644 srcpkgs/strawberry/template diff --git a/srcpkgs/strawberry/patches/musl.patch b/srcpkgs/strawberry/patches/musl.patch new file mode 100644 index 00000000000..b9bfea08a32 --- /dev/null +++ b/srcpkgs/strawberry/patches/musl.patch @@ -0,0 +1,20 @@ +--- ext/libstrawberry-common/core/logging.cpp 2019-01-03 23:40:30.761082917 +0100 ++++ ext/libstrawberry-common/core/logging.cpp 2019-01-03 23:41:07.721257707 +0100 +@@ -32,7 +32,7 @@ + #include + #include + #include +-#ifdef Q_OS_UNIX ++#if defined Q_OS_UNIX && defined __GLIBC__ + #include + #endif + +@@ -249,7 +249,7 @@ + } + + void DumpStackTrace() { +-#ifdef Q_OS_UNIX ++#if defined Q_OS_UNIX && defined __GLIBC__ + void* callstack[128]; + int callstack_size = backtrace(reinterpret_cast(&callstack), sizeof(callstack)); + char** symbols = backtrace_symbols(reinterpret_cast(&callstack), callstack_size); diff --git a/srcpkgs/strawberry/patches/sentinel.patch b/srcpkgs/strawberry/patches/sentinel.patch new file mode 100644 index 00000000000..5d6f1443db0 --- /dev/null +++ b/srcpkgs/strawberry/patches/sentinel.patch @@ -0,0 +1,42 @@ +--- src/engine/gstenginepipeline.cpp 2019-01-04 01:25:44.330066042 +0100 ++++ src/engine/gstenginepipeline.cpp 2019-01-04 01:25:49.105534312 +0100 +@@ -390,7 +390,7 @@ + if (!InitAudioBin()) return false; + + // Set playbin's sink to be our costum audio-sink. +- g_object_set(GST_OBJECT(pipeline_), "audio-sink", audiobin_, NULL); ++ g_object_set(GST_OBJECT(pipeline_), "audio-sink", audiobin_, (char*)0); + pipeline_is_connected_ = true; + + return true; +--- src/device/cddasongloader.cpp 2019-01-04 01:28:36.954906340 +0100 ++++ src/device/cddasongloader.cpp 2019-01-04 01:29:22.541864995 +0100 +@@ -84,7 +84,7 @@ + g_object_set(cdda_, "device", g_strdup(url_.path().toLocal8Bit().constData()), nullptr); + } + if (g_object_class_find_property (G_OBJECT_GET_CLASS (cdda_), "paranoia-mode")) { +- g_object_set (cdda_, "paranoia-mode", 0, NULL); ++ g_object_set (cdda_, "paranoia-mode", 0, (char*)0); + } + + // Change the element's state to ready and paused, to be able to query it +@@ -124,7 +124,7 @@ + + GstElement *pipeline = gst_pipeline_new("pipeline"); + GstElement *sink = gst_element_factory_make ("fakesink", NULL); +- gst_bin_add_many (GST_BIN (pipeline), cdda_, sink, NULL); ++ gst_bin_add_many (GST_BIN (pipeline), cdda_, sink, (char*)0); + gst_element_link (cdda_, sink); + gst_element_set_state(pipeline, GST_STATE_READY); + gst_element_set_state(pipeline, GST_STATE_PAUSED); +--- src/musicbrainz/chromaprinter.cpp 2019-01-04 01:27:28.842452039 +0100 ++++ src/musicbrainz/chromaprinter.cpp 2019-01-04 01:27:49.900117399 +0100 +@@ -101,7 +101,7 @@ + "format", G_TYPE_STRING, "S16LE", + "channels", G_TYPE_INT, kDecodeChannels, + "rate", G_TYPE_INT, kDecodeRate, +- NULL); ++ (char*)0); + gst_element_link_filtered(resample, sink, caps); + gst_caps_unref(caps); + diff --git a/srcpkgs/strawberry/template b/srcpkgs/strawberry/template new file mode 100644 index 00000000000..c3e5fe20058 --- /dev/null +++ b/srcpkgs/strawberry/template @@ -0,0 +1,18 @@ +# Template file for 'strawberry' +pkgname=strawberry +version=0.4.2 +revision=1 +build_style=cmake +hostmakedepends="pkg-config qt5-host-tools qt5-devel protobuf-c" +makedepends="alsa-lib-devel boost-devel chromaprint-devel + gst-plugins-base1-devel libcdio-devel libgpod-devel libmtp-devel + protobuf-devel pulseaudio-devel qt5-plugin-mysql qt5-plugin-odbc + qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-x11extras-devel + taglib-devel" +depends="qt5-plugin-sqlite desktop-file-utils" +short_desc="Audio player and music collection organizer" +maintainer="q66 " +license="GPL-3.0-or-later" +homepage="https://www.strawbs.org/" +distfiles="https://files.jkvinge.net/packages/${pkgname}/${pkgname}-${version}.tar.xz" +checksum=5ddfba18a5e607c263354e41b85582ae7cb5ccd020b0639390928c76d5ed8d89