libraries/bluez-alsa: Updated for version 1.3.1.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 4 insertions, 205 deletions

diff --git a/libraries/bluez-alsa/bluez-alsa.SlackBuild b/libraries/bluez-alsa/bluez-alsa.SlackBuild
index 80c5294a78f6f..920e24675c6ee 100644
--- a/libraries/bluez-alsa/bluez-alsa.SlackBuild
+++ b/libraries/bluez-alsa/bluez-alsa.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=bluez-alsa
-VERSION=${VERSION:-1.2.0}
+VERSION=${VERSION:-1.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -69,8 +69,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-patch -p2 < $CWD/ortp.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 autoreconf --install
diff --git a/libraries/bluez-alsa/bluez-alsa.info b/libraries/bluez-alsa/bluez-alsa.info
index 134b9c2e04899..79fe733926948 100644
--- a/libraries/bluez-alsa/bluez-alsa.info
+++ b/libraries/bluez-alsa/bluez-alsa.info
@@ -1,8 +1,8 @@
 PRGNAM="bluez-alsa"
-VERSION="1.2.0"
+VERSION="1.3.1"
 HOMEPAGE="https://github.com/Arkq/bluez-alsa"
-DOWNLOAD="https://github.com/Arkq/bluez-alsa/archive/v1.2.0/bluez-alsa-1.2.0.tar.gz"
-MD5SUM="7a6710f4c6d693417fc09db61b1b2cdb"
+DOWNLOAD="https://github.com/Arkq/bluez-alsa/archive/v1.3.1/bluez-alsa-1.3.1.tar.gz"
+MD5SUM="a7be0746aa37893420935c49b95dd76f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/bluez-alsa/ortp.patch b/libraries/bluez-alsa/ortp.patch
deleted file mode 100644
index 7286d261a3031..0000000000000
--- a/libraries/bluez-alsa/ortp.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-*** a/bluez-alsa-1.2.0/README.md	2017-04-13 13:50:39.000000000 -0700
---- b/bluez-alsa-1.2.0/README.md	2018-04-26 13:33:35.943544513 -0700
-***************
-*** 23,28 ****
---- 23,36 ----
-  	$ autoreconf --install
-  	$ mkdir build && cd build
-  	$ ../configure --enable-aac --enable-debug
-+ 
-+ or if you intend to stream audio from a Linux distribution using PulseAudio (see [this
-+ issue](https://github.com/Arkq/bluez-alsa/issues/13))
-+ 
-+ 	$ ../configure --enable-aac --enable-debug --disable-payloadcheck
-+ 
-+ then
-+ 
-  	$ make && make install
-  
-  Dependencies:
-***************
-*** 31,44 ****
-  - [bluez](http://www.bluez.org/) >= 5.0
-  - [glib](https://wiki.gnome.org/Projects/GLib) with GIO support
-  - [sbc](https://git.kernel.org/cgit/bluetooth/sbc.git)
-- - [ortp](http://www.linphone.org/technical-corner/ortp.html) (required for compilation only)
-  - [fdk-aac](https://github.com/mstorsjo/fdk-aac) (when AAC support is enabled with `--enable-aac`)
-  
-! Dependencies for `hcitop` (unless `--disable-hcitop` is specified during configuration):
-  
-  - [libbsd](https://libbsd.freedesktop.org/)
-  - [ncurses](https://www.gnu.org/software/ncurses/)
-  
-  
-  Configuration & Usage
-  ---------------------
---- 39,54 ----
-  - [bluez](http://www.bluez.org/) >= 5.0
-  - [glib](https://wiki.gnome.org/Projects/GLib) with GIO support
-  - [sbc](https://git.kernel.org/cgit/bluetooth/sbc.git)
-  - [fdk-aac](https://github.com/mstorsjo/fdk-aac) (when AAC support is enabled with `--enable-aac`)
-  
-! Dependencies for `hcitop` (when `--enable-hcitop` is specified during configuration):
-  
-  - [libbsd](https://libbsd.freedesktop.org/)
-  - [ncurses](https://www.gnu.org/software/ncurses/)
-  
-+ If you are using Debian-based distribution, take a look at the [.travis.yml](.travis.yml) file,
-+ it might give you a hint about required packages.
-+ 
-  
-  Configuration & Usage
-  ---------------------
-***************
-*** 100,107 ****
-  	alongside, but Bluetooth support has to be disabled in the PulseAudio. Any Bluetooth related
-  	module has to be unloaded - e.g. `bluetooth-discover`, `bluez5-discover`.
-  
-- 	See also [this](https://github.com/Arkq/bluez-alsa/issues/13) PulseAudio related issue.
-- 
-  2. ALSA thread-safe API (alsa-lib >= 1.1.2).
-  
-  	Starting from ALSA library 1.1.2, it is possible to enable thread-safe API functions. It is a
---- 110,115 ----
-*** a/bluez-alsa-1.2.0/configure.ac	2017-04-13 13:50:39.000000000 -0700
---- b/bluez-alsa-1.2.0/configure.ac	2018-04-26 13:30:55.692862106 -0700
-***************
-*** 34,41 ****
-  
-  AC_CHECK_LIB([pthread], [pthread_create],
-  	[], [AC_MSG_ERROR([pthread library not found])])
-- AC_CHECK_HEADERS([ortp/rtp.h],
-- 	[], [AC_MSG_ERROR([ortp/rtp.h header not found])])
-  AC_SEARCH_LIBS([clock_gettime], [rt],
-  	[], [AC_MSG_ERROR([unable to find clock_gettime() function])])
-  AC_SEARCH_LIBS([pow], [m],
---- 34,39 ----
-***************
-*** 57,74 ****
-  	AC_DEFINE([ENABLE_AAC], [1], [Define to 1 if AAC is enabled.])
-  ])
-  
-  AC_ARG_ENABLE([aplay],
-! 	[AS_HELP_STRING([--disable-aplay], [disable building of aplay tool])])
-  AM_CONDITIONAL([ENABLE_APLAY], [test "x$enable_aplay" != "xno"])
-  
-  AC_ARG_ENABLE([hcitop],
-! 	[AS_HELP_STRING([--disable-hcitop], [disable building of hcitop tool])])
-! AM_CONDITIONAL([ENABLE_HCITOP], [test "x$enable_hcitop" != "xno"])
-  AM_COND_IF([ENABLE_HCITOP], [
-  	PKG_CHECK_MODULES([LIBBSD], [libbsd])
-  	PKG_CHECK_MODULES([NCURSES], [ncurses])
-  ])
-  
-  AC_ARG_WITH([alsaplugindir],
-  	AS_HELP_STRING([--with-alsaplugindir=dir], [path where ALSA plugin files are stored]),
-  	[alsaplugindir="$withval"], [alsaplugindir="$libdir/alsa-lib"])
---- 55,85 ----
-  	AC_DEFINE([ENABLE_AAC], [1], [Define to 1 if AAC is enabled.])
-  ])
-  
-+ AC_ARG_ENABLE([payloadcheck],
-+ 	[AS_HELP_STRING([--disable-payloadcheck], [disable RTP payload type check (workaround for a PulseAudio bug)])])
-+ AM_CONDITIONAL([ENABLE_PAYLOADCHECK], [test "x$enable_payloadcheck" != "xno"])
-+ AM_COND_IF([ENABLE_PAYLOADCHECK], [
-+ 	AC_DEFINE([ENABLE_PAYLOADCHECK], [1], [Define to 1 if PAYLOADCHECK is enabled.])
-+ ])
-+ 
-  AC_ARG_ENABLE([aplay],
-! 	[AS_HELP_STRING([--disable-aplay], [disable building of bluealsa-aplay tool])])
-  AM_CONDITIONAL([ENABLE_APLAY], [test "x$enable_aplay" != "xno"])
-  
-  AC_ARG_ENABLE([hcitop],
-! 	[AS_HELP_STRING([--enable-hcitop], [enable building of hcitop tool])])
-! AM_CONDITIONAL([ENABLE_HCITOP], [test "x$enable_hcitop" = "xyes"])
-  AM_COND_IF([ENABLE_HCITOP], [
-  	PKG_CHECK_MODULES([LIBBSD], [libbsd])
-  	PKG_CHECK_MODULES([NCURSES], [ncurses])
-  ])
-  
-+ # Since it is not possible to specify custom ALSA plugin directory, BlueALSA
-+ # PCM plugin has to be installed prior to this test.
-+ AC_ARG_ENABLE([pcm-test],
-+ 	[AS_HELP_STRING([--enable-pcm-test], [enable PCM plugin test])])
-+ AM_CONDITIONAL([ENABLE_PCM_TEST], [test "x$enable_pcm_test" = "xyes"])
-+ 
-  AC_ARG_WITH([alsaplugindir],
-  	AS_HELP_STRING([--with-alsaplugindir=dir], [path where ALSA plugin files are stored]),
-  	[alsaplugindir="$withval"], [alsaplugindir="$libdir/alsa-lib"])
-*** a/bluez-alsa-1.2.0/src/a2dp-rtp.h	2017-04-13 13:50:39.000000000 -0700
---- b/bluez-alsa-1.2.0/src/a2dp-rtp.h	2018-04-26 13:31:29.385585082 -0700
-***************
-*** 1,6 ****
-  /*
-   * BlueALSA - a2dp-rtp.h
-!  * Copyright (c) 2016 Arkadiusz Bokowy
-   *
-   * This file is a part of bluez-alsa.
-   *
---- 1,6 ----
-  /*
-   * BlueALSA - a2dp-rtp.h
-!  * Copyright (c) 2016-2017 Arkadiusz Bokowy
-   *
-   * This file is a part of bluez-alsa.
-   *
-***************
-*** 12,18 ****
-  #define BLUEALSA_A2DPRTP_H_
-  
-  #include <stdint.h>
-! #include <ortp/rtp.h>
-  
-  /**
-   * Media payload header for SBC. */
---- 12,39 ----
-  #define BLUEALSA_A2DPRTP_H_
-  
-  #include <stdint.h>
-! 
-! typedef struct rtp_header {
-! #if __BYTE_ORDER == __LITTLE_ENDIAN
-! 	uint16_t cc:4;
-! 	uint16_t extbit:1;
-! 	uint16_t padbit:1;
-! 	uint16_t version:2;
-! 	uint16_t paytype:7;
-! 	uint16_t markbit:1;
-! #else
-! 	uint16_t version:2;
-! 	uint16_t padbit:1;
-! 	uint16_t extbit:1;
-! 	uint16_t cc:4;
-! 	uint16_t markbit:1;
-! 	uint16_t paytype:7;
-! #endif
-! 	uint16_t seq_number;
-! 	uint32_t timestamp;
-! 	uint32_t ssrc;
-! 	uint32_t csrc[16];
-! } __attribute__ ((packed)) rtp_header_t;
-  
-  /**
-   * Media payload header for SBC. */
-*** a/bluez-alsa-1.2.0/test/inc/a2dp.inc	2017-04-13 13:50:39.000000000 -0700
---- b/bluez-alsa-1.2.0/test/inc/a2dp.inc	2018-04-26 13:34:28.586111682 -0700
-***************
-*** 10,16 ****
---- 10,20 ----
-   *
-   */
-  
-+ #include <errno.h>
-  #include <stdlib.h>
-+ #include <string.h>
-+ #include <unistd.h>
-+ #include <arpa/inet.h>
-  #include <sbc/sbc.h>
-  #include "../src/a2dp-codecs.h"
-  #include "../src/a2dp-rtp.h"