diff --git a/srcpkgs/flac/template b/srcpkgs/flac/template index 3b872d419d0106..f2ab2d80c09e5a 100644 --- a/srcpkgs/flac/template +++ b/srcpkgs/flac/template @@ -1,11 +1,9 @@ # Template file for 'flac' pkgname=flac version=1.5.0 -revision=1 -build_style=gnu-configure -configure_args="--disable-rpath --disable-doxygen-docs --disable-examples - --with-ogg=${XBPS_CROSS_BASE}/usr --disable-thorough-tests" -hostmakedepends="pkg-config" +revision=2 +build_style=cmake +configure_args="-DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON -DBUILD_TESTING=OFF" makedepends="libogg-devel" short_desc="Free Lossless Audio Codec" maintainer="Rutpiv " @@ -27,13 +25,14 @@ libflac_package() { } libflac-devel_package() { - depends="libogg-devel libflac>=${version}_${revision}" + depends="libogg-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include + vmove usr/lib/cmake vmove usr/lib/pkgconfig vmove "usr/lib/*.so" - vmove usr/share/aclocal + install -Dm 644 src/*/*.m4 -t ${PKGDESTDIR}/usr/share/aclocal vmove usr/share/doc } } diff --git a/srcpkgs/libogg/template b/srcpkgs/libogg/template index e19b445c65993c..d82ff1e5c0e407 100644 --- a/srcpkgs/libogg/template +++ b/srcpkgs/libogg/template @@ -1,8 +1,9 @@ # Template file for 'libogg' pkgname=libogg version=1.3.6 -revision=1 -build_style=gnu-configure +revision=2 +build_style=cmake +configure_args="-DBUILD_SHARED_LIBS=ON" short_desc="Ogg bitstream file format library" maintainer="Orphaned " license="BSD-3-Clause" @@ -11,8 +12,18 @@ changelog="https://gitlab.xiph.org/xiph/ogg/-/raw/master/CHANGES" distfiles="https://downloads.xiph.org/releases/ogg/$pkgname-$version.tar.xz" checksum=5c8253428e181840cd20d41f3ca16557a9cc04bad4a3d04cce84808677fa1061 +post_configure() { + configure_args="-DBUILD_SHARED_LIBS=OFF" + cmake_builddir="build-static" do_configure +} + +post_build() { + cmake_builddir="build-static" do_build +} + post_install() { - vlicense COPYING LICENSE + cmake_builddir="build-static" do_install + vlicense ../COPYING LICENSE } libogg-devel_package() { @@ -20,6 +31,7 @@ libogg-devel_package() { short_desc+=" - development files" pkg_install() { vmove usr/include + vmove usr/lib/cmake vmove usr/lib/pkgconfig vmove "usr/lib/*.a" vmove "usr/lib/*.so" diff --git a/srcpkgs/libsndfile/template b/srcpkgs/libsndfile/template index 43d2b583e7459a..4e34f1145e1625 100644 --- a/srcpkgs/libsndfile/template +++ b/srcpkgs/libsndfile/template @@ -1,9 +1,9 @@ # Template file for 'libsndfile' pkgname=libsndfile version=1.2.2 -revision=2 -build_style=gnu-configure -configure_args="--enable-static" +revision=3 +build_style=cmake +configure_args="-DBUILD_SHARED_LIBS=ON" hostmakedepends="pkg-config python3" makedepends="alsa-lib-devel libvorbis-devel libflac-devel sqlite-devel opus-devel mpg123-devel lame-devel" short_desc="C library for reading and writing files containing sampled sound" @@ -14,6 +14,19 @@ changelog="https://github.com/libsndfile/libsndfile/raw/master/CHANGELOG.md" distfiles="https://github.com/libsndfile/libsndfile/releases/download/${version}/libsndfile-${version}.tar.xz" checksum=3799ca9924d3125038880367bf1468e53a1b7e3686a934f098b7e1d286cdb80e +post_configure() { + configure_args="-DBUILD_STATIC_LIBS=OFF" + cmake_builddir="build-static" do_configure +} + +post_build() { + cmake_builddir="build-static" do_build +} + +post_install() { + cmake_builddir="build-static" do_install +} + libsndfile-progs_package() { short_desc+=" - bundled cmdline apps" pkg_install() { @@ -27,6 +40,7 @@ libsndfile-devel_package() { short_desc+=" - development files" pkg_install() { vmove usr/include + vmove usr/lib/cmake vmove usr/lib/pkgconfig vmove "usr/lib/*.a" vmove "usr/lib/*.so" diff --git a/srcpkgs/musescore/patches/gcc14.patch b/srcpkgs/musescore/patches/gcc14.patch deleted file mode 100644 index 2a842512534550..00000000000000 --- a/srcpkgs/musescore/patches/gcc14.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 7496ad1a31f27442e2326f2c2a68c1c8b587db4c Mon Sep 17 00:00:00 2001 -From: Aleksey -Date: Tue, 23 Jan 2024 16:20:43 +0300 -Subject: [PATCH] Fix build with GCC 14. - -The method should not be const since it mutates the member field, which is not marked as mutable. ---- - dtl/Diff.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dtl/Diff.hpp b/dtl/Diff.hpp -index 8c9c774..57067f9 100644 ---- a/thirdparty/dtl/dtl/Diff.hpp -+++ b/thirdparty/dtl/dtl/Diff.hpp -@@ -164,7 +164,7 @@ namespace dtl { - return trivial; - } - -- void enableTrivial () const { -+ void enableTrivial () { - this->trivial = true; - } - - diff --git a/srcpkgs/musescore/template b/srcpkgs/musescore/template index 7c91101c6bed9d..9a35bd9be849fb 100644 --- a/srcpkgs/musescore/template +++ b/srcpkgs/musescore/template @@ -1,36 +1,28 @@ # Template file for 'musescore' pkgname=musescore -version=3.6.2 -revision=3 -build_style=gnu-makefile -make_build_args="USE_SYSTEM_FREETYPE=ON BUILD_WEBENGINE=OFF - DOWNLOAD_SOUNDFONT=OFF MUSESCORE_BUILD_CONFIG=release" -make_install_args="-C build.release" -hostmakedepends="cmake pkg-config qt5-qmake qt5-host-tools qt5-tools" -makedepends="jack-devel lame-devel libsndfile-devel portaudio-devel - portmidi-devel pulseaudio-devel qt5-declarative-devel qt5-script-devel - qt5-svg-devel qt5-tools-devel qt5-webchannel-devel - qt5-location-devel qt5-xmlpatterns-devel qt5-plugin-mysql qt5-plugin-odbc - qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-quickcontrols2-devel" -depends="qt5-plugin-sqlite qt5-graphicaleffects qt5-quickcontrols2" +version=4.6.5 +revision=1 +build_style=cmake +build_helper=qmake6 +configure_args="-DMUE_BUILD_BRAILLE_TESTS=OFF -DMUE_BUILD_CONVERTER_TESTS=OFF + -DMUE_BUILD_ENGRAVING_TESTS=OFF -DMUE_BUILD_IMPORTEXPORT_TESTS=OFF + -DMUE_BUILD_NOTATION_TESTS=OFF -DMUE_BUILD_PLAYBACK_TESTS=OFF + -DMUE_BUILD_PROJECT_TESTS=OFF -DMUE_COMPILE_USE_SYSTEM_FLAC=ON + -DMUE_COMPILE_USE_SYSTEM_FREETYPE=ON -DMUE_COMPILE_USE_SYSTEM_HARFBUZZ=ON + -DMUE_COMPILE_USE_SYSTEM_OPUS=ON -DMUE_COMPILE_USE_SYSTEM_OPUSENC=ON + -DMUE_COMPILE_USE_SYSTEM_TINYXML=ON -DMUE_INSTALL_SOUNDFONT=ON + -DMUSESCORE_BUILD_CONFIGURATION=app -DMUSE_APP_BUILD_MODE=release + -DMUSE_ENABLE_UNIT_TESTS=OFF -DMUSE_MODULE_DIAGNOSTICS_CRASHPAD_CLIENT=OFF + -DMUSE_MODULE_UPDATE=OFF -Wno-dev" +hostmakedepends="pkg-config qt6-declarative-host-tools qt6-shadertools qt6-tools" +makedepends="libflac-devel libopusenc-devel libsndfile-devel + qt6-base-private-devel qt6-declarative-devel qt6-networkauth-devel + qt6-qt5compat-devel qt6-scxml-devel qt6-shadertools-devel qt6-svg-devel + tinyxml2-devel" +depends="qt6-plugin-tls-openssl" short_desc="Create, play and print beautiful sheet music" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://musescore.org/" -_soundfont_url="https://ftp.osuosl.org/pub/musescore/soundfont/MuseScore_General" -distfiles="https://github.com/musescore/MuseScore/archive/v${version}.tar.gz - ${_soundfont_url}/MuseScore_General.sf3 - ${_soundfont_url}/MuseScore_General_License.md" -checksum="c37acc6d7a316f04925265d2d22a35d715888580e16eff846e9b621954133c45 - 5b85b6c2c61d10b2b91cddd41efcce7b25cd31c8271d511c73afafbef20b6fa3 - 5ad8d737e13c7f01f5b9674872a82a92b4ba253603e8ed14b9db12293550b4b9" -skip_extraction="MuseScore_General.sf3 MuseScore_General_License.md" - -post_extract() { - cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/MuseScore_General.sf3" "${wrksrc}/share/sound/" - cp "${XBPS_SRCDISTDIR}/${pkgname}-${version}/MuseScore_General_License.md" "${wrksrc}/share/sound/" -} - -post_patch() { - vsed -i CMakeLists.txt -e 's/CMAKE_MINIMUM_REQUIRED(VERSION 3.3.0/CMAKE_MINIMUM_REQUIRED(VERSION 3.5.0/g' -} +distfiles="https://github.com/musescore/MuseScore/archive/v${version}.tar.gz" +checksum=c9441c1344d2bd63f86e737e25293fbad532f3edec9380c7d42eab3a8042ced1