From 99cdafa5bccf0793da24a917f011625867861baa Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Wed, 25 May 2022 22:32:13 +0200 Subject: [PATCH] Ports: Replace the `x264` `config.sub` patch with our download --- Ports/x264/package.sh | 1 + ...efinitions-for-serenity-to-configure.patch} | 18 ++---------------- Ports/x264/patches/ReadMe.md | 4 ++-- 3 files changed, 5 insertions(+), 18 deletions(-) rename Ports/x264/patches/{0001-Add-definitions-for-serenity-to-configure-and-config.patch => 0001-Add-definitions-for-serenity-to-configure.patch} (61%) diff --git a/Ports/x264/package.sh b/Ports/x264/package.sh index 20d5ab2544..4c3befba88 100755 --- a/Ports/x264/package.sh +++ b/Ports/x264/package.sh @@ -6,3 +6,4 @@ useconfigure=true files="https://code.videolan.org/videolan/x264/-/archive/${version}/x264-master.tar.gz libx264-${version}.tar.gz 2ca2344fc2d657150599687e128dac8816b07e8d5c991fa2281e51fe647bbbe7" auth_type=sha256 configopts=("--enable-shared") +use_fresh_config_sub=true diff --git a/Ports/x264/patches/0001-Add-definitions-for-serenity-to-configure-and-config.patch b/Ports/x264/patches/0001-Add-definitions-for-serenity-to-configure.patch similarity index 61% rename from Ports/x264/patches/0001-Add-definitions-for-serenity-to-configure-and-config.patch rename to Ports/x264/patches/0001-Add-definitions-for-serenity-to-configure.patch index 22e0d1be65..669f022fb8 100644 --- a/Ports/x264/patches/0001-Add-definitions-for-serenity-to-configure-and-config.patch +++ b/Ports/x264/patches/0001-Add-definitions-for-serenity-to-configure.patch @@ -1,26 +1,12 @@ From 6f4145f606671d7be8597af7854bda59ef594802 Mon Sep 17 00:00:00 2001 From: Hunter Kvalevog Date: Sat, 2 Apr 2022 19:14:23 -0500 -Subject: [PATCH] Add definitions for serenity to configure and config.sub +Subject: [PATCH] Add definitions for serenity to configure --- - config.sub | 2 ++ configure | 4 ++++ - 2 files changed, 6 insertions(+) + 1 file changed, 4 insertions(+) -diff --git a/config.sub b/config.sub -index 72e9265..2ee3877 100755 ---- a/config.sub -+++ b/config.sub -@@ -1514,6 +1514,8 @@ case $os in - ;; - -nacl*) - ;; -+ -serenity) -+ ;; - -none) - ;; - *) diff --git a/configure b/configure index e242e73..1f60a1a 100755 --- a/configure diff --git a/Ports/x264/patches/ReadMe.md b/Ports/x264/patches/ReadMe.md index c5dfc44d97..d363edbd5f 100644 --- a/Ports/x264/patches/ReadMe.md +++ b/Ports/x264/patches/ReadMe.md @@ -1,7 +1,7 @@ # Patches for x264 on SerenityOS -## `0001-Add-definitions-for-serenity-to-configure-and-config.patch` +## `0001-Add-definitions-for-serenity-to-configure.patch` -Add definitions for serenity to configure and config.sub +Add definitions for serenity to configure