From d66e36c8b485e30eaf99e471b8ceddef5221ddbc Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 27 Jan 2012 11:36:57 +0100 Subject: [PATCH] x264: update to 20120126, bump abi_depends. --- common/shlibs | 2 +- srcpkgs/x264/depends | 2 +- srcpkgs/x264/template | 14 +++++--------- srcpkgs/x264/x264-devel.template | 5 +---- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/common/shlibs b/common/shlibs index 955fe94d88a..83418a75b5d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -368,7 +368,7 @@ libavutil.so.51 libavutil ffmpeg-devel libavfilter.so.2 libavfilter ffmpeg-devel libSDL-1.2.so.0 SDL SDL-devel libSDL_image-1.2.so.0 SDL_image SDL_image-devel -libx264.so.115 x264 x264-devel +libx264.so.120 x264 x264-devel libxvidcore.so.4 xvidcore xvidcore-devel libtag.so.1 taglib taglib-devel libtag_c.so.0 taglib taglib-devel diff --git a/srcpkgs/x264/depends b/srcpkgs/x264/depends index 531d2125561..b0c3a35350d 100644 --- a/srcpkgs/x264/depends +++ b/srcpkgs/x264/depends @@ -1,2 +1,2 @@ -abi_depends=">=20110617" +abi_depends=">=20120126" api_depends="${abi_depends}" diff --git a/srcpkgs/x264/template b/srcpkgs/x264/template index 08a32a3b10f..f7cd2b8307b 100644 --- a/srcpkgs/x264/template +++ b/srcpkgs/x264/template @@ -1,8 +1,7 @@ # Template file for 'x264' pkgname=x264 -_snap_date=20110617 +_snap_date=20120126 _snap_rev=2245 -revision=2 version="${_snap_date}.${_snap_rev}" wrksrc="x264-snapshot-${_snap_date}-${_snap_rev}-stable" distfiles="http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${_snap_date}-${_snap_rev}-stable.tar.bz2" @@ -10,25 +9,22 @@ short_desc="Free library for encoding H264/AVC video streams" maintainer="Juan RP " homepage="http://www.videolan.org/developers/x264.html" license="GPL-2" -checksum=ce6793f9b197c55246c37ca971c652c8af5621b2e759c2f9c0b1e967b16c606a +checksum=6270fcc6e2ef133e4db2b2e0f4f22b5dbdd9a637e979b5697014b698f0d56baa long_desc=" Stable snapshot version of x264, a high quality H.264 codec." subpackages="$pkgname-devel" Add_dependency build yasm -do_configure() -{ +do_configure() { ./configure --disable-swscale --enable-pic --enable-shared } -do_build() -{ +do_build() { make ${makejobs} } -do_install() -{ +do_install() { make DESTDIR=${DESTDIR} \ bindir=/usr/bin libdir=/usr/lib includedir=/usr/include install } diff --git a/srcpkgs/x264/x264-devel.template b/srcpkgs/x264/x264-devel.template index d541912d4c4..b6e8ce286c7 100644 --- a/srcpkgs/x264/x264-devel.template +++ b/srcpkgs/x264/x264-devel.template @@ -5,13 +5,10 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -revision=1 - Add_dependency run glibc-devel Add_dependency run x264 -do_install() -{ +do_install() { vmove usr/include usr vmove usr/lib/pkgconfig usr/lib }