wok-next rev 15342

mplayerplug-in, gecko-mediaplayer: add -I/usr/include/nspr
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Sep 29 15:05:37 2013 +0000 (2013-09-29)
parents 6b9be4254023
children 6851dbe3b197
files cups/stuff/etc/init.d/cupsd gecko-mediaplayer/receipt mplayerplug-in/receipt
line diff
     1.1 --- a/cups/stuff/etc/init.d/cupsd	Sun Sep 29 11:40:18 2013 +0000
     1.2 +++ b/cups/stuff/etc/init.d/cupsd	Sun Sep 29 15:05:37 2013 +0000
     1.3 @@ -18,6 +18,7 @@
     1.4  	stop)
     1.5  		echo -n "Stopping $DESC: $NAME... "
     1.6  		kill $(pgrep -f cupsd)
     1.7 +		sleep 2
     1.8  		rm -f $PIDFILE
     1.9  		status
    1.10  		;;
     2.1 --- a/gecko-mediaplayer/receipt	Sun Sep 29 11:40:18 2013 +0000
     2.2 +++ b/gecko-mediaplayer/receipt	Sun Sep 29 15:05:37 2013 +0000
     2.3 @@ -26,9 +26,10 @@
     2.4  		--sysconfdir=/etc \
     2.5  		--disable-schemas-install \
     2.6  		--without-gconf \
     2.7 +		CPPFLAGS="-I/usr/include/nspr" \
     2.8  		$CONFIGURE_ARGS &&
     2.9  	make  &&
    2.10 -	make DESTDIR=$DESTIDR install
    2.11 +	make DESTDIR=$DESTDIR install
    2.12  	
    2.13  }
    2.14  
     3.1 --- a/mplayerplug-in/receipt	Sun Sep 29 11:40:18 2013 +0000
     3.2 +++ b/mplayerplug-in/receipt	Sun Sep 29 15:05:37 2013 +0000
     3.3 @@ -5,13 +5,15 @@
     3.4  CATEGORY="multimedia"
     3.5  SHORT_DESC="a browser plugin that uses mplayer to play videos from websites"
     3.6  MAINTAINER="jozee@slitaz.org"
     3.7 -DEPENDS="mplayer xorg-libXpm gtk+ gcc-lib-base"
     3.8 -BUILD_DEPENDS="mplayer gtk+-dev xorg-libXpm-dev firefox-dev libIDL gettext"
     3.9 +LICENSE="GPL"
    3.10  TARBALL="$PACKAGE-$VERSION.tar.gz"
    3.11  WEB_SITE="http://mplayerplug-in.sourceforge.net/" 
    3.12  WGET_URL="http://downloads.sourceforge.net/mplayerplug-in/$TARBALL"
    3.13  TAGS="player audio video browser"
    3.14  
    3.15 +DEPENDS="mplayer xorg-libXpm gtk+ gcc-lib-base"
    3.16 +BUILD_DEPENDS="mplayer gtk+-dev xorg-libXpm-dev firefox-dev libIDL gettext"
    3.17 +
    3.18  get_firefox_version()
    3.19  {
    3.20  	FIREFOX_VER=`cat $1/var/lib/tazpkg/installed/firefox/receipt | \
    3.21 @@ -47,6 +49,7 @@
    3.22  		--enable-qt \
    3.23  		--enable-rm \
    3.24  		--enable-dvx \
    3.25 +		CFLAGS="$CFLAGS -I/usr/include/nspr" \
    3.26  		GECKO_XPIDL="$stuff/xpidl" \
    3.27  		MOZILLA_HOME="/usr/lib/firefox-$FIREFOX_VER" \
    3.28  		GECKO_IDLDIR="/usr/share/idl/firefox-$FIREFOX_VER" &&
    3.29 @@ -57,8 +60,8 @@
    3.30  genpkg_rules()
    3.31  {
    3.32  	mkdir -p $fs/usr/lib
    3.33 -	cp -a $_pkg/etc $fs
    3.34 -	cp -a $_pkg/usr/lib/mozilla $fs/usr/lib		
    3.35 +	cp -a $install/etc $fs
    3.36 +	cp -a $install/usr/lib/mozilla $fs/usr/lib		
    3.37  	# change the default video output to xv,x11
    3.38  	sed -i "s/#vo=xv,x11/vo=xv,x11/" $fs/etc/$PACKAGE.conf
    3.39