diff --git a/.gitmodules b/.gitmodules index 1b5ee18..3923c60 100644 --- a/.gitmodules +++ b/.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 diff --git a/codecs/x265 b/codecs/x265 deleted file mode 160000 index 32e25ff..0000000 --- a/codecs/x265 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 32e25ffcf810c5fe284901859b369270824c4596 diff --git a/make/configure-x265.sh b/make/configure-x265.sh deleted file mode 100755 index c8ff0a3..0000000 --- a/make/configure-x265.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh -# People's Video Editor: high quality, GPU accelerated mp4 editor -# Copyright (C) 2025 Roz K -# -# 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 . - -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 diff --git a/make/make-x265.sh b/make/make-x265.sh deleted file mode 100755 index 2039bb0..0000000 --- a/make/make-x265.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -# People's Video Editor: high quality, GPU accelerated mp4 editor -# Copyright (C) 2025 Roz K -# -# 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 . - -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 </dev/null -fi - -make install