[arch-commits] CVS update of extra/multimedia/mplayer-plugin (PKGBUILD)

[Alexander Baldeck]

    Date: Wednesday, February 13, 2008 @ 05:07:07
  Author: alexander
    Path: /home/cvs-extra/extra/multimedia/mplayer-plugin

Modified: PKGBUILD (1.38 -> 1.39)

* fix user build with non-modified mozilla-common


----------+
 PKGBUILD |   15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)


Index: extra/multimedia/mplayer-plugin/PKGBUILD
diff -u extra/multimedia/mplayer-plugin/PKGBUILD:1.38 extra/multimedia/mplayer-plugin/PKGBUILD:1.39
--- extra/multimedia/mplayer-plugin/PKGBUILD:1.38	Tue Feb 12 06:17:35 2008
+++ extra/multimedia/mplayer-plugin/PKGBUILD	Wed Feb 13 05:07:07 2008
@@ -1,21 +1,23 @@
-# $Id: PKGBUILD,v 1.38 2008/02/12 11:17:35 alexander Exp $
+# $Id: PKGBUILD,v 1.39 2008/02/13 10:07:07 alexander Exp $
 # Mantainer: Alexander Baldeck <alexander at archlinux.org>
 pkgname=mplayer-plugin
 pkgver=3.50
-pkgrel=2
+pkgrel=3
 pkgdesc="mplayerplug-in is a browser plugin that uses mplayer to play videos from websites."
 arch=(i686 x86_64)
 license=('GPL')
 url="http://mplayerplug-in.sourceforge.net/"
 depends=('gcc' 'mozilla-common>=1.1-2' 'mplayer' 'libxi' 'libxt' 'libxpm')
-makedepends=('xulrunner>=1.8.1.9-2' 'pkgconfig')
+makedepends=('xulrunner>=1.8.1.11-1' 'pkgconfig')
 backup=(etc/mplayer-plugin.conf)
 install=mplayer-plugin.install
 source=(http://dl.sourceforge.net/sourceforge/mplayerplug-in/mplayerplug-in-${pkgver}.tar.gz
         mplayerplug-in.conf)
 
 build() {
-  [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
+  # temporarily use static paths during the transition to /usr
+  export MOZ_PLUGIN_PATH=/usr/lib/mozilla/plugins
+  
   cd ${startdir}/src/mplayerplug-in
   sed -e 's/mozilla-plugin/xulrunner-plugin/g' \
       -i configure configure.in
@@ -24,10 +26,7 @@
   make LDFLAGS="" || return 1
   mkdir -p $startdir/pkg/${MOZ_PLUGIN_PATH}
   
-  # temporarily use static paths during the transition to /usr
-  #install -m755 mplayerplug-in*so ${startdir}/pkg/${MOZ_PLUGIN_PATH}
-  #install -m755 mplayerplug-in*xpt ${startdir}/pkg/${MOZ_PLUGIN_PATH}
-  mkdir -p ${startdir}/pkg/usr/lib/mozilla/plugins
+  mkdir -p ${startdir}/pkg/usr/${MOZ_PLUGIN_PATH}
   install -m755 mplayerplug-in*so ${startdir}/pkg/${MOZ_PLUGIN_PATH}
   install -m755 mplayerplug-in*xpt ${startdir}/pkg/${MOZ_PLUGIN_PATH}