| Message ID | 1418398967-2183-8-git-send-email-gregd72002@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
Dear Gregory Dymarek, On Fri, 12 Dec 2014 15:42:47 +0000, Gregory Dymarek wrote: > Signed-off-by: Gregory Dymarek <gregd72002@gmail.com> > --- > package/Config.in | 1 + > package/janus-gateway/Config.in | 13 +++++++++++ > .../janus-gateway-0001-disable-ssp.patch | 12 ++++++++++ > package/janus-gateway/janus-gateway.hash | 1 + > package/janus-gateway/janus-gateway.mk | 27 ++++++++++++++++++++++ > 5 files changed, 54 insertions(+) > create mode 100644 package/janus-gateway/Config.in > create mode 100644 package/janus-gateway/janus-gateway-0001-disable-ssp.patch > create mode 100644 package/janus-gateway/janus-gateway.hash > create mode 100644 package/janus-gateway/janus-gateway.mk Thanks, applied, with a number of changes: [Thomas: - Rename patch to the proper naming convention, and add a description to it. - Add mandatory dependency to OpenSSL. - Make the dependency on libwebsock optional. - Remove select of host-gengetopt, since this package no longer has a menuconfig option. - Add missing toolchain option dependencies inherited from selected packages. - Add proper Config.in help text. - Fix the .mk comment header to the proper format. - Use the github function and remove the unneeded SITE_METHOD variable. - Add support for optional Opus and Libogg support. - Remove hash file, since the package is fetched from github.] See the final commit at http://git.buildroot.net/buildroot/commit/?id=f95c7e6fb9c0cf30eb769a8f0e272e76f36c5eae. Also, could you: * Submit the SSP patch to the upstream project, and ask them to create the m4/ directory? * Create a followup patch for Buildroot that adds a working example of janus.cfg configuration file and an init script to start the janus daemon? This way users of the package at least have a working starting point. Thanks! Thomas
diff --git a/package/Config.in b/package/Config.in index 316d899..f02d695 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1055,6 +1055,7 @@ endif source "package/iptraf-ng/Config.in" source "package/iputils/Config.in" source "package/iw/Config.in" + source "package/janus-gateway/Config.in" source "package/kismet/Config.in" source "package/knock/Config.in" source "package/leafnode2/Config.in" diff --git a/package/janus-gateway/Config.in b/package/janus-gateway/Config.in new file mode 100644 index 0000000..3a201ba --- /dev/null +++ b/package/janus-gateway/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_JANUS_GATEWAY + bool "janus-gateway" + select BR2_PACKAGE_LIBMICROHTTPD + select BR2_PACKAGE_JANSSON + select BR2_PACKAGE_LIBNICE + select BR2_PACKAGE_SOFIA_SIP + select BR2_PACKAGE_LIBSRTP + select BR2_PACKAGE_DING_LIBS + select BR2_PACKAGE_LIBWEBSOCK + select BR2_PACKAGE_HOST_GENGETOPT + help + Adds janusgateway: + https://github.com/meetecho/janus-gateway diff --git a/package/janus-gateway/janus-gateway-0001-disable-ssp.patch b/package/janus-gateway/janus-gateway-0001-disable-ssp.patch new file mode 100644 index 0000000..5de8b3b --- /dev/null +++ b/package/janus-gateway/janus-gateway-0001-disable-ssp.patch @@ -0,0 +1,12 @@ +diff -rupN janus-gateway-master.orig/Makefile.am janus-gateway-master/Makefile.am +--- janus-gateway-master.orig/Makefile.am 2014-11-27 14:36:31.000000000 +0000 ++++ janus-gateway-master/Makefile.am 2014-12-01 16:39:50.551935028 +0000 +@@ -14,7 +14,7 @@ AM_CFLAGS += -Wredundant-decls # sophia + # some fairly big refactoring though, which can wait. + # AM_CFLAGS += -Wshadow -Wstrict-aliasing=2 + +-AM_CFLAGS += -fstack-protector-all -g -ggdb -fPIC -rdynamic ++AM_CFLAGS += -g -ggdb -fPIC -rdynamic + + # FIXME: make docs work with distcheck + DISTCHECK_CONFIGURE_FLAGS = --disable-docs --enable-post-processing diff --git a/package/janus-gateway/janus-gateway.hash b/package/janus-gateway/janus-gateway.hash new file mode 100644 index 0000000..8be5bb2 --- /dev/null +++ b/package/janus-gateway/janus-gateway.hash @@ -0,0 +1 @@ +sha256,3e90f67810f78255042d3ab857629b510009052b6a334af4b80701cf2a824874 diff --git a/package/janus-gateway/janus-gateway.mk b/package/janus-gateway/janus-gateway.mk new file mode 100644 index 0000000..277a38c --- /dev/null +++ b/package/janus-gateway/janus-gateway.mk @@ -0,0 +1,27 @@ +############################################################# +# +# janus-gateway +# +############################################################# +JANUS_GATEWAY_VERSION = c632c1e9da5ffd8c34df6086a1aa5a8511a2a02d +JANUS_GATEWAY_SITE_METHOD = git +JANUS_GATEWAY_SITE = https://github.com/meetecho/janus-gateway.git +JANUS_GATEWAY_LICENSE = GPLv3 +JANUS_GATEWAY_LICENSE_FILES = COPYING + +JANUS_GATEWAY_DEPENDENCIES = host-pkgconf libmicrohttpd jansson libnice sofia-sip libsrtp ding-libs libwebsock host-gengetopt + +# Straight out of the repository, no ./configure +JANUS_GATEWAY_AUTORECONF = YES + +define JANUS_GATEWAY_M4 + mkdir -p $(@D)/m4 +endef +JANUS_GATEWAY_POST_PATCH_HOOKS += JANUS_GATEWAY_M4 + +JANUS_GATEWAY_CONF_OPTS = --disable-data-channels \ + --disable-rabbitmq + +JANUS_GATEWAY_MAKE=$(MAKE1) + +$(eval $(autotools-package))
Signed-off-by: Gregory Dymarek <gregd72002@gmail.com> --- package/Config.in | 1 + package/janus-gateway/Config.in | 13 +++++++++++ .../janus-gateway-0001-disable-ssp.patch | 12 ++++++++++ package/janus-gateway/janus-gateway.hash | 1 + package/janus-gateway/janus-gateway.mk | 27 ++++++++++++++++++++++ 5 files changed, 54 insertions(+) create mode 100644 package/janus-gateway/Config.in create mode 100644 package/janus-gateway/janus-gateway-0001-disable-ssp.patch create mode 100644 package/janus-gateway/janus-gateway.hash create mode 100644 package/janus-gateway/janus-gateway.mk