Update buidlroot to version 2016.08.1
This commit is contained in:
@@ -0,0 +1,20 @@
|
||||
Makefile: link with pthread
|
||||
|
||||
Otherwise building multicat in a static context fails:
|
||||
aggregartp.c:381: undefined reference to `pthread_self'
|
||||
|
||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
||||
Sent upstream: https://mailman.videolan.org/pipermail/multicat-devel/2016-March/000125.html
|
||||
|
||||
diff -purN multicat-2.1.orig/Makefile multicat-2.1/Makefile
|
||||
--- multicat-2.1.orig/Makefile 2015-10-05 18:36:29.000000000 +0200
|
||||
+++ multicat-2.1/Makefile 2016-03-19 21:47:59.467745127 +0100
|
||||
@@ -4,7 +4,7 @@ VERSION = 2.1
|
||||
CFLAGS += -Wall -Wformat-security -O3 -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -D_ISOC99_SOURCE -D_BSD_SOURCE
|
||||
CFLAGS += -g
|
||||
# Comment out the following line for Mac OS X build
|
||||
-LDLIBS += -lrt
|
||||
+LDLIBS += -lrt -pthread
|
||||
|
||||
OBJ_MULTICAT = multicat.o util.o
|
||||
OBJ_INGESTS = ingests.o util.o
|
||||
47
bsp/buildroot/package/multicat/0002-Fix-musl-build.patch
Normal file
47
bsp/buildroot/package/multicat/0002-Fix-musl-build.patch
Normal file
@@ -0,0 +1,47 @@
|
||||
Fix musl build
|
||||
|
||||
Defining _GNU_SOURCE is required to get proper member names in `struct udphdr`
|
||||
when building against musl. Build error:
|
||||
|
||||
util.c: In function 'RawFillHeaders':
|
||||
util.c:481:9: error: 'struct udphdr' has no member named 'source'
|
||||
udph->source = htons(portsrc);
|
||||
^
|
||||
util.c:482:9: error: 'struct udphdr' has no member named 'dest'
|
||||
udph->dest = htons(portdst);
|
||||
^
|
||||
util.c:483:9: error: 'struct udphdr' has no member named 'len'
|
||||
udph->len = htons(sizeof(struct udphdr) + len);
|
||||
^
|
||||
util.c:484:9: error: 'struct udphdr' has no member named 'check'
|
||||
udph->check = 0;
|
||||
|
||||
Including <sys/types.h> in needed for mode_t, otherwise musl build fails:
|
||||
util.h:91:1: error: unknown type name 'mode_t'
|
||||
|
||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
||||
Sent upstream: https://mailman.videolan.org/pipermail/multicat-devel/2016-March/000126.html
|
||||
|
||||
diff -purN multicat-2.1.orig/util.c multicat-2.1/util.c
|
||||
--- multicat-2.1.orig/util.c 2015-07-17 18:03:17.000000000 +0200
|
||||
+++ multicat-2.1/util.c 2016-03-19 22:21:01.110178772 +0100
|
||||
@@ -21,6 +21,8 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
|
||||
*****************************************************************************/
|
||||
|
||||
+#define _GNU_SOURCE
|
||||
+
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <stdint.h>
|
||||
diff -purN multicat-2.1.orig/util.h multicat-2.1/util.h
|
||||
--- multicat-2.1.orig/util.h 2015-07-15 22:47:39.000000000 +0200
|
||||
+++ multicat-2.1/util.h 2016-03-19 22:21:58.649834990 +0100
|
||||
@@ -21,6 +21,7 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
|
||||
*****************************************************************************/
|
||||
|
||||
+#include <sys/types.h>
|
||||
#include <netinet/udp.h>
|
||||
#include <netinet/ip.h>
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
uClibc may be configured without support for clock_nanosleep(). The function is
|
||||
only available with uClibc if the C library is build with NPTL support (sets
|
||||
__UCLIBC_HAS_THREADS_NATIVE__) and __UCLIBC_HAS_ADVANCED_REALTIME__ set.
|
||||
|
||||
Upstream status: Pending
|
||||
https://mailman.videolan.org/pipermail/multicat-devel/2016-March/000129.html
|
||||
|
||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
||||
|
||||
diff -purN multicat-2.1.orig/util.h multicat-2.1/util.h
|
||||
--- multicat-2.1.orig/util.h 2015-07-15 22:47:39.000000000 +0200
|
||||
+++ multicat-2.1/util.h 2016-03-20 18:13:51.899780405 +0100
|
||||
@@ -26,7 +26,10 @@
|
||||
|
||||
#ifdef __APPLE__
|
||||
#define POLLRDHUP 0
|
||||
-#else
|
||||
+/* uClibc may not have clock_nanosleep() available */
|
||||
+#elif !defined (__UCLIBC__) || \
|
||||
+ defined (__UCLIBC__) && defined (__UCLIBC_HAS_THREADS_NATIVE__) \
|
||||
+ && defined (__UCLIBC_HAS_ADVANCED_REALTIME__)
|
||||
#define HAVE_CLOCK_NANOSLEEP
|
||||
#endif
|
||||
|
||||
11
bsp/buildroot/package/multicat/Config.in
Normal file
11
bsp/buildroot/package/multicat/Config.in
Normal file
@@ -0,0 +1,11 @@
|
||||
config BR2_PACKAGE_MULTICAT
|
||||
bool "multicat"
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
select BR2_PACKAGE_BITSTREAM
|
||||
help
|
||||
Simple and efficient multicast and transport stream manipulation.
|
||||
|
||||
http://www.videolan.org/projects/multicat.html
|
||||
|
||||
comment "multicat needs a toolchain w/ threads"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
4
bsp/buildroot/package/multicat/multicat.hash
Normal file
4
bsp/buildroot/package/multicat/multicat.hash
Normal file
@@ -0,0 +1,4 @@
|
||||
# from https://get.videolan.org/multicat/2.1/multicat-2.1.tar.bz2.md5
|
||||
md5 2e3ecd8dee64f5bd32a61733d4cc2226 multicat-2.1.tar.bz2
|
||||
# locally calculated
|
||||
sha256 5eabe8d9a3dde452b2d348683cc7da213680551a9d4059c356f7319c6aa9b3d1 multicat-2.1.tar.bz2
|
||||
25
bsp/buildroot/package/multicat/multicat.mk
Normal file
25
bsp/buildroot/package/multicat/multicat.mk
Normal file
@@ -0,0 +1,25 @@
|
||||
################################################################################
|
||||
#
|
||||
# multicat
|
||||
#
|
||||
################################################################################
|
||||
|
||||
MULTICAT_VERSION = 2.1
|
||||
MULTICAT_SOURCE = multicat-$(MULTICAT_VERSION).tar.bz2
|
||||
MULTICAT_SITE = https://get.videolan.org/multicat/$(MULTICAT_VERSION)
|
||||
MULTICAT_LICENSE = GPLv2+
|
||||
MULTICAT_LICENSE_FILES = COPYING
|
||||
|
||||
MULTICAT_DEPENDENCIES = bitstream
|
||||
|
||||
MULTICAT_MAKE_ENV = $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS)
|
||||
|
||||
define MULTICAT_BUILD_CMDS
|
||||
$(MULTICAT_MAKE_ENV) $(MAKE) -C $(@D)
|
||||
endef
|
||||
|
||||
define MULTICAT_INSTALL_TARGET_CMDS
|
||||
$(MULTICAT_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) PREFIX=/usr install
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
Reference in New Issue
Block a user