# HG changeset patch
# User Xander Ziiryanoff <psychomaniak@xakep.ru>
# Date 1453720681 -3600
# Node ID 0c85739e5ac32d6963b6d19748d96132a89b9542
# Parent  f6ecd4224bf81a84ac9f9a007149040f3fd2996e
Restore "apulse" &&  Workaround in "nvidia*" for "find-depends"

diff -r f6ecd4224bf8 -r 0c85739e5ac3 apulse/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/apulse/receipt	Mon Jan 25 12:18:01 2016 +0100
@@ -0,0 +1,29 @@
+# SliTaz package receipt.
+
+PACKAGE="apulse"
+VERSION="0.1.5"
+CATEGORY="multimedia"
+SHORT_DESC="PulseAudio emulator for Alsa"
+MAINTAINER="psychomaniak@xakep.ru"
+LICENSE="MIT"
+WEB_SITE="https://github.com/i-rinat/apulse"
+TARBALL="v$VERSION.tar.gz"
+WGET_URL="$WEB_SITE/archive/$TARBALL"
+SUGGESTED="skype"
+
+DEPENDS="pcre alsa-lib glib"
+BUILD_DEPENDS="cmake wget alsa-lib-dev glib-dev"
+
+# Rules to configure and make the package.
+compile_rules()
+{
+        mv  $src/* ../
+        cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
+        make && make install
+}
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+        cp -a $install/* $fs
+}
diff -r f6ecd4224bf8 -r 0c85739e5ac3 get-skype/stuff/get-skype
--- a/get-skype/stuff/get-skype	Sun Jan 24 17:48:50 2016 +0100
+++ b/get-skype/stuff/get-skype	Mon Jan 25 12:18:01 2016 +0100
@@ -45,14 +45,19 @@
 mkdir -p skype-$VERSION/fs/usr/share/skype skype-$VERSION/fs/usr/bin
 mkdir -p skype-$VERSION/fs/etc skype-$VERSION/fs/usr/share/applications
 mkdir -p skype-$VERSION/fs/usr/share/pixmaps
-mkdir -p skype-$VERSION/fs/usr/share/skype
+mkdir -p skype-$VERSION/fs/usr/share/skype/lang
 mv LICENSE README skype-$VERSION/fs/usr/share/skype
+mv lang/*_ru.* skype-$VERSION/fs/usr/share/skype/lang
 mv skype skype-$VERSION/fs/usr/bin
 mv icons skype-$VERSION/fs/usr/share/skype
 mv avatars skype-$VERSION/fs/usr/share/skype
 mv sounds skype-$VERSION/fs/usr/share/skype
 mv skype.conf skype-$VERSION/fs/etc
 mv skype.desktop skype-$VERSION/fs/usr/share/applications
+cp skype.desktop skype-$VERSION/fs/usr/share/applications/skype.desktop
+mv skype.desktop skype-$VERSION/fs/usr/share/applications/skype-pulse.desktop
+sed 's|Exec=|TryExec=apulse\nExec=apulse |' -i skype-$VERSION/fs/usr/share/applications/skype.desktop
+sed 's|Name=Skype|Name=Skype (PulseAudio)\nTryExec=pulseaudio|' -i skype-$VERSION/fs/usr/share/applications/skype-pulse.desktop
 cd skype-$VERSION/fs/usr/share/pixmaps/
 ln -s ../skype/icons/SkypeBlue_16x16.png skype.png ; cd -
 
@@ -66,7 +71,7 @@
 WEB_SITE="$WEB_SITE"
 DEPENDS="libsigc++ xorg-libXv xorg-libXss libv4l bzip2 tiff \
 qt4-phonon libQtDBus libQtWebkit libQtGui libQtXml libQtCore \
-gst-plugins-base"
+gst-plugins-base apulse"
 CONFIG_FILES="/etc/skype.conf"
 
 post_install()
diff -r f6ecd4224bf8 -r 0c85739e5ac3 nvidia-173xx/receipt
--- a/nvidia-173xx/receipt	Sun Jan 24 17:48:50 2016 +0100
+++ b/nvidia-173xx/receipt	Mon Jan 25 12:18:01 2016 +0100
@@ -12,7 +12,7 @@
 WGET_URL="http://download.nvidia.com/XFree86/Linux-x86/$VERSION/$TARBALL"
 RUN_OPTS="--extract-only"
 TAGS="driver graphic video"
-PROVIDE="nvidia"
+PROVIDE="nvidia mesa"
 
 DEPENDS="linux xorg-server gtk+ cairo linux-agp xorg-libXv"
 BUILD_DEPENDS="linux-module-headers coreutils-file-summarize xz"
@@ -61,6 +61,10 @@
 	ln -s libcuda.so.$VERSION $fs/usr/lib/libcuda.so.1
 	ln -s libGL.so.$VERSION $fs/usr/lib/libGL.so
 	ln -s libGL.so.$VERSION $fs/usr/lib/libGL.so.1
+	# exclude from files.list (for tazpkg's "find-depends")
+        cd $fs/usr/lib
+        for i in $(ls libGL.so*) ; do mv -f $i ${i//./-.-} ; done
+
 	ln -s libGLcore.so.$VERSION $fs/usr/lib/libGLcore.so.1
 	ln -s libnvidia-cfg.so.$VERSION $fs/usr/lib/libnvidia-cfg.so
 	ln -s libnvidia-cfg.so.$VERSION $fs/usr/lib/libnvidia-cfg.so.1
@@ -85,6 +89,10 @@
 
 post_install()
 {
+	# Restore excluded from files.list (for tazpkg's "find-depends")
+        cd $1/usr/lib
+	for i in $(ls libGL.so*) ; do mv -f $i ${i//-.-/.} ; done
+
 	chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz
 
 	# correct .desktop file file
diff -r f6ecd4224bf8 -r 0c85739e5ac3 nvidia-96xx/receipt
--- a/nvidia-96xx/receipt	Sun Jan 24 17:48:50 2016 +0100
+++ b/nvidia-96xx/receipt	Mon Jan 25 12:18:01 2016 +0100
@@ -12,6 +12,7 @@
 WGET_URL="http://download.nvidia.com/XFree86/Linux-x86/$VERSION/$TARBALL"
 RUN_OPTS="--extract-only"
 TAGS="drivers graphic video"
+PROVIDE="mesa"
 
 DEPENDS="linux xorg-server gtk+ cairo linux-agp linux-drm"
 BUILD_DEPENDS="linux-module-headers coreutils-file-summarize xz"
@@ -57,6 +58,10 @@
 		ln -s $(basename $i) $(dirname $i)/$(basename ${i/so.${VERSION}/so/})
 		ln -s $(basename $i) $(dirname $i)/$(basename ${i/so.${VERSION}/so.1/})
 	done
+	
+	# exclude from files.list (for tazpkg's "find-depends")
+	cd $fs/usr/lib
+	for i in $(ls libGL.so*) ; do mv -f $i ${i//./-.-} ; done
 }
 
 pre_install()
@@ -69,6 +74,10 @@
 
 post_install()
 {
+	# Restore excluded from files.list (for tazpkg's "find-depends")
+	cd $1/usr/lib
+	for i in $(ls libGL.so*) ; do mv -f $i ${i//-.-/.} ; done
+
 	newline
 	chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz