diff options
| -rw-r--r-- | multimedia/x265/6d55869ed5e2.patch | 19 | ||||
| -rw-r--r-- | multimedia/x265/x265.SlackBuild | 8 | ||||
| -rw-r--r-- | multimedia/x265/x265.info | 6 |
3 files changed, 28 insertions, 5 deletions
diff --git a/multimedia/x265/6d55869ed5e2.patch b/multimedia/x265/6d55869ed5e2.patch new file mode 100644 index 0000000000..868440f541 --- /dev/null +++ b/multimedia/x265/6d55869ed5e2.patch @@ -0,0 +1,19 @@ +# HG changeset patch +# User Steve Borho <steve@borho.org> +# Date 1394041694 21600 +# Node ID 6d55869ed5e29c97977b89aa0218a5c8510c671a +# Parent c40c379f283cbe458e1c9330521dfa2ad1d0aa92 +cmake: add i686 to x86 alias list (closes #33) + +diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt +--- a/source/CMakeLists.txt ++++ b/source/CMakeLists.txt +@@ -30,7 +30,7 @@ + string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC) + if("${SYSPROC}" STREQUAL "i386" OR "${SYSPROC}" STREQUAL "amd64" OR + "${SYSPROC}" STREQUAL "x86_64" OR "${SYSPROC}" STREQUAL "x86" OR +- "${SYSPROC}" STREQUAL "") ++ "${SYSPROC}" STREQUAL "i686" OR "${SYSPROC}" STREQUAL "") + message(STATUS "Detected x86 system processor") + set(X86 1) + add_definitions(-DX265_ARCH_X86=1) diff --git a/multimedia/x265/x265.SlackBuild b/multimedia/x265/x265.SlackBuild index a81ecaf678..1c812dcbf0 100644 --- a/multimedia/x265/x265.SlackBuild +++ b/multimedia/x265/x265.SlackBuild @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=x265 -VERSION=${VERSION:-0.7} -REVISION=${REVISION:-d24e2a8c4326} +VERSION=${VERSION:-0.8} +REVISION=${REVISION:-527d03c56d68} SRCNAM=multicoreware BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -71,6 +71,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# upstream patch to make it buildable on x86 +# https://bitbucket.org/multicoreware/x265/commits/6d55869ed5e29c97977b89aa0218a5c8510c671a +patch -p1 < $CWD/6d55869ed5e2.patch + # patched for x86_64 sed -i "s|/lib|/lib${LIBDIRSUFFIX}|" source/x265.pc.in sed -i "s|/lib|/lib${LIBDIRSUFFIX}|" source/CMakeLists.txt diff --git a/multimedia/x265/x265.info b/multimedia/x265/x265.info index 76dacf04d4..3b2e62603f 100644 --- a/multimedia/x265/x265.info +++ b/multimedia/x265/x265.info @@ -1,8 +1,8 @@ PRGNAM="x265" -VERSION="0.7" +VERSION="0.8" HOMEPAGE="https://www.videolan.org/developers/x265.html" -DOWNLOAD="https://bitbucket.org/multicoreware/x265/get/0.7.tar.bz2" -MD5SUM="042f8518e58ec69c870e6ae499fc0c55" +DOWNLOAD="https://bitbucket.org/multicoreware/x265/get/0.8.tar.bz2" +MD5SUM="0c690dfad024e87f6b617e6fc2f354eb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |