Skip to content

Commit

Permalink
Merge pull request #284 from nyanmisaka/next-5.1
Browse files Browse the repository at this point in the history
Bump version to 5.1.3-6
  • Loading branch information
nyanmisaka authored Oct 16, 2023
2 parents b131dda + b610939 commit 5dbe994
Show file tree
Hide file tree
Showing 47 changed files with 190 additions and 127 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
uses: ./.github/workflows/_meta.yaml
with:
distro: 'ubuntu'
codenames: '["bionic", "focal", "jammy", "kinetic", "lunar"]'
codenames: '["bionic", "focal", "jammy", "lunar", "mantic"]'
architectures: '["amd64", "arm64", "armhf"]'
release: false

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: ./.github/workflows/_meta.yaml
with:
distro: 'ubuntu'
codenames: '["bionic", "focal", "jammy", "kinetic", "lunar"]'
codenames: '["bionic", "focal", "jammy", "lunar", "mantic"]'
architectures: '["amd64", "arm64", "armhf"]'
release: true
secrets:
Expand Down Expand Up @@ -69,8 +69,8 @@ jobs:
{distro: 'ubuntu', codename: 'bionic'},
{distro: 'ubuntu', codename: 'focal'},
{distro: 'ubuntu', codename: 'jammy'},
{distro: 'ubuntu', codename: 'kinetic'},
{distro: 'ubuntu', codename: 'lunar'}
{distro: 'ubuntu', codename: 'lunar'},
{distro: 'ubuntu', codename: 'mantic'}
]
steps:
- name: Sync mirrors and update symlinks
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.win64.make
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/make
DISTRO=ubuntu:lunar
DISTRO=ubuntu:mantic
.PHONY: Dockerfile
Dockerfile: Dockerfile.win64.in
sed 's/DISTRO/$(DISTRO)/' $< > $@ || rm -f $@
Expand Down
12 changes: 6 additions & 6 deletions build
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ usage() {
echo -e " * bionic"
echo -e " * focal"
echo -e " * jammy"
echo -e " * kinetic"
echo -e " * lunar"
echo -e " * mantic"
}

if [[ -z ${1} ]]; then
Expand Down Expand Up @@ -51,16 +51,16 @@ case ${cli_release} in
gcc_version="11"
llvm_version="15"
;;
'kinetic')
release="ubuntu:kinetic"
gcc_version="12"
llvm_version="15"
;;
'lunar')
release="ubuntu:lunar"
gcc_version="12"
llvm_version="15"
;;
'mantic')
release="ubuntu:mantic"
gcc_version="13"
llvm_version="17"
;;
*)
echo "Invalid release."
usage
Expand Down
8 changes: 4 additions & 4 deletions build.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
# We just wrap `build` so this is really it
name: "jellyfin-ffmpeg"
version: "5.1.3-5"
version: "5.1.3-6"
packages:
- buster-amd64
- buster-armhf
Expand All @@ -21,9 +21,9 @@ packages:
- jammy-amd64
- jammy-armhf
- jammy-arm64
- kinetic-amd64
- kinetic-armhf
- kinetic-arm64
- lunar-amd64
- lunar-armhf
- lunar-arm64
- mantic-amd64
- mantic-armhf
- mantic-arm64
51 changes: 32 additions & 19 deletions builder/images/base-linux64/ct-ng-config
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
#
# Automatically generated file; DO NOT EDIT.
# crosstool-NG 1.25.0.152_89671bf Configuration
# crosstool-NG 1.25.0.232_c175b21 Configuration
#
CT_CONFIGURE_has_static_link=y
CT_CONFIGURE_has_cxx11=y
CT_CONFIGURE_has_wget=y
CT_CONFIGURE_has_curl=y
CT_CONFIGURE_has_meson=y
CT_CONFIGURE_has_ninja=y
CT_CONFIGURE_has_rsync=y
CT_CONFIGURE_has_make_3_81_or_newer=y
CT_CONFIGURE_has_make_4_0_or_newer=y
CT_CONFIGURE_has_libtool_2_4_or_newer=y
CT_CONFIGURE_has_libtoolize_2_4_or_newer=y
CT_CONFIGURE_has_autoconf_2_71_or_newer=y
CT_CONFIGURE_has_autoreconf_2_71_or_newer=y
CT_CONFIGURE_has_automake_1_16_or_newer=y
CT_CONFIGURE_has_autoconf_2_65_or_newer=y
CT_CONFIGURE_has_autoreconf_2_65_or_newer=y
CT_CONFIGURE_has_automake_1_15_or_newer=y
CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y
CT_CONFIGURE_has_python_3_4_or_newer=y
CT_CONFIGURE_has_bison_2_7_or_newer=y
Expand All @@ -28,7 +26,7 @@ CT_CONFIGURE_has_sha1sum=y
CT_CONFIGURE_has_sha256sum=y
CT_CONFIGURE_has_sha512sum=y
CT_CONFIGURE_has_install_with_strip_program=y
CT_VERSION="1.25.0.152_89671bf"
CT_VERSION="1.25.0.232_c175b21"
CT_VCHECK=""
CT_CONFIG_VERSION_ENV="4"
CT_CONFIG_VERSION_CURRENT="4"
Expand Down Expand Up @@ -269,6 +267,9 @@ CT_LINUX_PATCH_GLOBAL=y
# CT_LINUX_PATCH_LOCAL_BUNDLED is not set
# CT_LINUX_PATCH_NONE is not set
CT_LINUX_PATCH_ORDER="global"
# CT_LINUX_V_6_4 is not set
# CT_LINUX_V_6_3 is not set
# CT_LINUX_V_6_2 is not set
# CT_LINUX_V_6_1 is not set
# CT_LINUX_V_6_0 is not set
# CT_LINUX_V_5_19 is not set
Expand Down Expand Up @@ -452,6 +453,7 @@ CT_GLIBC_PATCH_GLOBAL=y
# CT_GLIBC_PATCH_LOCAL_BUNDLED is not set
# CT_GLIBC_PATCH_NONE is not set
CT_GLIBC_PATCH_ORDER="global"
# CT_GLIBC_V_2_38 is not set
# CT_GLIBC_V_2_37 is not set
# CT_GLIBC_V_2_36 is not set
# CT_GLIBC_V_2_35 is not set
Expand All @@ -475,6 +477,10 @@ CT_GLIBC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_GLIBC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
CT_GLIBC_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
CT_GLIBC_SIGNATURE_FORMAT="packed/.sig"
CT_GLIBC_2_38_or_older=y
CT_GLIBC_older_than_2_38=y
CT_GLIBC_2_37_or_older=y
CT_GLIBC_older_than_2_37=y
CT_GLIBC_2_36_or_older=y
CT_GLIBC_older_than_2_36=y
CT_GLIBC_2_34_or_older=y
Expand Down Expand Up @@ -579,7 +585,8 @@ CT_GCC_PATCH_GLOBAL=y
# CT_GCC_PATCH_LOCAL_BUNDLED is not set
# CT_GCC_PATCH_NONE is not set
CT_GCC_PATCH_ORDER="global"
CT_GCC_V_12=y
CT_GCC_V_13=y
# CT_GCC_V_12 is not set
# CT_GCC_V_11 is not set
# CT_GCC_V_10 is not set
# CT_GCC_V_9 is not set
Expand All @@ -588,12 +595,14 @@ CT_GCC_V_12=y
# CT_GCC_V_6 is not set
# CT_GCC_V_5 is not set
# CT_GCC_V_4_9 is not set
CT_GCC_VERSION="12.2.0"
CT_GCC_VERSION="13.2.0"
CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
CT_GCC_ARCHIVE_FORMATS=".tar.xz .tar.gz"
CT_GCC_SIGNATURE_FORMAT=""
CT_GCC_later_than_13=y
CT_GCC_13_or_later=y
CT_GCC_later_than_12=y
CT_GCC_12_or_later=y
CT_GCC_later_than_11=y
Expand Down Expand Up @@ -766,7 +775,8 @@ CT_ISL_PATCH_GLOBAL=y
# CT_ISL_PATCH_LOCAL_BUNDLED is not set
# CT_ISL_PATCH_NONE is not set
CT_ISL_PATCH_ORDER="global"
CT_ISL_V_0_25=y
CT_ISL_V_0_26=y
# CT_ISL_V_0_25 is not set
# CT_ISL_V_0_24 is not set
# CT_ISL_V_0_23 is not set
# CT_ISL_V_0_22 is not set
Expand All @@ -778,7 +788,7 @@ CT_ISL_V_0_25=y
# CT_ISL_V_0_16 is not set
# CT_ISL_V_0_15 is not set
# CT_ISL_V_0_11 is not set
CT_ISL_VERSION="0.25"
CT_ISL_VERSION="0.26"
CT_ISL_MIRRORS="https://libisl.sourceforge.io"
CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
Expand Down Expand Up @@ -829,7 +839,7 @@ CT_MPC_V_1_2=y
# CT_MPC_V_1_1 is not set
# CT_MPC_V_1_0 is not set
CT_MPC_VERSION="1.2.1"
CT_MPC_MIRRORS="http://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)"
CT_MPC_MIRRORS="https://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)"
CT_MPC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_MPC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
CT_MPC_ARCHIVE_FORMATS=".tar.gz"
Expand All @@ -850,11 +860,12 @@ CT_MPFR_PATCH_GLOBAL=y
# CT_MPFR_PATCH_LOCAL_BUNDLED is not set
# CT_MPFR_PATCH_NONE is not set
CT_MPFR_PATCH_ORDER="global"
CT_MPFR_V_4_1=y
CT_MPFR_V_4_2=y
# CT_MPFR_V_4_1 is not set
# CT_MPFR_V_4_0 is not set
# CT_MPFR_V_3_1 is not set
CT_MPFR_VERSION="4.1.0"
CT_MPFR_MIRRORS="http://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)"
CT_MPFR_VERSION="4.2.1"
CT_MPFR_MIRRORS="https://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)"
CT_MPFR_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_MPFR_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
CT_MPFR_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz .zip"
Expand All @@ -875,10 +886,11 @@ CT_NCURSES_PATCH_GLOBAL=y
# CT_NCURSES_PATCH_LOCAL_BUNDLED is not set
# CT_NCURSES_PATCH_NONE is not set
CT_NCURSES_PATCH_ORDER="global"
CT_NCURSES_V_6_2=y
CT_NCURSES_V_6_4=y
# CT_NCURSES_V_6_2 is not set
# CT_NCURSES_V_6_1 is not set
# CT_NCURSES_V_6_0 is not set
CT_NCURSES_VERSION="6.2"
CT_NCURSES_VERSION="6.4"
CT_NCURSES_MIRRORS="https://invisible-mirror.net/archives/ncurses $(CT_Mirrors GNU ncurses)"
CT_NCURSES_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_NCURSES_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
Expand Down Expand Up @@ -927,8 +939,9 @@ CT_ZSTD_PATCH_GLOBAL=y
# CT_ZSTD_PATCH_LOCAL_BUNDLED is not set
# CT_ZSTD_PATCH_NONE is not set
CT_ZSTD_PATCH_ORDER="global"
CT_ZSTD_V_1_5_2=y
CT_ZSTD_VERSION="1.5.2"
CT_ZSTD_V_1_5_5=y
# CT_ZSTD_V_1_5_2 is not set
CT_ZSTD_VERSION="1.5.5"
CT_ZSTD_MIRRORS="https://github.com/facebook/zstd/releases/download/v${CT_ZSTD_VERSION} https://www.zstd.net/"
CT_ZSTD_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_ZSTD_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
Expand Down
Loading

0 comments on commit 5dbe994

Please sign in to comment.