From e0afb84a6672db5e3dcc7d666cab5f59ddce3837 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sun, 5 Mar 2017 00:22:55 +0100 Subject: [PATCH] Remove alsa-lib and alsa-utils disabled packages Android does not have the alsa kernel level support. These packages were only added as a build dependency of openjdk 9, but that should no longer be necessary. --- disabled-packages/alsa-lib/build.sh | 16 ------------- disabled-packages/alsa-lib/pcm_direct.c.patch | 17 -------------- disabled-packages/alsa-lib/pcm_mmap.c.patch.old | 20 ---------------- disabled-packages/alsa-lib/versionsort.patch | 24 ------------------- disabled-packages/alsa-utils/build.sh | 11 --------- disabled-packages/alsa-utils/configure.patch | 27 ---------------------- .../alsa-utils/volume_mapping.c.patch | 11 --------- 7 files changed, 126 deletions(-) delete mode 100644 disabled-packages/alsa-lib/build.sh delete mode 100644 disabled-packages/alsa-lib/pcm_direct.c.patch delete mode 100644 disabled-packages/alsa-lib/pcm_mmap.c.patch.old delete mode 100644 disabled-packages/alsa-lib/versionsort.patch delete mode 100644 disabled-packages/alsa-utils/build.sh delete mode 100644 disabled-packages/alsa-utils/configure.patch delete mode 100644 disabled-packages/alsa-utils/volume_mapping.c.patch diff --git a/disabled-packages/alsa-lib/build.sh b/disabled-packages/alsa-lib/build.sh deleted file mode 100644 index 721cf0f3..00000000 --- a/disabled-packages/alsa-lib/build.sh +++ /dev/null @@ -1,16 +0,0 @@ -# patches taken from https://github.com/michaelwu/alsa-lib -TERMUX_PKG_HOMEPAGE=http://www.alsa-project.org -TERMUX_PKG_VERSION=1.1.3 -TERMUX_PKG_MAINTAINER='Vishal Biswas @vishalbiswas' -TERMUX_PKG_DEPENDS="python2" -TERMUX_PKG_SRCURL=ftp://ftp.alsa-project.org/pub/lib/alsa-lib-$TERMUX_PKG_VERSION.tar.bz2 -TERMUX_PKG_SHA256=71282502184c592c1a008e256c22ed0ba5728ca65e05273ceb480c70f515969c -TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --with-pythonlibs=\"-lpython2.7\" --with-pythonincludes=-I/$TERMUX_PREFIX/include/python2.7" - -termux_step_pre_configure () { - #LDFLAGS="$LDFLAGS -landroid-shmem" - #_files='src/pcm/pcm_dsnoop.c src/pcm/pcm_mmap.c src/pcm/pcm_shm.c src/pcm/pcm_dmix.c src/pcm/pcm_dshare.c src/pcm/pcm_direct.c src/shmarea.c src/control/control_shm.c aserver/aserver.c' - #for _file in $_files; do sed -i 's%#include %#include %' "$TERMUX_PKG_SRCDIR/$_file"; done - #export ac_cv_header_sys_shm_h='no' - CPPFLAGS="$CPPFLAGS -DTERMUX_SHMEM_STUBS -DTERMUX_SEMOPS_STUBS" -} diff --git a/disabled-packages/alsa-lib/pcm_direct.c.patch b/disabled-packages/alsa-lib/pcm_direct.c.patch deleted file mode 100644 index 4dc37743..00000000 --- a/disabled-packages/alsa-lib/pcm_direct.c.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- ./src/pcm/pcm_direct.c 2016-08-02 23:18:38.000000000 +0530 -+++ ./src/pcm/pcm_direct.c 2016-12-02 23:19:30.771819040 +0530 -@@ -44,12 +44,14 @@ - * - */ - -+#if !defined(ANDROID) && !defined(__ANDROID__) - union semun { - int val; /* Value for SETVAL */ - struct semid_ds *buf; /* Buffer for IPC_STAT, IPC_SET */ - unsigned short *array; /* Array for GETALL, SETALL */ - struct seminfo *__buf; /* Buffer for IPC_INFO (Linux specific) */ - }; -+#endif - - /* - * FIXME: diff --git a/disabled-packages/alsa-lib/pcm_mmap.c.patch.old b/disabled-packages/alsa-lib/pcm_mmap.c.patch.old deleted file mode 100644 index 703b0973..00000000 --- a/disabled-packages/alsa-lib/pcm_mmap.c.patch.old +++ /dev/null @@ -1,20 +0,0 @@ ---- ./src/pcm/pcm_mmap.c 2016-08-02 23:18:38.000000000 +0530 -+++ /home/vishal/AndroidDev/alsa/src/pcm/pcm_mmap.c 2016-12-03 00:06:36.620336924 +0530 -@@ -344,7 +344,7 @@ - i->addr = ptr; - break; - case SND_PCM_AREA_SHM: --#ifdef HAVE_SYS_SHM_H -+#if 0 - if (i->u.shm.shmid < 0) { - int id; - /* FIXME: safer permission? */ -@@ -474,7 +474,7 @@ - errno = 0; - break; - case SND_PCM_AREA_SHM: --#ifdef HAVE_SYS_SHM_H -+#if 0 - if (i->u.shm.area) { - snd_shm_area_destroy(i->u.shm.area); - i->u.shm.area = NULL; diff --git a/disabled-packages/alsa-lib/versionsort.patch b/disabled-packages/alsa-lib/versionsort.patch deleted file mode 100644 index 2f6ca1d7..00000000 --- a/disabled-packages/alsa-lib/versionsort.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ruN ./src/conf.c /home/vishal/AndroidDev/alsa/src/conf.c ---- ./src/conf.c 2016-08-02 23:18:38.000000000 +0530 -+++ /home/vishal/AndroidDev/alsa/src/conf.c 2016-12-02 23:42:04.689785910 +0530 -@@ -3558,7 +3558,7 @@ - int n; - - #ifndef DOC_HIDDEN --#if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__sun) -+#if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__sun) && !defined(__ANDROID__) && !defined(ANDROID) - #define SORTFUNC versionsort - #else - #define SORTFUNC alphasort -diff -ruN ./src/ucm/parser.c /home/vishal/AndroidDev/alsa/src/ucm/parser.c ---- ./src/ucm/parser.c 2016-08-02 23:18:38.000000000 +0530 -+++ /home/vishal/AndroidDev/alsa/src/ucm/parser.c 2016-12-02 23:42:17.406370931 +0530 -@@ -1274,7 +1274,7 @@ - "%s", env ? env : ALSA_USE_CASE_DIR); - filename[MAX_FILE-1] = '\0'; - --#if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__sun) -+#if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__sun) && !defined(__ANDROID__) && !defined(ANDROID) - #define SORTFUNC versionsort - #else - #define SORTFUNC alphasort diff --git a/disabled-packages/alsa-utils/build.sh b/disabled-packages/alsa-utils/build.sh deleted file mode 100644 index 45332742..00000000 --- a/disabled-packages/alsa-utils/build.sh +++ /dev/null @@ -1,11 +0,0 @@ -TERMUX_PKG_HOMEPAGE=http://www.alsa-project.org -TERMUX_PKG_VERSION=1.1.3 -TERMUX_PKG_MAINTAINER='Vishal Biswas @vishalbiswas' -TERMUX_PKG_SRCURL=ftp://ftp.alsa-project.org/pub/utils/alsa-utils-$TERMUX_PKG_VERSION.tar.bz2 -TERMUX_PKG_SHA256=127217a54eea0f9a49700a2f239a2d4f5384aa094d68df04a8eb80132eb6167c -TERMUX_PKG_DEPENDS="alsa-lib" -TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --with-alsa-prefix=$TERMUX_PREFIX/lib --with-alsa-inc-prefix=$TERMUX_PREFIX/include --with-udev-rules-dir=$TERMUX_PREFIX/lib/udev/rules.d --disable-bat" - -termux_step_pre_configure () { - LDFLAGS+=" -llog" -} diff --git a/disabled-packages/alsa-utils/configure.patch b/disabled-packages/alsa-utils/configure.patch deleted file mode 100644 index e2e18f6b..00000000 --- a/disabled-packages/alsa-utils/configure.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- ./configure 2016-08-02 22:44:23.000000000 +0530 -+++ ../configure 2016-12-03 23:06:46.641370754 +0530 -@@ -7123,7 +7123,7 @@ - LDFLAGS="$LDFLAGS $ALSA_LIBS" - fi - --ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread" -+ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl" - LIBS="$ALSA_LIBS $LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ALSA_LIBS" >&5 - $as_echo "$ALSA_LIBS" >&6; } -@@ -7741,7 +7741,6 @@ - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lpthread $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -7776,7 +7775,6 @@ - #define HAVE_LIBPTHREAD 1 - _ACEOF - -- LIBS="-lpthread $LIBS" - - else - as_fn_error $? "Error: need PTHREAD library" "$LINENO" 5 diff --git a/disabled-packages/alsa-utils/volume_mapping.c.patch b/disabled-packages/alsa-utils/volume_mapping.c.patch deleted file mode 100644 index bb672161..00000000 --- a/disabled-packages/alsa-utils/volume_mapping.c.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./alsamixer/volume_mapping.c 2016-08-02 22:39:45.000000000 +0530 -+++ ../volume_mapping.c 2016-12-03 23:15:26.390744307 +0530 -@@ -37,7 +37,7 @@ - #include - #include "volume_mapping.h" - --#ifdef __UCLIBC__ -+#if defined(__UCLIBC__) || defined(__ANDROID__) - /* 10^x = 10^(log e^x) = (e^x)^log10 = e^(x * log 10) */ - #define exp10(x) (exp((x) * log(10))) - #endif /* __UCLIBC__ */ -- 2.11.0