aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-10-09 12:38:40 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-10-09 12:40:01 +0000
commita42a84139197d94cc96a3b95e296eff4c8f73be7 (patch)
tree787f38a1d3d339f38cd8ee0c27d7285006e35f9e
parenta79b67399cebd6a447a857d9397eea632c599642 (diff)
main/libvpx: build shared lib, split -utils
-rw-r--r--main/libvpx/APKBUILD22
-rw-r--r--main/libvpx/libm-pc.patch11
2 files changed, 29 insertions, 4 deletions
diff --git a/main/libvpx/APKBUILD b/main/libvpx/APKBUILD
index 3f788bafe59..98556a7e8dd 100644
--- a/main/libvpx/APKBUILD
+++ b/main/libvpx/APKBUILD
@@ -2,7 +2,7 @@
pkgname=libvpx
pkgver=1.1.0
_ver=${pkgver/_/-}
-pkgrel=0
+pkgrel=1
pkgdesc="Library for the vp8 codec"
url="http://www.webmproject.org/"
arch="all"
@@ -10,13 +10,19 @@ license="GPL"
depends=
makedepends="coreutils yasm bash perl"
install=
-subpackages="$pkgname-dev"
-source="http://webm.googlecode.com/files/libvpx-v$_ver.tar.bz2"
+subpackages="$pkgname-dev $pkgname-utils"
+patches="libm-pc.patch"
+source="http://webm.googlecode.com/files/libvpx-v$_ver.tar.bz2
+ $patches"
_builddir="$srcdir"/$pkgname-v$_ver
prepare() {
cd "$_builddir"
+ for i in $patches; do
+ msg $i
+ patch -p1 -i "$srcdir"/$i || return 1
+ done
}
build() {
@@ -26,6 +32,7 @@ build() {
--enable-libs \
--enable-runtime-cpu-detect \
--enable-vp8 \
+ --enable-shared \
--disable-install-srcs \
|| return 1
make || return 1
@@ -37,4 +44,11 @@ package() {
chmod 644 "$pkgdir"/usr/include/vpx/*.h
}
-md5sums="7ae163ac3196c79ec2f0904280078a45 libvpx-v1.1.0.tar.bz2"
+utils() {
+ pkgdesc="VP8 utilities and tools"
+ install -d "$subpkgdir"/usr
+ mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+}
+
+md5sums="7ae163ac3196c79ec2f0904280078a45 libvpx-v1.1.0.tar.bz2
+8a0ec70d65975dde522ece92e9eeb7f1 libm-pc.patch"
diff --git a/main/libvpx/libm-pc.patch b/main/libvpx/libm-pc.patch
new file mode 100644
index 00000000000..87f07a39808
--- /dev/null
+++ b/main/libvpx/libm-pc.patch
@@ -0,0 +1,11 @@
+--- ./libs.mk.orig
++++ ./libs.mk
+@@ -241,7 +241,7 @@
+ $(qexec)echo 'Version: $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)' >> $@
+ $(qexec)echo 'Requires:' >> $@
+ $(qexec)echo 'Conflicts:' >> $@
+- $(qexec)echo 'Libs: -L$${libdir} -lvpx' >> $@
++ $(qexec)echo 'Libs: -L$${libdir} -lvpx -lm' >> $@
+ $(qexec)echo 'Cflags: -I$${includedir}' >> $@
+ INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc
+ INSTALL_MAPS += $(LIBSUBDIR)/pkgconfig/%.pc %.pc