# HG changeset patch # User Pascal Bellard # Date 1380467137 0 # Node ID 531807aaf860ebb88fc3726fb6b3c9caab72add1 # Parent 6b9be42540238f424dbe9d8baca991fcfe8373d2 mplayerplug-in, gecko-mediaplayer: add -I/usr/include/nspr diff -r 6b9be4254023 -r 531807aaf860 cups/stuff/etc/init.d/cupsd --- a/cups/stuff/etc/init.d/cupsd Sun Sep 29 11:40:18 2013 +0000 +++ b/cups/stuff/etc/init.d/cupsd Sun Sep 29 15:05:37 2013 +0000 @@ -18,6 +18,7 @@ stop) echo -n "Stopping $DESC: $NAME... " kill $(pgrep -f cupsd) + sleep 2 rm -f $PIDFILE status ;; diff -r 6b9be4254023 -r 531807aaf860 gecko-mediaplayer/receipt --- a/gecko-mediaplayer/receipt Sun Sep 29 11:40:18 2013 +0000 +++ b/gecko-mediaplayer/receipt Sun Sep 29 15:05:37 2013 +0000 @@ -26,9 +26,10 @@ --sysconfdir=/etc \ --disable-schemas-install \ --without-gconf \ + CPPFLAGS="-I/usr/include/nspr" \ $CONFIGURE_ARGS && make && - make DESTDIR=$DESTIDR install + make DESTDIR=$DESTDIR install } diff -r 6b9be4254023 -r 531807aaf860 mplayerplug-in/receipt --- a/mplayerplug-in/receipt Sun Sep 29 11:40:18 2013 +0000 +++ b/mplayerplug-in/receipt Sun Sep 29 15:05:37 2013 +0000 @@ -5,13 +5,15 @@ CATEGORY="multimedia" SHORT_DESC="a browser plugin that uses mplayer to play videos from websites" MAINTAINER="jozee@slitaz.org" -DEPENDS="mplayer xorg-libXpm gtk+ gcc-lib-base" -BUILD_DEPENDS="mplayer gtk+-dev xorg-libXpm-dev firefox-dev libIDL gettext" +LICENSE="GPL" TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://mplayerplug-in.sourceforge.net/" WGET_URL="http://downloads.sourceforge.net/mplayerplug-in/$TARBALL" TAGS="player audio video browser" +DEPENDS="mplayer xorg-libXpm gtk+ gcc-lib-base" +BUILD_DEPENDS="mplayer gtk+-dev xorg-libXpm-dev firefox-dev libIDL gettext" + get_firefox_version() { FIREFOX_VER=`cat $1/var/lib/tazpkg/installed/firefox/receipt | \ @@ -47,6 +49,7 @@ --enable-qt \ --enable-rm \ --enable-dvx \ + CFLAGS="$CFLAGS -I/usr/include/nspr" \ GECKO_XPIDL="$stuff/xpidl" \ MOZILLA_HOME="/usr/lib/firefox-$FIREFOX_VER" \ GECKO_IDLDIR="/usr/share/idl/firefox-$FIREFOX_VER" && @@ -57,8 +60,8 @@ genpkg_rules() { mkdir -p $fs/usr/lib - cp -a $_pkg/etc $fs - cp -a $_pkg/usr/lib/mozilla $fs/usr/lib + cp -a $install/etc $fs + cp -a $install/usr/lib/mozilla $fs/usr/lib # change the default video output to xv,x11 sed -i "s/#vo=xv,x11/vo=xv,x11/" $fs/etc/$PACKAGE.conf