Merge from bittboy/buildroot@db180c0

package/x264/Config.in

@@ -0,0 +1,19 @@
+config BR2_PACKAGE_X264
+	bool "x264"
+	help
+	  x264 is a free software library and application for
+	  encoding video streams into the H.264/MPEG-4 AVC
+	  compression format, and is released under the terms
+	  of the GNU GPL.
+
+	  https://www.videolan.org/developers/x264.html
+
+if BR2_PACKAGE_X264
+
+config BR2_PACKAGE_X264_CLI
+	bool "CLI"
+	help
+	  Command-line tool to encode video streams into the
+	  H.264/MPEG-4 AVC compression format.
+
+endif

package/x264/x264.hash

@@ -0,0 +1,3 @@
+# Locally computed
+sha256 88bbb8f7453497be4ee85cbc6f7d27c02822c4a3744b5ae6042c9c0159ad0747  x264-snapshot-20190623-2245.tar.bz2
+sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670  COPYING

package/x264/x264.mk

@@ -0,0 +1,70 @@
+################################################################################
+#
+# x264
+#
+################################################################################
+
+X264_VERSION = 20190623-2245
+X264_SITE = http://download.videolan.org/x264/snapshots
+X264_SOURCE = x264-snapshot-$(X264_VERSION).tar.bz2
+X264_LICENSE = GPL-2.0+
+X264_DEPENDENCIES = host-pkgconf
+X264_LICENSE_FILES = COPYING
+X264_INSTALL_STAGING = YES
+X264_CONF_OPTS = --disable-avs --disable-lavf --disable-swscale
+
+ifeq ($(BR2_i386)$(BR2_x86_64),y)
+# nasm needed for assembly files
+X264_DEPENDENCIES += host-nasm
+X264_CONF_ENV += AS="$(HOST_DIR)/bin/nasm"
+else ifeq ($(BR2_ARM_CPU_ARMV7A)$(BR2_aarch64),y)
+# We need to pass gcc as AS, because the ARM assembly files have to be
+# preprocessed
+X264_CONF_ENV += AS="$(TARGET_CC)"
+else
+X264_CONF_OPTS += --disable-asm
+endif
+
+ifeq ($(BR2_STATIC_LIBS),)
+X264_CONF_OPTS += --enable-pic --enable-shared
+endif
+
+ifeq ($(BR2_PACKAGE_X264_CLI),)
+X264_CONF_OPTS += --disable-cli
+endif
+
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
+X264_CONF_OPTS += --disable-thread
+endif
+
+# Even though the configure script is not generated by autoconf, x264
+# uses config.sub/config.guess, so we want up-to-date versions of
+# them.
+X264_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK
+
+# the configure script is not generated by autoconf
+define X264_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_CONFIGURE_OPTS) $(X264_CONF_ENV) ./configure \
+		--prefix=/usr \
+		--host="$(GNU_TARGET_NAME)" \
+		--cross-prefix="$(TARGET_CROSS)" \
+		--disable-ffms \
+		--enable-static \
+		--disable-opencl \
+		$(X264_CONF_OPTS) \
+	)
+endef
+
+define X264_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define X264_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) DESTDIR="$(STAGING_DIR)" -C $(@D) install
+endef
+
+define X264_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) DESTDIR="$(TARGET_DIR)" -C $(@D) install
+endef
+
+$(eval $(generic-package))