From 28d7ef5a92154359c73d080117e1a8daae3c1699 Mon Sep 17 00:00:00 2001 From: ilia Date: Fri, 7 Jul 2023 10:03:08 +0500 Subject: [PATCH] Update template libdispatch --- srcpkgs/deadbeef/template | 28 ++++++---------- srcpkgs/libdispatch-devel | 1 + .../libdispatch/patches/disable-warn.patch | 20 ++++++++++++ srcpkgs/libdispatch/template | 32 +++++++++++++++++++ 4 files changed, 62 insertions(+), 19 deletions(-) create mode 120000 srcpkgs/libdispatch-devel create mode 100644 srcpkgs/libdispatch/patches/disable-warn.patch create mode 100644 srcpkgs/libdispatch/template diff --git a/srcpkgs/deadbeef/template b/srcpkgs/deadbeef/template index b664bb1b9bd9..1f6b46a83ef9 100644 --- a/srcpkgs/deadbeef/template +++ b/srcpkgs/deadbeef/template @@ -1,31 +1,25 @@ # Template file for 'deadbeef' pkgname=deadbeef -version=1.8.8 +version=1.9.5 revision=1 create_wrksrc=yes build_style=gnu-configure -configure_args="--disable-oss --disable-lfm --disable-notify --disable-gtk2" +configure_args="--disable-oss --disable-notify --disable-gtk2" hostmakedepends="automake libtool gettext gettext-devel intltool pkg-config - yasm clang glib-devel" + yasm clang glib-devel libdispatch-devel" makedepends=" alsa-lib-devel dbus-devel faad2-devel ffmpeg-devel gtk+3-devel imlib2-devel jansson-devel libcddb-devel libcdio-devel libcurl-devel libflac-devel libmad-devel libpng-devel libsamplerate-devel libsndfile-devel libvorbis-devel - libzip-devel mpg123-devel opusfile-devel pulseaudio-devel wavpack-devel" + libzip-devel mpg123-devel opusfile-devel pulseaudio-devel wavpack-devel pipewire-devel git patch clang" depends="desktop-file-utils hicolor-icon-theme" short_desc="Ultimate Music Player for GNU/Linux" -maintainer="Orphaned " +maintainer="Ilya " license="Zlib, GPL-2.0-or-later, LGPL-2.1-or-later" -_apbuild_commit=c64f490e54447e3902fae54784d01ab59fa7dc95 -_mp4p_commit=77ac9f2ecaa3a2f6e232fb45cd7f8550e13cc3d3 homepage="https://deadbeef.sourceforge.io" changelog="https://deadbeef.sourceforge.io/news0.html" -distfiles="https://github.com/DeaDBeeF-Player/deadbeef/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz - https://github.com/DeaDBeeF-Player/apbuild/archive/${_apbuild_commit}.tar.gz>apbuild-${_apbuild_commit}.tar.gz - https://github.com/DeaDBeeF-Player/mp4p/archive/${_mp4p_commit}.tar.gz>mp4p-${_mp4p_commit}.tar.gz" -checksum="a667d55b787d76bc9d3593882b57ae9a449a99e93e1c11f85ec638566e10877d - c5eeb3fa116d51d251fe7c7e5c44798680f6478c43a1fffdcb28c4caf1c68286 - d0ba1b4ad062cb5c056c4a59ed55769d79371fc9b3bf9aaa0ca48f508e3eba75" +distfiles="https://sourceforge.net/projects/deadbeef/files/travis/linux/${version}/deadbeef-${version}.tar.bz2" +checksum="74c4478edccfee8a978d4adbeeb208f049bef63982f4df19ee208aaad8a6cd26" LDFLAGS+=" -Wl,-z,stack-size=1048576" # The soundtouchup plugin was made default in 1.8.4 and fails to build on i686. @@ -40,14 +34,10 @@ fi post_extract() { mv deadbeef-${version}/* . - rm -rf external/apbuild - rm -rf external/mp4p - mv -v apbuild-${_apbuild_commit} external/apbuild - mv -v mp4p-${_mp4p_commit} external/mp4p } -pre_configure() { - NOCONFIGURE=1 ./autogen.sh +do_configure() { + CC=clang CXX=clang++ ./configure ${configure_args} } post_install() { diff --git a/srcpkgs/libdispatch-devel b/srcpkgs/libdispatch-devel new file mode 120000 index 000000000000..b66e96a6610f --- /dev/null +++ b/srcpkgs/libdispatch-devel @@ -0,0 +1 @@ +libdispatch/ \ No newline at end of file diff --git a/srcpkgs/libdispatch/patches/disable-warn.patch b/srcpkgs/libdispatch/patches/disable-warn.patch new file mode 100644 index 000000000000..073efe20c45f --- /dev/null +++ b/srcpkgs/libdispatch/patches/disable-warn.patch @@ -0,0 +1,20 @@ +comment + +--- a/cmake/modules/DispatchCompilerWarnings.cmake ++++ b/cmake/modules/DispatchCompilerWarnings.cmake +@@ -2,7 +2,6 @@ + if("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC") + # TODO: someone needs to provide the msvc equivalent warning flags + else() +- add_compile_options($<$,$>:-Werror>) + add_compile_options($<$,$>:-Wall>) + add_compile_options($<$,$>:-Wextra>) + +@@ -38,7 +37,6 @@ + add_compile_options($<$,$>:-Wswitch>) + add_compile_options($<$,$>:-Wunguarded-availability>) + add_compile_options($<$,$>:-Wunreachable-code>) +- add_compile_options($<$,$>:-Wunused>) + + add_compile_options($<$,$>:-Wno-unknown-warning-option>) + add_compile_options($<$,$>:-Wno-trigraphs>) diff --git a/srcpkgs/libdispatch/template b/srcpkgs/libdispatch/template new file mode 100644 index 000000000000..4c58a2ec8bd2 --- /dev/null +++ b/srcpkgs/libdispatch/template @@ -0,0 +1,32 @@ +# Template file for 'deadbeef' +pkgname=libdispatch +version=5.5.3 +revision=1 +create_wrksrc=yes +build_style=cmake +hostmakedepends="ninja clang git" +makedepends="patch" +short_desc="libdispatch provides comprehensive support for concurrent code execution on multicore hardware" +maintainer="Ilya " +license="Apache-2.0" +homepage="https://github.com/apple/swift-corelibs-libdispatch" +distfiles="https://github.com/apple/swift-corelibs-libdispatch/archive/swift-${version}-RELEASE.tar.gz>${pkgname}-${version}.tar.gz" +checksum="dc0912c2812953c84eea996358abd6a2dbeb97f334d5c1d4064e077ca43d569f" + +pre_patch() { + mv -v ./*/* ./ + mkdir build +} + +do_configure() { + cd build + cmake -G Ninja -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ .. +} + +libdispatch-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + } +}