Ports: Update x264 to b35605a

Also update the patch for the configure script to use a portable shebang
(/bin/bash does not exist on NixOS) and add nasm to the nix shell to
make it build:

[x264/configure] + ./configure --host=x86_64-pc-serenity --enable-shared
[x264/configure] Found no assembler
[x264/configure] Minimum version is nasm-2.13
[x264/configure] If you really want to compile without asm, configure
                 with --disable-asm.
This commit is contained in:
Linus Groh authored and Nico Weber committed 2025-08-04 19:25:35 -04:00
1 parent c11bbf5998
commit e900f128a6
4 files changed
+14 -7

No files matched your search

+1 -1
View File
@@ -350,7 +350,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
| [`wget`](wget/) | GNU Wget | 1.25.0 | https://www.gnu.org/software/wget/ |
| [`which`](which/) | GNU which | 2.21 | https://www.gnu.org/software/which/ |
| [`wireguard-tools`](wireguard-tools/) | WireGuard Tools | 1.0.20250521 | https://www.wireguard.com/ |
| [`x264`](x264/) | x264 | 4613ac3 | https://www.videolan.org/developers/x264.html |
| [`x264`](x264/) | x264 | b35605a | https://www.videolan.org/developers/x264.html |
| [`x265`](x265/) | x265 | 3.6 | https://bitbucket.org/multicoreware/x265_git/wiki/Home |
| [`xash3d-fwgs`](xash3d-fwgs/) | Xash3D FWGS game engine | 2022.12.26 | https://github.com/FWGS/xash3d-fwgs |
| [`xmp-cli`](xmp-cli/) | Extended Module Player | 4.2.0 | https://github.com/libxmp/xmp-cli |
+2 -2
View File
@@ -1,8 +1,8 @@
#!/usr/bin/env -S bash ../.port_include.sh
port='x264'
version='4613ac3c15fd75cebc4b9f65b7fb95e70a3acce1'
version='b35605ace3ddf7c1a5d67a2eb553f034aef41d55'
files=(
"https://code.videolan.org/videolan/x264/-/archive/${version}/x264-master.tar.gz#44ce79258656d7dbe06165321cb989cc242a66effa308e25d2f0a197b50f8398"
"https://code.videolan.org/videolan/x264/-/archive/${version}/x264-master.tar.gz#cd71a7515b0e9a012e1ac9b1f8415bebcaf6fc97d4db32286642ac4c0fbe24f9"
)
useconfigure='true'
use_fresh_config_sub='true'
@@ -4,14 +4,20 @@ Date: Sat, 2 Apr 2022 19:14:23 -0500
Subject: [PATCH] Add definitions for serenity to configure
---
configure | 4 ++++
1 file changed, 4 insertions(+)
configure | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index e242e73..1f60a1a 100755
index c1fb599f053b4d5c8e92733298933e29255ec0bf..4f5274af5b7f498eca092da917028e4d37c647e8 100755
--- a/configure
+++ b/configure
@@ -729,6 +729,10 @@ case $host_os in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
cat <<EOF
@@ -730,6 +730,10 @@ case $host_os in
*haiku*)
SYS="HAIKU"
;;
+1
View File
@@ -35,6 +35,7 @@ mkShell.override { stdenv = gccStdenv; } {
imagemagick
libtool
meson
nasm
wayland-scanner
# For development
# NOTE: The unwrapped clang package is used because the one installed by `clang-tools`