Merge from bittboy/buildroot@db180c0

package/multicat/Config.in

@@ -0,0 +1,12 @@
+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

package/multicat/multicat.hash

@@ -0,0 +1,6 @@
+# From https://get.videolan.org/multicat/2.3/multicat-2.3.tar.bz2.md5
+md5 cf4e4bc07d72eda110050d755db14620  multicat-2.3.tar.bz2
+# From https://get.videolan.org/multicat/2.3/multicat-2.3.tar.bz2.sha256
+sha256 2be162e9e8b2e6f6aa7686431f102db6c72c8288bd82dbc67ffed631f4a3361e  multicat-2.3.tar.bz2
+# locally calculated
+sha256 94f68aec169fb6c9937eade757251714d38a56812be5dbfc3973914a71ad8d2d COPYING

package/multicat/multicat.mk

@@ -0,0 +1,27 @@
+################################################################################
+#
+# multicat
+#
+################################################################################
+
+MULTICAT_VERSION = 2.3
+MULTICAT_SOURCE = multicat-$(MULTICAT_VERSION).tar.bz2
+MULTICAT_SITE = https://get.videolan.org/multicat/$(MULTICAT_VERSION)
+MULTICAT_LICENSE = GPL-2.0+
+MULTICAT_LICENSE_FILES = COPYING
+
+MULTICAT_DEPENDENCIES = bitstream
+
+# Makefile does not use LDFLAGS. Use LDLIBS for that instead.
+MULTICAT_MAKE_ENV = $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \
+	LDLIBS="$(TARGET_LDFLAGS)"
+
+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))