main/vlc: cleanup and split libs and plugins

3 files changed, 112 insertions, 25 deletions

diff --git a/main/vlc/APKBUILD b/main/vlc/APKBUILD
index ad07484685..d0309ae6b9 100644
--- a/main/vlc/APKBUILD
+++ b/main/vlc/APKBUILD
@@ -4,17 +4,46 @@ pkgname=vlc
 pkgver=2.1.4
 _pkgver=${pkgver/_/-}
 _ver=${_pkgver%[a-z]}
-pkgrel=3
+pkgrel=4
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
+triggers="vlc-libs.trigger=/usr/lib/vlc/plugins"
 pkgusers="vlc"
 pkggroups="vlc"
 url="http://www.videolan.org/vlc/"
 arch="all"
 license="GPL2+"
-triggers="$pkgname.trigger=/usr/lib/vlc/plugins"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-qt $pkgname-xorg
-	$pkgname-daemon"
-depends="ttf-dejavu"
+subpackages="$pkgname-dev
+	$pkgname-doc
+	$pkgname-qt
+	$pkgname-xorg
+	$pkgname-daemon
+	$pkgname-libs
+	$pkgname-plugins
+
+	$pkgname-plugins-access:plugins_access
+	$pkgname-plugins-access_output:plugins_access_output
+	$pkgname-plugins-audio_filter:plugins_audio_filter
+	$pkgname-plugins-audio_mixer:plugins_audio_mixer
+	$pkgname-plugins-audio_output:plugins_audio_output
+	$pkgname-plugins-codec:plugins_codec
+	$pkgname-plugins-control:plugins_control
+	$pkgname-plugins-demux:plugins_demux
+	$pkgname-plugins-gui:plugins_gui
+	$pkgname-plugins-lua:plugins_lua
+	$pkgname-plugins-meta_engine:plugins_meta_engine
+	$pkgname-plugins-misc:plugins_misc
+	$pkgname-plugins-mux:plugins_mux
+	$pkgname-plugins-notify:plugins_notify
+	$pkgname-plugins-packetizer:plugins_packetizer
+	$pkgname-plugins-services_discovery:plugins_services_discovery
+	$pkgname-plugins-stream_filter:plugins_stream_filter
+	$pkgname-plugins-stream_out:plugins_stream_out
+	$pkgname-plugins-text_renderer:plugins_text_renderer
+	$pkgname-plugins-video_chroma:plugins_video_chroma
+	$pkgname-plugins-video_filter:plugins_video_filter
+	$pkgname-plugins-video_output:plugins_video_output
+	$pkgname-plugins-visualization:plugins_visualization"
+depends="ttf-dejavu $pkgname-plugins"
 makedepends="
 	a52dec-dev
 	alsa-lib-dev
@@ -76,9 +105,6 @@ makedepends="
 	"
 source="http://download.videolan.org/pub/videolan/$pkgname/${_ver}/$pkgname-$_pkgver.tar.xz
 	fix-waitpid-usage.patch
-	uclibc-define-fminf.patch
-	dbus-fmaxf.patch
-	uclibc-fix-idn.patch
 
 	0001-omxil-Release-picture-in-direct-rendering-mode.patch
 	0002-omxil-vout-Handle-dynamic-aspect-changes.patch
@@ -86,7 +112,7 @@ source="http://download.videolan.org/pub/videolan/$pkgname/${_ver}/$pkgname-$_pk
 	0004-omxil-bcm-h264-Don-t-wait-for-error-free-frame.patch
 	0010-omxil-rpi-codecs.patch
 
-	vlc.trigger"
+	vlc-libs.trigger"
 
 _builddir="$srcdir"/$pkgname-$_ver
 prepare() {
@@ -183,6 +209,34 @@ package() {
 	find "$pkgdir" -name '*.la' -delete
 }
 
+plugins() {
+	pkgdesc="$pkgname all plugins meta package"
+	depends="$pkgname-plugins-access
+		$pkgname-plugins-access_output
+		$pkgname-plugins-audio_filter
+		$pkgname-plugins-audio_mixer
+		$pkgname-plugins-audio_output
+		$pkgname-plugins-codec
+		$pkgname-plugins-control
+		$pkgname-plugins-demux
+		$pkgname-plugins-gui
+		$pkgname-plugins-lua
+		$pkgname-plugins-meta_engine
+		$pkgname-plugins-misc
+		$pkgname-plugins-mux
+		$pkgname-plugins-notify
+		$pkgname-plugins-packetizer
+		$pkgname-plugins-services_discovery
+		$pkgname-plugins-stream_filter
+		$pkgname-plugins-stream_out
+		$pkgname-plugins-text_renderer
+		$pkgname-plugins-video_chroma
+		$pkgname-plugins-video_filter
+		$pkgname-plugins-video_output
+		$pkgname-plugins-visualization"
+	mkdir -p "$subpkgdir"
+}
+
 _mv() {
 	local dir=${1%/*}
 	mkdir -p "$subpkgdir"/$dir
@@ -245,36 +299,68 @@ daemon() {
 	install -d -o vlc -g vlc "$subpkgdir"/var/log/vlc
 }
 
+libs() {
+	depends=
+	mkdir -p "$subpkgdir"/usr/lib/vlc
+	mv "$pkgdir"/usr/lib/vlc/vlc-cache-gen \
+		"$subpkgdir"/usr/lib/vlc/
+	default_libs
+}
+
+_mv_plugins() {
+	local plugin=$1
+	pkgdesc="$pkgname $plugin plugin"
+	depends=
+	mkdir -p "$subpkgdir"/usr/lib/vlc/plugins
+	mv "$pkgdir"/usr/lib/vlc/plugins/"$plugin" \
+		"$subpkgdir"/usr/lib/vlc/plugins
+}
+
+plugins_access()		{ _mv_plugins access; }
+plugins_access_output()		{ _mv_plugins access_output; }
+plugins_audio_filter()		{ _mv_plugins audio_filter; }
+plugins_audio_mixer()		{ _mv_plugins audio_mixer; }
+plugins_audio_output()		{ _mv_plugins audio_output; }
+plugins_codec()			{ _mv_plugins codec; }
+plugins_control()		{ _mv_plugins control; }
+plugins_demux()			{ _mv_plugins demux; }
+plugins_gui()			{ _mv_plugins gui; }
+plugins_lua()			{ _mv_plugins lua; }
+plugins_meta_engine()		{ _mv_plugins meta_engine; }
+plugins_misc()			{ _mv_plugins misc; }
+plugins_mux()			{ _mv_plugins mux; }
+plugins_notify()		{ _mv_plugins notify; }
+plugins_packetizer()		{ _mv_plugins packetizer; }
+plugins_services_discovery()	{ _mv_plugins services_discovery; }
+plugins_stream_filter()		{ _mv_plugins stream_filter; }
+plugins_stream_out()		{ _mv_plugins stream_out; }
+plugins_text_renderer()		{ _mv_plugins text_renderer; }
+plugins_video_chroma()		{ _mv_plugins video_chroma; }
+plugins_video_filter()		{ _mv_plugins video_filter; }
+plugins_video_output()		{ _mv_plugins video_output; }
+plugins_visualization()		{ _mv_plugins visualization; }
+
 md5sums="7ed67d22f7425011078772bfc62ac222  vlc-2.1.4.tar.xz
 7b1a482e521b9d6dcdb6710aff51894f  fix-waitpid-usage.patch
-34bacc70c150bdbe19476d84a76f2849  uclibc-define-fminf.patch
-0f373eaee7e74def94d0dab2be9d0c01  dbus-fmaxf.patch
-a57ecdeb28b93c2ac0ade2adff2da2b4  uclibc-fix-idn.patch
 76ab721e5d303158201293c4ae5b5ba9  0001-omxil-Release-picture-in-direct-rendering-mode.patch
 3d39249940b63e20ac6c84c68ee67677  0002-omxil-vout-Handle-dynamic-aspect-changes.patch
 4209dd3c03001a921ece0f8647ecb1c5  0003-omxil-rpi-Fetch-pixel-aspect-ratio-from-decoder.patch
 616a2e6dc58810732146ea922819aea2  0004-omxil-bcm-h264-Don-t-wait-for-error-free-frame.patch
 d43b448ee0ba6980ecfc5fdfa655f473  0010-omxil-rpi-codecs.patch
-350b30698eb784def7d19446eb1d6c81  vlc.trigger"
+dd899a9926ad84db9446d92890a5aa3e  vlc-libs.trigger"
 sha256sums="3e566c7525478167e18cc53dc75d621e4af91eb40aabb6231e47db25d682d5d3  vlc-2.1.4.tar.xz
 0c802698c215dd2d2ad9a4889b1d46dfd5d6c304d4cd1b34bacb2bacc35dd3c9  fix-waitpid-usage.patch
-b16801cca70c0f13830a27146025cc55b947897744d9da1ab713c5f5ce0460a0  uclibc-define-fminf.patch
-3ebb0577b1ef9780eba27cd829c9839b2ddf7729c5a2a81019d08b2c0a7e5b79  dbus-fmaxf.patch
-8e15a1c29fed29eeafef4dd37c73cc0da578b40d9d94713ac12a69c101040901  uclibc-fix-idn.patch
 3ff97e9c1b4055ac9a0981fa90b6f55abe72e44d5606a963f9b66f6274672822  0001-omxil-Release-picture-in-direct-rendering-mode.patch
 f9e5d27aa46cc4ebb929afaa30f53343eb40347915ec827cf461a42745fa525a  0002-omxil-vout-Handle-dynamic-aspect-changes.patch
 7709d3fa0090e4aa8fb21eff55320fa11b681e6b7a8faab24b4473645cda3112  0003-omxil-rpi-Fetch-pixel-aspect-ratio-from-decoder.patch
 fe0b937e0b0a05b7d2cccd27dab49df77e84928e49fb148bae3d0effeb261d2f  0004-omxil-bcm-h264-Don-t-wait-for-error-free-frame.patch
 11db39f206ddb968d6a4411c75bfa6102189cb8e784316c491dd964ee9a3dfaf  0010-omxil-rpi-codecs.patch
-0639c022dc844fad95eb0246b1d24557641939bbda91af0c700374378d8f054a  vlc.trigger"
+1c93af2feb217a06f6adc3cd51def8f00eea431f9d26ace7b90c377f7e85fc7a  vlc-libs.trigger"
 sha512sums="da09744d0da1742a89747a34f749b83a30b18ddfc84ed9ee1a59a1c16cfa4ce0e7d4ddd66e9dfd13d5309b7ff66f72a7d3b2c3837ec740a193656ce6f8b04845  vlc-2.1.4.tar.xz
 3c6ff4f25b7e1f0041bc47872a2b59b6c4f8bc1747d6830e9f2d9c35ee75cd2581558a12225070dede37d6a2287b0fc5c089c8f4f8ae26784aa6aded7177bed0  fix-waitpid-usage.patch
-0d9310afef1afbf15a19bcc8aa1835416830666d79a5461b45df900afde5b115ec7c18d4bc15d36efe45b912ebb51ceb91cc20ebd0be0ecc4ff3fd0e06dd4a55  uclibc-define-fminf.patch
-b51041adcb16234289c928444a8c03db549640af28cc8dc75f732863bea519141dc36a44f353d2e42d8afde1fd8052faff0b2b661bf04a10c64f1f18f120e87b  dbus-fmaxf.patch
-24d7ae347a81e05aa2273c180ed76dfb0c8140ef1e4f877a88326fdf37acec0ac8bf1bde98845e40cd57c93fe6e5c186623a6f6f66ed6fe94386826260d88738  uclibc-fix-idn.patch
 0dc1c827af73f29fe715e3d75812ca916d0feac355d7c5f7ac1696bfbf3aca31dabbdd0ec05174a1c15713c530748f9dcb1b4b87819f3a6570c86c71ac503954  0001-omxil-Release-picture-in-direct-rendering-mode.patch
 c276962f33c38ad64caa6c4f8ca673c4367635b8998ee8a1003047f89e652c535027c68a836822d9b762d1b76ad04bd04dc0d19bbfabc5c3b7d14a7ee1cdd744  0002-omxil-vout-Handle-dynamic-aspect-changes.patch
 db15b7488768b429f26e4e7fdf82259ffc834fa2bdf1461b297b36111aad87603f7b015b0855afb8bc797fb351311dee555bbef0dc0a5d029748b057a3c23f92  0003-omxil-rpi-Fetch-pixel-aspect-ratio-from-decoder.patch
 a9bd6f622a9868de3e0a9f6643b906a73cabcfbc79ffebafbac00a45e3eec31cbb7bc9c9ec2748c58c928e95f45b29878ac78f654e5e658413687b60aaf52683  0004-omxil-bcm-h264-Don-t-wait-for-error-free-frame.patch
 6fb242c37bd9af224b7bcd78702ac1b5612748c7363405e594c509288940a18ae4334f032497e9d6e11f83e870b9437a5c3197db0271123c95de24db63b8802e  0010-omxil-rpi-codecs.patch
-a081dd93248b63724ffb65cde0a00db0e1f3b9a1d47074800d898e39dc71c074b3dd3fa18e5fbc45fa90376e7df6d7ef8689c4253c1d9405868a3f8bbd76adcc  vlc.trigger"
+b67b6e21e9d4027aef1006e6057f9ba8e65ce3895b08f7b911b1675cff9bc423f64ee2c187c584860e9e5d4635a30408a7781add9694d9bba753eac37f357406  vlc-libs.trigger"
diff --git a/main/vlc/vlc-libs.trigger b/main/vlc/vlc-libs.trigger
new file mode 100644
index 0000000000..c13bace998
--- /dev/null
+++ b/main/vlc/vlc-libs.trigger
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+exec /usr/lib/vlc/vlc-cache-gen "$@"  >&/dev/null
+exit 0
+
diff --git a/main/vlc/vlc.trigger b/main/vlc/vlc.trigger
deleted file mode 100644
index d7322fcb16..0000000000
--- a/main/vlc/vlc.trigger
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-exec /usr/lib/vlc/vlc-cache-gen "$@"
-