From d2567bfbdf0e9fa6db0a6ed1534831ec859a3e03 Mon Sep 17 00:00:00 2001 From: davidovski Date: Wed, 15 Jun 2022 20:02:02 +0100 Subject: added deps for qemu --- skip/cryptsetup/cryptsetup.xibuild | 36 --- skip/cryptsetup/dmcrypt.confd | 111 ------- skip/cryptsetup/dmcrypt.initd | 339 --------------------- .../zynaddsubfx-3.0.6-libzest_location.patch | 13 - .../zynaddsubfx-3.0.6-system_rtosc.patch | 92 ------ ...bfx-mruby-zest-build-3.0.6-cflags_ldflags.patch | 21 -- ...bfx-mruby-zest-build-3.0.6-devendor_rtosc.patch | 14 - ...x-mruby-zest-build-3.0.6-libzest_location.patch | 13 - ...ubfx-mruby-zest-build-3.0.6-makefile_find.patch | 75 ----- ...uby-zest-build-3.0.6-system_wide_location.patch | 46 --- skip/zynaddsubfx/zynaddsubfx.xibuild | 23 -- 11 files changed, 783 deletions(-) delete mode 100644 skip/cryptsetup/cryptsetup.xibuild delete mode 100644 skip/cryptsetup/dmcrypt.confd delete mode 100644 skip/cryptsetup/dmcrypt.initd delete mode 100644 skip/zynaddsubfx/zynaddsubfx-3.0.6-libzest_location.patch delete mode 100644 skip/zynaddsubfx/zynaddsubfx-3.0.6-system_rtosc.patch delete mode 100644 skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-cflags_ldflags.patch delete mode 100644 skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-devendor_rtosc.patch delete mode 100644 skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-libzest_location.patch delete mode 100644 skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-makefile_find.patch delete mode 100644 skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-system_wide_location.patch delete mode 100644 skip/zynaddsubfx/zynaddsubfx.xibuild (limited to 'skip') diff --git a/skip/cryptsetup/cryptsetup.xibuild b/skip/cryptsetup/cryptsetup.xibuild deleted file mode 100644 index 6c883d9..0000000 --- a/skip/cryptsetup/cryptsetup.xibuild +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -NAME="cryptsetup" -DESC="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi" - -MAKEDEPS="make" -DEPS="util-linux musl popt device-mapper" - -PKG_VER=2.4.3 -SOURCE="https://www.kernel.org/pub/linux/utils/cryptsetup/v${PKG_VER%.*}/cryptsetup-$PKG_VER.tar.gz" -ADDITIONAL="dmcrypt.initd dmcrypt.confd " - -build () { - ./configure \ - --prefix=/usr \ - --bindir=/usr/bin \ - --sysconfdir=/etc \ - --disable-static \ - --enable-libargon2 \ - --with-crypto_backend=openssl \ - --disable-external-tokens \ - --disable-ssh-token - - make -} - -package () { - make DESTDIR=$PKG_DEST install - install -Dm644 "$srcdir"/dmcrypt.confd "$PKG_DEST"/etc/conf.d/dmcrypt - install -Dm755 "$srcdir"/dmcrypt.initd "$PKG_DEST"/etc/init.d/dmcrypt - - mkdir -p "$PKG_DEST"/usr/share/doc/cryptsetup/ - install -m644 README.md FAQ docs/v$PKG_VER-ReleaseNotes \ - "$PKG_DEST"/usr/share/doc/cryptsetup/ - -} diff --git a/skip/cryptsetup/dmcrypt.confd b/skip/cryptsetup/dmcrypt.confd deleted file mode 100644 index 642ff08..0000000 --- a/skip/cryptsetup/dmcrypt.confd +++ /dev/null @@ -1,111 +0,0 @@ -# /etc/conf.d/dmcrypt - -# For people who run dmcrypt on top of some other layer (like raid), -# use rc_need to specify that requirement. See the runscript(8) man -# page for more information. - -#-------------------- -# Instructions -#-------------------- - -# Note regarding the syntax of this file. This file is *almost* bash, -# but each line is evaluated separately. Separate swaps/targets can be -# specified. The init-script which reads this file assumes that a -# swap= or target= line starts a new section, similar to lilo or grub -# configuration. - -# Note when using gpg keys and /usr on a separate partition, you will -# have to copy /usr/bin/gpg to /bin/gpg so that it will work properly -# and ensure that gpg has been compiled statically. -# See http://bugs.gentoo.org/90482 for more information. - -# Note that the init-script which reads this file detects whether your -# partition is LUKS or not. No mkfs is run unless you specify a makefs -# option. - -# Global options: -#---------------- - -# How long to wait for each timeout (in seconds). -dmcrypt_key_timeout=1 - -# Max number of checks to perform (see dmcrypt_key_timeout). -#dmcrypt_max_timeout=300 - -# Number of password retries. -dmcrypt_retries=5 - -# Arguments: -#----------- -# target= == Mapping name for partition. -# swap= == Mapping name for swap partition. -# source='' == Real device for partition. -# Note: You can (and should) specify a tag like UUID -# for blkid (see -t option). This is safer than using -# the full path to the device. -# key='[:]' == Fullpath from / or from inside removable media. -# remdev='' == Device that will be assigned to removable media. -# gpg_options='' == Default are --quiet --decrypt -# options='' == cryptsetup, for LUKS you can only use --readonly -# loop_file='' == Loopback file. -# Note: If you omit $source, then a free loopback will -# be looked up automatically. -# pre_mount='cmds' == commands to execute before mounting partition. -# post_mount='cmds' == commands to execute after mounting partition. -#----------- -# Supported Modes -# gpg == decrypt and pipe key into cryptsetup. -# Note: new-line character must not be part of key. -# Command to erase \n char: 'cat key | tr -d '\n' > cleanKey' - -#-------------------- -# dm-crypt examples -#-------------------- - -## swap -# Swap partitions. These should come first so that no keys make their -# way into unencrypted swap. -# If no options are given, they will default to: -c aes -h sha1 -d /dev/urandom -# If no makefs is given then mkswap will be assumed -#swap=crypt-swap -#source='/dev/hda2' - -## /home with passphrase -#target=crypt-home -#source='/dev/hda5' - -## /home with regular keyfile -#target=crypt-home -#source='/dev/hda5' -#key='/full/path/to/homekey' - -## /home with gpg protected key -#target=crypt-home -#source='/dev/hda5' -#key='/full/path/to/homekey:gpg' - -## /home with regular keyfile on removable media(such as usb-stick) -#target=crypt-home -#source='/dev/hda5' -#key='/full/path/to/homekey' -#remdev='/dev/sda1' - -## /home with gpg protected key on removable media(such as usb-stick) -#target=crypt-home -#source='/dev/hda5' -#key='/full/path/to/homekey:gpg' -#remdev='/dev/sda1' - -## /tmp with regular keyfile -#target=crypt-tmp -#source='/dev/hda6' -#key='/full/path/to/tmpkey' -#pre_mount='/sbin/mkreiserfs -f -f ${dev}' -#post_mount='chown root:root ${mount_point}; chmod 1777 ${mount_point}' - -## Loopback file example -#target='crypt-loop-home' -#source='/dev/loop0' -#loop_file='/mnt/crypt/home' - -# The file must be terminated by a newline. Or leave this comment last. diff --git a/skip/cryptsetup/dmcrypt.initd b/skip/cryptsetup/dmcrypt.initd deleted file mode 100644 index 85c77f7..0000000 --- a/skip/cryptsetup/dmcrypt.initd +++ /dev/null @@ -1,339 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - before checkfs fsck - - if grep -qs ^swap= "${conf_file}" ; then - before swap - fi -} - -# We support multiple dmcrypt instances based on $SVCNAME -conf_file="/etc/conf.d/${SVCNAME}" - -# Get splash helpers if available. -if [ -e /sbin/splash-functions.sh ] ; then - . /sbin/splash-functions.sh -fi - -# Setup mappings for an individual target/swap -# Note: This relies on variables localized in the main body below. -dm_crypt_execute() { - local dev ret mode foo - - if [ -z "${target}" -a -z "${swap}" ] ; then - return - fi - - # Set up default values. - : ${dmcrypt_key_timeout:=1} - : ${dmcrypt_max_timeout:=300} - : ${dmcrypt_retries:=5} - - # Handle automatic look up of the source path. - if [ -z "${source}" -a -n "${loop_file}" ] ; then - source=$(losetup --show -f "${loop_file}") - fi - case ${source} in - *=*) - source="$(findfs ${source})" - ;; - esac - if [ -z "${source}" ] || [ ! -e "${source}" ] ; then - ewarn "source \"${source}\" for ${target} missing, skipping..." - return - fi - - if [ -n "${target}" ] ; then - # let user set options, otherwise leave empty - : ${options:=' '} - elif [ -n "${swap}" ] ; then - if cryptsetup isLuks ${source} 2>/dev/null ; then - ewarn "The swap you have defined is a LUKS partition. Aborting crypt-swap setup." - return - fi - target=${swap} - # swap contents do not need to be preserved between boots, luks not required. - # suspend2 users should have initramfs's init handling their swap partition either way. - : ${options:='-c aes -h sha1 -d /dev/urandom'} - : ${pre_mount:='mkswap ${dev}'} - fi - - if [ -n "${loop_file}" ] ; then - dev="/dev/mapper/${target}" - ebegin " Setting up loop device ${source}" - losetup ${source} ${loop_file} - fi - - # cryptsetup: - # open # is $source - # create # is $target - local arg1="create" arg2="${target}" arg3="${source}" - if cryptsetup isLuks ${source} 2>/dev/null ; then - arg1="open" - arg2="${source}" - arg3="${target}" - fi - - # Older versions reported: - # ${target} is active: - # Newer versions report: - # ${target} is active[ and is in use.] - if cryptsetup status ${target} | egrep -q ' is active' ; then - einfo "dm-crypt mapping ${target} is already configured" - return - fi - splash svc_input_begin ${SVCNAME} >/dev/null 2>&1 - - # Handle keys - if [ -n "${key}" ] ; then - read_abort() { - # some colors - local ans savetty resettty - [ -z "${NORMAL}" ] && eval $(eval_ecolors) - einfon " $1? (${WARN}yes${NORMAL}/${GOOD}No${NORMAL}) " - shift - # This is ugly as s**t. But POSIX doesn't provide `read -t`, so - # we end up having to implement our own crap with stty/etc... - savetty=$(stty -g) - resettty='stty ${savetty}; trap - EXIT HUP INT TERM' - trap 'eval "${resettty}"' EXIT HUP INT TERM - stty -icanon - stty min 0 time "$(( $2 * 10 ))" - ans=$(dd count=1 bs=1 2>/dev/null) || ans='' - eval "${resettty}" - if [ -z "${ans}" ] ; then - printf '\r' - else - echo - fi - case ${ans} in - [yY]) return 0;; - *) return 1;; - esac - } - - # Notes: sed not used to avoid case where /usr partition is encrypted. - mode=${key##*:} && ( [ "${mode}" = "${key}" ] || [ -z "${mode}" ] ) && mode=reg - key=${key%:*} - case "${mode}" in - gpg|reg) - # handle key on removable device - if [ -n "${remdev}" ] ; then - # temp directory to mount removable device - local mntrem="${RC_SVCDIR}/dm-crypt-remdev.$$" - if [ ! -d "${mntrem}" ] ; then - if ! mkdir -p "${mntrem}" ; then - ewarn "${source} will not be decrypted ..." - einfo "Reason: Unable to create temporary mount point '${mntrem}'" - return - fi - fi - i=0 - einfo "Please insert removable device for ${target}" - while [ ${i} -lt ${dmcrypt_max_timeout} ] ; do - foo="" - if mount -n -o ro "${remdev}" "${mntrem}" 2>/dev/null >/dev/null ; then - # keyfile exists? - if [ ! -e "${mntrem}${key}" ] ; then - umount -n "${mntrem}" - rmdir "${mntrem}" - einfo "Cannot find ${key} on removable media." - read_abort "Abort" ${dmcrypt_key_timeout} && return - else - key="${mntrem}${key}" - break - fi - else - [ -e "${remdev}" ] \ - && foo="mount failed" \ - || foo="mount source not found" - fi - : $((i += 1)) - read_abort "Stop waiting after $i attempts (${foo})" -t 1 && return - done - else # keyfile ! on removable device - if [ ! -e "${key}" ] ; then - ewarn "${source} will not be decrypted ..." - einfo "Reason: keyfile ${key} does not exist." - return - fi - fi - ;; - *) - ewarn "${source} will not be decrypted ..." - einfo "Reason: mode ${mode} is invalid." - return - ;; - esac - else - mode=none - fi - ebegin " ${target} using: ${options} ${arg1} ${arg2} ${arg3}" - if [ "${mode}" = "gpg" ] ; then - : ${gpg_options:='-q -d'} - # gpg available ? - if command -v gpg >/dev/null ; then - i=0 - while [ ${i} -lt ${dmcrypt_retries} ] ; do - # paranoid, don't store key in a variable, pipe it so it stays very little in ram unprotected. - # save stdin stdout stderr "values" - timeout ${dmcrypt_max_timeout} gpg ${gpg_options} ${key} 2>/dev/null | \ - cryptsetup --key-file - ${options} ${arg1} ${arg2} ${arg3} - ret=$? - # The timeout command exits 124 when it times out. - [ ${ret} -eq 0 -o ${ret} -eq 124 ] && break - : $(( i += 1 )) - done - eend ${ret} "failure running cryptsetup" - else - ewarn "${source} will not be decrypted ..." - einfo "Reason: cannot find gpg application." - einfo "You have to install gnupg first." - einfo "If you have /usr on its own partition, try copying gpg to /bin ." - fi - else - if [ "${mode}" = "reg" ] ; then - cryptsetup ${options} -d ${key} ${arg1} ${arg2} ${arg3} - ret=$? - eend ${ret} "failure running cryptsetup" - else - cryptsetup ${options} ${arg1} ${arg2} ${arg3} - ret=$? - eend ${ret} "failure running cryptsetup" - fi - fi - if [ -d "${mntrem}" ] ; then - umount -n ${mntrem} 2>/dev/null >/dev/null - rmdir ${mntrem} 2>/dev/null >/dev/null - fi - splash svc_input_end ${SVCNAME} >/dev/null 2>&1 - - if [ ${ret} -ne 0 ] ; then - cryptfs_status=1 - else - if [ -n "${pre_mount}" ] ; then - dev="/dev/mapper/${target}" - eval ebegin \"" pre_mount: ${pre_mount}"\" - eval "${pre_mount}" > /dev/null - ewend $? || cryptfs_status=1 - fi - fi -} - -# Lookup optional bootparams -get_bootparam_val() { - # We're given something like: - # foo=bar=cow - # Return the "bar=cow" part. - case $1 in - *=*) - echo "${1#*=}" - ;; - esac -} - -start() { - local header=true cryptfs_status=0 - local gpg_options key loop_file target targetline options pre_mount post_mount source swap remdev - - local x - for x in $(cat /proc/cmdline) ; do - case "${x}" in - key_timeout=*) - dmcrypt_key_timeout=$(get_bootparam_val "${x}") - ;; - esac - done - - while read targetline <&3 ; do - case ${targetline} in - # skip comments and blank lines - ""|"#"*) continue ;; - # skip service-specific openrc configs #377927 - rc_*) continue ;; - esac - - ${header} && ebegin "Setting up dm-crypt mappings" - header=false - - # check for the start of a new target/swap - case ${targetline} in - target=*|swap=*) - # If we have a target queued up, then execute it - dm_crypt_execute - - # Prepare for the next target/swap by resetting variables - unset gpg_options key loop_file target options pre_mount post_mount source swap remdev - ;; - - gpg_options=*|remdev=*|key=*|loop_file=*|options=*|pre_mount=*|post_mount=*|source=*) - if [ -z "${target}${swap}" ] ; then - ewarn "Ignoring setting outside target/swap section: ${targetline}" - continue - fi - ;; - - dmcrypt_*=*) - # ignore global options - continue - ;; - - *) - ewarn "Skipping invalid line in ${conf_file}: ${targetline}" - ;; - esac - - # Queue this setting for the next call to dm_crypt_execute - eval "${targetline}" - done 3< ${conf_file} - - # If we have a target queued up, then execute it - dm_crypt_execute - - ewend ${cryptfs_status} "Failed to setup dm-crypt devices" -} - -stop() { - local line header - - # Break down all mappings - header=true - egrep "^(target|swap)=" ${conf_file} | \ - while read line ; do - ${header} && einfo "Removing dm-crypt mappings" - header=false - - target= swap= - eval ${line} - - [ -n "${swap}" ] && target=${swap} - if [ -z "${target}" ] ; then - ewarn "invalid line in ${conf_file}: ${line}" - continue - fi - - ebegin " ${target}" - cryptsetup remove ${target} - eend $? - done - - # Break down loop devices - header=true - grep '^source=./dev/loop' ${conf_file} | \ - while read line ; do - ${header} && einfo "Detaching dm-crypt loop devices" - header=false - - source= - eval ${line} - - ebegin " ${source}" - losetup -d "${source}" - eend $? - done - - return 0 -} diff --git a/skip/zynaddsubfx/zynaddsubfx-3.0.6-libzest_location.patch b/skip/zynaddsubfx/zynaddsubfx-3.0.6-libzest_location.patch deleted file mode 100644 index ce14e67..0000000 --- a/skip/zynaddsubfx/zynaddsubfx-3.0.6-libzest_location.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git i/src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp w/src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp -index 0829e889..010e1fac 100644 ---- i/src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp -+++ w/src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp -@@ -68,7 +68,7 @@ public: - #else - handle = dlopen("./libzest.so", RTLD_LAZY); - if(!handle) -- handle = dlopen("/opt/zyn-fusion/libzest.so", RTLD_LAZY); -+ handle = dlopen("/usr/lib/zynaddsubfx/libzest.so", RTLD_LAZY); - if(!handle) - handle = dlopen("libzest.so", RTLD_LAZY); - #endif diff --git a/skip/zynaddsubfx/zynaddsubfx-3.0.6-system_rtosc.patch b/skip/zynaddsubfx/zynaddsubfx-3.0.6-system_rtosc.patch deleted file mode 100644 index 799ff8e..0000000 --- a/skip/zynaddsubfx/zynaddsubfx-3.0.6-system_rtosc.patch +++ /dev/null @@ -1,92 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5c708574..ef17dbd3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -10,24 +10,34 @@ if(DEFINED ZYN_DATADIR) - add_definitions(-DZYN_DATADIR="${ZYN_DATADIR}") - endif() - -+option(ZYN_SYSTEM_RTOSC "Use system provided librtosc and librtosc-cpp" OFF) -+ - #Include RTOSC --if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/rtosc/CMakeLists.txt") -- message(STATUS "RTOSC NOT FOUND") -- message(STATUS "Attempting to checkout submodule") -- find_package(Git REQUIRED) -- execute_process(COMMAND git submodule update --init --recursive) -+if(ZYN_SYSTEM_RTOSC) -+ include(FindPkgConfig) -+ pkg_check_modules(RTOSC REQUIRED librtosc) -+ pkg_check_modules(RTOSC_CPP REQUIRED librtosc-cpp) -+ include_directories(${RTOSC_INCLUDE_DIR}) -+ message(STATUS "Found system provided librtosc and librtosc-cpp...") -+else() - if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/rtosc/CMakeLists.txt") -- message(FATAL_ERROR "FAILED TO CHECKOUT RTOSC\n" -- "please check file permissions and your network") -+ message(STATUS "RTOSC NOT FOUND") -+ message(STATUS "Attempting to checkout submodule") -+ find_package(Git REQUIRED) -+ execute_process(COMMAND git submodule update --init --recursive) -+ if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/rtosc/CMakeLists.txt") -+ message(FATAL_ERROR "FAILED TO CHECKOUT RTOSC\n" -+ "please check file permissions and your network") -+ endif() -+ else() -+ message(STATUS "Found Rtosc Submodule...") - endif() --else() -- message(STATUS "Found Rtosc Submodule...") --endif() - --set(RTOSC_NO_INSTALL TRUE) --include("rtosc/cmake/ColorMessage.cmake") --add_subdirectory(rtosc) --include_directories(rtosc/include) -+ set(RTOSC_NO_INSTALL TRUE) -+ include("rtosc/cmake/ColorMessage.cmake") -+ add_subdirectory(rtosc) -+ include_directories(rtosc/include) -+endif() - - enable_testing() - include(CTestConfig.cmake) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 2900f4b7..8348df70 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -575,13 +575,27 @@ else() - set(PTHREAD_LIBRARY pthread) - endif() - --target_link_libraries(zynaddsubfx_core -- ${ZLIB_LIBRARIES} -- ${FFTW3F_LIBRARIES} -- ${MXML_LIBRARIES} -- ${OS_LIBRARIES} -- ${PTHREAD_LIBRARY} -- rtosc rtosc-cpp) -+if(ZYN_SYSTEM_RTOSC) -+ target_link_libraries(zynaddsubfx_core -+ ${ZLIB_LIBRARIES} -+ ${FFTW3F_LIBRARIES} -+ ${MXML_LIBRARIES} -+ ${OS_LIBRARIES} -+ ${PTHREAD_LIBRARY} -+ ${RTOSC_LIBRARIES} -+ ${RTOSC_CPP_LIBRARIES} -+ ) -+else() -+ target_link_libraries(zynaddsubfx_core -+ ${ZLIB_LIBRARIES} -+ ${FFTW3F_LIBRARIES} -+ ${MXML_LIBRARIES} -+ ${OS_LIBRARIES} -+ ${PTHREAD_LIBRARY} -+ rtosc -+ rtosc-cpp -+ ) -+endif() - - if(IwyuErr) - message (STATUS "Include what you use: ${IwyuErr}") diff --git a/skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-cflags_ldflags.patch b/skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-cflags_ldflags.patch deleted file mode 100644 index 09dca6f..0000000 --- a/skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-cflags_ldflags.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git i/Makefile w/Makefile -index 7bc3788..3af1cce 100644 ---- i/Makefile -+++ w/Makefile -@@ -16,10 +16,14 @@ linux: - $(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -v mrbc | grep -e "\.o$$" | grep -v bin` ./deps/libnanovg.a \ - ./deps/libnanovg.a \ - src/osc-bridge/libosc-bridge.a \ -- `pkg-config --libs libuv` -lm -lX11 -lGL -lpthread -+ $(CFLAGS) \ -+ `pkg-config --libs libuv` -lm -lX11 -lGL -lpthread \ -+ $(LDFLAGS) - $(CC) test-libversion.c deps/pugl/pugl/pugl_x11.c \ -+ $(CFLAGS) \ - -DPUGL_HAVE_GL \ -- -ldl -o zest -lX11 -lGL -lpthread -I deps/pugl -std=gnu99 -Wno-trigraphs -+ -ldl -o zest -lX11 -lGL -lpthread -I deps/pugl -std=gnu99 -Wno-trigraphs \ -+ $(LDFLAGS) - - osx: deps/libuv.a - ruby ./rebuild-fcache.rb diff --git a/skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-devendor_rtosc.patch b/skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-devendor_rtosc.patch deleted file mode 100644 index 38e84e1..0000000 --- a/skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-devendor_rtosc.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git i/src/mruby-widget-lib/src/gem.c w/src/mruby-widget-lib/src/gem.c -index 8e3d721..7f200e3 100644 ---- i/src/mruby-widget-lib/src/gem.c -+++ w/src/mruby-widget-lib/src/gem.c -@@ -11,8 +11,8 @@ - #ifdef WIN32 - #include - #endif -+#include - #include "../../../deps/pugl/pugl/pugl.h" --#include "../../../deps/rtosc/include/rtosc/rtosc.h" - #include "../../../src/osc-bridge/src/bridge.h" - #include "../../../deps/mruby-nanovg/src/gl_core.3.2.h" - diff --git a/skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-libzest_location.patch b/skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-libzest_location.patch deleted file mode 100644 index 26dad92..0000000 --- a/skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-libzest_location.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git i/test-libversion.c w/test-libversion.c -index 808c01f..a122585 100644 ---- i/test-libversion.c -+++ w/test-libversion.c -@@ -660,7 +660,7 @@ int main(int argc, char **argv) - if(!handle) - handle = dlopen("libzest.so", RTLD_LAZY); - if(!handle) -- handle = dlopen("/opt/zyn-fusion/libzest.so", RTLD_LAZY); -+ handle = dlopen("/usr/lib/zynaddsubfx/libzest.so", RTLD_LAZY); - #endif - if(!handle) { - printf("[ERROR] Cannot Open libzest.so\n"); diff --git a/skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-makefile_find.patch b/skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-makefile_find.patch deleted file mode 100644 index d6e3a93..0000000 --- a/skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-makefile_find.patch +++ /dev/null @@ -1,75 +0,0 @@ -From c1f5fcbad97c20b14a35e894477081d69519f6b0 Mon Sep 17 00:00:00 2001 -From: David Runge -Date: Sat, 21 May 2022 13:19:48 +0200 -Subject: [PATCH] Use find internals instead of piping into grep - -Makefile: -Use GNU find internals (e.g. `-iname`, `-exec` and conditionals) instead -of piping into multiple instances of grep. -Simplify line counting by using wc from find. ---- - Makefile | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/Makefile b/Makefile -index 7bc3788c..a78568e9 100644 ---- a/Makefile -+++ b/Makefile -@@ -13,7 +13,7 @@ linux: - # force rebuilding all code that depends on hotloading. - touch src/mruby-widget-lib/src/api.c - cd mruby && $(HOTLOADING) MRUBY_CONFIG=../build_config.rb rake -- $(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -v mrbc | grep -e "\.o$$" | grep -v bin` ./deps/libnanovg.a \ -+ $(CC) -shared -o libzest.so `find mruby/build/host -type f \( -not -iwholename "*mrbc*" -a -not -iwholename "*bin*" -a -iname "*.o" \)` \ - ./deps/libnanovg.a \ - src/osc-bridge/libosc-bridge.a \ - `pkg-config --libs libuv` -lm -lX11 -lGL -lpthread -@@ -30,7 +30,7 @@ osx: deps/libuv.a - cd deps/pugl && python2 ./waf - cd src/osc-bridge && CFLAGS="-I ../../deps/libuv/include " make lib - cd mruby && MRUBY_CONFIG=../build_config.rb rake -- $(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -v mrbc | grep -e "\.o$$" | grep -v bin` ./deps/libnanovg.a \ -+ $(CC) -shared -o libzest.so `find mruby/build/host -type f \( -not -iwholename "*mrbc*" -a -not -iwholename "*bin*" -a -iname "*.o" \)` ./deps/libnanovg.a \ - ./deps/libnanovg.a \ - src/osc-bridge/libosc-bridge.a \ - ./deps/libuv/.libs/libuv.a -lm -framework OpenGL -lpthread -@@ -41,7 +41,7 @@ windows: buildpuglwin deps/libuv-win.a - $(AR) rc deps/libnanovg.a deps/nanovg/src/*.o - cd src/osc-bridge && CFLAGS="-mstackrealign -I ../../deps/libuv/include " make lib - cd mruby && WINDOWS=1 MRUBY_CONFIG=../build_config.rb rake -- $(CC) -mstackrealign -shared -o libzest.dll -static-libgcc `find mruby/build/w64 -type f | grep -e "\.o$$" | grep -v bin` \ -+ $(CC) -mstackrealign -shared -o libzest.dll -static-libgcc `find mruby/build/w64 -type f \( -not -iwholename "*mrbc*" -a -not -iwholename "*bin*" -a -iname "*.o" \)` \ - ./deps/libnanovg.a \ - src/osc-bridge/libosc-bridge.a \ - ./deps/libuv-win.a \ -@@ -98,21 +98,21 @@ stats: - @echo 'mruby-qml-parse commits: ' `cd src/mruby-qml-parse && git log --oneline | wc -l` - @echo 'mruby-qml-spawn commits: ' `cd src/mruby-qml-spawn && git log --oneline | wc -l` - @echo 'osc-bridge commits: ' `cd src/osc-bridge && git log --oneline | wc -l` -- @echo 'number of qml files:' `find src/ -type f | grep -e qml$$ | wc -l` -- @echo 'number of ruby files:' `find src/ -type f | grep -e rb$$ | wc -l` -- @echo 'number of c files:' `find src/ -type f | grep -e c$$ | wc -l` -- @echo 'number of header files:' `find src/ -type f | grep -e h$$ | wc -l` -+ @echo 'number of qml files:' `find src/ -type f -iname "*.qml" | wc -l` -+ @echo 'number of ruby files:' `find src/ -type f -iname "*.rb" | wc -l` -+ @echo 'number of c files:' `find src/ -type f -iname "*.c" | wc -l` -+ @echo 'number of header files:' `find src/ -type f -iname "*.h" | wc -l` - @echo 'lines of OSC schema:' `wc -l src/osc-bridge/schema/test.json` - @echo 'lines of qml:' -- @wc -l `find src/ -type f | grep qml$$` | tail -n 1 -+ @`find src/ -type f -iname "*.qml" -exec wc -l {} +` | tail -n 1 - @echo 'lines of ruby:' -- @wc -l `find src/ -type f | grep -e rb$$ | grep -v fcache` | tail -n 1 -+ @`find src/ -type f \( -iname "*.rb" -a -not -iwholename "*fcache*" \) -exec wc -l {} +` | tail -n 1 - @echo 'lines of c source:' -- @wc -l `find src/ -type f | grep -e c$$` | tail -n 1 -+ @`find src/ -type f -iname "*.c" -exec wc -l {} +` | tail -n 1 - @echo 'lines of c header:' -- @wc -l `find src/ -type f | grep -e h$$` | tail -n 1 -+ @`find src/ -type f -iname "*.h" -exec wc -l {} +` | tail -n 1 - @echo 'total lines of code:' -- @wc -l `find src/ -type f | grep -Ee "(qml|rb|c|h)$$" | grep -v fcache` | tail -n 1 -+ @`find src/ -type f \( -iname "*.qml" -o -iname "*.rb" -o -iname "*.c" -o -iname "*.h" -a -not -iwholename "*fcache*" \) -exec wc -l {} +` | tail -n 1 - - - verbose: ## Compile mruby with --trace diff --git a/skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-system_wide_location.patch b/skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-system_wide_location.patch deleted file mode 100644 index 101ea3b..0000000 --- a/skip/zynaddsubfx/zynaddsubfx-mruby-zest-build-3.0.6-system_wide_location.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git i/src/mruby-widget-lib/mrblib/script.rb w/src/mruby-widget-lib/mrblib/script.rb -index 2d3e7fc..4dbd3c7 100644 ---- i/src/mruby-widget-lib/mrblib/script.rb -+++ w/src/mruby-widget-lib/mrblib/script.rb -@@ -160,13 +160,13 @@ class ZRunner - search = @search_path - search ||= "" - font_error = false -- sans = [search + "font/Roboto-Regular.ttf", "deps/nanovg/example/Roboto-Regular.ttf"] -+ sans = ["/usr/share/fonts/TTF/Roboto-Regular.ttf", search + "font/Roboto-Regular.ttf", "deps/nanovg/example/Roboto-Regular.ttf"] - if(@vg.create_font('sans', sans[0]) == -1 && @vg.create_font('sans', sans[1]) == -1) - GL::debug "[ERROR] could not find sans font" - font_error = true - end - -- bold = [search + "font/Roboto-Bold.ttf", "deps/nanovg/example/Roboto-Bold.ttf"] -+ bold = ["/usr/share/fonts/TTF/Roboto-Bold.ttf", search + "font/Roboto-Bold.ttf", "deps/nanovg/example/Roboto-Bold.ttf"] - if(@vg.create_font('bold', bold[0]) == -1 && @vg.create_font('bold', bold[1]) == -1) - GL::debug "[ERROR] could not find bold font" - font_error = true -diff --git i/src/mruby-widget-lib/src/api.c w/src/mruby-widget-lib/src/api.c -index 6949413..1118717 100644 ---- i/src/mruby-widget-lib/src/api.c -+++ w/src/mruby-widget-lib/src/api.c -@@ -110,7 +110,7 @@ zest_open(char *address) - if(strstr(path, "libzest")) - strstr(path, "libzest")[0] = 0; - char path2[256]; -- snprintf(path2, sizeof(path2), "%s%s", path, "./qml/MainWindow.qml"); -+ snprintf(path2, sizeof(path2), "%s%s", path, "../../share/zynaddsubfx/qml/MainWindow.qml"); - FILE *f = fopen(path2, "r"); - if(f) { - printf("[INFO:Zyn] Found Assets at %s\n", path); -diff --git i/src/osc-bridge/src/bridge.c w/src/osc-bridge/src/bridge.c -index f87c849..6405bbb 100644 ---- i/src/osc-bridge/src/bridge.c -+++ w/src/osc-bridge/src/bridge.c -@@ -431,7 +431,7 @@ schema_t br_get_schema(bridge_t *br, uri_t uri) - schema_t sch; - - //printf("[debug] loading json file\n"); -- FILE *f = fopen("schema/test.json", "r"); -+ FILE *f = fopen("/usr/share/zynaddsubfx/schema/test.json", "r"); - if(!f && br->search_path) { - char tmp[256]; - snprintf(tmp, sizeof(tmp), "%s%s", br->search_path, "schema/test.json"); diff --git a/skip/zynaddsubfx/zynaddsubfx.xibuild b/skip/zynaddsubfx/zynaddsubfx.xibuild deleted file mode 100644 index 6362364..0000000 --- a/skip/zynaddsubfx/zynaddsubfx.xibuild +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -NAME="zynaddsubfx" -DESC="Opensource software synthesizer capable of making a countless number of instruments." - -MAKEDEPS="cmake jack fltk portaudio mxml sndio bash-completion liblo" -DEPS="less " - -PKG_VER=3.0.6 -SOURCE="https://downloads.sourceforge.net/project/zynaddsubfx/zynaddsubfx/$PKG_VER/zynaddsubfx-$PKG_VER.tar.bz2" -ADDITIONAL=" -" - -build () { - cmake -B build \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=/usr/lib - cmake --build build -} - -package () { - DESTDIR="$PKG_DEST" cmake --install build -} -- cgit v1.2.1