Remove old disabled-packages/alsa-lib/
This commit is contained in:
parent
7d1783752e
commit
255450ab4d
@ -1,11 +0,0 @@
|
||||
--- ./src/conf/alsa.conf.orig 2016-12-20 14:43:20.000000000 +0000
|
||||
+++ ./src/conf/alsa.conf 2017-03-06 22:51:47.242150837 +0000
|
||||
@@ -15,7 +15,7 @@
|
||||
"/alsa.conf.d/"
|
||||
]
|
||||
}
|
||||
- "/etc/asound.conf"
|
||||
+ "@TERMUX_PREFIX@/etc/asound.conf"
|
||||
"~/.asoundrc"
|
||||
]
|
||||
errors false
|
@ -1,17 +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_DEPENDS="libandroid-shmem, python2"
|
||||
TERMUX_PKG_DEPENDS="libandroid-shmem"
|
||||
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_PKG_EXTRA_CONFIGURE_ARGS="--disable-python"
|
||||
|
||||
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 <sys/shm.h>%#include <shmem/shm.h>%' "$TERMUX_PKG_SRCDIR/$_file"; done
|
||||
#export ac_cv_header_sys_shm_h='no'
|
||||
CPPFLAGS="$CPPFLAGS -DTERMUX_SHMEM_STUBS -DTERMUX_SEMOPS_STUBS"
|
||||
}
|
@ -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:
|
@ -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;
|
@ -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
|
Loading…
Reference in New Issue
Block a user