From 36027616acffca0c9ba5d96a74c0d52a9fb1880a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Mon, 30 Jan 2012 16:34:25 +0200
Subject: testing/vlc: enable libmatroska, fix trigger to generate cache

---
 testing/vlc/APKBUILD    | 9 +++++----
 testing/vlc/vlc.trigger | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'testing')

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/
 
-- 
cgit v1.2.3