From e97b4516aa3530beaed6ea307859802e95a95e99 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sun, 26 May 2024 22:50:48 +0200 Subject: [PATCH 1/4] iniparser: update to 4.2.2 --- common/shlibs | 2 +- srcpkgs/iniparser-example | 1 - srcpkgs/iniparser/files/iniparser.pc | 11 ---- .../iniparser/patches/no-install-tests.patch | 15 +++++ srcpkgs/iniparser/template | 59 +++++-------------- 5 files changed, 31 insertions(+), 57 deletions(-) delete mode 120000 srcpkgs/iniparser-example delete mode 100644 srcpkgs/iniparser/files/iniparser.pc create mode 100644 srcpkgs/iniparser/patches/no-install-tests.patch diff --git a/common/shlibs b/common/shlibs index 65658013b5ffb6..800be475ad4d2c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2480,7 +2480,7 @@ libCEGUISILLYImageCodec.so cegui-0.8.7_1 libct.so.4 freetds-0.95.19_1 libsybdb.so.5 freetds-0.95.19_1 libqqwing.so.2 qqwing-1.3.4_1 -libiniparser.so.1 iniparser-4.1_1 +libiniparser.so.4 iniparser-4.2.2_1 libzita-resampler.so.1 zita-resampler-1.3.0_1 libmlt.so.6 mlt-6.4.1_1 libmlt++.so.3 mlt-6.4.1_1 diff --git a/srcpkgs/iniparser-example b/srcpkgs/iniparser-example deleted file mode 120000 index 237c429bcdd2b2..00000000000000 --- a/srcpkgs/iniparser-example +++ /dev/null @@ -1 +0,0 @@ -iniparser \ No newline at end of file diff --git a/srcpkgs/iniparser/files/iniparser.pc b/srcpkgs/iniparser/files/iniparser.pc deleted file mode 100644 index 8f820f01bc8991..00000000000000 --- a/srcpkgs/iniparser/files/iniparser.pc +++ /dev/null @@ -1,11 +0,0 @@ -# Package configuration for @PKGNAME@-@VERSION@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: @PKGNAME@ -Description: Library to parse ini files -Version: @VERSION@ -Libs: -L${libdir} -liniparser -Cflags: -I${includedir} diff --git a/srcpkgs/iniparser/patches/no-install-tests.patch b/srcpkgs/iniparser/patches/no-install-tests.patch new file mode 100644 index 00000000000000..61e43f952c8a60 --- /dev/null +++ b/srcpkgs/iniparser/patches/no-install-tests.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f97b195..b679519 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -141,10 +141,6 @@ if(BUILD_TESTS) + $ + $) + +- install(TARGETS ${TEST_NAME}) +- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test/ressources +- DESTINATION ${CMAKE_INSTALL_BINDIR}) +- + enable_testing() + add_test( + NAME testsuite diff --git a/srcpkgs/iniparser/template b/srcpkgs/iniparser/template index fb813c7d870db6..94570542a0ef04 100644 --- a/srcpkgs/iniparser/template +++ b/srcpkgs/iniparser/template @@ -1,49 +1,24 @@ # Template file for 'iniparser' pkgname=iniparser -version=4.1 -revision=3 -build_style=gnu-makefile -hostmakedepends="doxygen chrpath" +version=4.2.2 +revision=1 +build_style=cmake +configure_args="-DBUILD_EXAMPLES=OFF" +hostmakedepends="doxygen" short_desc="Free stand-alone ini file parsing library" maintainer="Orphaned " license="MIT" -homepage="http://ndevilla.free.fr/iniparser/" -distfiles="https://github.com/ndevilla/iniparser/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=960daa800dd31d70ba1bacf3ea2d22e8ddfc2906534bf328319495966443f3ae +homepage="https://gitlab.com/iniparser/iniparser" +changelog="https://gitlab.com/iniparser/iniparser/-/releases" +distfiles="https://gitlab.com/iniparser/iniparser/-/archive/v${version}/iniparser-v${version}.tar.gz" +checksum=7996b62cf499b83edb1a47e28d3c5cc74a2320c7e0b7f8cbb9f5cd5f3c5477e3 -CFLAGS="-fPIC" +if [ "${XBPS_CHECK_PKGS}" ]; then + configure_args+=" -DBUILD_TESTS=ON" +fi -post_build() { - make docs -} - -do_install() { +post_install() { vlicense LICENSE - - # Install header files - vmkdir usr/include - vcopy "src/*.h" usr/include - - # Install libraries - vmkdir usr/lib - vcopy "libiniparser.*" usr/lib - ln -s libiniparser.so.1 ${DESTDIR}/usr/lib/libiniparser.so - chrpath -d ${DESTDIR}/usr/lib/libiniparser.so - - # Install pkg-config file - vmkdir usr/lib/pkgconfig - sed ${FILESDIR}/${pkgname}.pc \ - -e "s;@PKGNAME@;$pkgname;g" \ - -e "s;@VERSION@;$version;g" \ - > ${DESTDIR}/usr/lib/pkgconfig/${pkgname}.pc - - # Install example source and binaries - vmkdir usr/share/${pkgname}/example - vcopy "${wrksrc}/example/*" usr/share/${pkgname}/example - - # Install documentation - vmkdir usr/share/doc/${pkgname} - vcopy "${wrksrc}/html/*" usr/share/doc/${pkgname} } iniparser-devel_package() { @@ -51,20 +26,16 @@ iniparser-devel_package() { depends="${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include + vmove usr/lib/cmake vmove usr/lib/pkgconfig vmove "usr/lib/*.a" vmove "usr/lib/*.so" } } + iniparser-doc_package() { short_desc+=" - documentation" pkg_install() { vmove usr/share/doc/iniparser } } -iniparser-example_package() { - short_desc+=" - example code" - pkg_install() { - vmove usr/share/iniparser/example - } -} From 4d1ed761062eeb81390e94dab482b585c8bd630a Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sun, 26 May 2024 23:42:47 +0200 Subject: [PATCH 2/4] cava: rebuild for iniparser --- srcpkgs/cava/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cava/template b/srcpkgs/cava/template index 102607733abb96..6c9a016da12a46 100644 --- a/srcpkgs/cava/template +++ b/srcpkgs/cava/template @@ -1,7 +1,7 @@ # Template file for 'cava' pkgname=cava version=0.10.2 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="autoconf-archive automake libtool pkg-config" makedepends="fftw-devel iniparser-devel ncurses-devel SDL2-devel From 0bf2558623aed0c0c193fd3abe546a980f56f3ce Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sun, 26 May 2024 23:43:28 +0200 Subject: [PATCH 3/4] ubridge: rebuild for iniparser --- srcpkgs/ubridge/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ubridge/template b/srcpkgs/ubridge/template index edaf0ef76a1f06..f56d35312022e6 100644 --- a/srcpkgs/ubridge/template +++ b/srcpkgs/ubridge/template @@ -1,7 +1,7 @@ # Template file for 'ubridge' pkgname=ubridge version=0.9.18 -revision=2 +revision=3 build_style=gnu-makefile make_build_args="SYSTEM_INIPARSER=1" makedepends="libpcap-devel iniparser-devel" From ccb173b9e84e7c0d515194b7c9684ff703871d19 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Sun, 26 May 2024 23:45:00 +0200 Subject: [PATCH 4/4] xava: update to 0.7.0.0 --- srcpkgs/xava/patches/broken-cmake.patch | 22 ------------- srcpkgs/xava/patches/fix-cmake.patch | 30 +++++++++++++++++ .../xava/patches/use-system-iniparser.patch | 33 +++++++++++++++++++ srcpkgs/xava/template | 18 +++++++--- 4 files changed, 76 insertions(+), 27 deletions(-) delete mode 100644 srcpkgs/xava/patches/broken-cmake.patch create mode 100644 srcpkgs/xava/patches/fix-cmake.patch create mode 100644 srcpkgs/xava/patches/use-system-iniparser.patch diff --git a/srcpkgs/xava/patches/broken-cmake.patch b/srcpkgs/xava/patches/broken-cmake.patch deleted file mode 100644 index 56411aadd3da14..00000000000000 --- a/srcpkgs/xava/patches/broken-cmake.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/CMakeLists.txt 2020-08-27 15:31:42.000000000 +0700 -+++ b/CMakeLists.txt 2021-01-14 21:44:51.704505119 +0700 -@@ -10,19 +10,6 @@ - option(SNDIO "SNDIO" ON) - option(PORTAUDIO "PORTAUDIO" ON) - --# Fix pkg-config for cross-builds (such as MinGW on ArchLinux) --if(CMAKE_FIND_ROOT_PATH) -- set(CMAKE_SYSROOT "${CMAKE_FIND_ROOT_PATH}") -- -- set(ENV{PKG_CONFIG_DIR} "") -- set(ENV{PKG_CONFIG_LIBDIR} "${CMAKE_SYSROOT}/lib/pkgconfig:${CMAKE_SYSROOT}/share/pkgconfig") -- set(ENV{PKG_CONFIG_SYSROOT_DIR} ${CMAKE_SYSROOT}) --endif() -- --if(NOT CMAKE_BUILD_TYPE) -- set(CMAKE_BUILD_TYPE Debug) --endif() -- - set(CMAKE_C_STANDARD 11) - set(xava_VERSION_MAJOR 0) - set(xava_VERSION_MINOR 6) diff --git a/srcpkgs/xava/patches/fix-cmake.patch b/srcpkgs/xava/patches/fix-cmake.patch new file mode 100644 index 00000000000000..5fcb90457fd847 --- /dev/null +++ b/srcpkgs/xava/patches/fix-cmake.patch @@ -0,0 +1,30 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 37a13bf..a31a3ab 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,25 +7,11 @@ function(cat IN_FILE OUT_FILE) + file(APPEND ${OUT_FILE} "${CONTENTS}") + endfunction() + +-# REQUIRE GIT to be present +-if(NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/.git) +- message(FATAL_ERROR "XAVA from 0.7.0 onwards requires to be built in a .git directory") +-endif() +- + # Correct CMAKE_INSTALL_PREFIX so that distros don't break + if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Default installation path" FORCE) + endif() + +-# Fix pkg-config for cross-builds (such as MinGW on ArchLinux) +-if(CMAKE_FIND_ROOT_PATH) +- set(CMAKE_SYSROOT "${CMAKE_FIND_ROOT_PATH}") +- +- set(ENV{PKG_CONFIG_DIR} "") +- set(ENV{PKG_CONFIG_LIBDIR} "${CMAKE_SYSROOT}/lib/pkgconfig:${CMAKE_SYSROOT}/share/pkgconfig") +- set(ENV{PKG_CONFIG_SYSROOT_DIR} ${CMAKE_SYSROOT}) +-endif() +- + # Debug is default + if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE Debug) diff --git a/srcpkgs/xava/patches/use-system-iniparser.patch b/srcpkgs/xava/patches/use-system-iniparser.patch new file mode 100644 index 00000000000000..7a4a7b3dd3b754 --- /dev/null +++ b/srcpkgs/xava/patches/use-system-iniparser.patch @@ -0,0 +1,33 @@ +diff --git a/src/shared/build.cmake b/src/shared/build.cmake +index 9fb1043..22dd854 100644 +--- a/src/shared/build.cmake ++++ b/src/shared/build.cmake +@@ -10,10 +10,11 @@ set(ADDITIONAL_SHARED_INCLUDE_DIRS "") + execute_process(COMMAND git submodule update --init) + + # Pull submodule and install dependency +-add_library(iniparser STATIC +- lib/iniparser/src/dictionary.c +- lib/iniparser/src/iniparser.c) +-set_target_properties(iniparser PROPERTIES COMPILE_FLAGS "-fPIC") ++# add_library(iniparser STATIC ++# lib/iniparser/src/dictionary.c ++# lib/iniparser/src/iniparser.c) ++# set_target_properties(iniparser PROPERTIES COMPILE_FLAGS "-fPIC") ++find_package(iniparser REQUIRED) + + # Runtime library load + if(UNIX) +diff --git a/src/shared/config/config.c b/src/shared/config/config.c +index 814c2be..a2e86c1 100644 +--- a/src/shared/config/config.c ++++ b/src/shared/config/config.c +@@ -1,7 +1,7 @@ + #include + #include + +-#include ++#include + + #include "../../shared.h" + diff --git a/srcpkgs/xava/template b/srcpkgs/xava/template index f7cf336ac7f6d3..666b893120646a 100644 --- a/srcpkgs/xava/template +++ b/srcpkgs/xava/template @@ -1,16 +1,24 @@ # Template file for 'xava' pkgname=xava -version=0.6.3.1 -revision=2 +version=0.7.0.0 +revision=1 +_efsw_commit=4dc2b9e2718e0ffb0a89a00db5bad7d328b9e3ae build_style=cmake hostmakedepends="automake libtool pkg-config" -makedepends="SDL2-devel iniparser-devel ncurses-devel sndio-devel portaudio-devel" +makedepends="SDL2-devel glew-devel iniparser-devel ncurses-devel sndio-devel portaudio-devel" short_desc="X11 Audio Visualizer for ALSA" maintainer="Orphaned " license="MIT" homepage="https://github.com/nikp123/xava" -distfiles="https://github.com/nikp123/xava/archive/${version}.tar.gz" -checksum=b38b810e4bfd71aff44f223b444ae4f158eb8d6428c5e9d42697343ccb5a19f9 +distfiles="https://github.com/nikp123/xava/archive/refs/tags/${version}.tar.gz + https://github.com/SpartanJ/efsw/archive/${_efsw_commit}.tar.gz" +checksum="bc78aa3073e47bd1e247780464f4d38d05db084a4f49718e39a4d20f61b1398c + 74770f00613522a8733a44b81a28c65cf27e3330ff698b340f3c327bdf693083" +skip_extraction="${_efsw_commit}.tar.gz" + +post_extract() { + vsrcextract -C lib/efsw ${_efsw_commit}.tar.gz +} post_install() { vlicense LICENSE