aboutsummaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2012-01-30 16:34:25 +0200
committerTimo Teräs <timo.teras@iki.fi>2012-01-30 16:35:05 +0200
commit36027616acffca0c9ba5d96a74c0d52a9fb1880a (patch)
tree731e54e56fc827849504ceaca5295b0d074cd85e /testing
parent289c16c3de2c232dd3823f413823e63b5bd86cda (diff)
downloadaports-36027616acffca0c9ba5d96a74c0d52a9fb1880a.tar.bz2
aports-36027616acffca0c9ba5d96a74c0d52a9fb1880a.tar.xz
testing/vlc: enable libmatroska, fix trigger to generate cache
Diffstat (limited to 'testing')
-rw-r--r--testing/vlc/APKBUILD9
-rw-r--r--testing/vlc/vlc.trigger2
2 files changed, 6 insertions, 5 deletions
diff --git a/testing/vlc/APKBUILD b/testing/vlc/APKBUILD
index 513b3bdf6c..8c8b00d231 100644
--- a/testing/vlc/APKBUILD
+++ b/testing/vlc/APKBUILD
@@ -3,7 +3,7 @@
pkgname=vlc
pkgver=2.0.0_rc1
_pkgver=${pkgver/_/-}
-pkgrel=1
+pkgrel=2
pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
pkgusers="vlc"
pkggroups="vlc"
@@ -13,9 +13,8 @@ license="GPL-2"
triggers="$pkgname.trigger=/usr/lib/vlc/plugins"
subpackages="$pkgname-dev $pkgname-doc $pkgname-xorg $pkgname-daemon"
#depends="fluidsynth zvbi lirc-utils libdca
-# libproxy libdvdnav>=4.1.3 libcddb smbclient
-# libmatroska libmpcdec
-# qt libmodplug ttf-dejavu"
+# libproxy libcddb smbclient
+# libmpcdec libmodplug"
depends="ttf-dejavu"
makedepends="
a52dec-dev
@@ -40,6 +39,7 @@ makedepends="
libice-dev
libiconv-dev
libmad-dev
+ libmatroska-dev
libmpeg2-dev
libnotify-dev
libogg-dev
@@ -118,6 +118,7 @@ build ()
--enable-flac \
--enable-httpd \
--enable-live555 \
+ --enable-matroska \
--enable-merge-ffmpeg \
--enable-ncurses \
--enable-qt4 \
diff --git a/testing/vlc/vlc.trigger b/testing/vlc/vlc.trigger
index def39b951a..b038d1d7d7 100644
--- a/testing/vlc/vlc.trigger
+++ b/testing/vlc/vlc.trigger
@@ -1,4 +1,4 @@
#!/bin/sh
-exec /usr/lib/vlc/vlc-cache-gen
+exec /usr/lib/vlc/vlc-cache-gen /usr/lib/vlc/