From 2b4ece9bee27ffce35e57f2a0011f1b9157a589a Mon Sep 17 00:00:00 2001
From: Roz K <roz@rozk.net>
Date: Sat, 4 Oct 2025 12:58:55 +0200
Subject: [PATCH] build scripts

---
 .gitignore               |  1 -
 make/configure-ffmpeg.sh | 13 +++++--------
 make/configure-x264.sh   |  8 ++------
 make/make-ffmpeg.sh      |  5 -----
 make/make-x264.sh        |  5 -----
 5 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index 66ed74e..fc4c75d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@ __pycache__/
 # Distribution / packaging
 .Python
 /build/
-/install/
 develop-eggs/
 dist/
 downloads/
diff --git a/make/configure-ffmpeg.sh b/make/configure-ffmpeg.sh
index 8e8a336..ff6716f 100755
--- a/make/configure-ffmpeg.sh
+++ b/make/configure-ffmpeg.sh
@@ -16,17 +16,12 @@
 # If not, see <https://www.gnu.org/licenses/>.
 
 source_directory="ffmpeg"
-include_directory="build/codecs/include"
-lib_directory="build/codecs/lib"
+include_directory="build/include"
+lib_directory="build/lib"
 build_directory="build/${source_directory}"
 install_directory="build"
 install_library_directory="mp4"
 
-if ! [ -d ${source_directory} ] ; then
-	echo "This script must be executed from the root directory: ./make/configure-ffmpeg.sh"
-	exit 1
-fi
-
 mkdir -p ${build_directory}
 mkdir -p ${install_directory}
 
@@ -38,12 +33,15 @@ absolute_install_directory=$(realpath ${install_directory})
 absolute_install_library_directory=$(realpath ${install_library_directory})
 
 cd "${absolute_build_directory}"
+
+PKG_CONFIG_PATH="${absolute_lib_directory}/pkgconfig" \
 ${absolute_source_directory}/configure \
 	--prefix=${absolute_install_directory} \
 	--pkg-config-flags="--static" \
 	--extra-cflags="-I${absolute_include_directory}" \
 	--extra-ldflags="-L${absolute_lib_directory}" \
 	--extra-libs="-lpthread -lm" \
+	--ld="g++" \
 	--disable-static \
 	--enable-shared \
 	--enable-rpath \
@@ -57,7 +55,6 @@ ${absolute_source_directory}/configure \
 	--disable-txtpages \
 	--enable-gpl \
 	--enable-libx264 \
-	--enable-libx265 \
 	--disable-xlib \
 	--disable-libxcb \
 	--disable-libxcb-shm \
diff --git a/make/configure-x264.sh b/make/configure-x264.sh
index 48613cb..2f70e68 100755
--- a/make/configure-x264.sh
+++ b/make/configure-x264.sh
@@ -17,12 +17,7 @@
 
 source_directory="codecs/x264"
 build_directory="build/${source_directory}"
-install_directory="build/codecs"
-
-if ! [ -d ${source_directory} ] ; then
-	echo "This script must be executed from the root directory: ./make/configure-x264.sh"
-	exit 1
-fi
+install_directory="build"
 
 mkdir -p ${build_directory}
 mkdir -p ${install_directory}
@@ -36,6 +31,7 @@ ${absolute_source_directory}/configure \
 	--prefix=${absolute_install_directory} \
 	--disable-cli \
 	--enable-static \
+	--enable-shared \
 	--disable-bashcompletion \
 	--bit-depth=all \
 	--chroma-format=all \
diff --git a/make/make-ffmpeg.sh b/make/make-ffmpeg.sh
index 3aebc62..b517e5e 100755
--- a/make/make-ffmpeg.sh
+++ b/make/make-ffmpeg.sh
@@ -18,11 +18,6 @@
 source_directory="ffmpeg"
 build_directory="build/${source_directory}"
 
-if ! [ -d ${source_directory} ] ; then
-	echo "This script must be executed from the root directory: ./make/make-ffmpeg.sh"
-	exit 1
-fi
-
 if ! [ -d ${build_directory} ] ; then
 	./make/configure-ffmpeg.sh || exit 1
 fi
diff --git a/make/make-x264.sh b/make/make-x264.sh
index 901ca5d..905d1b6 100755
--- a/make/make-x264.sh
+++ b/make/make-x264.sh
@@ -18,11 +18,6 @@
 source_directory="codecs/x264"
 build_directory="build/${source_directory}"
 
-if ! [ -d ${source_directory} ] ; then
-	echo "This script must be executed from the root directory: ./make/make-x264.sh"
-	exit 1
-fi
-
 if ! [ -d ${build_directory} ] ; then
 	./make/configure-x264.sh || exit 1
 fi