aboutsummaryrefslogtreecommitdiff
path: root/multimedia/x265
diff options
context:
space:
mode:
authorWilly Sudiarto Raharjo <willysr@slackbuilds.org>2014-04-18 22:49:18 -0500
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2014-04-23 07:52:08 +0700
commit7163004753d1991de95571eaa4cdf9af7fa5dc46 (patch)
tree44dbbea60a130eff9bf373a39da51f6adc929667 /multimedia/x265
parent06b074b2876ff29aacb8763c3a6d968ca5bfd3b9 (diff)
multimedia/x265: Updated for version 0.9.
Signed-off-by: Erik Hanson <erik@slackbuilds.org> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'multimedia/x265')
-rw-r--r--multimedia/x265/6d55869ed5e2.patch19
-rw-r--r--multimedia/x265/x265.SlackBuild15
-rw-r--r--multimedia/x265/x265.info6
3 files changed, 6 insertions, 34 deletions
diff --git a/multimedia/x265/6d55869ed5e2.patch b/multimedia/x265/6d55869ed5e2.patch
deleted file mode 100644
index 868440f541488..0000000000000
--- a/multimedia/x265/6d55869ed5e2.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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 7d14fc66285a3..30694eead4e86 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.8}
-REVISION=${REVISION:-527d03c56d68}
+VERSION=${VERSION:-0.9}
+REVISION=${REVISION:-82bbd2bf3b49}
SRCNAM=multicoreware
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -71,21 +71,12 @@ 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
-sed -i "s|LIBRARY DESTINATION lib|LIBRARY DESTINATION lib${LIBDIRSUFFIX}|" source/CMakeLists.txt
-sed -i "s|ARCHIVE DESTINATION lib|ARCHIVE DESTINATION lib${LIBDIRSUFFIX}|" source/CMakeLists.txt
-
cd build/linux
cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_INSTALL_DIR=lib${LIBDIRSUFFIX} \
-DCMAKE_BUILD_TYPE=Release ../../source
make
make install DESTDIR=$PKG
diff --git a/multimedia/x265/x265.info b/multimedia/x265/x265.info
index 3b2e62603f3e7..55192bd12d840 100644
--- a/multimedia/x265/x265.info
+++ b/multimedia/x265/x265.info
@@ -1,8 +1,8 @@
PRGNAM="x265"
-VERSION="0.8"
+VERSION="0.9"
HOMEPAGE="https://www.videolan.org/developers/x265.html"
-DOWNLOAD="https://bitbucket.org/multicoreware/x265/get/0.8.tar.bz2"
-MD5SUM="0c690dfad024e87f6b617e6fc2f354eb"
+DOWNLOAD="https://bitbucket.org/multicoreware/x265/get/0.9.tar.bz2"
+MD5SUM="0cc0b0189cf9ed7422aad98633c6de8f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""