Subject: [alpine-aports] [PATCH] main/rtpproxy: Version bump to 2.0.0

From: Nathan Angelacos <[email-masked]>
Date: Wed, 11 Mar 2015 01:22:25 +0000

new subpackage:  rtpproxy-debug
---
 main/rtpproxy/APKBUILD                             | 34 +++++++++++++++++-----
 main/rtpproxy/define-byte-order.patch              | 25 ++++++++++++++++
 main/rtpproxy/musl-fix-headers.patch               | 10 +++++++
 .../prevent-pthread-from-running-macro.patch       | 11 +++++++
 4 files changed, 72 insertions(+), 8 deletions(-)
 create mode 100644 main/rtpproxy/define-byte-order.patch
 create mode 100644 main/rtpproxy/musl-fix-headers.patch
 create mode 100644 main/rtpproxy/prevent-pthread-from-running-macro.patch

diff --git a/main/rtpproxy/APKBUILD b/main/rtpproxy/APKBUILD
index f6335a5..64f646b 100644
--- a/main/rtpproxy/APKBUILD
+++ b/main/rtpproxy/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Jeff Bilyk <[email-masked]>
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=rtpproxy
-pkgver=1.2.1
-pkgrel=4
+pkgver=2.0.0
+pkgrel=0
 pkgdesc="RTP proxy"
 url="http://www.rtpproxy.org"
 arch="all"
@@ -11,8 +11,11 @@ depends=
 depends_dev=
 makedepends="$depends_dev"
 install="$pkgname.pre-install"
-subpackages="$pkgname-doc"
-source="http://b2bua.org/chrome/site/$pkgname-$pkgver.tar.gz
+subpackages="$pkgname-doc $pkgname-debug"
+source="https://github.com/sippy/rtpproxy/archive/v${pkgver}.tar.gz
+	musl-fix-headers.patch
+	define-byte-order.patch
+	prevent-pthread-from-running-macro.patch
 	rtpproxy.confd
 	rtpproxy.initd"
 
@@ -25,7 +28,6 @@ prepare() {
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
-	update_config_sub || return 1
 }
 
 build() {
@@ -41,6 +43,13 @@ build() {
 	make || return 1
 }
 
+debug() {
+	pkgdesc="Debug version of rtpproxy"
+	mkdir -p "$subpkgdir"/usr/bin
+	mv "$pkgdir"/usr/bin/${pkgname}_debug "$subpkgdir"/usr/bin/
+}
+
+
 package() {
 	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
@@ -48,12 +57,21 @@ package() {
 	install -m644 -D "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
 }
 
-md5sums="b0b5d6cdce3f17cdbbac473c11a2d0e5  rtpproxy-1.2.1.tar.gz
+md5sums="8d36fcc1dd93994ac5376d145f19ac73  v2.0.0.tar.gz
+620786b8d8460446fc1a59c6b49a1351  musl-fix-headers.patch
+9c915ff8c04976304394febe5fceeccc  define-byte-order.patch
+118c66428b994a8340c2bed05355ef0d  prevent-pthread-from-running-macro.patch
 aee99ab9f380cd0b43754ae658f26c92  rtpproxy.confd
 b0f8894794b3f24af21ed050477851b1  rtpproxy.initd"
-sha256sums="aba667136420adfc6dbf6ff94a778e1e2484116ed13ea5196f3293d4d645df85  rtpproxy-1.2.1.tar.gz
+sha256sums="b52bf2a302a8f08c269217e5d507f3c3ba38f4b627bb7029c8dac8ec268b23c6  v2.0.0.tar.gz
+de8f7bca9ed93e1dab34d3c48f9792be525277a5a6df60a829ba6c6769449ac0  musl-fix-headers.patch
+342d30d1c24fd0b5d2d697591405aefdf4fbc372877bf63a4dc76f60b88ac50b  define-byte-order.patch
+1cd9c7794c9da256f0eb69eb7476ab939479111320a664602f6b39c11ef0f50d  prevent-pthread-from-running-macro.patch
 0b956e60a4fb27140d88c2182537615f524e167e6b608a9c9782bbf781791e1d  rtpproxy.confd
 3a792681ab97e4e0f86dd9964688cbec09154776568be0269e6839a878f3b37b  rtpproxy.initd"
-sha512sums="99760cd0ef6efda806cc059ea3d3d0ea9f953f6f06f9f9642b46353cb3347f3a54b81dd0a27350242a7a9b8a264f5f95d4c6c5a9cb7564bbf9177600aa113c45  rtpproxy-1.2.1.tar.gz
+sha512sums="d3991643e1e260890ec284a5cb0bacac012063512667215166551a1d534921caa035ab64452e2be7837b306ce4486cc604a9bb552254913f3a920d7756ad3711  v2.0.0.tar.gz
+bd05f24bfa66cd9491135efe341359cc4b16b80fd9c45fbfc880c7a82ba53ad5f2317dd6bfbaecfd0dd42ba0d54a55041403ba6409b8deff568fcb095892956d  musl-fix-headers.patch
+8ab21c20ee87c0d9ef9a113b436eaecd34d93c596d761b2f4b8d746c34946acb41421ab24be6446dd2ad2c0c3e1cd894637d945e945a90e1af1eda091d91306f  define-byte-order.patch
+ba54855fd147c8f166939b37a18c0576c55481c762c3f5b9e0ffa45e00eedeeaabb1d3fd4e45fe8f59f43064ecd852d87f83bcc8f746923219e9e3a795cf592e  prevent-pthread-from-running-macro.patch
 e2ab3705329ffd10a8a5723ac3a07a2f98547f29b7055e1616ebbd141d6beff9c81d44579af9f3486f7835a7ac7228ecfe49cf09208438ed490843c6b100a104  rtpproxy.confd
 7b9dddada1b88dc6a06d0a2a3f9d0a3cb1fa0d55950daa6af1508b9f48d13c21a22183d3524f1ba285c0a03b35f6e649017bc5959b2d85d666cb8db1af3617c4  rtpproxy.initd"
diff --git a/main/rtpproxy/define-byte-order.patch b/main/rtpproxy/define-byte-order.patch
new file mode 100644
index 0000000..1e9fe4d
--- /dev/null
+++ b/main/rtpproxy/define-byte-order.patch
@@ -0,0 +1,25 @@
+--- ./src/rtp.h.orig
++++ ./src/rtp.h
+@@ -47,6 +47,22 @@
+ 
+ #define RTP_NSAMPLES_UNKNOWN  (-1)
+ 
++/*
++ * Normally would define this in the .c file, 
++ * but this header is used in multiple places -
++ * easier to make the patch here once
++ */
++
++#include "config.h"
++
++#if defined(HAVE_SYS_ENDIAN_H)
++#include <sys/endian.h>
++#endif
++#if defined(HAVE_ENDIAN_H)
++#include <endian.h>
++#endif
++
++
+ #if !defined(BYTE_ORDER)
+ # error "BYTE_ORDER needs to be defined"
+ #endif
diff --git a/main/rtpproxy/musl-fix-headers.patch b/main/rtpproxy/musl-fix-headers.patch
new file mode 100644
index 0000000..e2ed24c
--- /dev/null
+++ b/main/rtpproxy/musl-fix-headers.patch
@@ -0,0 +1,10 @@
+--- ./src/rtpp_util.c.orig
++++ ./src/rtpp_util.c
+@@ -28,7 +28,6 @@
+ 
+ #include <sys/time.h>
+ #include <sys/types.h>
+-#include <sys/sysctl.h>
+ #include <sys/resource.h>
+ #include <errno.h>
+ #include <fcntl.h>
diff --git a/main/rtpproxy/prevent-pthread-from-running-macro.patch b/main/rtpproxy/prevent-pthread-from-running-macro.patch
new file mode 100644
index 0000000..6f63ea6
--- /dev/null
+++ b/main/rtpproxy/prevent-pthread-from-running-macro.patch
@@ -0,0 +1,11 @@
+--- ./src/rtpp_memdeb.h.orig
++++ ./src/rtpp_memdeb.h
+@@ -29,6 +29,8 @@
+ #include <string.h>
+ #include <stdlib.h>
+ 
++#include <pthread.h>
++
+ #undef malloc
+ #define malloc(n) rtpp_memdeb_malloc((n), __FILE__, __LINE__, __func__)
+ #undef free
-- 
2.3.1

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---