From f1c28c77d494a330d24463d9f00e356ca8a7744f Mon Sep 17 00:00:00 2001 From: Apaczer <94932128+Apaczer@users.noreply.github.com> Date: Tue, 30 Apr 2024 21:04:46 +0200 Subject: [PATCH] PACKAGE-x264: bump to 152 version (#103) inline with legacy sysroot --- package/x264/x264.hash | 2 +- package/x264/x264.mk | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/package/x264/x264.hash b/package/x264/x264.hash index fc8f394c..f0e9f1b8 100644 --- a/package/x264/x264.hash +++ b/package/x264/x264.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 a3a304da9eb1d5e6b19102e3c4156e17a9e7142d6dc1336e1001ff214c986843 x264-72d53ab2ac7af24597a824e868f2ef363a22f5d4.tar.gz +sha256 986863122b0b3ac2c1fa27c6e3932c3490b84287335fa162bca020aa815aa695 x264-ba24899b0bf23345921da022f7a51e0c57dbe73d.tar.gz diff --git a/package/x264/x264.mk b/package/x264/x264.mk index 1d32bae3..39cf3965 100644 --- a/package/x264/x264.mk +++ b/package/x264/x264.mk @@ -4,18 +4,18 @@ # ################################################################################ -X264_VERSION = 72d53ab2ac7af24597a824e868f2ef363a22f5d4 +X264_VERSION = ba24899b0bf23345921da022f7a51e0c57dbe73d X264_SITE = http://sources.buildroot.net -X264_LICENSE = GPLv2+ +X264_LICENSE = GPL-2.0+ X264_DEPENDENCIES = host-pkgconf X264_LICENSE_FILES = COPYING X264_INSTALL_STAGING = YES -X264_CONF_OPTS = --disable-avs +X264_CONF_OPTS = --disable-avs --disable-lavf --disable-swscale ifeq ($(BR2_i386)$(BR2_x86_64),y) -# yasm needed for assembly files -X264_DEPENDENCIES += host-yasm -X264_CONF_ENV += AS="$(HOST_DIR)/usr/bin/yasm" +# 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 @@ -36,6 +36,11 @@ 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 \