[arch-commits] Commit in x265/repos (10 files)
Maxime Gauduin
alucryd at archlinux.org
Sun Oct 11 12:36:54 UTC 2015
Date: Sunday, October 11, 2015 @ 14:36:54
Author: alucryd
Revision: 248883
db-move: moved x265 from [testing] to [extra] (i686, x86_64)
Added:
x265/repos/extra-i686/PKGBUILD
(from rev 248882, x265/repos/testing-i686/PKGBUILD)
x265/repos/extra-i686/x265-1.7-fix-slowness-with-gcc-5.1.patch
(from rev 248882, x265/repos/testing-i686/x265-1.7-fix-slowness-with-gcc-5.1.patch)
x265/repos/extra-x86_64/PKGBUILD
(from rev 248882, x265/repos/testing-x86_64/PKGBUILD)
x265/repos/extra-x86_64/x265-1.7-fix-slowness-with-gcc-5.1.patch
(from rev 248882, x265/repos/testing-x86_64/x265-1.7-fix-slowness-with-gcc-5.1.patch)
Deleted:
x265/repos/extra-i686/PKGBUILD
x265/repos/extra-i686/x265-1.7-fix-slowness-with-gcc-5.1.patch
x265/repos/extra-x86_64/PKGBUILD
x265/repos/extra-x86_64/x265-1.7-fix-slowness-with-gcc-5.1.patch
x265/repos/testing-i686/
x265/repos/testing-x86_64/
-------------------------------------------------------+
/PKGBUILD | 170 ++++++++++++++++
/x265-1.7-fix-slowness-with-gcc-5.1.patch | 56 +++++
extra-i686/PKGBUILD | 35 ---
extra-i686/x265-1.7-fix-slowness-with-gcc-5.1.patch | 28 --
extra-x86_64/PKGBUILD | 35 ---
extra-x86_64/x265-1.7-fix-slowness-with-gcc-5.1.patch | 28 --
6 files changed, 226 insertions(+), 126 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-10-11 12:14:39 UTC (rev 248882)
+++ extra-i686/PKGBUILD 2015-10-11 12:36:54 UTC (rev 248883)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: kfgz <kfgz at interia pl>
-
-pkgname=x265
-pkgver=1.7
-pkgrel=2
-pkgdesc='Open Source H265/HEVC video encoder'
-arch=('i686' 'x86_64')
-url='https://bitbucket.org/multicoreware/x265'
-license=('GPL')
-depends=('gcc-libs')
-makedepends=('yasm' 'cmake')
-provides=('libx265.so')
-source=($pkgname-$pkgver.tar.bz2::$url/get/$pkgver.tar.bz2
- x265-1.7-fix-slowness-with-gcc-5.1.patch)
-md5sums=('d6020c277b05ab44f8222342aaa9c99f'
- '30c7fc491f22cbdec1ee17caab7d620a')
-
-prepare() {
- cd multicoreware-x265-*
- patch -p1 -i "$srcdir"/x265-1.7-fix-slowness-with-gcc-5.1.patch
-}
-
-build() {
- cd multicoreware-x265-*/build/linux
- [[ $CARCH == x86_64 ]] && LDFLAGS+=',-z,noexecstack'
- cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr ../../source
- make
-}
-
-package() {
- cd multicoreware-x265-*/build/linux
- make DESTDIR="$pkgdir" install
-}
Copied: x265/repos/extra-i686/PKGBUILD (from rev 248882, x265/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-10-11 12:36:54 UTC (rev 248883)
@@ -0,0 +1,85 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: kfgz <kfgz at interia.pl>
+
+pkgname=x265
+pkgver=1.8
+pkgrel=1
+pkgdesc='Open Source H265/HEVC video encoder'
+arch=('i686' 'x86_64')
+url='https://bitbucket.org/multicoreware/x265'
+license=('GPL')
+depends=('gcc-libs')
+makedepends=('yasm' 'cmake')
+provides=('libx265.so')
+source=("https://bitbucket.org/multicoreware/x265/downloads/x265_${pkgver}.tar.gz")
+md5sums=('8b7ef9bc0b5bd26965d05a4508effeed')
+
+prepare() {
+ cd x265_11047
+
+ for d in 8 $([[ $CARCH == 'x86_64' ]] && echo "10 12"); do
+ if [[ -d build-$d ]]; then
+ rm -rf build-$d
+ fi
+ mkdir build-$d
+ done
+}
+
+build() {
+ if [[ $CARCH == x86_64 ]]; then
+
+ cd x265_11047/build-12
+
+ cmake ../source \
+ -DCMAKE_INSTALL_PREFIX='/usr' \
+ -DHIGH_BIT_DEPTH='TRUE' \
+ -DMAIN12='TRUE' \
+ -DEXPORT_C_API='FALSE' \
+ -DENABLE_CLI='FALSE' \
+ -DENABLE_SHARED='FALSE'
+ make
+
+ cd ../build-10
+
+ cmake ../source \
+ -DCMAKE_INSTALL_PREFIX='/usr' \
+ -DHIGH_BIT_DEPTH='TRUE' \
+ -DEXPORT_C_API='FALSE' \
+ -DENABLE_CLI='FALSE' \
+ -DENABLE_SHARED='FALSE'
+ make
+
+ cd ../build-8
+
+ ln -s ../build-10/libx265.a libx265_main10.a
+ ln -s ../build-12/libx265.a libx265_main12.a
+
+ cmake ../source \
+ -DCMAKE_INSTALL_PREFIX='/usr' \
+ -DENABLE_SHARED='TRUE' \
+ -DEXTRA_LIB='x265_main10.a;x265_main12.a' \
+ -DEXTRA_LINK_FLAGS='-L.' \
+ -DLINKED_10BIT='TRUE' \
+ -DLINKED_12BIT='TRUE'
+ make
+
+ else
+
+ cd x265_11047/build-8
+
+ cmake ../source \
+ -DCMAKE_INSTALL_PREFIX='/usr' \
+ -DENABLE_SHARED='TRUE'
+
+ fi
+}
+
+package() {
+ cd x265_11047/build-8
+
+ make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:
Deleted: extra-i686/x265-1.7-fix-slowness-with-gcc-5.1.patch
===================================================================
--- extra-i686/x265-1.7-fix-slowness-with-gcc-5.1.patch 2015-10-11 12:14:39 UTC (rev 248882)
+++ extra-i686/x265-1.7-fix-slowness-with-gcc-5.1.patch 2015-10-11 12:36:54 UTC (rev 248883)
@@ -1,28 +0,0 @@
-# HG changeset patch
-# User Deepthi Nandakumar <deepthi at multicorewareinc.com>
-# Date 1434559454 -19800
-# Wed Jun 17 22:14:14 2015 +0530
-# Branch stable
-# Node ID 98325f22a1bad500e6a0c3372bf8177e81167cae
-# Parent e0738af788da598a3cdf4458dbb46fbb07563534
-fix issue #143 x265 is slow when it is build with GCC 5.1
-
-diff -r e0738af788da -r 98325f22a1ba source/common/vec/vec-primitives.cpp
---- a/source/common/vec/vec-primitives.cpp Wed May 20 10:29:09 2015 -0500
-+++ b/source/common/vec/vec-primitives.cpp Wed Jun 17 22:14:14 2015 +0530
-@@ -32,12 +32,13 @@
- #define HAVE_SSE4
- #define HAVE_AVX2
- #elif defined(__GNUC__)
--#if __clang__ || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 3)
-+#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
-+#if __clang__ || GCC_VERSION >= 40300 /* gcc_version >= gcc-4.3.0 */
- #define HAVE_SSE3
- #define HAVE_SSSE3
- #define HAVE_SSE4
- #endif
--#if __clang__ || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
-+#if __clang__ || GCC_VERSION >= 40700 /* gcc_version >= gcc-4.7.0 */
- #define HAVE_AVX2
- #endif
- #elif defined(_MSC_VER)
Copied: x265/repos/extra-i686/x265-1.7-fix-slowness-with-gcc-5.1.patch (from rev 248882, x265/repos/testing-i686/x265-1.7-fix-slowness-with-gcc-5.1.patch)
===================================================================
--- extra-i686/x265-1.7-fix-slowness-with-gcc-5.1.patch (rev 0)
+++ extra-i686/x265-1.7-fix-slowness-with-gcc-5.1.patch 2015-10-11 12:36:54 UTC (rev 248883)
@@ -0,0 +1,28 @@
+# HG changeset patch
+# User Deepthi Nandakumar <deepthi at multicorewareinc.com>
+# Date 1434559454 -19800
+# Wed Jun 17 22:14:14 2015 +0530
+# Branch stable
+# Node ID 98325f22a1bad500e6a0c3372bf8177e81167cae
+# Parent e0738af788da598a3cdf4458dbb46fbb07563534
+fix issue #143 x265 is slow when it is build with GCC 5.1
+
+diff -r e0738af788da -r 98325f22a1ba source/common/vec/vec-primitives.cpp
+--- a/source/common/vec/vec-primitives.cpp Wed May 20 10:29:09 2015 -0500
++++ b/source/common/vec/vec-primitives.cpp Wed Jun 17 22:14:14 2015 +0530
+@@ -32,12 +32,13 @@
+ #define HAVE_SSE4
+ #define HAVE_AVX2
+ #elif defined(__GNUC__)
+-#if __clang__ || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 3)
++#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
++#if __clang__ || GCC_VERSION >= 40300 /* gcc_version >= gcc-4.3.0 */
+ #define HAVE_SSE3
+ #define HAVE_SSSE3
+ #define HAVE_SSE4
+ #endif
+-#if __clang__ || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
++#if __clang__ || GCC_VERSION >= 40700 /* gcc_version >= gcc-4.7.0 */
+ #define HAVE_AVX2
+ #endif
+ #elif defined(_MSC_VER)
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-10-11 12:14:39 UTC (rev 248882)
+++ extra-x86_64/PKGBUILD 2015-10-11 12:36:54 UTC (rev 248883)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: kfgz <kfgz at interia pl>
-
-pkgname=x265
-pkgver=1.7
-pkgrel=2
-pkgdesc='Open Source H265/HEVC video encoder'
-arch=('i686' 'x86_64')
-url='https://bitbucket.org/multicoreware/x265'
-license=('GPL')
-depends=('gcc-libs')
-makedepends=('yasm' 'cmake')
-provides=('libx265.so')
-source=($pkgname-$pkgver.tar.bz2::$url/get/$pkgver.tar.bz2
- x265-1.7-fix-slowness-with-gcc-5.1.patch)
-md5sums=('d6020c277b05ab44f8222342aaa9c99f'
- '30c7fc491f22cbdec1ee17caab7d620a')
-
-prepare() {
- cd multicoreware-x265-*
- patch -p1 -i "$srcdir"/x265-1.7-fix-slowness-with-gcc-5.1.patch
-}
-
-build() {
- cd multicoreware-x265-*/build/linux
- [[ $CARCH == x86_64 ]] && LDFLAGS+=',-z,noexecstack'
- cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr ../../source
- make
-}
-
-package() {
- cd multicoreware-x265-*/build/linux
- make DESTDIR="$pkgdir" install
-}
Copied: x265/repos/extra-x86_64/PKGBUILD (from rev 248882, x265/repos/testing-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-10-11 12:36:54 UTC (rev 248883)
@@ -0,0 +1,85 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: kfgz <kfgz at interia.pl>
+
+pkgname=x265
+pkgver=1.8
+pkgrel=1
+pkgdesc='Open Source H265/HEVC video encoder'
+arch=('i686' 'x86_64')
+url='https://bitbucket.org/multicoreware/x265'
+license=('GPL')
+depends=('gcc-libs')
+makedepends=('yasm' 'cmake')
+provides=('libx265.so')
+source=("https://bitbucket.org/multicoreware/x265/downloads/x265_${pkgver}.tar.gz")
+md5sums=('8b7ef9bc0b5bd26965d05a4508effeed')
+
+prepare() {
+ cd x265_11047
+
+ for d in 8 $([[ $CARCH == 'x86_64' ]] && echo "10 12"); do
+ if [[ -d build-$d ]]; then
+ rm -rf build-$d
+ fi
+ mkdir build-$d
+ done
+}
+
+build() {
+ if [[ $CARCH == x86_64 ]]; then
+
+ cd x265_11047/build-12
+
+ cmake ../source \
+ -DCMAKE_INSTALL_PREFIX='/usr' \
+ -DHIGH_BIT_DEPTH='TRUE' \
+ -DMAIN12='TRUE' \
+ -DEXPORT_C_API='FALSE' \
+ -DENABLE_CLI='FALSE' \
+ -DENABLE_SHARED='FALSE'
+ make
+
+ cd ../build-10
+
+ cmake ../source \
+ -DCMAKE_INSTALL_PREFIX='/usr' \
+ -DHIGH_BIT_DEPTH='TRUE' \
+ -DEXPORT_C_API='FALSE' \
+ -DENABLE_CLI='FALSE' \
+ -DENABLE_SHARED='FALSE'
+ make
+
+ cd ../build-8
+
+ ln -s ../build-10/libx265.a libx265_main10.a
+ ln -s ../build-12/libx265.a libx265_main12.a
+
+ cmake ../source \
+ -DCMAKE_INSTALL_PREFIX='/usr' \
+ -DENABLE_SHARED='TRUE' \
+ -DEXTRA_LIB='x265_main10.a;x265_main12.a' \
+ -DEXTRA_LINK_FLAGS='-L.' \
+ -DLINKED_10BIT='TRUE' \
+ -DLINKED_12BIT='TRUE'
+ make
+
+ else
+
+ cd x265_11047/build-8
+
+ cmake ../source \
+ -DCMAKE_INSTALL_PREFIX='/usr' \
+ -DENABLE_SHARED='TRUE'
+
+ fi
+}
+
+package() {
+ cd x265_11047/build-8
+
+ make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:
Deleted: extra-x86_64/x265-1.7-fix-slowness-with-gcc-5.1.patch
===================================================================
--- extra-x86_64/x265-1.7-fix-slowness-with-gcc-5.1.patch 2015-10-11 12:14:39 UTC (rev 248882)
+++ extra-x86_64/x265-1.7-fix-slowness-with-gcc-5.1.patch 2015-10-11 12:36:54 UTC (rev 248883)
@@ -1,28 +0,0 @@
-# HG changeset patch
-# User Deepthi Nandakumar <deepthi at multicorewareinc.com>
-# Date 1434559454 -19800
-# Wed Jun 17 22:14:14 2015 +0530
-# Branch stable
-# Node ID 98325f22a1bad500e6a0c3372bf8177e81167cae
-# Parent e0738af788da598a3cdf4458dbb46fbb07563534
-fix issue #143 x265 is slow when it is build with GCC 5.1
-
-diff -r e0738af788da -r 98325f22a1ba source/common/vec/vec-primitives.cpp
---- a/source/common/vec/vec-primitives.cpp Wed May 20 10:29:09 2015 -0500
-+++ b/source/common/vec/vec-primitives.cpp Wed Jun 17 22:14:14 2015 +0530
-@@ -32,12 +32,13 @@
- #define HAVE_SSE4
- #define HAVE_AVX2
- #elif defined(__GNUC__)
--#if __clang__ || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 3)
-+#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
-+#if __clang__ || GCC_VERSION >= 40300 /* gcc_version >= gcc-4.3.0 */
- #define HAVE_SSE3
- #define HAVE_SSSE3
- #define HAVE_SSE4
- #endif
--#if __clang__ || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
-+#if __clang__ || GCC_VERSION >= 40700 /* gcc_version >= gcc-4.7.0 */
- #define HAVE_AVX2
- #endif
- #elif defined(_MSC_VER)
Copied: x265/repos/extra-x86_64/x265-1.7-fix-slowness-with-gcc-5.1.patch (from rev 248882, x265/repos/testing-x86_64/x265-1.7-fix-slowness-with-gcc-5.1.patch)
===================================================================
--- extra-x86_64/x265-1.7-fix-slowness-with-gcc-5.1.patch (rev 0)
+++ extra-x86_64/x265-1.7-fix-slowness-with-gcc-5.1.patch 2015-10-11 12:36:54 UTC (rev 248883)
@@ -0,0 +1,28 @@
+# HG changeset patch
+# User Deepthi Nandakumar <deepthi at multicorewareinc.com>
+# Date 1434559454 -19800
+# Wed Jun 17 22:14:14 2015 +0530
+# Branch stable
+# Node ID 98325f22a1bad500e6a0c3372bf8177e81167cae
+# Parent e0738af788da598a3cdf4458dbb46fbb07563534
+fix issue #143 x265 is slow when it is build with GCC 5.1
+
+diff -r e0738af788da -r 98325f22a1ba source/common/vec/vec-primitives.cpp
+--- a/source/common/vec/vec-primitives.cpp Wed May 20 10:29:09 2015 -0500
++++ b/source/common/vec/vec-primitives.cpp Wed Jun 17 22:14:14 2015 +0530
+@@ -32,12 +32,13 @@
+ #define HAVE_SSE4
+ #define HAVE_AVX2
+ #elif defined(__GNUC__)
+-#if __clang__ || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 3)
++#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
++#if __clang__ || GCC_VERSION >= 40300 /* gcc_version >= gcc-4.3.0 */
+ #define HAVE_SSE3
+ #define HAVE_SSSE3
+ #define HAVE_SSE4
+ #endif
+-#if __clang__ || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 7)
++#if __clang__ || GCC_VERSION >= 40700 /* gcc_version >= gcc-4.7.0 */
+ #define HAVE_AVX2
+ #endif
+ #elif defined(_MSC_VER)
More information about the arch-commits
mailing list