From e58f17d99d3fdf2daf1f3aa96a541282f927fd29 Mon Sep 17 00:00:00 2001
From: Stefan Fiedler <stefan.fiedler@students.jku.at>
Date: Sat, 3 Nov 2007 09:26:47 +0000
Subject: [PATCH] Stefan Fiedler: 	update vlc, build mozilla plugin if
 possible

[2007101320315911725] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8798 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/base/vlc/vlc.conf | 23 +++++++++++++++--------
 package/base/vlc/vlc.desc |  4 ++--
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/package/base/vlc/vlc.conf b/package/base/vlc/vlc.conf
index 987037b6c..ebc381b9a 100644
--- a/package/base/vlc/vlc.conf
+++ b/package/base/vlc/vlc.conf
@@ -1,3 +1,4 @@
+#!/bin/bash
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 #
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
@@ -20,14 +21,20 @@
 #
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-var_append confopt ' ' '--enable-release'
-var_append confopt ' ' '--enable-loader'
+var_append extraconfopt ' ' '--enable-release'
+var_append extraconfopt ' ' '--enable-loader'
 
-var_append confopt ' ' '--enable-esd'
-var_append confopt ' ' '--enable-arts'
-var_append confopt ' ' '--enable-jack'
+var_append extraconfopt ' ' '--enable-esd'
+var_append extraconfopt ' ' '--enable-arts'
+var_append extraconfopt ' ' '--enable-jack'
 
-var_append confopt ' ' '--enable-pvr'
-var_append confopt ' ' '--enable-v4l'
-var_append confopt ' ' '--enable-dvb'
+var_append extraconfopt ' ' '--enable-pvr'
+var_append extraconfopt ' ' '--enable-v4l'
+var_append extraconfopt ' ' '--enable-dvb'
 
+pkginstalled mozilla || pkginstalled firefox && \
+    var_append extraconfopt ' ' '--enable-mozilla'
+pkginstalled firefox && hook_add preconf 3 \
+    'export ac_cv_path_MOZILLA_CONFIG="$root/usr/bin/firefox-config" ; \
+     export ac_cv_path_XPIDL="$root/usr/lib/firefox-`$ac_cv_path_MOZILLA_CONFIG --version`/xpidl
+     var_append makeinstopt npvlcdir=$root/usr/lib/firefox-`$ac_cv_path_MOZILLA_CONFIG --version`/plugins"'
diff --git a/package/base/vlc/vlc.desc b/package/base/vlc/vlc.desc
index 1d30bd821..2340efc61 100644
--- a/package/base/vlc/vlc.desc
+++ b/package/base/vlc/vlc.desc
@@ -42,7 +42,7 @@
 
 [L] GPL
 [S] Alpha
-[V] 0.8.6a
+[V] 0.8.6c
 [P] X --?--5---9 240.600
 
-[D] 2717965504 vlc-0.8.6a.tar.bz2 http://www.videolan.org/pub/videolan/vlc/0.8.6a/
+[D] 1858324772 vlc-0.8.6c.tar.bz2 http://www.videolan.org/pub/videolan/vlc/0.8.6c/