Fix Conflicts

README.md

@@ -46,5 +46,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.

addins/4.3.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-GIT_BRANCH="release/4.3"

addins/4.4.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+GIT_BRANCH="release/4.4"

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
 }
 

scripts.d/50-rav1e.sh

@@ -25,6 +25,5 @@ ffbuild_configure() {
 }
 
 ffbuild_unconfigure() {
-    [[ $VARIANT == *4.2* ]] && return 0
     echo --disable-librav1e
 }

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
 }

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
 }