build scripts

.gitignore

@@ -11,7 +11,6 @@ __pycache__/
 # Distribution / packaging
 .Python
 /build/
-/install/
 develop-eggs/
 dist/
 downloads/

.gitmodules

@@ -8,8 +8,3 @@
 	url = https://code.videolan.org/videolan/x264.git
 	branch = stable
     shallow = true
-[submodule "codecs/x265"]
-	path = codecs/x265
-	url = https://bitbucket.org/multicoreware/x265_git.git
-	branch = Release_4.1
-    shallow = true

make/configure-ffmpeg.sh

@@ -16,17 +16,12 @@
 # If not, see <https://www.gnu.org/licenses/>.
 
 source_directory="ffmpeg"
-include_directory="build/codecs/include"
+include_directory="build/include"
-lib_directory="build/codecs/lib"
+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 \

make/configure-x264.sh

@@ -17,12 +17,7 @@
 
 source_directory="codecs/x264"
 build_directory="build/${source_directory}"
-install_directory="build/codecs"
+install_directory="build"
-
-if ! [ -d ${source_directory} ] ; then
-	echo "This script must be executed from the root directory: ./make/configure-x264.sh"
-	exit 1
-fi
 
 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 \

make/configure-x265.sh

@@ -1,59 +0,0 @@
-#!/bin/sh
-# People's Video Editor: high quality, GPU accelerated mp4 editor
-# Copyright (C) 2025 Roz K <roz@rozk.net>
-#
-# This file is part of People's Video Editor.
-#
-# People's Video Editor is free software: you can redistribute it and/or modify it under the terms of the
-# GNU General Public License as published by the Free Software Foundation, either version 3 of the License,
-# or (at your option) any later version.
-#
-# People's Video Editor is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-# without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with People's Video Editor.
-# If not, see <https://www.gnu.org/licenses/>.
-
-source_directory="codecs/x265"
-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-x265.sh"
-	exit 1
-fi
-
-mkdir -p ${build_directory}/8bit
-mkdir -p ${build_directory}/10bit
-mkdir -p ${build_directory}/12bit
-mkdir -p ${install_directory}
-
-absolute_source_directory=$(realpath ${source_directory})
-absolute_build_directory=$(realpath ${build_directory})
-absolute_install_directory=$(realpath ${install_directory})
-
-cmake -S ${absolute_source_directory}/source -B ${absolute_build_directory}/12bit \
-	-Wno-dev \
-	-DHIGH_BIT_DEPTH=ON \
-	-DEXPORT_C_API=OFF \
-	-DENABLE_SHARED=OFF \
-	-DENABLE_CLI=OFF \
-	-DMAIN12=ON
-
-cmake -S ${absolute_source_directory}/source -B ${absolute_build_directory}/10bit \
-	-Wno-dev \
-	-DHIGH_BIT_DEPTH=ON \
-	-DEXPORT_C_API=OFF \
-	-DENABLE_SHARED=OFF \
-	-DENABLE_CLI=OFF
-
-cmake -S ${absolute_source_directory}/source -B ${absolute_build_directory}/8bit \
-	--install-prefix ${absolute_install_directory} \
-	-Wno-dev \
-	-DEXTRA_LIB="x265_main10.a;x265_main12.a" \
-	-DEXTRA_LINK_FLAGS=-L. \
-	-DLINKED_10BIT=ON \
-	-DLINKED_12BIT=ON \
-	-DENABLE_SHARED=OFF \
-	-DENABLE_CLI=OFF

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

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

make/make-x265.sh

@@ -1,61 +0,0 @@
-#!/bin/sh
-# People's Video Editor: high quality, GPU accelerated mp4 editor
-# Copyright (C) 2025 Roz K <roz@rozk.net>
-#
-# This file is part of People's Video Editor.
-#
-# People's Video Editor is free software: you can redistribute it and/or modify it under the terms of the
-# GNU General Public License as published by the Free Software Foundation, either version 3 of the License,
-# or (at your option) any later version.
-#
-# People's Video Editor is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-# without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along with People's Video Editor.
-# If not, see <https://www.gnu.org/licenses/>.
-
-source_directory="codecs/x265"
-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-x265.sh || exit 1
-fi
-
-absolute_build_directory=$(realpath ${build_directory})
-
-cd ${absolute_build_directory}/12bit
-make || exit 1
-
-cd ${absolute_build_directory}/10bit
-make || exit1
-
-cd ${absolute_build_directory}/8bit
-
-ln -sf ../10bit/libx265.a libx265_main10.a
-ln -sf ../12bit/libx265.a libx265_main12.a
-
-make || exit 1
-
-mv -f libx265.a libx265_main.a
-
-uname=`uname`
-if [ "$uname" = "Linux" ] ; then
-ar -M <<EOF
-CREATE libx265.a
-ADDLIB libx265_main.a
-ADDLIB libx265_main10.a
-ADDLIB libx265_main12.a
-SAVE
-END
-EOF
-else
-libtool -static -o libx265.a libx265_main.a libx265_main10.a libx265_main12.a 2>/dev/null
-fi
-
-make install