From f92185df66fa07ee9bf58418476ef72eaa24f052 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 25 Sep 2012 12:31:00 +0200 Subject: [PATCH] x264: fixed version in pkg-config file. --- srcpkgs/x264/template | 9 +++++---- srcpkgs/x264/x264-devel.template | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/x264/template b/srcpkgs/x264/template index e2fb7aac77a..8217dfb13ff 100644 --- a/srcpkgs/x264/template +++ b/srcpkgs/x264/template @@ -3,20 +3,19 @@ pkgname=x264 _snap_date=20120126 _snap_rev=2245 version="${_snap_date}.${_snap_rev}" +revision=2 +subpackages="x264-devel" 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" makedepends="yasm" -revision=1 short_desc="Free library for encoding H264/AVC video streams" maintainer="Juan RP " homepage="http://www.videolan.org/developers/x264.html" license="GPL-2" +distfiles="http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${_snap_date}-${_snap_rev}-stable.tar.bz2" checksum=6270fcc6e2ef133e4db2b2e0f4f22b5dbdd9a637e979b5697014b698f0d56baa long_desc=" Stable snapshot version of x264, a high quality H.264 codec." -subpackages="$pkgname-devel" - do_configure() { ./configure --disable-swscale --enable-pic --enable-shared } @@ -28,4 +27,6 @@ do_build() { do_install() { make DESTDIR=${DESTDIR} \ bindir=/usr/bin libdir=/usr/lib includedir=/usr/include install + # Set version as 0.120.0 in pkg-config file. + sed -i -e "s|0.120.x|0.120.0|g" ${DESTDIR}/usr/lib/pkgconfig/x264.pc } diff --git a/srcpkgs/x264/x264-devel.template b/srcpkgs/x264/x264-devel.template index 3ac5445497d..ec8ea77bf1c 100644 --- a/srcpkgs/x264/x264-devel.template +++ b/srcpkgs/x264/x264-devel.template @@ -1,12 +1,12 @@ # Template file for 'x264-devel'. # -depends="glibc-devel x264" +noarch=yes +depends="glibc-devel x264>=${version}" short_desc="${short_desc} (development files)" long_desc="${long_desc} This package contains files for development, headers, static libs, etc." - do_install() { vmove usr/include usr vmove usr/lib/pkgconfig usr/lib