From 75db19361e7d2bdacf3feec50a1b2cfb7eb2a635 Mon Sep 17 00:00:00 2001
From: nanake <nanake@users.noreply.github.com>
Date: Sun, 4 Apr 2021 13:38:55 +0700
Subject: [PATCH] Roll release/4.4

---
 .github/workflows/build.yml | 4 ++--
 .github/workflows/pr.yml    | 2 +-
 README.md                   | 2 +-
 addins/4.3.sh               | 2 --
 addins/4.4.sh               | 2 ++
 scripts.d/50-glslang.sh     | 1 -
 scripts.d/50-rav1e.sh       | 1 -
 scripts.d/50-svtav1.sh      | 2 --
 scripts.d/50-uavs3d.sh      | 2 --
 9 files changed, 6 insertions(+), 12 deletions(-)
 delete mode 100644 addins/4.3.sh
 create mode 100644 addins/4.4.sh

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f913c14..e678eb1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -71,7 +71,7 @@ jobs:
       fail-fast: false
       matrix:
         target: [win64]
-        variant: [gpl,lgpl,gpl 4.3,lgpl 4.3,gpl-shared,lgpl-shared,gpl-shared 4.3,lgpl-shared 4.3]
+        variant: [gpl,lgpl,gpl 4.4,lgpl 4.4,gpl-shared,lgpl-shared,gpl-shared 4.4,lgpl-shared 4.4]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -100,7 +100,7 @@ jobs:
       fail-fast: false
       matrix:
         target: [win64]
-        variant: [gpl,lgpl,gpl 4.3,lgpl 4.3,gpl-shared,lgpl-shared,gpl-shared 4.3,lgpl-shared 4.3]
+        variant: [gpl,lgpl,gpl 4.4,lgpl 4.4,gpl-shared,lgpl-shared,gpl-shared 4.4,lgpl-shared 4.4]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 4e535c4..76fb5f9 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         target: [win64]
-        variant: [gpl,lgpl,gpl 4.3,lgpl 4.3,gpl-shared,lgpl-shared,gpl-shared 4.3,lgpl-shared 4.3]
+        variant: [gpl,lgpl,gpl 4.4,lgpl 4.4,gpl-shared,lgpl-shared,gpl-shared 4.4,lgpl-shared 4.4]
     steps:
       - name: Checkout
         uses: actions/checkout@v2
diff --git a/README.md b/README.md
index a3c177b..492817d 100644
--- a/README.md
+++ b/README.md
@@ -40,5 +40,5 @@ The two available targets are `win64` and `win32`.
 Available in `gpl`, `lgpl`, `gpl-shared` and `lgpl-shared` variants.
 
 All of those can be optionally combined with any combination of addins.
-Currently that's `4.3`, to build from the 4.3 release branch instead of master.
+Currently that's `4.4`, to build from the 4.4 release branch instead of master.
 `debug` to not strip debug symbols from the binaries. This increases the output size by about 250MB.
diff --git a/addins/4.3.sh b/addins/4.3.sh
deleted file mode 100644
index 8f3bcc0..0000000
--- a/addins/4.3.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-GIT_BRANCH="release/4.3"
diff --git a/addins/4.4.sh b/addins/4.4.sh
new file mode 100644
index 0000000..6eec695
--- /dev/null
+++ b/addins/4.4.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+GIT_BRANCH="release/4.4"
diff --git a/scripts.d/50-glslang.sh b/scripts.d/50-glslang.sh
index 113bdc2..1d08426 100755
--- a/scripts.d/50-glslang.sh
+++ b/scripts.d/50-glslang.sh
@@ -4,7 +4,6 @@ GLSLANG_REPO="https://github.com/KhronosGroup/glslang.git"
 GLSLANG_COMMIT="5878bcb17e43bf22cecaf6095900a33ff7f53445"
 
 ffbuild_enabled() {
-    [[ $ADDINS_STR == *4.3* ]] && return -1
     return 0
 }
 
diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh
index 6a86493..123e712 100755
--- a/scripts.d/50-rav1e.sh
+++ b/scripts.d/50-rav1e.sh
@@ -25,6 +25,5 @@ ffbuild_configure() {
 }
 
 ffbuild_unconfigure() {
-    [[ $VARIANT == *4.2* ]] && return 0
     echo --disable-librav1e
 }
diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh
index 8b68225..be05656 100755
--- a/scripts.d/50-svtav1.sh
+++ b/scripts.d/50-svtav1.sh
@@ -5,7 +5,6 @@ SVTAV1_COMMIT="0a253a1cec457d50a3a441cec4d553c817bb7231"
 
 ffbuild_enabled() {
     [[ $TARGET == win32 ]] && return -1
-    [[ $ADDINS_STR == *4.3* ]] && return -1
     return 0
 }
 
@@ -26,6 +25,5 @@ ffbuild_configure() {
 }
 
 ffbuild_unconfigure() {
-    [[ $ADDINS_STR == *4.3* ]] && return 0
     echo --disable-libsvtav1
 }
diff --git a/scripts.d/50-uavs3d.sh b/scripts.d/50-uavs3d.sh
index 4651fec..19f0219 100755
--- a/scripts.d/50-uavs3d.sh
+++ b/scripts.d/50-uavs3d.sh
@@ -4,7 +4,6 @@ UAVS3D_REPO="https://github.com/uavs3/uavs3d.git"
 UAVS3D_COMMIT="85a165fadca9e2d8bd0d25febc1fed96cdcf8351"
 
 ffbuild_enabled() {
-    [[ $ADDINS_STR == *4.3* ]] && return -1
     [[ $TARGET == win32 ]] && return -1
     return 0
 }
@@ -27,6 +26,5 @@ ffbuild_configure() {
 }
 
 ffbuild_unconfigure() {
-    [[ $ADDINS_STR == *4.3* ]] && return 0
     echo --disable-libuavs3d
 }