build scripts

.gitignore

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

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 \

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 \

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