diff --git a/srcpkgs/sndio/patches/7a03da2.patch b/srcpkgs/sndio/patches/7a03da2.patch deleted file mode 100644 index 26c15cddcba..00000000000 --- a/srcpkgs/sndio/patches/7a03da2.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 7a03da2848551e6bd9d3e06d2beee4b2d438a999 Mon Sep 17 00:00:00 2001 -From: Duncan Overbruck -Date: Mon, 31 Aug 2020 22:36:58 +0200 -Subject: [PATCH] Add libsndio.so.${MAJ} symlink and use it as SONAME on linux - -This avoids having to rebuild a lot of packages even if the -ABI did not break. cubeb used by firefox currently dlopen's -either libsndio.so.7.1 or libsndio.so, with the major link -this would also avoid having to patch this as long as the -ABI doesn't break without having to ship the libsndio.so -symlink outside of -dev/-devel packages. ---- - configure | 4 +++- - libsndio/Makefile.in | 8 ++++++-- - 2 files changed, 9 insertions(+), 3 deletions(-) - -diff --git a/configure b/configure -index 94829c4..eb2ea9e 100755 ---- configure -+++ configure -@@ -60,8 +60,9 @@ case `uname` in - alsa=yes - ldadd="-lrt" - user=sndiod -- so_ldflags="-Wl,-soname=libsndio.so.\${MAJ}.\${MIN}" - so_link="libsndio.so" -+ so_link_maj="libsndio.so.\${MAJ}" -+ so_ldflags="-Wl,-soname=libsndio.so.\${MAJ}" - defs='-D_GNU_SOURCE -DHAVE_SOCK_CLOEXEC -DHAVE_CLOCK_GETTIME' - ;; - NetBSD) -@@ -268,6 +269,7 @@ do - -e "s:@ldadd@:$ldadd:" \ - -e "s:@so@:$so:" \ - -e "s:@so_link@:$so_link:" \ -+ -e "s:@so_link_maj@:$so_link_maj:" \ - -e "s:@so_ldflags@:$so_ldflags:" \ - -e "s:@vars@:${vars}:" \ - -e "s:@precision@:$precision:" \ -diff --git a/libsndio/Makefile.in b/libsndio/Makefile.in -index 58ec1e7..36f1fd9 100644 ---- libsndio/Makefile.in -+++ libsndio/Makefile.in -@@ -49,8 +49,9 @@ MAJ = 7 - MIN = 1 - SO = @so@ - SO_LINK = @so_link@ -+SO_LINK_MAJ = @so_link_maj@ - --all: ${SO} ${SO_LINK} -+all: ${SO} ${SO_LINK} ${SO_LINK_MAJ} - - - install: -@@ -59,7 +60,7 @@ install: - mkdir -p ${DESTDIR}${MAN3_DIR} - mkdir -p ${DESTDIR}${MAN7_DIR} - cp sndio.h ${DESTDIR}${INCLUDE_DIR} -- cp -R ${SO} ${SO_LINK} ${DESTDIR}${LIB_DIR} -+ cp -R ${SO} ${SO_LINK} ${SO_LINK_MAJ} ${DESTDIR}${LIB_DIR} - cp sio_open.3 ${DESTDIR}${MAN3_DIR} - ln -sf sio_open.3 ${DESTDIR}${MAN3_DIR}/sio_close.3 - ln -sf sio_open.3 ${DESTDIR}${MAN3_DIR}/sio_setpar.3 -@@ -126,6 +127,9 @@ ${SO}: ${OBJS} - ${SO_LINK}: - ln -sf ${SO} ${SO_LINK} - -+${SO_LINK_MAJ}: -+ ln -sf ${SO} ${SO_LINK_MAJ} -+ - issetugid.o: ../bsd-compat/issetugid.c - ${CC} ${CFLAGS} ${SO_CFLAGS} ${INCLUDE} ${DEFS} -c -o issetugid.o ../bsd-compat/issetugid.c - diff --git a/srcpkgs/sndio/patches/fflush.patch b/srcpkgs/sndio/patches/fflush.patch deleted file mode 100644 index dbe15d6f317..00000000000 --- a/srcpkgs/sndio/patches/fflush.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/sndioctl/sndioctl.c b/sndioctl/sndioctl.c -index 4c4a85a..71ae298 100644 ---- sndioctl/sndioctl.c -+++ sndioctl/sndioctl.c -@@ -1014,6 +1014,7 @@ main(int argc, char **argv) - perror("malloc"); - exit(1); - } - for (;;) { -+ fflush(stdout); - nfds = sioctl_pollfd(hdl, pfds, POLLIN); - if (nfds == 0)