[arch-commits] Commit in x264/trunk (PKGBUILD)

2020-08-04 Thread Maxime Gauduin via arch-commits
Date: Tuesday, August 4, 2020 @ 14:06:35
  Author: alucryd
Revision: 393139

upgpkg: x264 3:0.160.r3011.cde9a93-1

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-08-04 14:00:42 UTC (rev 393138)
+++ PKGBUILD2020-08-04 14:06:35 UTC (rev 393139)
@@ -5,7 +5,7 @@
 # Contributor: Paul Mattal 
 
 pkgname=x264
-pkgver=0.159.r2999.296494a
+pkgver=0.160.r3011.cde9a93
 pkgrel=1
 epoch=3
 pkgdesc='Open Source H264/AVC video encoder'
@@ -34,7 +34,8 @@
   libx264-10bit
   libx264-all
 )
-source=(git+https://code.videolan.org/videolan/x264.git#commit=296494a4011f58f32adc54304a2654627558c59a)
+_commit=cde9a93319bea766a92e306d69059c76de970190
+source=(git+https://code.videolan.org/videolan/x264.git#commit=${_commit})
 sha256sums=(SKIP)
 
 pkgver() {


[arch-commits] Commit in x264/trunk (PKGBUILD)

2020-04-11 Thread Maxime Gauduin via arch-commits
Date: Saturday, April 11, 2020 @ 17:22:31
  Author: alucryd
Revision: 380123

upgpkg: x264 3:0.159.r2999.296494a-1

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-11 17:16:43 UTC (rev 380122)
+++ PKGBUILD2020-04-11 17:22:31 UTC (rev 380123)
@@ -5,7 +5,7 @@
 # Contributor: Paul Mattal 
 
 pkgname=x264
-pkgver=0.159.r2991.1771b55
+pkgver=0.159.r2999.296494a
 pkgrel=1
 epoch=3
 pkgdesc='Open Source H264/AVC video encoder'
@@ -34,7 +34,7 @@
   libx264-10bit
   libx264-all
 )
-source=(git+https://code.videolan.org/videolan/x264.git#commit=1771b556ee45207f8711744ccbd5d42a3949b14c)
+source=(git+https://code.videolan.org/videolan/x264.git#commit=296494a4011f58f32adc54304a2654627558c59a)
 sha256sums=(SKIP)
 
 pkgver() {


[arch-commits] Commit in x264/trunk (PKGBUILD)

2019-12-19 Thread Maxime Gauduin via arch-commits
Date: Thursday, December 19, 2019 @ 20:51:47
  Author: alucryd
Revision: 371940

upgpkg: x264 3:0.159.r2991.1771b55-1

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-12-19 20:09:16 UTC (rev 371939)
+++ PKGBUILD2019-12-19 20:51:47 UTC (rev 371940)
@@ -5,8 +5,8 @@
 # Contributor: Paul Mattal 
 
 pkgname=x264
-pkgver=0.157.r2980.34c06d1
-pkgrel=2
+pkgver=0.159.r2991.1771b55
+pkgrel=1
 epoch=3
 pkgdesc='Open Source H264/AVC video encoder'
 arch=(x86_64)
@@ -34,7 +34,7 @@
   libx264-10bit
   libx264-all
 )
-source=(git+https://code.videolan.org/videolan/x264.git#commit=34c06d1c17ad968fbdda153cb772f77ee31b3095)
+source=(git+https://code.videolan.org/videolan/x264.git#commit=1771b556ee45207f8711744ccbd5d42a3949b14c)
 sha256sums=(SKIP)
 
 pkgver() {


[arch-commits] Commit in x264/trunk (PKGBUILD)

2019-11-20 Thread Maxime Gauduin via arch-commits
Date: Wednesday, November 20, 2019 @ 21:18:51
  Author: alucryd
Revision: 369520

FS#64456: x264 3:0.157.r2980.34c06d1-2

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-11-20 20:49:49 UTC (rev 369519)
+++ PKGBUILD2019-11-20 21:18:51 UTC (rev 369520)
@@ -6,7 +6,7 @@
 
 pkgname=x264
 pkgver=0.157.r2980.34c06d1
-pkgrel=1
+pkgrel=2
 epoch=3
 pkgdesc='Open Source H264/AVC video encoder'
 arch=(x86_64)
@@ -50,7 +50,8 @@
 --prefix=/usr \
 --enable-shared \
 --enable-pic \
---enable-lto
+--enable-lto \
+--disable-avs
   make
 }
 


[arch-commits] Commit in x264/trunk (PKGBUILD)

2019-10-24 Thread Maxime Gauduin via arch-commits
Date: Thursday, October 24, 2019 @ 20:27:22
  Author: alucryd
Revision: 365484

change naming scheme and remove dep on ffmpeg: x264 3:0.157.r2980.34c06d1-1

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |   29 +++--
 1 file changed, 7 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-10-24 19:45:15 UTC (rev 365483)
+++ PKGBUILD2019-10-24 20:27:22 UTC (rev 365484)
@@ -5,23 +5,18 @@
 # Contributor: Paul Mattal 
 
 pkgname=x264
-pkgver=157.r72db4377
+pkgver=0.157.r2980.34c06d1
 pkgrel=1
-epoch=2
+epoch=3
 pkgdesc='Open Source H264/AVC video encoder'
 arch=(x86_64)
 url=https://www.videolan.org/developers/x264.html
 license=(GPL)
 depends=(
-  libavcodec.so
-  libavformat.so
-  libavutil.so
   liblsmash.so
-  libswscale.so
 )
 makedepends=(
   git
-  ffmpeg
   l-smash
   nasm
 )
@@ -39,29 +34,19 @@
   libx264-10bit
   libx264-all
 )
-source=(git+https://code.videolan.org/videolan/x264.git#commit=72db437770fd1ce3961f624dd57a8e75ff65ae0b)
+source=(git+https://code.videolan.org/videolan/x264.git#commit=34c06d1c17ad968fbdda153cb772f77ee31b3095)
 sha256sums=(SKIP)
 
 pkgver() {
   cd x264
 
-  local _ver=$(grep '#define X264_BUILD' x264.h | cut -d' ' -f3)
-  local _rev=$(git rev-parse --short HEAD)
-
-  echo ${_ver}.r${_rev}
+  ./version.sh | grep X264_POINTVER | sed -r 's/^#define X264_POINTVER 
"([0-9]+\.[0-9]+)\.([0-9]+) (.*)"$/\1.r\2.\3/'
 }
 
-prepare() {
-  if [[ -d build ]]; then
-rm -rf build
-  fi
-  mkdir build
-}
-
 build() {
-  cd build
+  cd x264
 
-  ../x264/configure \
+  ./configure \
 --prefix=/usr \
 --enable-shared \
 --enable-pic \
@@ -70,7 +55,7 @@
 }
 
 package() {
-  make -C build DESTDIR="${pkgdir}" install-cli install-lib-shared
+  make -C x264 DESTDIR="${pkgdir}" install-cli install-lib-shared
 }
 
 # vim: ts=2 sw=2 et:


[arch-commits] Commit in x264/trunk (PKGBUILD)

2019-03-27 Thread Maxime Gauduin via arch-commits
Date: Wednesday, March 27, 2019 @ 10:17:47
  Author: alucryd
Revision: 349263

upgpkg: x264 2:157.r72db4377-1

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |   48 +---
 1 file changed, 33 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-03-27 10:17:15 UTC (rev 349262)
+++ PKGBUILD2019-03-27 10:17:47 UTC (rev 349263)
@@ -5,24 +5,42 @@
 # Contributor: Paul Mattal 
 
 pkgname=x264
-pkgver=155.r0a84d986
-pkgrel=2
+pkgver=157.r72db4377
+pkgrel=1
 epoch=2
 pkgdesc='Open Source H264/AVC video encoder'
-arch=('x86_64')
-url='https://www.videolan.org/developers/x264.html'
-license=('GPL')
+arch=(x86_64)
+url=https://www.videolan.org/developers/x264.html
+license=(GPL)
 depends=(
-  'libavcodec.so' 'libavformat.so' 'libavutil.so' 'liblsmash.so'
-  'libswscale.so'
+  libavcodec.so
+  libavformat.so
+  libavutil.so
+  liblsmash.so
+  libswscale.so
 )
-makedepends=('git' 'ffmpeg' 'l-smash' 'nasm')
-provides=('libx264' 'libx264.so')
-conflicts=('libx264' 'libx264-10bit' 'libx264-all')
-replaces=('libx264' 'libx264-10bit' 'libx264-all')
-_commit='0a84d986e7020f8344f00752e3600b9769cc1e85'
-source=("git+https://git.videolan.org/git/x264.git#commit=${_commit};)
-sha256sums=('SKIP')
+makedepends=(
+  git
+  ffmpeg
+  l-smash
+  nasm
+)
+provides=(
+  libx264
+  libx264.so
+)
+conflicts=(
+  libx264
+  libx264-10bit
+  libx264-all
+)
+replaces=(
+  libx264
+  libx264-10bit
+  libx264-all
+)
+source=(git+https://code.videolan.org/videolan/x264.git#commit=72db437770fd1ce3961f624dd57a8e75ff65ae0b)
+sha256sums=(SKIP)
 
 pkgver() {
   cd x264
@@ -44,7 +62,7 @@
   cd build
 
   ../x264/configure \
---prefix='/usr' \
+--prefix=/usr \
 --enable-shared \
 --enable-pic \
 --enable-lto


[arch-commits] Commit in x264/trunk (PKGBUILD)

2018-08-07 Thread Maxime Gauduin via arch-commits
Date: Tuesday, August 7, 2018 @ 10:03:05
  Author: alucryd
Revision: 331101

upgpkg: x264 2:155.r0a84d986-2

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-07 09:49:53 UTC (rev 331100)
+++ PKGBUILD2018-08-07 10:03:05 UTC (rev 331101)
@@ -7,7 +7,7 @@
 
 pkgname=x264
 pkgver=155.r0a84d986
-pkgrel=1
+pkgrel=2
 epoch=2
 pkgdesc='Open Source H264/AVC video encoder'
 arch=('x86_64')
@@ -18,7 +18,7 @@
   'libswscale.so'
 )
 makedepends=('git' 'ffmpeg' 'l-smash' 'nasm')
-provides=('libx264.so')
+provides=('libx264' 'libx264.so')
 conflicts=('libx264' 'libx264-10bit' 'libx264-all')
 replaces=('libx264' 'libx264-10bit' 'libx264-all')
 _commit='0a84d986e7020f8344f00752e3600b9769cc1e85'


[arch-commits] Commit in x264/trunk (PKGBUILD)

2018-08-07 Thread Maxime Gauduin via arch-commits
Date: Tuesday, August 7, 2018 @ 09:14:09
  Author: alucryd
Revision: 331095

upgpkg: x264 2:155.r0a84d986-1

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |   94 ++---
 1 file changed, 28 insertions(+), 66 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-07 04:58:36 UTC (rev 331094)
+++ PKGBUILD2018-08-07 09:14:09 UTC (rev 331095)
@@ -5,93 +5,55 @@
 # Contributor: damir 
 # Contributor: Paul Mattal 
 
-pkgname=('x264' 'libx264' 'libx264-10bit' 'libx264-all')
-pkgver=152.20171224
-pkgrel=2
+pkgname=x264
+pkgver=155.r0a84d986
+pkgrel=1
 epoch=2
+pkgdesc='Open Source H264/AVC video encoder'
 arch=('x86_64')
 url='https://www.videolan.org/developers/x264.html'
 license=('GPL')
-depends=('glibc')
+depends=(
+  'libavcodec.so' 'libavformat.so' 'libavutil.so' 'liblsmash.so'
+  'libswscale.so'
+)
 makedepends=('git' 'ffmpeg' 'l-smash' 'nasm')
-_commit='e9a5903edf8ca59ef20e6f4894c196f135af735e'
+provides=('libx264.so')
+conflicts=('libx264' 'libx264-10bit' 'libx264-all')
+replaces=('libx264' 'libx264-10bit' 'libx264-all')
+_commit='0a84d986e7020f8344f00752e3600b9769cc1e85'
 source=("git+https://git.videolan.org/git/x264.git#commit=${_commit};)
 sha256sums=('SKIP')
 
 pkgver() {
-  cd ${pkgbase}
+  cd x264
 
   local _ver=$(grep '#define X264_BUILD' x264.h | cut -d' ' -f3)
-  local _date=$(git log -1 --format="%cd" --date=short | tr -d -)
+  local _rev=$(git rev-parse --short HEAD)
 
-  echo ${_ver}.${_date}
+  echo ${_ver}.r${_rev}
 }
 
 prepare() {
-  mkdir build-{8,10}bit
+  if [[ -d build ]]; then
+rm -rf build
+  fi
+  mkdir build
 }
 
 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
-}
+  cd build
 
-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
+  ../x264/configure \
+--prefix='/usr' \
+--enable-shared \
+--enable-pic \
+--enable-lto
+  make
 }
 
-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() {
+  make -C build DESTDIR="${pkgdir}" install-cli 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:


[arch-commits] Commit in x264/trunk (PKGBUILD)

2018-04-23 Thread Maxime Gauduin via arch-commits
Date: Monday, April 23, 2018 @ 17:07:26
  Author: alucryd
Revision: 322842

ffmpeg 4.0 rebuild: x264 2:152.20171224-2

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-04-23 16:57:55 UTC (rev 322841)
+++ PKGBUILD2018-04-23 17:07:26 UTC (rev 322842)
@@ -7,7 +7,7 @@
 
 pkgname=('x264' 'libx264' 'libx264-10bit' 'libx264-all')
 pkgver=152.20171224
-pkgrel=1
+pkgrel=2
 epoch=2
 arch=('x86_64')
 url='https://www.videolan.org/developers/x264.html'


[arch-commits] Commit in x264/trunk (PKGBUILD)

2017-12-28 Thread Maxime Gauduin via arch-commits
Date: Thursday, December 28, 2017 @ 16:07:39
  Author: alucryd
Revision: 313726

upgpkg: x264 2:152.20171224-1

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-28 13:46:15 UTC (rev 313725)
+++ PKGBUILD2017-12-28 16:07:39 UTC (rev 313726)
@@ -6,7 +6,7 @@
 # Contributor: Paul Mattal 
 
 pkgname=('x264' 'libx264' 'libx264-10bit' 'libx264-all')
-pkgver=148.20170521
+pkgver=152.20171224
 pkgrel=1
 epoch=2
 arch=('x86_64')
@@ -13,8 +13,8 @@
 url='https://www.videolan.org/developers/x264.html'
 license=('GPL')
 depends=('glibc')
-makedepends=('yasm' 'git' 'ffmpeg' 'l-smash')
-_commit='aaa9aa83a111ed6f1db253d5afa91c5fc844583f'
+makedepends=('git' 'ffmpeg' 'l-smash' 'nasm')
+_commit='e9a5903edf8ca59ef20e6f4894c196f135af735e'
 source=("git+https://git.videolan.org/git/x264.git#commit=${_commit};)
 sha256sums=('SKIP')
 


[arch-commits] Commit in x264/trunk (PKGBUILD)

2017-06-27 Thread Maxime Gauduin
Date: Tuesday, June 27, 2017 @ 19:54:28
  Author: alucryd
Revision: 299297

upgpkg: x264 2:148.20170521-1

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-06-27 13:20:53 UTC (rev 299296)
+++ PKGBUILD2017-06-27 19:54:28 UTC (rev 299297)
@@ -6,7 +6,7 @@
 # Contributor: Paul Mattal 
 
 pkgname=('x264' 'libx264' 'libx264-10bit' 'libx264-all')
-pkgver=148.20170519
+pkgver=148.20170521
 pkgrel=1
 epoch=2
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
 license=('GPL')
 depends=('glibc')
 makedepends=('yasm' 'git' 'ffmpeg' 'l-smash')
-_commit='d32d7bf1c6923a42cbd5ac2fd540ecbb009ba681'
+_commit='aaa9aa83a111ed6f1db253d5afa91c5fc844583f'
 source=("git+https://git.videolan.org/git/x264.git#commit=${_commit};)
 sha256sums=('SKIP')
 


[arch-commits] Commit in x264/trunk (PKGBUILD)

2017-05-26 Thread Maxime Gauduin
Date: Friday, May 26, 2017 @ 12:36:10
  Author: alucryd
Revision: 296650

upgpkg: x264 2:148.20170519-1

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-26 10:58:03 UTC (rev 296649)
+++ PKGBUILD2017-05-26 12:36:10 UTC (rev 296650)
@@ -6,8 +6,8 @@
 # Contributor: Paul Mattal 
 
 pkgname=('x264' 'libx264' 'libx264-10bit' 'libx264-all')
-pkgver=148.20170121
-pkgrel=6
+pkgver=148.20170519
+pkgrel=1
 epoch=2
 arch=('i686' 'x86_64')
 url='https://www.videolan.org/developers/x264.html'
@@ -14,7 +14,7 @@
 license=('GPL')
 depends=('glibc')
 makedepends=('yasm' 'git' 'ffmpeg' 'l-smash')
-_commit='97eaef2ab82a46d13ea5e00270712d6475fbe42b'
+_commit='d32d7bf1c6923a42cbd5ac2fd540ecbb009ba681'
 source=("git+https://git.videolan.org/git/x264.git#commit=${_commit};)
 sha256sums=('SKIP')
 


[arch-commits] Commit in x264/trunk (PKGBUILD)

2017-05-07 Thread Jan Steffens
Date: Sunday, May 7, 2017 @ 16:21:02
  Author: heftig
Revision: 295431

148.20170121-6: make this somewhat saner again; accept some duplication

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |   89 ++---
 1 file changed, 45 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-07 16:08:00 UTC (rev 295430)
+++ PKGBUILD2017-05-07 16:21:02 UTC (rev 295431)
@@ -5,17 +5,17 @@
 # Contributor: damir 
 # Contributor: Paul Mattal 
 
-pkgname=('x264' 'libx264' 'libx264-10bit')
+pkgname=('x264' 'libx264' 'libx264-10bit' 'libx264-all')
 pkgver=148.20170121
-pkgrel=5
+pkgrel=6
 epoch=2
 arch=('i686' 'x86_64')
-url='http://www.videolan.org/developers/x264.html'
+url='https://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}")
+source=("git+https://git.videolan.org/git/x264.git#commit=${_commit};)
 sha256sums=('SKIP')
 
 pkgver() {
@@ -28,26 +28,20 @@
 }
 
 prepare() {
-  cp -r ${pkgbase} ${pkgbase}-10bit
+  mkdir build-{8,10}bit
 }
 
 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
+  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() {
@@ -54,43 +48,50 @@
   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)
+  for _b in {8,10}bit; do
+provides+=("x264-${_b}")
 
-  install -dm 755 "${pkgdir}"/usr/lib/x264
+make -C build-${_b} DESTDIR="${pkgdir}" install-cli
+mv "${pkgdir}"/usr/bin/x264{,-${_b}}
+  done
 
-  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
+  ln -s x264-8bit "${pkgdir}"/usr/bin/x264
 }
 
 package_libx264() {
-  pkgdesc='Library for encoding H264/AVC video streams'
+  pkgdesc='Library for encoding H264/AVC video streams (8bit depth)'
+  provides=('libx264-8bit' 'libx264.so')
+  conflicts=('libx264')
 
-  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}
+  make -C build-8bit DESTDIR=${pkgdir} install-lib-shared
 }
 
 package_libx264-10bit() {
-  pkgdesc='Library for encoding H264/AVC video streams (10bit-depth)'
-  provides=('libx264')
+  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 -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}
+  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:


[arch-commits] Commit in x264/trunk (PKGBUILD)

2017-05-07 Thread Maxime Gauduin
Date: Sunday, May 7, 2017 @ 14:29:25
  Author: alucryd
Revision: 295423

upgpkg: x264 2:148.20170121-5

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-07 12:45:58 UTC (rev 295422)
+++ PKGBUILD2017-05-07 14:29:25 UTC (rev 295423)
@@ -7,7 +7,7 @@
 
 pkgname=('x264' 'libx264' 'libx264-10bit')
 pkgver=148.20170121
-pkgrel=4
+pkgrel=5
 epoch=2
 arch=('i686' 'x86_64')
 url='http://www.videolan.org/developers/x264.html'
@@ -62,10 +62,12 @@
 
   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
 }
 


[arch-commits] Commit in x264/trunk (PKGBUILD)

2017-05-07 Thread Maxime Gauduin
Date: Sunday, May 7, 2017 @ 12:28:30
  Author: alucryd
Revision: 295417

upgpkg: x264 2:148.20170121-4

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-07 12:24:33 UTC (rev 295416)
+++ PKGBUILD2017-05-07 12:28:30 UTC (rev 295417)
@@ -58,14 +58,14 @@
 
   local _ver=$(grep '#define X264_BUILD' "${pkgbase}"/x264.h | cut -d' ' -f3)
 
-  install -dm 755 "${pkgdir}"/usr/lib/libx264
+  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/libx264/libx264-10bit.so.${_ver}
+  mv "${pkgdir}"/usr/lib/libx264.so.${_ver} 
"${pkgdir}"/usr/lib/x264/libx264-10bit.so.${_ver}
   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/libx264/libx264-8bit.so.${_ver}
+  mv "${pkgdir}"/usr/lib/libx264.so.${_ver} 
"${pkgdir}"/usr/lib/x264/libx264-8bit.so.${_ver}
   rm "${pkgdir}"/usr/lib/libx264.so
 }
 
@@ -75,8 +75,8 @@
   local _ver=$(grep '#define X264_BUILD' "${pkgbase}"/x264.h | cut -d' ' -f3)
 
   install -dm 755 "${pkgdir}"/usr/lib
-  ln -s libx264/libx264-8bit.so.${_ver} "${pkgdir}"/usr/lib/libx264.so
-  ln -s libx264/libx264-8bit.so.${_ver} "${pkgdir}"/usr/lib/libx264.so.${_ver}
+  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() {
@@ -87,8 +87,8 @@
   local _ver=$(grep '#define X264_BUILD' "${pkgbase}"/x264.h | cut -d' ' -f3)
 
   install -dm 755 "${pkgdir}"/usr/lib
-  ln -s libx264/libx264-10bit.so.${_ver} "${pkgdir}"/usr/lib/libx264.so
-  ln -s libx264/libx264-10bit.so.${_ver} "${pkgdir}"/usr/lib/libx264.so.${_ver}
+  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:


[arch-commits] Commit in x264/trunk (PKGBUILD)

2017-05-07 Thread Maxime Gauduin
Date: Sunday, May 7, 2017 @ 12:14:01
  Author: alucryd
Revision: 295412

upgpkg: x264 2:148.20170121-4

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |   32 +++-
 1 file changed, 15 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-07 11:40:48 UTC (rev 295411)
+++ PKGBUILD2017-05-07 12:14:01 UTC (rev 295412)
@@ -7,7 +7,7 @@
 
 pkgname=('x264' 'libx264' 'libx264-10bit')
 pkgver=148.20170121
-pkgrel=3
+pkgrel=4
 epoch=2
 arch=('i686' 'x86_64')
 url='http://www.videolan.org/developers/x264.html'
@@ -56,27 +56,27 @@
 '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/libx264
+
   make -C ${pkgbase}-10bit DESTDIR="${pkgdir}" install-cli install-lib-shared
-  rename x264 x264-10bit "${pkgdir}"/usr/bin/*
-  rm "${pkgdir}"/usr/lib/libx264.so
-  rename libx264.so libx264-10bit.so "${pkgdir}"/usr/lib/*
-  ln -s libx264-10bit.so.${_ver} "${pkgdir}"/usr/lib/libx264-10bit.so
+  mv "${pkgdir}"/usr/lib/libx264.so.${_ver} 
"${pkgdir}"/usr/lib/libx264/libx264-10bit.so.${_ver}
+  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/libx264/libx264-8bit.so.${_ver}
   rm "${pkgdir}"/usr/lib/libx264.so
-  rename libx264.so libx264-8bit.so "${pkgdir}"/usr/lib/*
-  ln -s libx264-8bit.so.${_ver} "${pkgdir}"/usr/lib/libx264-8bit.so
 }
 
 package_libx264() {
   pkgdesc='Library for encoding H264/AVC video streams'
 
-  cd ${pkgbase}
+  local _ver=$(grep '#define X264_BUILD' "${pkgbase}"/x264.h | cut -d' ' -f3)
 
-  local _ver=$(grep '#define X264_BUILD' x264.h | cut -d' ' -f3)
-
   install -dm 755 "${pkgdir}"/usr/lib
-  ln -s libx264-8bit.so.${_ver} "${pkgdir}"/usr/lib/libx264.so
-  ln -s libx264-8bit.so.${_ver} "${pkgdir}"/usr/lib/libx264.so.${_ver}
+  ln -s libx264/libx264-8bit.so.${_ver} "${pkgdir}"/usr/lib/libx264.so
+  ln -s libx264/libx264-8bit.so.${_ver} "${pkgdir}"/usr/lib/libx264.so.${_ver}
 }
 
 package_libx264-10bit() {
@@ -84,13 +84,11 @@
   provides=('libx264')
   conflicts=('libx264')
 
-  cd ${pkgbase}
+  local _ver=$(grep '#define X264_BUILD' "${pkgbase}"/x264.h | cut -d' ' -f3)
 
-  local _ver=$(grep '#define X264_BUILD' x264.h | cut -d' ' -f3)
-
   install -dm 755 "${pkgdir}"/usr/lib
-  ln -s libx264-10bit.so.${_ver} "${pkgdir}"/usr/lib/libx264.so
-  ln -s libx264-10bit.so.${_ver} "${pkgdir}"/usr/lib/libx264.so.${_ver}
+  ln -s libx264/libx264-10bit.so.${_ver} "${pkgdir}"/usr/lib/libx264.so
+  ln -s libx264/libx264-10bit.so.${_ver} "${pkgdir}"/usr/lib/libx264.so.${_ver}
 }
 
 # vim: ts=2 sw=2 et:


[arch-commits] Commit in x264/trunk (PKGBUILD)

2017-05-07 Thread Maxime Gauduin
Date: Sunday, May 7, 2017 @ 11:31:28
  Author: alucryd
Revision: 295408

upgpkg: x264 2:148.20170121-3

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |   34 +++---
 1 file changed, 23 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-07 10:37:33 UTC (rev 295407)
+++ PKGBUILD2017-05-07 11:31:28 UTC (rev 295408)
@@ -7,7 +7,7 @@
 
 pkgname=('x264' 'libx264' 'libx264-10bit')
 pkgver=148.20170121
-pkgrel=2
+pkgrel=3
 epoch=2
 arch=('i686' 'x86_64')
 url='http://www.videolan.org/developers/x264.html'
@@ -54,31 +54,43 @@
   pkgdesc='CLI tools for encoding H264/AVC video streams'
   depends+=('libavcodec.so' 'libavformat.so' 'libavutil.so' 'liblsmash.so'
 'libswscale.so')
-  provides=('x264-10bit')
-  conflicts=('x264-10bit')
+  provides=('libx264-8bit.so' 'libx264-10bit.so')
 
-  make -C ${pkgbase}-10bit DESTDIR="${pkgdir}" install-cli
+  make -C ${pkgbase}-10bit DESTDIR="${pkgdir}" install-cli install-lib-shared
   rename x264 x264-10bit "${pkgdir}"/usr/bin/*
-  make -C ${pkgbase} DESTDIR="${pkgdir}" install-cli
+  rm "${pkgdir}"/usr/lib/libx264.so
+  rename libx264.so libx264-10bit.so "${pkgdir}"/usr/lib/*
+  ln -s libx264-10bit.so.${_ver} "${pkgdir}"/usr/lib/libx264-10bit.so
+  make -C ${pkgbase} DESTDIR="${pkgdir}" install-cli install-lib-shared
+  rm "${pkgdir}"/usr/lib/libx264.so
+  rename libx264.so libx264-8bit.so "${pkgdir}"/usr/lib/*
+  ln -s libx264-8bit.so.${_ver} "${pkgdir}"/usr/lib/libx264-8bit.so
 }
 
 package_libx264() {
   pkgdesc='Library for encoding H264/AVC video streams'
-  provides=('libx264.so' 'libx264-10bit.so')
 
+  cd ${pkgbase}
+
+  local _ver=$(grep '#define X264_BUILD' x264.h | cut -d' ' -f3)
+
   install -dm 755 "${pkgdir}"/usr/lib
-  make -C ${pkgbase}-10bit DESTDIR="${pkgdir}" install-lib-shared
-  rename x264 x264-10bit "${pkgdir}"/usr/lib/*
-  make -C ${pkgbase} DESTDIR="${pkgdir}" install-lib-shared
+  ln -s libx264-8bit.so.${_ver} "${pkgdir}"/usr/lib/libx264.so
+  ln -s 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' 'libx264.so')
+  provides=('libx264')
   conflicts=('libx264')
 
+  cd ${pkgbase}
+
+  local _ver=$(grep '#define X264_BUILD' x264.h | cut -d' ' -f3)
+
   install -dm 755 "${pkgdir}"/usr/lib
-  make -C ${pkgbase}-10bit DESTDIR="${pkgdir}" install-lib-shared
+  ln -s libx264-10bit.so.${_ver} "${pkgdir}"/usr/lib/libx264.so
+  ln -s libx264-10bit.so.${_ver} "${pkgdir}"/usr/lib/libx264.so.${_ver}
 }
 
 # vim: ts=2 sw=2 et:


[arch-commits] Commit in x264/trunk (PKGBUILD)

2017-05-07 Thread Maxime Gauduin
Date: Sunday, May 7, 2017 @ 10:19:21
  Author: alucryd
Revision: 295404

upgpkg: x264 2:148.20170121-2

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-07 05:41:27 UTC (rev 295403)
+++ PKGBUILD2017-05-07 10:19:21 UTC (rev 295404)
@@ -7,7 +7,7 @@
 
 pkgname=('x264' 'libx264' 'libx264-10bit')
 pkgver=148.20170121
-pkgrel=1
+pkgrel=2
 epoch=2
 arch=('i686' 'x86_64')
 url='http://www.videolan.org/developers/x264.html'
@@ -56,26 +56,26 @@
 'libswscale.so')
   provides=('x264-10bit')
   conflicts=('x264-10bit')
-  replaces=('x264-10bit')
 
+  make -C ${pkgbase}-10bit DESTDIR="${pkgdir}" install-cli
+  rename x264 x264-10bit "${pkgdir}"/usr/bin/*
   make -C ${pkgbase} DESTDIR="${pkgdir}" install-cli
-  install -m 755 ${pkgbase}-10bit/x264 "${pkgdir}"/usr/bin/x264-10bit
 }
 
 package_libx264() {
   pkgdesc='Library for encoding H264/AVC video streams'
-  provides=('libx264.so' 'x264-dev')
-  conflicts=('x264-dev')
-  replaces=('x264-dev')
+  provides=('libx264.so' 'libx264-10bit.so')
 
   install -dm 755 "${pkgdir}"/usr/lib
+  make -C ${pkgbase}-10bit DESTDIR="${pkgdir}" install-lib-shared
+  rename x264 x264-10bit "${pkgdir}"/usr/lib/*
   make -C ${pkgbase} DESTDIR="${pkgdir}" install-lib-shared
 }
 
 package_libx264-10bit() {
-  pkgdesc='Library for encoding H264/AVC video streams. 10bit-depth.'
-  provides=('libx264.so' 'libx264' 'x264-dev')
-  conflicts=('libx264' 'x264-dev')
+  pkgdesc='Library for encoding H264/AVC video streams (10bit-depth)'
+  provides=('libx264' 'libx264.so')
+  conflicts=('libx264')
 
   install -dm 755 "${pkgdir}"/usr/lib
   make -C ${pkgbase}-10bit DESTDIR="${pkgdir}" install-lib-shared


[arch-commits] Commit in x264/trunk (PKGBUILD)

2017-03-26 Thread Maxime Gauduin
Date: Sunday, March 26, 2017 @ 13:50:04
  Author: alucryd
Revision: 291657

upgpkg: x264 2:148.20170121-1

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-03-26 13:42:03 UTC (rev 291656)
+++ PKGBUILD2017-03-26 13:50:04 UTC (rev 291657)
@@ -6,7 +6,7 @@
 # Contributor: Paul Mattal 
 
 pkgname=('x264' 'libx264' 'libx264-10bit')
-pkgver=148.20160920
+pkgver=148.20170121
 pkgrel=1
 epoch=2
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
 license=('GPL')
 depends=('glibc')
 makedepends=('yasm' 'git' 'ffmpeg' 'l-smash')
-_commit='86b71982e131eaa70125f8d0e725fcade9c4c677'
+_commit='97eaef2ab82a46d13ea5e00270712d6475fbe42b'
 source=("git://git.videolan.org/x264.git#commit=${_commit}")
 sha256sums=('SKIP')
 


[arch-commits] Commit in x264/trunk (PKGBUILD)

2016-10-02 Thread Maxime Gauduin
Date: Sunday, October 2, 2016 @ 14:28:11
  Author: alucryd
Revision: 277555

upgpkg: x264 2:148.20160920-1

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-10-02 14:20:03 UTC (rev 277554)
+++ PKGBUILD2016-10-02 14:28:11 UTC (rev 277555)
@@ -6,8 +6,8 @@
 # Contributor: Paul Mattal 
 
 pkgname=('x264' 'libx264' 'libx264-10bit')
-pkgver=148.20160613
-pkgrel=2
+pkgver=148.20160920
+pkgrel=1
 epoch=2
 arch=('i686' 'x86_64')
 url='http://www.videolan.org/developers/x264.html'
@@ -14,7 +14,7 @@
 license=('GPL')
 depends=('glibc')
 makedepends=('yasm' 'git' 'ffmpeg' 'l-smash')
-_commit='a5e06b9a435852f0125de4ecb198ad47340483fa'
+_commit='86b71982e131eaa70125f8d0e725fcade9c4c677'
 source=("git://git.videolan.org/x264.git#commit=${_commit}")
 sha256sums=('SKIP')
 


[arch-commits] Commit in x264/trunk (PKGBUILD)

2016-07-19 Thread Maxime Gauduin
Date: Tuesday, July 19, 2016 @ 19:52:48
  Author: alucryd
Revision: 272013

upgpkg: x264 2:148.20160613-2

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-07-19 19:49:46 UTC (rev 272012)
+++ PKGBUILD2016-07-19 19:52:48 UTC (rev 272013)
@@ -7,7 +7,7 @@
 
 pkgname=('x264' 'libx264' 'libx264-10bit')
 pkgver=148.20160613
-pkgrel=1
+pkgrel=2
 epoch=2
 arch=('i686' 'x86_64')
 url='http://www.videolan.org/developers/x264.html'


[arch-commits] Commit in x264/trunk (PKGBUILD)

2016-07-03 Thread Maxime Gauduin
Date: Sunday, July 3, 2016 @ 19:31:20
  Author: alucryd
Revision: 270908

ffmpeg 3.1 rebuild: x264 2:148.20160613-1

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-07-03 19:28:42 UTC (rev 270907)
+++ PKGBUILD2016-07-03 19:31:20 UTC (rev 270908)
@@ -6,7 +6,7 @@
 # Contributor: Paul Mattal 
 
 pkgname=('x264' 'libx264' 'libx264-10bit')
-pkgver=148.20160103
+pkgver=148.20160613
 pkgrel=1
 epoch=2
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
 license=('GPL')
 depends=('glibc')
 makedepends=('yasm' 'git' 'ffmpeg' 'l-smash')
-_commit='5c6570495f8f1c716b294aee1430d8766a4beb9c'
+_commit='a5e06b9a435852f0125de4ecb198ad47340483fa'
 source=("git://git.videolan.org/x264.git#commit=${_commit}")
 sha256sums=('SKIP')
 


[arch-commits] Commit in x264/trunk (PKGBUILD)

2016-02-15 Thread Maxime Gauduin
Date: Monday, February 15, 2016 @ 23:48:08
  Author: alucryd
Revision: 259357

Add ffmpeg sodepends

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-02-15 22:45:26 UTC (rev 259356)
+++ PKGBUILD2016-02-15 22:48:08 UTC (rev 259357)
@@ -52,7 +52,8 @@
 
 package_x264() {
   pkgdesc='CLI tools for encoding H264/AVC video streams'
-  depends=('ffmpeg' 'liblsmash.so')
+  depends+=('libavcodec.so' 'libavformat.so' 'libavutil.so' 'liblsmash.so'
+'libswscale.so')
   provides=('x264-10bit')
   conflicts=('x264-10bit')
   replaces=('x264-10bit')


[arch-commits] Commit in x264/trunk (PKGBUILD)

2016-02-15 Thread Maxime Gauduin
Date: Monday, February 15, 2016 @ 23:34:19
  Author: alucryd
Revision: 259351

upgpkg: x264 2:148.20160103-1

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-02-15 22:33:26 UTC (rev 259350)
+++ PKGBUILD2016-02-15 22:34:19 UTC (rev 259351)
@@ -6,7 +6,7 @@
 # Contributor: Paul Mattal 
 
 pkgname=('x264' 'libx264' 'libx264-10bit')
-pkgver=148.20150725
+pkgver=148.20160103
 pkgrel=1
 epoch=2
 arch=('i686' 'x86_64')


[arch-commits] Commit in x264/trunk (PKGBUILD)

2016-02-15 Thread Maxime Gauduin
Date: Monday, February 15, 2016 @ 23:33:26
  Author: alucryd
Revision: 259350

ffmpeg 3.0 rebuild: x264 2:148.20150725-1

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |   51 ++-
 1 file changed, 30 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-02-15 22:13:13 UTC (rev 259349)
+++ PKGBUILD2016-02-15 22:33:26 UTC (rev 259350)
@@ -1,7 +1,7 @@
 # $Id$
-# Maintainer:  Ionut Biru 
-# Maintainer:  Bartłomiej Piotrowski 
-# Maintainer:  Maxime Gauduin 
+# Maintainer: Maxime Gauduin 
+# Contributor: Ionut Biru 
+# Contributor: Bartłomiej Piotrowski 
 # Contributor: damir 
 # Contributor: Paul Mattal 
 
@@ -14,12 +14,13 @@
 license=('GPL')
 depends=('glibc')
 makedepends=('yasm' 'git' 'ffmpeg' 'l-smash')
-_commit=73ae2d11d472d0eb3b7c218dc1659db32f649b14
-source=(git://git.videolan.org/x264.git#commit=${_commit})
-md5sums=('SKIP')
+_commit='5c6570495f8f1c716b294aee1430d8766a4beb9c'
+source=("git://git.videolan.org/x264.git#commit=${_commit}")
+sha256sums=('SKIP')
 
 pkgver() {
-  cd $pkgbase
+  cd ${pkgbase}
+
   local _ver=$(grep '#define X264_BUILD' x264.h | cut -d' ' -f3)
   local _date=$(git log -1 --format="%cd" --date=short | tr -d -)
 
@@ -27,19 +28,25 @@
 }
 
 prepare() {
-  cp -r $pkgbase $pkgbase-10bit
+  cp -r ${pkgbase} ${pkgbase}-10bit
 }
 
 build() {
-  cd $pkbase
-  ./configure --prefix=/usr \
---enable-shared --enable-pic
+  cd ${pkgbase}
+
+  ./configure \
+--prefix='/usr' \
+--enable-shared \
+--enable-pic
   make
 
-  cd ../$pkgbase-10bit
-  ./configure --prefix=/usr \
---enable-shared --enable-pic \
---bit-depth=10
+  cd ../${pkgbase}-10bit
+
+  ./configure \
+--prefix='/usr' \
+--enable-shared \
+--enable-pic \
+--bit-depth='10'
   make
 }
 
@@ -50,8 +57,8 @@
   conflicts=('x264-10bit')
   replaces=('x264-10bit')
 
-  make -C $pkgbase DESTDIR="$pkgdir" install-cli
-  install -Dm755 $pkgbase-10bit/x264 "$pkgdir"/usr/bin/x264-10bit
+  make -C ${pkgbase} DESTDIR="${pkgdir}" install-cli
+  install -m 755 ${pkgbase}-10bit/x264 "${pkgdir}"/usr/bin/x264-10bit
 }
 
 package_libx264() {
@@ -60,8 +67,8 @@
   conflicts=('x264-dev')
   replaces=('x264-dev')
 
-  install -d "$pkgdir"/usr/lib
-  make -C $pkgbase DESTDIR="$pkgdir" install-lib-shared
+  install -dm 755 "${pkgdir}"/usr/lib
+  make -C ${pkgbase} DESTDIR="${pkgdir}" install-lib-shared
 }
 
 package_libx264-10bit() {
@@ -69,6 +76,8 @@
   provides=('libx264.so' 'libx264' 'x264-dev')
   conflicts=('libx264' 'x264-dev')
 
-  install -d "$pkgdir"/usr/lib
-  make -C $pkgbase-10bit DESTDIR="$pkgdir" install-lib-shared
+  install -dm 755 "${pkgdir}"/usr/lib
+  make -C ${pkgbase}-10bit DESTDIR="${pkgdir}" install-lib-shared
 }
+
+# vim: ts=2 sw=2 et:


[arch-commits] Commit in x264/trunk (PKGBUILD)

2015-09-23 Thread Bartłomiej Piotrowski
Date: Wednesday, September 23, 2015 @ 19:06:29
  Author: bpiotrowski
Revision: 247163

Use $pkgbase in pkgver(), prepare() and build()

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-23 14:33:30 UTC (rev 247162)
+++ PKGBUILD2015-09-23 17:06:29 UTC (rev 247163)
@@ -19,7 +19,7 @@
 md5sums=('SKIP')
 
 pkgver() {
-  cd $pkgname
+  cd $pkgbase
   local _ver=$(grep '#define X264_BUILD' x264.h | cut -d' ' -f3)
   local _date=$(git log -1 --format="%cd" --date=short | tr -d -)
 
@@ -27,16 +27,16 @@
 }
 
 prepare() {
-  cp -r $pkgname $pkgname-10bit
+  cp -r $pkgbase $pkgbase-10bit
 }
 
 build() {
-  cd $pkgname
+  cd $pkbase
   ./configure --prefix=/usr \
 --enable-shared --enable-pic
   make
 
-  cd ../$pkgname-10bit
+  cd ../$pkgbase-10bit
   ./configure --prefix=/usr \
 --enable-shared --enable-pic \
 --bit-depth=10


[arch-commits] Commit in x264/trunk (PKGBUILD)

2015-07-28 Thread Maxime Gauduin
Date: Tuesday, July 28, 2015 @ 23:47:44
  Author: alucryd
Revision: 242620

FS#45799: x264 2:148.20150717-1

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-07-28 21:19:01 UTC (rev 242619)
+++ PKGBUILD2015-07-28 21:47:44 UTC (rev 242620)
@@ -14,7 +14,8 @@
 license=('GPL')
 depends=('glibc')
 makedepends=('yasm' 'git' 'ffmpeg' 'l-smash')
-source=(x264::git://git.videolan.org/x264/x264-sandbox.git#commit=e6d2a36bb)
+_commit=73ae2d11d472d0eb3b7c218dc1659db32f649b14
+source=(git://git.videolan.org/x264.git#commit=${_commit})
 md5sums=('SKIP')
 
 pkgver() {


[arch-commits] Commit in x264/trunk (PKGBUILD)

2015-07-17 Thread Maxime Gauduin
Date: Friday, July 17, 2015 @ 16:09:26
  Author: alucryd
Revision: 242307

upgpkg: x264 2:148.20150717-1

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |   11 +--
 1 file changed, 5 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-07-17 13:46:25 UTC (rev 242306)
+++ PKGBUILD2015-07-17 14:09:26 UTC (rev 242307)
@@ -1,11 +1,12 @@
 # $Id$
 # Maintainer:  Ionut Biru ib...@archlinux.org
 # Maintainer:  Bartłomiej Piotrowski bpiotrow...@archlinux.org
+# Maintainer:  Maxime Gauduin aluc...@archlinux.org
 # Contributor: damir da...@archlinux.org
 # Contributor: Paul Mattal p...@archlinux.org
 
 pkgname=('x264' 'libx264' 'libx264-10bit')
-pkgver=144.20150223
+pkgver=148.20150717
 pkgrel=1
 epoch=2
 arch=('i686' 'x86_64')
@@ -12,8 +13,8 @@
 url='http://www.videolan.org/developers/x264.html'
 license=('GPL')
 depends=('glibc')
-makedepends=('yasm' 'git' 'ffmpeg')
-source=(git://git.videolan.org/x264.git#commit=c8a773ebf)
+makedepends=('yasm' 'git' 'ffmpeg' 'l-smash')
+source=(x264::git://git.videolan.org/x264/x264-sandbox.git#commit=e6d2a36bb)
 md5sums=('SKIP')
 
 pkgver() {
@@ -43,7 +44,7 @@
 
 package_x264() {
   pkgdesc='CLI tools for encoding H264/AVC video streams'
-  depends=('glibc' 'ffmpeg')
+  depends=('ffmpeg' 'liblsmash.so')
   provides=('x264-10bit')
   conflicts=('x264-10bit')
   replaces=('x264-10bit')
@@ -54,7 +55,6 @@
 
 package_libx264() {
   pkgdesc='Library for encoding H264/AVC video streams'
-  depends=('glibc')
   provides=('libx264.so' 'x264-dev')
   conflicts=('x264-dev')
   replaces=('x264-dev')
@@ -65,7 +65,6 @@
 
 package_libx264-10bit() {
   pkgdesc='Library for encoding H264/AVC video streams. 10bit-depth.'
-  depends=('glibc')
   provides=('libx264.so' 'libx264' 'x264-dev')
   conflicts=('libx264' 'x264-dev')
 


[arch-commits] Commit in x264/trunk (PKGBUILD)

2015-03-07 Thread Bartłomiej Piotrowski
Date: Saturday, March 7, 2015 @ 15:17:22
  Author: bpiotrowski
Revision: 232975

upgpkg: x264 1:144.20150223-1

new upstream release

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-07 14:05:50 UTC (rev 232974)
+++ PKGBUILD2015-03-07 14:17:22 UTC (rev 232975)
@@ -5,8 +5,8 @@
 # Contributor: Paul Mattal p...@archlinux.org
 
 pkgname=('x264' 'libx264' 'libx264-10bit')
-pkgver=142.20140826
-pkgrel=2
+pkgver=144.20150223
+pkgrel=1
 epoch=1
 arch=('i686' 'x86_64')
 url='http://www.videolan.org/developers/x264.html'
@@ -13,7 +13,7 @@
 license=('GPL')
 depends=('glibc')
 makedepends=('yasm' 'git' 'ffmpeg')
-source=(git://git.videolan.org/x264.git#commit=021c0dc6c95c)
+source=(git://git.videolan.org/x264.git#commit=c8a773ebf)
 md5sums=('SKIP')
 
 pkgver() {
@@ -55,7 +55,7 @@
 package_libx264() {
   pkgdesc='Library for encoding H264/AVC video streams'
   depends=('glibc')
-  provides=('x264-dev')
+  provides=('libx264.so=144' 'x264-dev')
   conflicts=('x264-dev')
   replaces=('x264-dev')
 
@@ -66,7 +66,7 @@
 package_libx264-10bit() {
   pkgdesc='Library for encoding H264/AVC video streams. 10bit-depth.'
   depends=('glibc')
-  provides=('libx264' 'x264-dev')
+  provides=('libx264.so=144' 'libx264' 'x264-dev')
   conflicts=('libx264' 'x264-dev')
 
   install -d $pkgdir/usr/lib


[arch-commits] Commit in x264/trunk (PKGBUILD)

2015-03-07 Thread Bartłomiej Piotrowski
Date: Saturday, March 7, 2015 @ 18:29:44
  Author: bpiotrowski
Revision: 232986

upgpkg: x264 2:144.20150223-1

bump to latest commit from stable branch

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-07 17:24:55 UTC (rev 232985)
+++ PKGBUILD2015-03-07 17:29:44 UTC (rev 232986)
@@ -5,7 +5,7 @@
 # Contributor: Paul Mattal p...@archlinux.org
 
 pkgname=('x264' 'libx264' 'libx264-10bit')
-pkgver=142.20140826
+pkgver=144.20150223
 pkgrel=1
 epoch=2
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
 license=('GPL')
 depends=('glibc')
 makedepends=('yasm' 'git' 'ffmpeg')
-source=(git://git.videolan.org/x264.git#commit=021c0dc6c95c)
+source=(git://git.videolan.org/x264.git#commit=c8a773ebf)
 md5sums=('SKIP')
 
 pkgver() {
@@ -55,7 +55,7 @@
 package_libx264() {
   pkgdesc='Library for encoding H264/AVC video streams'
   depends=('glibc')
-  provides=('x264-dev')
+  provides=('libx264.so' 'x264-dev')
   conflicts=('x264-dev')
   replaces=('x264-dev')
 
@@ -66,7 +66,7 @@
 package_libx264-10bit() {
   pkgdesc='Library for encoding H264/AVC video streams. 10bit-depth.'
   depends=('glibc')
-  provides=('libx264' 'x264-dev')
+  provides=('libx264.so' 'libx264' 'x264-dev')
   conflicts=('libx264' 'x264-dev')
 
   install -d $pkgdir/usr/lib


[arch-commits] Commit in x264/trunk (PKGBUILD)

2015-03-07 Thread Evangelos Foutras
Date: Saturday, March 7, 2015 @ 18:12:35
  Author: foutrelis
Revision: 232982

upgpkg: x264 2:142.20140826-1

Revert to previous x264 version as we missed a soname bump.

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-03-07 15:03:11 UTC (rev 232981)
+++ PKGBUILD2015-03-07 17:12:35 UTC (rev 232982)
@@ -5,15 +5,15 @@
 # Contributor: Paul Mattal p...@archlinux.org
 
 pkgname=('x264' 'libx264' 'libx264-10bit')
-pkgver=144.20150223
+pkgver=142.20140826
 pkgrel=1
-epoch=1
+epoch=2
 arch=('i686' 'x86_64')
 url='http://www.videolan.org/developers/x264.html'
 license=('GPL')
 depends=('glibc')
 makedepends=('yasm' 'git' 'ffmpeg')
-source=(git://git.videolan.org/x264.git#commit=c8a773ebf)
+source=(git://git.videolan.org/x264.git#commit=021c0dc6c95c)
 md5sums=('SKIP')
 
 pkgver() {
@@ -55,7 +55,7 @@
 package_libx264() {
   pkgdesc='Library for encoding H264/AVC video streams'
   depends=('glibc')
-  provides=('libx264.so=144' 'x264-dev')
+  provides=('x264-dev')
   conflicts=('x264-dev')
   replaces=('x264-dev')
 
@@ -66,7 +66,7 @@
 package_libx264-10bit() {
   pkgdesc='Library for encoding H264/AVC video streams. 10bit-depth.'
   depends=('glibc')
-  provides=('libx264.so=144' 'libx264' 'x264-dev')
+  provides=('libx264' 'x264-dev')
   conflicts=('libx264' 'x264-dev')
 
   install -d $pkgdir/usr/lib


[arch-commits] Commit in x264/trunk (PKGBUILD)

2014-09-15 Thread Bartłomiej Piotrowski
Date: Monday, September 15, 2014 @ 10:43:49
  Author: bpiotrowski
Revision: 221746

upgpkg: x264 1:142.20140826-2

rebuild against ffmpeg 2.4

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-15 08:29:29 UTC (rev 221745)
+++ PKGBUILD2014-09-15 08:43:49 UTC (rev 221746)
@@ -6,7 +6,7 @@
 
 pkgname=('x264' 'libx264' 'libx264-10bit')
 pkgver=142.20140826
-pkgrel=1
+pkgrel=2
 epoch=1
 arch=('i686' 'x86_64')
 url='http://www.videolan.org/developers/x264.html'



[arch-commits] Commit in x264/trunk (PKGBUILD)

2014-09-07 Thread Bartłomiej Piotrowski
Date: Sunday, September 7, 2014 @ 12:31:09
  Author: bpiotrowski
Revision: 221091

upgpkg: x264 1:142.20140826-1

- update to latest commit from stable branch
- move header files to libx264*, as x264 pulls too many dependencies thanks to 
ffmpeg

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |   22 --
 1 file changed, 12 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-09-07 10:21:23 UTC (rev 221090)
+++ PKGBUILD2014-09-07 10:31:09 UTC (rev 221091)
@@ -5,8 +5,8 @@
 # Contributor: Paul Mattal p...@archlinux.org
 
 pkgname=('x264' 'libx264' 'libx264-10bit')
-pkgver=142.20140311
-pkgrel=6
+pkgver=142.20140826
+pkgrel=1
 epoch=1
 arch=('i686' 'x86_64')
 url='http://www.videolan.org/developers/x264.html'
@@ -13,7 +13,7 @@
 license=('GPL')
 depends=('glibc')
 makedepends=('yasm' 'git' 'ffmpeg')
-source=(git://git.videolan.org/x264.git#commit=b7a50c16)
+source=(git://git.videolan.org/x264.git#commit=021c0dc6c95c)
 md5sums=('SKIP')
 
 pkgver() {
@@ -25,7 +25,6 @@
 }
 
 prepare() {
-  sed -i 's/install-lib-dev$//g' $pkgname/Makefile
   cp -r $pkgname $pkgname-10bit
 }
 
@@ -45,11 +44,11 @@
 package_x264() {
   pkgdesc='CLI tools for encoding H264/AVC video streams'
   depends=('glibc' 'ffmpeg')
-  provides=('x264-dev' 'x264-10bit')
-  conflicts=('x264-dev' 'x264-10bit')
-  replaces=('x264-dev' 'x264-10bit')
+  provides=('x264-10bit')
+  conflicts=('x264-10bit')
+  replaces=('x264-10bit')
 
-  make -C $pkgbase DESTDIR=$pkgdir install-cli install-lib-dev
+  make -C $pkgbase DESTDIR=$pkgdir install-cli
   install -Dm755 $pkgbase-10bit/x264 $pkgdir/usr/bin/x264-10bit
 }
 
@@ -56,6 +55,9 @@
 package_libx264() {
   pkgdesc='Library for encoding H264/AVC video streams'
   depends=('glibc')
+  provides=('x264-dev')
+  conflicts=('x264-dev')
+  replaces=('x264-dev')
 
   install -d $pkgdir/usr/lib
   make -C $pkgbase DESTDIR=$pkgdir install-lib-shared
@@ -64,8 +66,8 @@
 package_libx264-10bit() {
   pkgdesc='Library for encoding H264/AVC video streams. 10bit-depth.'
   depends=('glibc')
-  provides=('libx264')
-  conflicts=('libx264')
+  provides=('libx264' 'x264-dev')
+  conflicts=('libx264' 'x264-dev')
 
   install -d $pkgdir/usr/lib
   make -C $pkgbase-10bit DESTDIR=$pkgdir install-lib-shared



[arch-commits] Commit in x264/trunk (PKGBUILD)

2014-08-07 Thread Bartłomiej Piotrowski
Date: Thursday, August 7, 2014 @ 11:00:22
  Author: bpiotrowski
Revision: 219381

upgpkg: x264 1:142.20140311-6

enable lavf support

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-07 08:55:30 UTC (rev 219380)
+++ PKGBUILD2014-08-07 09:00:22 UTC (rev 219381)
@@ -6,13 +6,13 @@
 
 pkgname=('x264' 'libx264' 'libx264-10bit')
 pkgver=142.20140311
-pkgrel=5
+pkgrel=6
 epoch=1
 arch=('i686' 'x86_64')
 url='http://www.videolan.org/developers/x264.html'
 license=('GPL')
 depends=('glibc')
-makedepends=('yasm' 'git')
+makedepends=('yasm' 'git' 'ffmpeg')
 source=(git://git.videolan.org/x264.git#commit=b7a50c16)
 md5sums=('SKIP')
 
@@ -44,7 +44,7 @@
 
 package_x264() {
   pkgdesc='CLI tools for encoding H264/AVC video streams'
-  depends=('glibc')
+  depends=('glibc' 'ffmpeg')
   provides=('x264-dev' 'x264-10bit')
   conflicts=('x264-dev' 'x264-10bit')
   replaces=('x264-dev' 'x264-10bit')



[arch-commits] Commit in x264/trunk (PKGBUILD)

2014-07-26 Thread Bartłomiej Piotrowski
Date: Saturday, July 26, 2014 @ 18:15:27
  Author: bpiotrowski
Revision: 218195

upgpkg: x264 1:142.20140311-5

remove x264's dependency on libx264

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-07-26 14:51:47 UTC (rev 218194)
+++ PKGBUILD2014-07-26 16:15:27 UTC (rev 218195)
@@ -6,7 +6,7 @@
 
 pkgname=('x264' 'libx264' 'libx264-10bit')
 pkgver=142.20140311
-pkgrel=4
+pkgrel=5
 epoch=1
 arch=('i686' 'x86_64')
 url='http://www.videolan.org/developers/x264.html'
@@ -16,11 +16,6 @@
 source=(git://git.videolan.org/x264.git#commit=b7a50c16)
 md5sums=('SKIP')
 
-prepare() {
-  sed -i 's/install-lib-dev$//g' $pkgname/Makefile
-  cp -r $pkgname $pkgname-10bit
-}
-
 pkgver() {
   cd $pkgname
   local _ver=$(grep '#define X264_BUILD' x264.h | cut -d' ' -f3)
@@ -29,6 +24,11 @@
   echo ${_ver}.${_date}
 }
 
+prepare() {
+  sed -i 's/install-lib-dev$//g' $pkgname/Makefile
+  cp -r $pkgname $pkgname-10bit
+}
+
 build() {
   cd $pkgname
   ./configure --prefix=/usr \
@@ -43,8 +43,8 @@
 }
 
 package_x264() {
-  pkgdesc='CLI tools for encoding H264/AVC video streams.'
-  depends=('glibc' 'libx264')
+  pkgdesc='CLI tools for encoding H264/AVC video streams'
+  depends=('glibc')
   provides=('x264-dev' 'x264-10bit')
   conflicts=('x264-dev' 'x264-10bit')
   replaces=('x264-dev' 'x264-10bit')
@@ -54,7 +54,7 @@
 }
 
 package_libx264() {
-  pkgdesc='Library for encoding H264/AVC video streams.'
+  pkgdesc='Library for encoding H264/AVC video streams'
   depends=('glibc')
 
   install -d $pkgdir/usr/lib



[arch-commits] Commit in x264/trunk (PKGBUILD)

2014-06-05 Thread Bartłomiej Piotrowski
Date: Thursday, June 5, 2014 @ 14:34:34
  Author: bpiotrowski
Revision: 214297

upgpkg: x264 1:142.20140311-4

Some applications (i.e. handbrake) in order to use 10bit depth, rely on
x264-10bit binary. Let's install it with its 8bit counterpart via x264 
package, but
split libx264 to separated subpackages. This way user can easily encode 10bit 
videos
without losing ability to play 8bit ones.

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |   34 +++---
 1 file changed, 19 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-05 11:03:46 UTC (rev 214296)
+++ PKGBUILD2014-06-05 12:34:34 UTC (rev 214297)
@@ -4,9 +4,9 @@
 # Contributor: damir da...@archlinux.org
 # Contributor: Paul Mattal p...@archlinux.org
 
-pkgname=('x264' 'x264-10bit' 'x264-dev')
+pkgname=('x264' 'libx264' 'libx264-10bit')
 pkgver=142.20140311
-pkgrel=3
+pkgrel=4
 epoch=1
 arch=('i686' 'x86_64')
 url='http://www.videolan.org/developers/x264.html'
@@ -43,26 +43,30 @@
 }
 
 package_x264() {
-  pkgdesc='Library for encoding H264/AVC video streams'
+  pkgdesc='CLI tools for encoding H264/AVC video streams.'
+  depends=('glibc' 'libx264')
+  provides=('x264-dev' 'x264-10bit')
+  conflicts=('x264-dev' 'x264-10bit')
+  replaces=('x264-dev' 'x264-10bit')
+
+  make -C $pkgbase DESTDIR=$pkgdir install-cli install-lib-dev
+  install -Dm755 $pkgbase-10bit/x264 $pkgdir/usr/bin/x264-10bit
+}
+
+package_libx264() {
+  pkgdesc='Library for encoding H264/AVC video streams.'
   depends=('glibc')
 
   install -d $pkgdir/usr/lib
-  make -C $pkgname DESTDIR=$pkgdir install-cli install-lib-shared
+  make -C $pkgbase DESTDIR=$pkgdir install-lib-shared
 }
 
-package_x264-10bit() {
+package_libx264-10bit() {
   pkgdesc='Library for encoding H264/AVC video streams. 10bit-depth.'
   depends=('glibc')
-  provides=('x264')
-  conflicts=('x264')
+  provides=('libx264')
+  conflicts=('libx264')
 
   install -d $pkgdir/usr/lib
-  make -C $pkgname DESTDIR=$pkgdir install-cli install-lib-shared
+  make -C $pkgbase-10bit DESTDIR=$pkgdir install-lib-shared
 }
-
-package_x264-dev() {
-  pkgdesc='Development files for library for encoding H264/AVC video streams'
-  depends=('x264')
-
-  make -C $pkgbase DESTDIR=$pkgdir install-lib-dev
-}



[arch-commits] Commit in x264/trunk (PKGBUILD)

2014-06-04 Thread Bartłomiej Piotrowski
Date: Wednesday, June 4, 2014 @ 21:27:10
  Author: bpiotrowski
Revision: 214265

upgpkg: x264 1:142.20140311-2

- build and split out 10bit-depth version (FS#33802)
- split out development headers to avoid conflict between x264 and x264-10bit

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |   46 +-
 1 file changed, 37 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-04 18:45:43 UTC (rev 214264)
+++ PKGBUILD2014-06-04 19:27:10 UTC (rev 214265)
@@ -4,19 +4,23 @@
 # Contributor: damir da...@archlinux.org
 # Contributor: Paul Mattal p...@archlinux.org
 
-pkgname=x264
+pkgname=('x264' 'x264-10bit' 'x264-dev')
 pkgver=142.20140311
-pkgrel=1
+pkgrel=2
 epoch=1
-pkgdesc='Library for encoding H264/AVC video streams'
 arch=('i686' 'x86_64')
 url='http://www.videolan.org/developers/x264.html'
 license=('GPL')
 depends=('glibc')
 makedepends=('yasm' 'git')
-source=(git://git.videolan.org/x264.git#commit=aff928d2)
+source=(git://git.videolan.org/x264.git#commit=b7a50c16)
 md5sums=('SKIP')
 
+prepare() {
+  sed -i 's/install-lib-dev$//g' $pkgname/Makefile
+  cp -r $pkgname $pkgname-10bit
+}
+
 pkgver() {
   cd $pkgname
   local _ver=$(grep '#define X264_BUILD' x264.h | cut -d' ' -f3)
@@ -27,14 +31,38 @@
 
 build() {
   cd $pkgname
+  ./configure --prefix=/usr \
+--enable-shared --enable-pic
+  make
 
+  cd ../$pkgname-10bit
   ./configure --prefix=/usr \
---enable-shared \
---enable-pic
-
+--enable-shared --enable-pic \
+--bit-depth=10
   make
 }
 
-package() {
-  make -C $pkgname DESTDIR=$pkgdir install
+package_x264() {
+  pkgdesc='Library for encoding H264/AVC video streams'
+  depends=('glibc')
+
+  install -d $pkgdir/usr/lib
+  make -C $pkgname DESTDIR=$pkgdir install-cli install-lib-shared
 }
+
+package_x264-10bit() {
+  pkgdesc='Library for encoding H264/AVC video streams. 10bit-depth.'
+  depends=('glibc')
+  provides=('x264')
+  conflicts=('x264')
+
+  install -d $pkgdir/usr/lib
+  make -C $pkgname DESTDIR=$pkgdir install-cli install-lib-shared
+}
+
+package_x264-dev() {
+  pkgdesc='Development files for library for encoding H264/AVC video streams'
+  depends=('x264')
+
+  make -C $pkgbase DESTDIR=$pkgdir install-lib-dev
+}



[arch-commits] Commit in x264/trunk (PKGBUILD)

2014-06-04 Thread Bartłomiej Piotrowski
Date: Wednesday, June 4, 2014 @ 21:49:50
  Author: bpiotrowski
Revision: 214278

upgpkg: x264 1:142.20140311-3

packages for x86_64 were built using older PKGBUILD, making x264-dev 
independent from x264

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-04 19:46:10 UTC (rev 214277)
+++ PKGBUILD2014-06-04 19:49:50 UTC (rev 214278)
@@ -6,7 +6,7 @@
 
 pkgname=('x264' 'x264-10bit' 'x264-dev')
 pkgver=142.20140311
-pkgrel=2
+pkgrel=3
 epoch=1
 arch=('i686' 'x86_64')
 url='http://www.videolan.org/developers/x264.html'



[arch-commits] Commit in x264/trunk (PKGBUILD)

2014-03-27 Thread Bartłomiej Piotrowski
Date: Thursday, March 27, 2014 @ 10:47:40
  Author: bpiotrowski
Revision: 208805

upgpkg: x264 1:142.20140311-1

use a saner versioning scheme

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-27 09:45:06 UTC (rev 208804)
+++ PKGBUILD2014-03-27 09:47:40 UTC (rev 208805)
@@ -5,8 +5,9 @@
 # Contributor: Paul Mattal p...@archlinux.org
 
 pkgname=x264
-pkgver=20140311
+pkgver=142.20140311
 pkgrel=1
+epoch=1
 pkgdesc='Library for encoding H264/AVC video streams'
 arch=('i686' 'x86_64')
 url='http://www.videolan.org/developers/x264.html'
@@ -18,7 +19,10 @@
 
 pkgver() {
   cd $pkgname
-  git log -1 --format=%cd --date=short | tr -d -
+  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}
 }
 
 build() {



[arch-commits] Commit in x264/trunk (PKGBUILD)

2014-03-24 Thread Bartłomiej Piotrowski
Date: Monday, March 24, 2014 @ 09:35:07
  Author: bpiotrowski
Revision: 208531

upgpkg: x264 20140311-1

update to the latest commit from stable branch

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |   16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-03-24 08:27:02 UTC (rev 208530)
+++ PKGBUILD2014-03-24 08:35:07 UTC (rev 208531)
@@ -1,12 +1,12 @@
 # $Id$
 # Maintainer:  Ionut Biru ib...@archlinux.org
-# Maintainer:  Bartłomiej Piotrowski nos...@bpiotrowski.pl
+# Maintainer:  Bartłomiej Piotrowski bpiotrow...@archlinux.org
 # Contributor: damir da...@archlinux.org
 # Contributor: Paul Mattal p...@archlinux.org
 
 pkgname=x264
-pkgver=20131030
-pkgrel=2
+pkgver=20140311
+pkgrel=1
 pkgdesc='Library for encoding H264/AVC video streams'
 arch=('i686' 'x86_64')
 url='http://www.videolan.org/developers/x264.html'
@@ -13,9 +13,14 @@
 license=('GPL')
 depends=('glibc')
 makedepends=('yasm' 'git')
-source=(git://git.videolan.org/x264.git#commit=c628e3bac)
+source=(git://git.videolan.org/x264.git#commit=aff928d2)
 md5sums=('SKIP')
 
+pkgver() {
+  cd $pkgname
+  git log -1 --format=%cd --date=short | tr -d -
+}
+
 build() {
   cd $pkgname
 
@@ -27,6 +32,5 @@
 }
 
 package() {
-  cd $pkgname
-  make DESTDIR=$pkgdir install
+  make -C $pkgname DESTDIR=$pkgdir install
 }



[arch-commits] Commit in x264/trunk (PKGBUILD)

2013-12-12 Thread Bartłomiej Piotrowski
Date: Friday, December 13, 2013 @ 08:56:14
  Author: bpiotrowski
Revision: 201498

upgpkg: x264 20131030-2

- rebuild with correct prefix to fix pkg-config file (FS#38112)

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |   15 +--
 1 file changed, 5 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-12-12 23:22:05 UTC (rev 201497)
+++ PKGBUILD2013-12-13 07:56:14 UTC (rev 201498)
@@ -6,7 +6,7 @@
 
 pkgname=x264
 pkgver=20131030
-pkgrel=1
+pkgrel=2
 pkgdesc='Library for encoding H264/AVC video streams'
 arch=('i686' 'x86_64')
 url='http://www.videolan.org/developers/x264.html'
@@ -19,19 +19,14 @@
 build() {
   cd $pkgname
 
-  ./configure --enable-shared \
+  ./configure --prefix=/usr \
+--enable-shared \
 --enable-pic
+
   make
 }
 
 package() {
   cd $pkgname
-
-  make DESTDIR=$pkgdir \
-bindir=/usr/bin \
-libdir=/usr/lib \
-includedir=/usr/include \
-install
+  make DESTDIR=$pkgdir install
 }
-
-# vim:set ts=2 sw=2 et:



[arch-commits] Commit in x264/trunk (PKGBUILD)

2013-11-02 Thread Bartłomiej Piotrowski
Date: Saturday, November 2, 2013 @ 08:39:14
  Author: bpiotrowski
Revision: 198689

upgpkg: x264 20131030-1

- update to the latest commit from stable branch

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |   18 +++---
 1 file changed, 7 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-11-02 07:36:33 UTC (rev 198688)
+++ PKGBUILD2013-11-02 07:39:14 UTC (rev 198689)
@@ -1,25 +1,21 @@
 # $Id$
-# Maintainer : Ionut Biru ib...@archlinux.org
+# Maintainer:  Ionut Biru ib...@archlinux.org
+# Maintainer:  Bartłomiej Piotrowski nos...@bpiotrowski.pl
 # Contributor: damir da...@archlinux.org
 # Contributor: Paul Mattal p...@archlinux.org
 
 pkgname=x264
-pkgver=20130702
-pkgrel=2
-pkgdesc=free library for encoding H264/AVC video streams
+pkgver=20131030
+pkgrel=1
+pkgdesc='Library for encoding H264/AVC video streams'
 arch=('i686' 'x86_64')
-url=http://www.videolan.org/developers/x264.html;
+url='http://www.videolan.org/developers/x264.html'
 license=('GPL')
 depends=('glibc')
 makedepends=('yasm' 'git')
-source=(git://git.videolan.org/x264.git#commit=585324fee3)
+source=(git://git.videolan.org/x264.git#commit=c628e3bac)
 md5sums=('SKIP')
 
-pkgver() {
-  cd $pkgname
-  git log -1 --format=%cd --date=short | sed 's|-||g'
-}
-
 build() {
   cd $pkgname
 



[arch-commits] Commit in x264/trunk (PKGBUILD)

2013-08-02 Thread Bartłomiej Piotrowski
Date: Friday, August 2, 2013 @ 10:00:42
  Author: bpiotrowski
Revision: 191967

upgpkg: x264 20130702-2

- re-enable assembler optimizations for i686

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-02 06:51:11 UTC (rev 191966)
+++ PKGBUILD2013-08-02 08:00:42 UTC (rev 191967)
@@ -5,7 +5,7 @@
 
 pkgname=x264
 pkgver=20130702
-pkgrel=1
+pkgrel=2
 pkgdesc=free library for encoding H264/AVC video streams
 arch=('i686' 'x86_64')
 url=http://www.videolan.org/developers/x264.html;
@@ -15,8 +15,6 @@
 source=(git://git.videolan.org/x264.git#commit=585324fee3)
 md5sums=('SKIP')
 
-[[ $CARCH == i686 ]]  _asm='--disable-asm'
-
 pkgver() {
   cd $pkgname
   git log -1 --format=%cd --date=short | sed 's|-||g'
@@ -26,8 +24,7 @@
   cd $pkgname
 
   ./configure --enable-shared \
---enable-pic \
-$_asm
+--enable-pic
   make
 }
 



[arch-commits] Commit in x264/trunk (PKGBUILD)

2013-07-11 Thread Bartłomiej Piotrowski
Date: Thursday, July 11, 2013 @ 15:52:52
  Author: bpiotrowski
Revision: 189916

upgpkg: x264 20130702-1

- update to latest commit

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |   35 ++-
 1 file changed, 22 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-07-11 09:05:57 UTC (rev 189915)
+++ PKGBUILD2013-07-11 13:52:52 UTC (rev 189916)
@@ -4,7 +4,7 @@
 # Contributor: Paul Mattal p...@archlinux.org
 
 pkgname=x264
-pkgver=20130206
+pkgver=20130702
 pkgrel=1
 pkgdesc=free library for encoding H264/AVC video streams
 arch=('i686' 'x86_64')
@@ -12,24 +12,33 @@
 license=('GPL')
 depends=('glibc')
 makedepends=('yasm' 'git')
-source=(ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-$pkgver.tar.xz)
-md5sums=('f952248492745a077ad6a77465276166')
+source=(git://git.videolan.org/x264.git#commit=585324fee3)
+md5sums=('SKIP')
 
+[[ $CARCH == i686 ]]  _asm='--disable-asm'
+
+pkgver() {
+  cd $pkgname
+  git log -1 --format=%cd --date=short | sed 's|-||g'
+}
+
 build() {
-cd $pkgname
+  cd $pkgname
 
-./configure --enable-shared
+  ./configure --enable-shared \
+--enable-pic \
+$_asm
+  make
+}
 
-make
-}
 package() {
-cd $pkgname
+  cd $pkgname
 
-make DESTDIR=$pkgdir \
-  bindir=/usr/bin \
-  libdir=/usr/lib \
-  includedir=/usr/include \
-  install
+  make DESTDIR=$pkgdir \
+bindir=/usr/bin \
+libdir=/usr/lib \
+includedir=/usr/include \
+install
 }
 
 # vim:set ts=2 sw=2 et:



[arch-commits] Commit in x264/trunk (PKGBUILD)

2013-02-06 Thread Ionuț Mircea Bîru
Date: Wednesday, February 6, 2013 @ 21:11:51
  Author: ioni
Revision: 177525

update to new snapshot
switch to git clones to get proper versioning FS#28668

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-02-06 19:34:44 UTC (rev 177524)
+++ PKGBUILD2013-02-06 20:11:51 UTC (rev 177525)
@@ -4,26 +4,26 @@
 # Contributor: Paul Mattal p...@archlinux.org
 
 pkgname=x264
-pkgver=20121113
+pkgver=20130206
 pkgrel=1
 pkgdesc=free library for encoding H264/AVC video streams
 arch=('i686' 'x86_64')
 url=http://www.videolan.org/developers/x264.html;
 license=('GPL')
 depends=('glibc')
-makedepends=('yasm')
-source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245-stable.tar.bz2)
-md5sums=('c37851c8534ef5d7b1935145f8f5a725')
+makedepends=('yasm' 'git')
+source=(ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-$pkgver.tar.xz)
+md5sums=('f952248492745a077ad6a77465276166')
 
 build() {
-cd $pkgname-snapshot-$pkgver-2245-stable
+cd $pkgname
 
 ./configure --enable-shared
 
 make
 }
 package() {
-cd $pkgname-snapshot-$pkgver-2245-stable
+cd $pkgname
 
 make DESTDIR=$pkgdir \
   bindir=/usr/bin \



[arch-commits] Commit in x264/trunk (PKGBUILD)

2012-11-14 Thread Ionut Biru
Date: Wednesday, November 14, 2012 @ 09:43:18
  Author: ibiru
Revision: 170994

update snapshot

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-11-14 14:37:18 UTC (rev 170993)
+++ PKGBUILD2012-11-14 14:43:18 UTC (rev 170994)
@@ -4,7 +4,7 @@
 # Contributor: Paul Mattal p...@archlinux.org
 
 pkgname=x264
-pkgver=20120705
+pkgver=20121113
 pkgrel=1
 pkgdesc=free library for encoding H264/AVC video streams
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
 depends=('glibc')
 makedepends=('yasm')
 
source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245-stable.tar.bz2)
-md5sums=('81e5bec5d5774a4a3f567f14bd94289c')
+md5sums=('c37851c8534ef5d7b1935145f8f5a725')
 
 build() {
 cd $pkgname-snapshot-$pkgver-2245-stable



[arch-commits] Commit in x264/trunk (PKGBUILD)

2012-07-06 Thread Ionut Biru
Date: Friday, July 6, 2012 @ 12:25:43
  Author: ibiru
Revision: 163080

update to latest snapshot

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-07-06 16:17:32 UTC (rev 163079)
+++ PKGBUILD2012-07-06 16:25:43 UTC (rev 163080)
@@ -4,7 +4,7 @@
 # Contributor: Paul Mattal p...@archlinux.org
 
 pkgname=x264
-pkgver=20120602
+pkgver=20120705
 pkgrel=1
 pkgdesc=free library for encoding H264/AVC video streams
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
 depends=('glibc')
 makedepends=('yasm')
 
source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245-stable.tar.bz2)
-md5sums=('50e6dc7a1031a19c710e912dffb19a7a')
+md5sums=('81e5bec5d5774a4a3f567f14bd94289c')
 
 build() {
 cd $pkgname-snapshot-$pkgver-2245-stable



[arch-commits] Commit in x264/trunk (PKGBUILD)

2012-06-03 Thread Ionut Biru
Date: Sunday, June 3, 2012 @ 10:27:47
  Author: ibiru
Revision: 160668

bump snapshot

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-06-03 14:22:11 UTC (rev 160667)
+++ PKGBUILD2012-06-03 14:27:47 UTC (rev 160668)
@@ -4,7 +4,7 @@
 # Contributor: Paul Mattal p...@archlinux.org
 
 pkgname=x264
-pkgver=20120204
+pkgver=20120602
 pkgrel=1
 pkgdesc=free library for encoding H264/AVC video streams
 arch=('i686' 'x86_64')
@@ -13,17 +13,17 @@
 depends=('glibc')
 makedepends=('yasm')
 
source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245-stable.tar.bz2)
-md5sums=('4d793ecc4f9d308724ea47edf400f312')
+md5sums=('50e6dc7a1031a19c710e912dffb19a7a')
 
 build() {
-cd $srcdir/$pkgname-snapshot-$pkgver-2245-stable
+cd $pkgname-snapshot-$pkgver-2245-stable
 
 ./configure --enable-shared
 
 make
 }
 package() {
-cd $srcdir/$pkgname-snapshot-$pkgver-2245-stable
+cd $pkgname-snapshot-$pkgver-2245-stable
 
 make DESTDIR=$pkgdir \
   bindir=/usr/bin \



[arch-commits] Commit in x264/trunk (PKGBUILD)

2012-02-05 Thread Ionut Biru
Date: Sunday, February 5, 2012 @ 07:57:26
  Author: ibiru
Revision: 148995

new snapshost, switch to stable

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |   12 
 1 file changed, 8 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-05 12:51:16 UTC (rev 148994)
+++ PKGBUILD2012-02-05 12:57:26 UTC (rev 148995)
@@ -4,7 +4,7 @@
 # Contributor: Paul Mattal p...@archlinux.org
 
 pkgname=x264
-pkgver=20111030
+pkgver=20120204
 pkgrel=1
 pkgdesc=free library for encoding H264/AVC video streams
 arch=('i686' 'x86_64')
@@ -12,15 +12,19 @@
 license=('GPL')
 depends=('glibc')
 makedepends=('yasm')
-source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2)
-md5sums=('fa52ad09dcb7d4e1a66adcaa2dab26bc')
+source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245-stable.tar.bz2)
+md5sums=('4d793ecc4f9d308724ea47edf400f312')
 
 build() {
-cd $srcdir/$pkgname-snapshot-$pkgver-2245
+cd $srcdir/$pkgname-snapshot-$pkgver-2245-stable
 
 ./configure --enable-shared
 
 make
+}
+package() {
+cd $srcdir/$pkgname-snapshot-$pkgver-2245-stable
+
 make DESTDIR=$pkgdir \
   bindir=/usr/bin \
   libdir=/usr/lib \



[arch-commits] Commit in x264/trunk (PKGBUILD)

2011-10-31 Thread Ionut Biru
Date: Monday, October 31, 2011 @ 09:04:28
  Author: ibiru
Revision: 141583

new snapshot

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-31 12:18:41 UTC (rev 141582)
+++ PKGBUILD2011-10-31 13:04:28 UTC (rev 141583)
@@ -4,7 +4,7 @@
 # Contributor: Paul Mattal p...@archlinux.org
 
 pkgname=x264
-pkgver=20111001
+pkgver=20111030
 pkgrel=1
 pkgdesc=free library for encoding H264/AVC video streams
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
 depends=('glibc')
 makedepends=('yasm')
 
source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2)
-md5sums=('dd67dca96ac79e7cb963bfcbf68e017b')
+md5sums=('fa52ad09dcb7d4e1a66adcaa2dab26bc')
 
 build() {
 cd $srcdir/$pkgname-snapshot-$pkgver-2245



[arch-commits] Commit in x264/trunk (PKGBUILD)

2011-10-03 Thread Ionut Biru
Date: Monday, October 3, 2011 @ 08:19:14
  Author: ibiru
Revision: 139540

bump x264

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-03 12:17:06 UTC (rev 139539)
+++ PKGBUILD2011-10-03 12:19:14 UTC (rev 139540)
@@ -4,7 +4,7 @@
 # Contributor: Paul Mattal p...@archlinux.org
 
 pkgname=x264
-pkgver=20110617
+pkgver=20111001
 pkgrel=1
 pkgdesc=free library for encoding H264/AVC video streams
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
 depends=('glibc')
 makedepends=('yasm')
 
source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2)
-md5sums=('928717aa2f0c7ca91e589d6b60e688f1')
+md5sums=('dd67dca96ac79e7cb963bfcbf68e017b')
 
 build() {
 cd $srcdir/$pkgname-snapshot-$pkgver-2245



[arch-commits] Commit in x264/trunk (PKGBUILD)

2011-06-18 Thread Ionut Biru
Date: Saturday, June 18, 2011 @ 12:05:03
  Author: ibiru
Revision: 127804

upgpkg: x264 20110617-1
bump to latest version

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-06-18 15:54:57 UTC (rev 127803)
+++ PKGBUILD2011-06-18 16:05:03 UTC (rev 127804)
@@ -4,7 +4,7 @@
 # Contributor: Paul Mattal p...@archlinux.org
 
 pkgname=x264
-pkgver=20110506
+pkgver=20110617
 pkgrel=1
 pkgdesc=free library for encoding H264/AVC video streams
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
 depends=('glibc')
 makedepends=('yasm')
 
source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2)
-md5sums=('29afc662ac62b7cabffccc65faa146ae')
+md5sums=('928717aa2f0c7ca91e589d6b60e688f1')
 
 build() {
 cd $srcdir/$pkgname-snapshot-$pkgver-2245



[arch-commits] Commit in x264/trunk (PKGBUILD)

2011-05-07 Thread Ionut Biru
Date: Saturday, May 7, 2011 @ 05:56:35
  Author: ibiru
Revision: 122909

bump ver

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-05-07 08:51:06 UTC (rev 122908)
+++ PKGBUILD2011-05-07 09:56:35 UTC (rev 122909)
@@ -4,7 +4,7 @@
 # Contributor: Paul Mattal p...@archlinux.org
 
 pkgname=x264
-pkgver=20110327
+pkgver=20110506
 pkgrel=1
 pkgdesc=free library for encoding H264/AVC video streams
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
 depends=('glibc')
 makedepends=('yasm')
 
source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2)
-md5sums=('7579aff8166a974a1b293cd18b9ead92')
+md5sums=('29afc662ac62b7cabffccc65faa146ae')
 
 build() {
 cd $srcdir/$pkgname-snapshot-$pkgver-2245



[arch-commits] Commit in x264/trunk (PKGBUILD)

2011-03-28 Thread Ionut Biru
Date: Monday, March 28, 2011 @ 14:20:15
  Author: ibiru
Revision: 117096

upgpkg: x264 20110327-1
update to 20110327

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-03-28 17:40:24 UTC (rev 117095)
+++ PKGBUILD2011-03-28 18:20:15 UTC (rev 117096)
@@ -4,7 +4,7 @@
 # Contributor: Paul Mattal p...@archlinux.org
 
 pkgname=x264
-pkgver=20110115
+pkgver=20110327
 pkgrel=1
 pkgdesc=free library for encoding H264/AVC video streams
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
 depends=('glibc')
 makedepends=('yasm')
 
source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2)
-md5sums=('c977e56dac340bc5145a3ecce9a45aef')
+md5sums=('7579aff8166a974a1b293cd18b9ead92')
 
 build() {
 cd $srcdir/$pkgname-snapshot-$pkgver-2245



[arch-commits] Commit in x264/trunk (PKGBUILD)

2011-01-16 Thread Ionut Biru
Date: Sunday, January 16, 2011 @ 08:56:10
  Author: ibiru
Revision: 106279

upgpkg: x264 20110115-1
update to latest snapshot

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-01-16 13:42:00 UTC (rev 106278)
+++ PKGBUILD2011-01-16 13:56:10 UTC (rev 106279)
@@ -4,7 +4,7 @@
 # Contributor: Paul Mattal p...@archlinux.org
 
 pkgname=x264
-pkgver=20101013
+pkgver=20110115
 pkgrel=1
 pkgdesc=free library for encoding H264/AVC video streams
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
 depends=('glibc')
 makedepends=('yasm')
 
source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2)
-md5sums=('332def30b4c8ba2d4ef307396a354c19')
+md5sums=('c977e56dac340bc5145a3ecce9a45aef')
 
 build() {
 cd $srcdir/$pkgname-snapshot-$pkgver-2245



[arch-commits] Commit in x264/trunk (PKGBUILD)

2010-10-14 Thread Ionut Biru
Date: Thursday, October 14, 2010 @ 15:03:03
  Author: ibiru
Revision: 95084

upgpkg: x264 20101013-1
update to latest snapshot

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-14 18:37:13 UTC (rev 95083)
+++ PKGBUILD2010-10-14 19:03:03 UTC (rev 95084)
@@ -4,7 +4,7 @@
 # Contributor: Paul Mattal p...@archlinux.org
 
 pkgname=x264
-pkgver=20100826
+pkgver=20101013
 pkgrel=1
 pkgdesc=free library for encoding H264/AVC video streams
 arch=('i686' 'x86_64')
@@ -13,14 +13,14 @@
 depends=('glibc')
 makedepends=('yasm')
 
source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2)
-md5sums=('a5045c65078bf870f845c6bc12ecd65f')
+md5sums=('332def30b4c8ba2d4ef307396a354c19')
 
 build() {
 cd $srcdir/$pkgname-snapshot-$pkgver-2245
 
 ./configure --enable-shared
 
-make || return 1
+make
 make DESTDIR=$pkgdir \
   bindir=/usr/bin \
   libdir=/usr/lib \



[arch-commits] Commit in x264/trunk (PKGBUILD)

2010-08-27 Thread Ionut Biru
Date: Friday, August 27, 2010 @ 13:40:17
  Author: ibiru
Revision: 88984

upgpkg: x264 20100826-1 bump version

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-08-27 17:36:16 UTC (rev 88983)
+++ PKGBUILD2010-08-27 17:40:17 UTC (rev 88984)
@@ -4,7 +4,7 @@
 # Contributor: Paul Mattal p...@archlinux.org
 
 pkgname=x264
-pkgver=20100722
+pkgver=20100826
 pkgrel=1
 pkgdesc=free library for encoding H264/AVC video streams
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
 depends=('glibc')
 makedepends=('yasm')
 
source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2)
-md5sums=('f5d2e43074b29b91df37a7953152e40c')
+md5sums=('a5045c65078bf870f845c6bc12ecd65f')
 
 build() {
 cd $srcdir/$pkgname-snapshot-$pkgver-2245



[arch-commits] Commit in x264/trunk (PKGBUILD)

2010-07-23 Thread Ionut Biru
Date: Friday, July 23, 2010 @ 16:45:00
  Author: ibiru
Revision: 85988

upgpkg: x264 20100722-1
bump to 20100722

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-07-23 17:20:19 UTC (rev 85987)
+++ PKGBUILD2010-07-23 20:45:00 UTC (rev 85988)
@@ -4,7 +4,7 @@
 # Contributor: Paul Mattal p...@archlinux.org
 
 pkgname=x264
-pkgver=20100607
+pkgver=20100722
 pkgrel=1
 pkgdesc=free library for encoding H264/AVC video streams
 arch=('i686' 'x86_64')
@@ -13,19 +13,19 @@
 depends=('glibc')
 makedepends=('yasm')
 
source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2)
-md5sums=('d796cbb3eb4ce5126b861aed64d0058e')
+md5sums=('f5d2e43074b29b91df37a7953152e40c')
 
 build() {
-cd $srcdir/$pkgname-snapshot-$pkgver-2245 || return 1
+cd $srcdir/$pkgname-snapshot-$pkgver-2245
 
-./configure --enable-shared  || return 1
+./configure --enable-shared
 
 make || return 1
 make DESTDIR=$pkgdir \
   bindir=/usr/bin \
   libdir=/usr/lib \
   includedir=/usr/include \
-  install || return 1
+  install
 }
 
 # vim:set ts=2 sw=2 et:



[arch-commits] Commit in x264/trunk (PKGBUILD)

2010-06-08 Thread Ionut Biru
Date: Tuesday, June 8, 2010 @ 11:54:23
  Author: ibiru
Revision: 82070

upgpkg: x264 20100607-1
bump to 20100607

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-06-08 13:08:27 UTC (rev 82069)
+++ PKGBUILD2010-06-08 15:54:23 UTC (rev 82070)
@@ -4,7 +4,7 @@
 # Contributor: Paul Mattal p...@archlinux.org
 
 pkgname=x264
-pkgver=20100524
+pkgver=20100607
 pkgrel=1
 pkgdesc=free library for encoding H264/AVC video streams
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
 depends=('glibc')
 makedepends=('yasm')
 
source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2)
-sha256sums=('0c7c93cd47104f7bfea2b73ab5290635c07212574cc325c22ab31e8ef03fa779')
+md5sums=('d796cbb3eb4ce5126b861aed64d0058e')
 
 build() {
 cd $srcdir/$pkgname-snapshot-$pkgver-2245 || return 1



[arch-commits] Commit in x264/trunk (PKGBUILD)

2010-05-25 Thread Ionut Biru
Date: Tuesday, May 25, 2010 @ 19:11:25
  Author: ibiru
Revision: 81021

upgpkg: x264 20100524-1
bump to new version

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-05-25 18:19:35 UTC (rev 81020)
+++ PKGBUILD2010-05-25 23:11:25 UTC (rev 81021)
@@ -4,7 +4,7 @@
 # Contributor: Paul Mattal p...@archlinux.org
 
 pkgname=x264
-pkgver=20100410
+pkgver=20100524
 pkgrel=1
 pkgdesc=free library for encoding H264/AVC video streams
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
 depends=('glibc')
 makedepends=('yasm')
 
source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2)
-sha256sums=('7f42481ad03ffdf04e182fcc336f86e3eec6cdaffb5385ca4e713541b8705185')
+sha256sums=('0c7c93cd47104f7bfea2b73ab5290635c07212574cc325c22ab31e8ef03fa779')
 
 build() {
 cd $srcdir/$pkgname-snapshot-$pkgver-2245 || return 1



[arch-commits] Commit in x264/trunk (PKGBUILD)

2010-04-11 Thread Ionut Biru
Date: Sunday, April 11, 2010 @ 12:32:30
  Author: ibiru
Revision: 77240

upgpkg: x264 20100410-1
update to 20100410

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-04-11 15:13:59 UTC (rev 77239)
+++ PKGBUILD2010-04-11 16:32:30 UTC (rev 77240)
@@ -4,7 +4,7 @@
 # Contributor: Paul Mattal p...@archlinux.org
 
 pkgname=x264
-pkgver=20100312
+pkgver=20100410
 pkgrel=1
 pkgdesc=free library for encoding H264/AVC video streams
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@
 depends=('glibc')
 makedepends=('yasm')
 
source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2)
-sha256sums=('89c15d9a7c5fdc3117969c3c7edd5e3c797d57319ecb549818ea2e90a1016d85')
+sha256sums=('7f42481ad03ffdf04e182fcc336f86e3eec6cdaffb5385ca4e713541b8705185')
 
 build() {
 cd $srcdir/$pkgname-snapshot-$pkgver-2245 || return 1



[arch-commits] Commit in x264/trunk (PKGBUILD)

2010-03-13 Thread Ionut Biru
Date: Saturday, March 13, 2010 @ 16:55:31
  Author: ibiru
Revision: 72265

upgpkg: x264 20100312-1
update to 20100312

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-03-13 21:45:37 UTC (rev 72264)
+++ PKGBUILD2010-03-13 21:55:31 UTC (rev 72265)
@@ -4,8 +4,8 @@
 # Contributor: Paul Mattal p...@archlinux.org
 
 pkgname=x264
-pkgver=20100207
-pkgrel=2
+pkgver=20100312
+pkgrel=1
 pkgdesc=free library for encoding H264/AVC video streams
 arch=('i686' 'x86_64')
 url=http://www.videolan.org/developers/x264.html;
@@ -13,7 +13,7 @@
 depends=('glibc')
 makedepends=('yasm')
 
source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2)
-md5sums=('c0b5b42c727b5ae515232f6d0c72')
+sha256sums=('89c15d9a7c5fdc3117969c3c7edd5e3c797d57319ecb549818ea2e90a1016d85')
 
 build() {
 cd $srcdir/$pkgname-snapshot-$pkgver-2245 || return 1
@@ -21,7 +21,6 @@
 ./configure --enable-shared  || return 1
 
 make || return 1
-
 make DESTDIR=$pkgdir \
   bindir=/usr/bin \
   libdir=/usr/lib \



[arch-commits] Commit in x264/trunk (PKGBUILD)

2010-02-08 Thread Ionut Biru
Date: Monday, February 8, 2010 @ 11:38:55
  Author: ibiru
Revision: 67569

upgpkg: x264 20100207-1
bump to new snapshost

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-02-08 16:25:49 UTC (rev 67568)
+++ PKGBUILD2010-02-08 16:38:55 UTC (rev 67569)
@@ -3,7 +3,7 @@
 # Maintainer: Paul Mattal p...@archlinux.org
 
 pkgname=x264
-pkgver=20100107
+pkgver=20100207
 pkgrel=1
 pkgdesc=free library for encoding H264/AVC video streams
 arch=(i686 x86_64)
@@ -12,8 +12,7 @@
 depends=('libx11')
 makedepends=('yasm')
 
source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2)
-md5sums=('58337bf425518cb79dd804bcfd10b7b7')
-
+md5sums=('c0b5b42c727b5ae515232f6d0c72')
 build() {
 cd $srcdir/$pkgname-snapshot-$pkgver-2245 || return 1
 



[arch-commits] Commit in x264/trunk (PKGBUILD)

2010-01-10 Thread Ionut Biru
Date: Sunday, January 10, 2010 @ 07:50:32
  Author: ibiru
Revision: 62584

upgpkg: x264 20100107-1
update to 20100107 snapshot

Modified:
  x264/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-01-10 09:24:27 UTC (rev 62583)
+++ PKGBUILD2010-01-10 12:50:32 UTC (rev 62584)
@@ -3,7 +3,7 @@
 # Maintainer: Paul Mattal p...@archlinux.org
 
 pkgname=x264
-pkgver=20090416
+pkgver=20100107
 pkgrel=1
 pkgdesc=free library for encoding H264/AVC video streams
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@
 depends=('libx11')
 makedepends=('yasm')
 
source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2)
-md5sums=('f5730feaa6175539e8227e48e38b7d67')
+md5sums=('58337bf425518cb79dd804bcfd10b7b7')
 
 build() {
 cd $srcdir/$pkgname-snapshot-$pkgver-2245 || return 1