[arch-commits] Commit in x264/repos (4 files)

Jan Steffens heftig at archlinux.org
Sun May 7 16:22:03 UTC 2017


    Date: Sunday, May 7, 2017 @ 16:22:03
  Author: heftig
Revision: 295432

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  x264/repos/testing-i686/PKGBUILD
    (from rev 295431, x264/trunk/PKGBUILD)
  x264/repos/testing-x86_64/PKGBUILD
    (from rev 295431, x264/trunk/PKGBUILD)
Deleted:
  x264/repos/testing-i686/PKGBUILD
  x264/repos/testing-x86_64/PKGBUILD

-------------------------+
 /PKGBUILD               |  194 ++++++++++++++++++++++++++++++++++++++++++++++
 testing-i686/PKGBUILD   |   96 ----------------------
 testing-x86_64/PKGBUILD |   96 ----------------------
 3 files changed, 194 insertions(+), 192 deletions(-)

Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2017-05-07 16:21:02 UTC (rev 295431)
+++ testing-i686/PKGBUILD	2017-05-07 16:22:03 UTC (rev 295432)
@@ -1,96 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: damir <damir at archlinux.org>
-# Contributor: Paul Mattal <paul at archlinux.org>
-
-pkgname=('x264' 'libx264' 'libx264-10bit')
-pkgver=148.20170121
-pkgrel=5
-epoch=2
-arch=('i686' 'x86_64')
-url='http://www.videolan.org/developers/x264.html'
-license=('GPL')
-depends=('glibc')
-makedepends=('yasm' 'git' 'ffmpeg' 'l-smash')
-_commit='97eaef2ab82a46d13ea5e00270712d6475fbe42b'
-source=("git://git.videolan.org/x264.git#commit=${_commit}")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd ${pkgbase}
-
-  local _ver=$(grep '#define X264_BUILD' x264.h | cut -d' ' -f3)
-  local _date=$(git log -1 --format="%cd" --date=short | tr -d -)
-
-  echo ${_ver}.${_date}
-}
-
-prepare() {
-  cp -r ${pkgbase} ${pkgbase}-10bit
-}
-
-build() {
-  cd ${pkgbase}
-
-  ./configure \
-    --prefix='/usr' \
-    --enable-shared \
-    --enable-pic
-  make
-
-  cd ../${pkgbase}-10bit
-
-  ./configure \
-    --prefix='/usr' \
-    --enable-shared \
-    --enable-pic \
-    --bit-depth='10'
-  make
-}
-
-package_x264() {
-  pkgdesc='CLI tools for encoding H264/AVC video streams'
-  depends+=('libavcodec.so' 'libavformat.so' 'libavutil.so' 'liblsmash.so'
-            'libswscale.so')
-  provides=('libx264-8bit.so' 'libx264-10bit.so')
-
-  local _ver=$(grep '#define X264_BUILD' "${pkgbase}"/x264.h | cut -d' ' -f3)
-
-  install -dm 755 "${pkgdir}"/usr/lib/x264
-
-  make -C ${pkgbase}-10bit DESTDIR="${pkgdir}" install-cli install-lib-shared
-  mv "${pkgdir}"/usr/lib/libx264.so.${_ver} "${pkgdir}"/usr/lib/x264/libx264-10bit.so.${_ver}
-  ln -s libx264-10bit.so.${_ver} "${pkgdir}"/usr/lib/x264/libx264-10bit.so
-  mv "${pkgdir}"/usr/bin/x264{,-10bit}
-
-  make -C ${pkgbase} DESTDIR="${pkgdir}" install-cli install-lib-shared
-  mv "${pkgdir}"/usr/lib/libx264.so.${_ver} "${pkgdir}"/usr/lib/x264/libx264-8bit.so.${_ver}
-  ln -s libx264-8bit.so.${_ver} "${pkgdir}"/usr/lib/x264/libx264-8bit.so
-  rm "${pkgdir}"/usr/lib/libx264.so
-}
-
-package_libx264() {
-  pkgdesc='Library for encoding H264/AVC video streams'
-
-  local _ver=$(grep '#define X264_BUILD' "${pkgbase}"/x264.h | cut -d' ' -f3)
-
-  install -dm 755 "${pkgdir}"/usr/lib
-  ln -s x264/libx264-8bit.so.${_ver} "${pkgdir}"/usr/lib/libx264.so
-  ln -s x264/libx264-8bit.so.${_ver} "${pkgdir}"/usr/lib/libx264.so.${_ver}
-}
-
-package_libx264-10bit() {
-  pkgdesc='Library for encoding H264/AVC video streams (10bit-depth)'
-  provides=('libx264')
-  conflicts=('libx264')
-
-  local _ver=$(grep '#define X264_BUILD' "${pkgbase}"/x264.h | cut -d' ' -f3)
-
-  install -dm 755 "${pkgdir}"/usr/lib
-  ln -s x264/libx264-10bit.so.${_ver} "${pkgdir}"/usr/lib/libx264.so
-  ln -s x264/libx264-10bit.so.${_ver} "${pkgdir}"/usr/lib/libx264.so.${_ver}
-}
-
-# vim: ts=2 sw=2 et:

Copied: x264/repos/testing-i686/PKGBUILD (from rev 295431, x264/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2017-05-07 16:22:03 UTC (rev 295432)
@@ -0,0 +1,97 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+# Contributor: Paul Mattal <paul at archlinux.org>
+
+pkgname=('x264' 'libx264' 'libx264-10bit' 'libx264-all')
+pkgver=148.20170121
+pkgrel=6
+epoch=2
+arch=('i686' 'x86_64')
+url='https://www.videolan.org/developers/x264.html'
+license=('GPL')
+depends=('glibc')
+makedepends=('yasm' 'git' 'ffmpeg' 'l-smash')
+_commit='97eaef2ab82a46d13ea5e00270712d6475fbe42b'
+source=("git+https://git.videolan.org/git/x264.git#commit=${_commit}")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd ${pkgbase}
+
+  local _ver=$(grep '#define X264_BUILD' x264.h | cut -d' ' -f3)
+  local _date=$(git log -1 --format="%cd" --date=short | tr -d -)
+
+  echo ${_ver}.${_date}
+}
+
+prepare() {
+  mkdir build-{8,10}bit
+}
+
+build() {
+  for _b in 8 10; do (
+    cd build-${_b}bit
+    ../${pkgbase}/configure \
+      --prefix='/usr' \
+      --enable-shared \
+      --enable-pic \
+      --enable-lto \
+      --bit-depth="${_b}"
+    make
+  ) done
+}
+
+package_x264() {
+  pkgdesc='CLI tools for encoding H264/AVC video streams'
+  depends+=('libavcodec.so' 'libavformat.so' 'libavutil.so' 'liblsmash.so'
+            'libswscale.so')
+
+  for _b in {8,10}bit; do
+    provides+=("x264-${_b}")
+
+    make -C build-${_b} DESTDIR="${pkgdir}" install-cli
+    mv "${pkgdir}"/usr/bin/x264{,-${_b}}
+  done
+
+  ln -s x264-8bit "${pkgdir}"/usr/bin/x264
+}
+
+package_libx264() {
+  pkgdesc='Library for encoding H264/AVC video streams (8bit depth)'
+  provides=('libx264-8bit' 'libx264.so')
+  conflicts=('libx264')
+
+  make -C build-8bit DESTDIR=${pkgdir} install-lib-shared
+}
+
+package_libx264-10bit() {
+  pkgdesc='Library for encoding H264/AVC video streams (10bit depth)'
+  provides=('libx264' 'libx264.so')
+  conflicts=('libx264')
+
+  make -C build-10bit DESTDIR=${pkgdir} install-lib-shared
+}
+
+package_libx264-all() {
+  pkgdesc="Library for encoding H264/AVC video streams (all depths)"
+
+  local _ver=$(grep '#define X264_BUILD' "${pkgbase}"/x264.h | cut -d' ' -f3)
+
+  install -d "${pkgdir}"/usr/lib/x264
+
+  for _b in {8,10}bit; do
+    provides+=("libx264-${_b}.so")
+
+    make -C build-${_b} DESTDIR="${pkgdir}" install-lib-shared
+
+    mv "${pkgdir}"/usr/lib/libx264.so.${_ver} "${pkgdir}"/usr/lib/x264/libx264-${_b}.so.${_ver}
+    rm -r "${pkgdir}"/usr/{include,lib/libx264.so,lib/pkgconfig}
+
+    ln -sr "${pkgdir}"/usr/lib/x264/libx264-${_b}.so{.${_ver},}
+  done
+}
+
+# vim: ts=2 sw=2 et:

Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2017-05-07 16:21:02 UTC (rev 295431)
+++ testing-x86_64/PKGBUILD	2017-05-07 16:22:03 UTC (rev 295432)
@@ -1,96 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: damir <damir at archlinux.org>
-# Contributor: Paul Mattal <paul at archlinux.org>
-
-pkgname=('x264' 'libx264' 'libx264-10bit')
-pkgver=148.20170121
-pkgrel=5
-epoch=2
-arch=('i686' 'x86_64')
-url='http://www.videolan.org/developers/x264.html'
-license=('GPL')
-depends=('glibc')
-makedepends=('yasm' 'git' 'ffmpeg' 'l-smash')
-_commit='97eaef2ab82a46d13ea5e00270712d6475fbe42b'
-source=("git://git.videolan.org/x264.git#commit=${_commit}")
-sha256sums=('SKIP')
-
-pkgver() {
-  cd ${pkgbase}
-
-  local _ver=$(grep '#define X264_BUILD' x264.h | cut -d' ' -f3)
-  local _date=$(git log -1 --format="%cd" --date=short | tr -d -)
-
-  echo ${_ver}.${_date}
-}
-
-prepare() {
-  cp -r ${pkgbase} ${pkgbase}-10bit
-}
-
-build() {
-  cd ${pkgbase}
-
-  ./configure \
-    --prefix='/usr' \
-    --enable-shared \
-    --enable-pic
-  make
-
-  cd ../${pkgbase}-10bit
-
-  ./configure \
-    --prefix='/usr' \
-    --enable-shared \
-    --enable-pic \
-    --bit-depth='10'
-  make
-}
-
-package_x264() {
-  pkgdesc='CLI tools for encoding H264/AVC video streams'
-  depends+=('libavcodec.so' 'libavformat.so' 'libavutil.so' 'liblsmash.so'
-            'libswscale.so')
-  provides=('libx264-8bit.so' 'libx264-10bit.so')
-
-  local _ver=$(grep '#define X264_BUILD' "${pkgbase}"/x264.h | cut -d' ' -f3)
-
-  install -dm 755 "${pkgdir}"/usr/lib/x264
-
-  make -C ${pkgbase}-10bit DESTDIR="${pkgdir}" install-cli install-lib-shared
-  mv "${pkgdir}"/usr/lib/libx264.so.${_ver} "${pkgdir}"/usr/lib/x264/libx264-10bit.so.${_ver}
-  ln -s libx264-10bit.so.${_ver} "${pkgdir}"/usr/lib/x264/libx264-10bit.so
-  mv "${pkgdir}"/usr/bin/x264{,-10bit}
-
-  make -C ${pkgbase} DESTDIR="${pkgdir}" install-cli install-lib-shared
-  mv "${pkgdir}"/usr/lib/libx264.so.${_ver} "${pkgdir}"/usr/lib/x264/libx264-8bit.so.${_ver}
-  ln -s libx264-8bit.so.${_ver} "${pkgdir}"/usr/lib/x264/libx264-8bit.so
-  rm "${pkgdir}"/usr/lib/libx264.so
-}
-
-package_libx264() {
-  pkgdesc='Library for encoding H264/AVC video streams'
-
-  local _ver=$(grep '#define X264_BUILD' "${pkgbase}"/x264.h | cut -d' ' -f3)
-
-  install -dm 755 "${pkgdir}"/usr/lib
-  ln -s x264/libx264-8bit.so.${_ver} "${pkgdir}"/usr/lib/libx264.so
-  ln -s x264/libx264-8bit.so.${_ver} "${pkgdir}"/usr/lib/libx264.so.${_ver}
-}
-
-package_libx264-10bit() {
-  pkgdesc='Library for encoding H264/AVC video streams (10bit-depth)'
-  provides=('libx264')
-  conflicts=('libx264')
-
-  local _ver=$(grep '#define X264_BUILD' "${pkgbase}"/x264.h | cut -d' ' -f3)
-
-  install -dm 755 "${pkgdir}"/usr/lib
-  ln -s x264/libx264-10bit.so.${_ver} "${pkgdir}"/usr/lib/libx264.so
-  ln -s x264/libx264-10bit.so.${_ver} "${pkgdir}"/usr/lib/libx264.so.${_ver}
-}
-
-# vim: ts=2 sw=2 et:

Copied: x264/repos/testing-x86_64/PKGBUILD (from rev 295431, x264/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2017-05-07 16:22:03 UTC (rev 295432)
@@ -0,0 +1,97 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+# Contributor: Paul Mattal <paul at archlinux.org>
+
+pkgname=('x264' 'libx264' 'libx264-10bit' 'libx264-all')
+pkgver=148.20170121
+pkgrel=6
+epoch=2
+arch=('i686' 'x86_64')
+url='https://www.videolan.org/developers/x264.html'
+license=('GPL')
+depends=('glibc')
+makedepends=('yasm' 'git' 'ffmpeg' 'l-smash')
+_commit='97eaef2ab82a46d13ea5e00270712d6475fbe42b'
+source=("git+https://git.videolan.org/git/x264.git#commit=${_commit}")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd ${pkgbase}
+
+  local _ver=$(grep '#define X264_BUILD' x264.h | cut -d' ' -f3)
+  local _date=$(git log -1 --format="%cd" --date=short | tr -d -)
+
+  echo ${_ver}.${_date}
+}
+
+prepare() {
+  mkdir build-{8,10}bit
+}
+
+build() {
+  for _b in 8 10; do (
+    cd build-${_b}bit
+    ../${pkgbase}/configure \
+      --prefix='/usr' \
+      --enable-shared \
+      --enable-pic \
+      --enable-lto \
+      --bit-depth="${_b}"
+    make
+  ) done
+}
+
+package_x264() {
+  pkgdesc='CLI tools for encoding H264/AVC video streams'
+  depends+=('libavcodec.so' 'libavformat.so' 'libavutil.so' 'liblsmash.so'
+            'libswscale.so')
+
+  for _b in {8,10}bit; do
+    provides+=("x264-${_b}")
+
+    make -C build-${_b} DESTDIR="${pkgdir}" install-cli
+    mv "${pkgdir}"/usr/bin/x264{,-${_b}}
+  done
+
+  ln -s x264-8bit "${pkgdir}"/usr/bin/x264
+}
+
+package_libx264() {
+  pkgdesc='Library for encoding H264/AVC video streams (8bit depth)'
+  provides=('libx264-8bit' 'libx264.so')
+  conflicts=('libx264')
+
+  make -C build-8bit DESTDIR=${pkgdir} install-lib-shared
+}
+
+package_libx264-10bit() {
+  pkgdesc='Library for encoding H264/AVC video streams (10bit depth)'
+  provides=('libx264' 'libx264.so')
+  conflicts=('libx264')
+
+  make -C build-10bit DESTDIR=${pkgdir} install-lib-shared
+}
+
+package_libx264-all() {
+  pkgdesc="Library for encoding H264/AVC video streams (all depths)"
+
+  local _ver=$(grep '#define X264_BUILD' "${pkgbase}"/x264.h | cut -d' ' -f3)
+
+  install -d "${pkgdir}"/usr/lib/x264
+
+  for _b in {8,10}bit; do
+    provides+=("libx264-${_b}.so")
+
+    make -C build-${_b} DESTDIR="${pkgdir}" install-lib-shared
+
+    mv "${pkgdir}"/usr/lib/libx264.so.${_ver} "${pkgdir}"/usr/lib/x264/libx264-${_b}.so.${_ver}
+    rm -r "${pkgdir}"/usr/{include,lib/libx264.so,lib/pkgconfig}
+
+    ln -sr "${pkgdir}"/usr/lib/x264/libx264-${_b}.so{.${_ver},}
+  done
+}
+
+# vim: ts=2 sw=2 et:



More information about the arch-commits mailing list