Merge lp:~romain-bouqueau-pro/zenbuild/zenbuild into lp:zenbuild

[Romain Bouqueau]

add x265

Unmerged revisions

99. By Romain Bouqueau on 2014-05-20

automatically changed properties...

98. By Romain Bouqueau on 2014-05-20

remove iconv and bzlib deps

97. By Romain Bouqueau on 2014-05-20

README about PATH restrictions

96. By Romain Bouqueau on 2014-05-20

add x265

=== modified file 'README'
--- README	2014-05-08 10:48:49 +0000
+++ README	2014-05-20 15:12:00 +0000
@@ -14,3 +14,6 @@
 The environment variable MAKE is influential, you can achieve parallel builds this way:
 MAKE='make -j8' ./zenbuild.sh /tmp/myWorkDirectory x86_64-w64-mingw32 libav
 
+If your environment variable PATH also contains other Unix-like environments such as Cygwin,
+you may want to restrict the environment PATH this way:
+PATH='/mingw64/bin:/mingw32/bin:/usr/local/bin:/usr/bin:/opt/bin' ./zenbuild.sh /tmp/myWorkDirectory x86_64-w64-mingw32 libav

=== added file 'patches/x265_01_version.diff'
--- patches/x265_01_version.diff	1970-01-01 00:00:00 +0000
+++ patches/x265_01_version.diff	2014-05-20 15:12:00 +0000
@@ -0,0 +1,79 @@
+diff -r b35a5d8f012b source/cmake/version.cmake
+--- a/source/cmake/version.cmake	Sun May 18 15:02:27 2014 +0900
++++ b/source/cmake/version.cmake	Tue May 20 14:41:09 2014 +0200
+@@ -10,75 +10,4 @@
+ set(X265_LATEST_TAG "0.0")
+ set(X265_TAG_DISTANCE "0")
+ 
+-if(EXISTS ${CMAKE_SOURCE_DIR}/../.hg_archival.txt)
+-    # read the lines of the archive summary file to extract the version
+-    file(READ ${CMAKE_SOURCE_DIR}/../.hg_archival.txt archive)
+-    STRING(REGEX REPLACE "\n" ";" archive "${archive}")
+-    foreach(f ${archive})
+-        string(FIND "${f}" ": " pos)
+-        string(SUBSTRING "${f}" 0 ${pos} key)
+-        string(SUBSTRING "${f}" ${pos} -1 value)
+-        string(SUBSTRING "${value}" 2 -1 value)
+-        set(hg_${key} ${value})
+-    endforeach()
+-    if(DEFINED hg_tag)
+-        set(X265_VERSION ${hg_tag} CACHE STRING "x265 version string.")
+-        set(X265_LATEST_TAG ${hg_tag})
+-        set(X265_TAG_DISTANCE "0")
+-    elseif(DEFINED hg_node)
+-        string(SUBSTRING "${hg_node}" 0 16 hg_id)
+-        set(X265_VERSION "${hg_latesttag}+${hg_latesttagdistance}-${hg_id}")
+-    endif()
+-elseif(HG_EXECUTABLE AND EXISTS ${CMAKE_SOURCE_DIR}/../.hg)
+-    execute_process(COMMAND
+-        ${HG_EXECUTABLE} log -r. --template "{latesttag}"
+-        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+-        OUTPUT_VARIABLE X265_LATEST_TAG
+-        ERROR_QUIET
+-        OUTPUT_STRIP_TRAILING_WHITESPACE
+-        )
+-    execute_process(COMMAND
+-        ${HG_EXECUTABLE} log -r. --template "{latesttagdistance}"
+-        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+-        OUTPUT_VARIABLE X265_TAG_DISTANCE
+-        ERROR_QUIET
+-        OUTPUT_STRIP_TRAILING_WHITESPACE
+-        )
+-    execute_process(
+-        COMMAND
+-        ${HG_EXECUTABLE} log -r. --template "{node|short}"
+-        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+-        OUTPUT_VARIABLE HG_REVISION_ID
+-        ERROR_QUIET
+-        OUTPUT_STRIP_TRAILING_WHITESPACE
+-        )
+-
+-    if(X265_LATEST_TAG MATCHES "^r")
+-        string(SUBSTRING ${X265_LATEST_TAG} 1 -1 X265_LATEST_TAG)
+-    endif()
+-    if(X265_TAG_DISTANCE STREQUAL "0")
+-        set(X265_VERSION "${X265_LATEST_TAG}")
+-    else()
+-        set(X265_VERSION "${X265_LATEST_TAG}+${X265_TAG_DISTANCE}-${HG_REVISION_ID}")
+-    endif()
+-elseif(GIT_EXECUTABLE AND EXISTS ${CMAKE_SOURCE_DIR}/../.git)
+-    execute_process(
+-        COMMAND
+-        ${GIT_EXECUTABLE} describe --tags --abbrev=0
+-        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+-        OUTPUT_VARIABLE X265_LATEST_TAG
+-        ERROR_QUIET
+-        OUTPUT_STRIP_TRAILING_WHITESPACE
+-        )
+-
+-    execute_process(
+-        COMMAND
+-        ${GIT_EXECUTABLE} describe --tags
+-        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+-        OUTPUT_VARIABLE X265_VERSION
+-        ERROR_QUIET
+-        OUTPUT_STRIP_TRAILING_WHITESPACE
+-        )
+-endif()
+-
+ message(STATUS "x265 version ${X265_VERSION}")

=== modified file 'zen-ffmpeg.sh'
--- zen-ffmpeg.sh	2014-05-14 21:22:47 +0000
+++ zen-ffmpeg.sh	2014-05-20 15:12:00 +0000
@@ -47,6 +47,8 @@
     --enable-libx264 \
     --disable-gnutls \
     --disable-openssl \
+    --disable-iconv \
+    --disable-bzlib \
     --enable-avresample \
     --pkg-config=pkg-config \
     --cross-prefix=$host-

=== modified file 'zen-libav.sh'
--- zen-libav.sh	2014-05-14 21:22:47 +0000
+++ zen-libav.sh	2014-05-20 15:12:00 +0000
@@ -47,6 +47,8 @@
     --enable-libx264 \
     --disable-gnutls \
     --disable-openssl \
+    --disable-iconv \
+    --disable-bzlib \
     --pkg-config=pkg-config \
     --cross-prefix=$host-
   $MAKE

=== added file 'zen-x265.sh'
--- zen-x265.sh	1970-01-01 00:00:00 +0000
+++ zen-x265.sh	2014-05-20 15:12:00 +0000
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+# Copyright (C) 2014 - Romain Bouqueau
+# This program 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.
+#
+# This program 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 this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+
+function x265_get_deps {
+  local a=0
+}
+
+function build_x265 {
+  local host=$1
+  local crossPrefix=$(get_cross_prefix $BUILD $host)
+
+  pushDir $WORK/src
+  hg clone -r 6879 https://bitbucket.org/multicoreware/x265 x265
+  
+  pushDir x265/
+  applyPatch $scriptDir/patches/x265_01_version.diff
+  
+  mkdir -p build/$host
+  pushDir build/$host
+
+  echo "SET(CMAKE_C_COMPILER $host-gcc)" > config.cmake
+  echo "SET(CMAKE_CXX_COMPILER $host-g++)" >> config.cmake
+  echo "SET(CMAKE_RC_COMPILER $host-windres)" >> config.cmake
+  echo "SET(CMAKE_RANLIB $host-ranlib)" >> config.cmake
+  echo "SET(CMAKE_ASM_YASM_COMPILER yasm)" >> config.cmake
+  echo "" >> config.cmake
+  echo "SET(CMAKE_CXX_FLAGS \"-static-libgcc -static-libstdc++ -static -O3 -s\")" >> config.cmake
+  echo "SET(CMAKE_C_FLAGS \"-static-libgcc -static-libstdc++ -static -O3 -s\")" >> config.cmake
+  echo "SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS \"-static-libgcc -static-libstdc++ -static -O3 -s\")" >> config.cmake
+  echo "SET(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS \"-static-libgcc -static-libstdc++ -static -O3 -s\")" >> config.cmake
+  echo "SET(CMAKE_SHARED_LINKER_FLAGS \"-static-libgcc -static-libstdc++ -static -O3 -s\")" >> config.cmake
+  
+  cmake -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=config.cmake -DCMAKE_INSTALL_PREFIX=$PREFIX/$host ../../source
+  $MAKE x265-shared
+  $MAKE install
+  
+  popDir
+  popDir
+  popDir
+}
+

=== modified file 'zenbuild.sh' (properties changed: +x to -x)
--- zenbuild.sh	2014-05-18 08:10:00 +0000
+++ zenbuild.sh	2014-05-20 15:12:00 +0000
@@ -408,6 +408,14 @@
     exit 1
   fi
 
+  if isMissing "cmake"; then
+    echo "make not installed.  Please install with:"
+    echo "pacman -S mingw-cmake"
+    echo "or"
+    echo "apt-get install cmake"
+    exit 1
+  fi
+
   if isMissing "autopoint"; then
     echo "autopoint not installed.  Please install with:"
     echo "pacman -S gettext gettext-devel"
@@ -453,6 +461,14 @@
     echo "apt-get install git"
     exit 1
   fi
+
+  if isMissing "hg" ; then
+    echo "git not installed.  Please install with:"
+    echo "pacman -S msys/mercurial"
+    echo "or"
+    echo "apt-get install mercurial"
+    exit 1
+  fi
 }
 
 function get_arch {