Updating build script

README.md

@@ -6,5 +6,6 @@ Will pull the latest versions of the packages from github, install them to the
 specified location, and then remove the source code (if successful).
 
 Packages that are not included, but are required include (but are not limited 
-to) gcc > v.11; gnu binutils > v2.6; and clang.  Good luck, and as usual you'll
-want to send a prayer up to St. Isidore.
+to) gcc > v.11; gnu binutils > v2.6; xorg-x11-drv-intel-devel (intel-gen4asm); 
+and clang.  Good luck, and as usual you'll want to send a prayer up to 
+St. Isidore.

build.sh

@@ -3,6 +3,7 @@
 #build with hwaccell
 export PKG_CONFIG_PATH=/app/ffmpeg/install/lib/pkgconfig:/app/ffmpeg/install/lib64/pkgconfig/:/usr/local:/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig
 
+curDir="$PWD"
 pkg=jellyfin-ffmpeg
 if ! [[ -d "$pkg" ]]
 then
@@ -26,28 +27,33 @@ make distclean
 	--extra-cflags="-I/app/ffmpeg/install/include" \
 	--extra-ldflags="-L/app/ffmpeg/install/lib" \
 	--extra-libs="-lpthread -lm -lz -ldl" \
-	--enable-vaapi \
-	--enable-opengl \
-	--enable-opencl \
-	--enable-libmfx \
+	--enable-libvpl \
 	--enable-libvorbis \
 	--enable-libvpx \
 	--enable-libdrm \
 	--enable-libzimg \
+  --enable-libsvtav1 \
+  --enable-libdav1d \
 	--enable-gpl \
 	--enable-runtime-cpudetect \
-	--cpu=native \
-	--enable-libfdk-aac \
+	--enable-libfdk_aac \
 	--enable-libx264 \
 	--enable-libx265 \
 	--enable-openssl \
 	--enable-libmp3lame \
 	--enable-pic \
+  --enable-libass \
+  --enable-libfreetype \
+  --enable-libsrt \
+	--cpu=native \
 	--enable-nonfree 
 
-
 #	--disable-debug \
 #	--enable-debug \
+#	--enable-libmfx \
+#	--enable-vaapi \
+#	--enable-opengl \
+#	--enable-opencl \
 
 make -j8 
 if make

build_part.sh

@@ -4,6 +4,7 @@
 
 export PKG_CONFIG_PATH=/app/ffmpeg/install/lib/pkgconfig:/app/ffmpeg/install/lib64/pkgconfig/:/usr/local:/usr/local/lib/pkgconfig:/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig
 
+curDir="$PWD"
 pkg=jellyfin-ffmpeg
 if ! [[ -d "$pkg" ]]
 then

deps/03_mesa/build.sh

@@ -6,7 +6,7 @@ curDir="$PWD"
 pkg=mesa-drm
 if ! [[ -d "$pkg" ]]
 then
-  git clone https://github.com/freedesktop/mesa-drm.git
+  git clone https://github.com/gnedo/mesa-drm.git
 fi
 mkdir -p build
 cd "$pkg"

deps/05_intel-sdk/MediaSDK

@@ -1 +0,0 @@
-Subproject commit 22dc85a376ebe8be9cc43fc48654ea159419db79

deps/05_libvpx/build.sh

@@ -34,7 +34,7 @@ make distclean
     --enable-realtime-only \
     --enable-better-hw-compatibility \
     --disable-unit-tests \
-    --as=nsam \
+    --as=nasm \
     --prefix="/app/ffmpeg/install/"
 
 make -j8 

deps/06_intel-vaapi/build.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+export PKG_CONFIG_PATH=/app/ffmpeg/install/lib/pkgconfig:/app/ffmpeg/install/lib64/pkgconfig/
+unset LIBVA_DRIVERS_PATH
+curDir="$PWD"
+
+pkg=intel-vaapi-driver
+if ! [[ -d "$pkg" ]]
+then
+  git clone https://github.com/intel/intel-vaapi-driver.git
+fi
+cd "$pkg"
+
+if ! [[ -f configure ]] && [[ -f autogen.sh ]]
+then
+  bash autogen.sh
+elif ! [[ -f configure ]]
+then
+  echo "NO WAY TO CONFIGURE?, CMAKE?"
+  exit 1
+fi
+
+make clean
+make distclean
+./configure \
+    --prefix="/app/ffmpeg/install/"
+
+#make -j8 
+if make
+then
+  make install
+  cd "$curDir"
+  rm -rf "$pkg"
+else
+  cd "$curDir"
+  echo "BUILD FAILED"
+fi
+
+echo "Done"
+

deps/06_intel-vaapi/intel-vaapi-driver

@@ -0,0 +1 @@
+Subproject commit fd727a4e9cb8b2878a1e93d4dddc8dd1c1a4e0ea

deps/07_intel-sdk/MediaSDK

@@ -0,0 +1 @@
+Subproject commit 7a72de33a15d6e7cdb842b12b901a003f7154f0a

deps/07_intel-sdk/build.sh

@@ -10,7 +10,7 @@ then
 fi
 
 #Unsure if still needed:
-echo "#include <stdint.h>" >>./MediaSDK/api/mfx_dispatch/linux/mfxparser.cpp
+sed -i "1s/^/#include <stdint.h>\n/" ./MediaSDK/api/mfx_dispatch/linux/mfxparser.cpp
 
 cd "$pkg"
 

deps/10_SDL/SDL

@@ -0,0 +1 @@
+Subproject commit 4797970bfa6d6258bc9e636b6797acdfc1e73c31

deps/13_libvpx/libvpx

@@ -1 +0,0 @@
-Subproject commit 972149cafeb71d6f08df89e91a0130d6a38c4b15

deps/15_ImageMagick/ImageMagick

@@ -0,0 +1 @@
+Subproject commit 4bea3e706c4d168377b813a8700198e9abfb7894

deps/15_ImageMagick/build.sh

@@ -0,0 +1,46 @@
+#!/bin/bash
+#Depends on libtool
+
+export PKG_CONFIG_PATH=/app/ffmpeg/install/lib/pkgconfig:/app/install/lib64/pkgconfig/
+export LD_LIBRARY_PATH=/app/ffmpeg/install/lib:/app/install/lib64:$LD_LIBRARY_PATH
+curDir="$PWD"
+
+pkg=ImageMagick
+if ! [[ -d "$pkg" ]]
+then
+  git clone https://github.com/ImageMagick/ImageMagick.git
+fi
+cd "$pkg"
+
+if ! [[ -f configure ]] && [[ -f autogen.sh ]]
+then
+  bash autogen.sh
+elif ! [[ -f configure ]]
+then
+  echo "NO WAY TO CONFIGURE?, CMAKE?"
+  exit 1
+fi
+
+make clean
+make distclean
+./configure \
+    --enable-opengl \
+    --enable-opencl \
+    --prefix="/app/ffmpeg/install/" \
+    CFLAGS="-ldl"
+
+
+make -j8 
+if make
+then
+  make install
+  cd "$curDir"
+  rm -rf "$pkg"
+else
+  cd "$curDir"
+  echo "BUILD FAILED"
+fi
+
+echo "Done"
+
+

deps/16_x265/x265_git

@@ -1 +0,0 @@
-Subproject commit c07d076cf20ab41d8077a804dda70fdbc3b97386

deps/20_libass/build.sh

@@ -1,13 +1,12 @@
 #!/bin/bash
-#Depends on libtool
 
 export PKG_CONFIG_PATH=/app/ffmpeg/install/lib/pkgconfig:/app/ffmpeg/install/lib64/pkgconfig/
 curDir="$PWD"
 
-pkg=ImageMagick
+pkg=libass
 if ! [[ -d "$pkg" ]]
 then
-  git clone https://github.com/ImageMagick/ImageMagick.git
+  git clone https://github.com/libass/libass.git
 fi
 cd "$pkg"
 
@@ -23,11 +22,8 @@ fi
 make clean
 make distclean
 ./configure \
-    --enable-opengl \
-    --enable-opencl \
     --prefix="/app/ffmpeg/install/"
 
-
 make -j8 
 if make
 then
@@ -41,4 +37,3 @@ fi
 
 echo "Done"
 
-

deps/21_freetype/build.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+export PKG_CONFIG_PATH=/app/ffmpeg/install/lib/pkgconfig:/app/ffmpeg/install/lib64/pkgconfig/
+curDir="$PWD"
+
+pkg=freetype
+if ! [[ -d "$pkg" ]]
+then
+  git clone https://gitlab.freedesktop.org/freetype/freetype.git
+fi
+cd "$pkg"
+
+if ! [[ -f configure ]] && [[ -f autogen.sh ]]
+then
+  bash autogen.sh
+elif ! [[ -f configure ]]
+then
+  echo "NO WAY TO CONFIGURE?, CMAKE?"
+  exit 1
+fi
+
+make clean
+make distclean
+./configure \
+    --prefix="/app/ffmpeg/install/"
+
+#make -j8 
+if make
+then
+  make install
+  cd "$curDir"
+  rm -rf "$pkg"
+else
+  cd "$curDir"
+  echo "BUILD FAILED"
+fi
+
+echo "Done"
+

deps/22_srt/build.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+export PKG_CONFIG_PATH=/app/ffmpeg/install/lib/pkgconfig:/app/ffmpeg/install/lib64/pkgconfig/
+curDir="$PWD"
+
+pkg=srt
+if ! [[ -d "$pkg" ]]
+then
+  git clone https://github.com/Haivision/srt.git
+fi
+cd "$pkg"
+
+if ! [[ -f configure ]] && [[ -f autogen.sh ]]
+then
+  bash autogen.sh
+elif ! [[ -f configure ]]
+then
+  echo "NO WAY TO CONFIGURE?, CMAKE?"
+  exit 1
+fi
+
+make clean
+make distclean
+./configure \
+    --prefix="/app/ffmpeg/install/"
+
+make -j8 
+if make
+then
+  make install
+  cd "$curDir"
+  rm -rf "$pkg"
+else
+  cd "$curDir"
+  echo "BUILD FAILED"
+fi
+
+echo "Done"
+

deps/23_libsvtav1/build.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+export PKG_CONFIG_PATH=/app/ffmpeg/install/lib/pkgconfig:/app/ffmpeg/install/lib64/pkgconfig/
+curDir="$PWD"
+
+pkg="SVT-AV1"
+if ! [[ -d "$pkg" ]]
+then
+  git clone https://gitlab.com/AOMediaCodec/SVT-AV1.git
+fi
+cd "$pkg/Build"
+
+make clean
+make distclean
+cmake \
+    -DCMAKE_BUILD_TYPE=Realease \
+    -DCMAKE_INSTALL_PREFIX="/app/ffmpeg/install/" \
+    .. -G"Unix Makefiles"
+
+make -j8 
+if make
+then
+  make install
+  cd "$curDir"
+  rm -rf "$pkg"
+else
+  cd "$curDir"
+  echo "BUILD FAILED"
+fi
+
+echo "Done"
+

deps/24_libdav1d/build.sh

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+export PKG_CONFIG_PATH=/app/ffmpeg/install/lib/pkgconfig:/app/ffmpeg/install/lib64/pkgconfig/
+curDir="$PWD"
+
+pkg=dav1d
+if ! [[ -d "$pkg" ]]
+then
+  git clone https://code.videolan.org/videolan/dav1d.git
+fi
+mkdir -p build
+cd "$pkg"
+
+meson ../build/
+meson configure ../build/ -Dprefix=/app/ffmpeg/install/
+cd ../
+
+if ninja -C build/ install
+then
+  make install
+  cd "$curDir"
+  rm -rf "$pkg" "build"
+else
+  cd "$curDir"
+  echo "BUILD FAILED"
+fi
+
+echo "Done"
+