Skip to content

Commit

Permalink
newer x265
Browse files Browse the repository at this point in the history
  • Loading branch information
Anime4000 committed Jun 30, 2017
1 parent 38f7f8a commit 75ed722
Show file tree
Hide file tree
Showing 9 changed files with 31 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ IFME=ifme7

all: clean compile copy fixmod
mv "$(DIR)" "release-ifme7"
zip -r "$(IFME).zip" "release-ifme7"
7za a -tzip -mm=lzma -mx=9 "$(IFME).zip" "release-ifme7"
mv "release-ifme7" "$(DIR)"

clean:
Expand Down
7 changes: 6 additions & 1 deletion changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
Version 7.3 (These Final Words)
Version 7.4
-----------
[fixed] encoded x264 not merge in MP4 files
[update] x265 version 2.4+96

Version 7.3 (These Final Words)
-------------------------------
[new] Support 32-bit computer for older tech (yet, high bit-depth require 64-bit OS)
[new] German localisation #126
Expand Down
13 changes: 11 additions & 2 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,15 @@ echo "Checking zip utils"
exit 1
}

echo "Checking 7za utils"
(7za x) < /dev/null > /dev/null 2>&1 || {
echo
echo "7za utils not detected!"
echo
sleep 3
exit 1
}

echo "Checking mono-runtime"
(mono --version) < /dev/null > /dev/null 2>&1 || {
echo
Expand Down Expand Up @@ -87,10 +96,10 @@ else
echo " Plugin not found, downloading..."
if [ $(uname -m | grep '64') ]; then
echo " 64-bit OS"
wget --no-check-certificate https://sourceforge.net/projects/ifme/files/plugin/plugin-basic_2017-06-30_amd64.tar.xz -O plugin.tar.xz
wget --no-check-certificate https://sourceforge.net/projects/ifme/files/plugin/plugin-basic_2017-07-01_amd64.tar.xz -O plugin.tar.xz
else
echo " 32-bit OS"
wget --no-check-certificate https://sourceforge.net/projects/ifme/files/plugin/plugin-basic_2017-06-30_i686.tar.xz -O plugin.tar.xz
wget --no-check-certificate https://sourceforge.net/projects/ifme/files/plugin/plugin-basic_2017-07-01_i686.tar.xz -O plugin.tar.xz
fi
fi

Expand Down
3 changes: 2 additions & 1 deletion sources/build-mkvtoolnix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
# ensure more portable, originally created by darealshinji
# modify for latest version

PASSWORD="142536"
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

commonflags="-Os -fstack-protector --param=ssp-buffer-size=4 -fno-strict-aliasing -ffunction-sections -fdata-sections -D_FORTIFY_SOURCE=2 -I."
Expand All @@ -25,7 +26,7 @@ fi

echo "OS is $BIT"

sudo apt-get install build-essential software-properties-common python2.7 git libssl-dev autoconf clang ruby rake libtool libtool-bin zlib1g-dev libxslt-dev xsltproc docbook-xsl liblzo2-dev libbz2-dev libmagic-dev po4a libicu-dev gawk doxygen -y
echo "$PASSWORD" | sudo -S apt-get install build-essential software-properties-common python2.7 git libssl-dev autoconf clang ruby rake libtool libtool-bin zlib1g-dev libxslt-dev xsltproc docbook-xsl liblzo2-dev libbz2-dev libmagic-dev po4a libicu-dev gawk doxygen -y

echo "Checking Ogg Dev"
if [ ! -f "/usr/local/include/ogg/ogg.h" ]; then
Expand Down
3 changes: 2 additions & 1 deletion sources/build-mkvtoolnix_ubuntu.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#!/bin/bash

PASSWORD="142536"
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

echo 142536 | sudo -S apt install --no-install-recommends rake libbz2-dev liblzo2-dev \
echo "$PASSWORD" | sudo -S apt install --no-install-recommends rake libbz2-dev liblzo2-dev \
zlib1g-dev libmagic-dev libflac-dev libogg-dev libvorbis-dev libboost-dev \
libboost-filesystem-dev libboost-regex-dev libboost-date-time-dev \
libboost-system-dev pkg-config po4a docbook-xsl xsltproc -y
Expand Down
3 changes: 2 additions & 1 deletion sources/build-mp4box.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@
# ensure more portable, originally created by darealshinji
# modify for latest version

PASSWORD="142536"
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

sudo apt install build-essential software-properties-common python2.7 git libssl-dev autoconf clang ruby rake libtool libtool-bin zlib1g-dev libxslt-dev xsltproc docbook-xsl liblzo2-dev libbz2-dev po4a libicu-dev -y
echo "$PASSWORD" | sudo -S apt install build-essential software-properties-common python2.7 git libssl-dev autoconf clang ruby rake libtool libtool-bin zlib1g-dev libxslt-dev xsltproc docbook-xsl liblzo2-dev libbz2-dev po4a libicu-dev -y

wget https://github.com/gpac/gpac/archive/v0.7.0.tar.gz
tar -xvf v0.7.0.tar.gz
Expand Down
1 change: 1 addition & 0 deletions sources/build-x264_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
# ensure more portable, originally created by darealshinji
# modify for latest version

PASSWORD="142536"
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

# check nasm
Expand Down
3 changes: 2 additions & 1 deletion sources/build-x265_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@
# ensure more portable, originally created by darealshinji
# modify for latest version

PASSWORD="142536"
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

sudo apt-get install mercurial cmake cmake-curses-gui build-essential yasm -y
echo "$PASSWORD" | sudo -S apt-get install mercurial cmake cmake-curses-gui build-essential yasm -y

hg clone https://bitbucket.org/multicoreware/x265
cd "x265/build/linux"
Expand Down
9 changes: 4 additions & 5 deletions sources/build-x265_msys.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,16 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

cd "$DIR"
hg clone --insecure http://bitbucket.org/multicoreware/x265
cd "$DIR/x265/build/msys"
cp -vrf "$DIR/x265/build/msys" "$DIR/x265/build/msys32"
cp -vrf "$DIR/x265/build/msys" "$DIR/x265/build/msys64"

cd "$DIR/x265/build/msys32"
cmake -G "MSYS Makefiles" ../../source -DWINXP_SUPPORT=ON -DENABLE_SHARED=OFF -DSTATIC_LINK_CRT=ON -DENABLE_CLI=ON
make
mv x265.exe "$DIR/x265-08_xp86.exe"

cd "$DIR"
rm -rf "x265"
hg clone --insecure http://bitbucket.org/multicoreware/x265
cd "$DIR/x265/build/msys"

cd "$DIR/x265/build/msys64"
cmake -G "MSYS Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-x86_64-w64-mingw32.cmake ../../source -DENABLE_SHARED=OFF -DSTATIC_LINK_CRT=ON -DENABLE_CLI=ON
make
mv x265.exe "$DIR/x265-08.exe"
Expand Down

0 comments on commit 75ed722

Please sign in to comment.