wok-next rev 20455

Update alsa
author Aleksej Bobylev <al.bobylev@gmail.com>
date Thu Mar 01 20:46:32 2018 +0200 (2018-03-01)
parents dd145c435e4b
children c3a368c0cddb
files alsa-firmware/receipt alsa-lib/receipt alsa-oss/receipt alsa-plugins/receipt alsa-tools/receipt alsa-tools/stuff/applications/echomixer.desktop alsa-tools/stuff/applications/envy24control.desktop alsa-tools/stuff/applications/rmedigicontrol.desktop alsa-tools/stuff/echomixer.desktop alsa-tools/stuff/envy24control.desktop alsa-tools/stuff/rmedigicontrol.desktop alsa-utils/receipt fltk/receipt fltk/stuff/Fl_XFont_On_Demand.patch fltk/stuff/applications/fltk-colbrowser.desktop fltk/stuff/applications/fltk-editor.desktop fltk/stuff/applications/fluid.desktop fltk/stuff/fltk-blocks.desktop fltk/stuff/fltk-checkers.desktop fltk/stuff/fltk-colbrowser.desktop fltk/stuff/fltk-editor.desktop fltk/stuff/fltk-sudoku.desktop fltk/stuff/patches/Fl_XFont_On_Demand.patch fltk/stuff/patches/series libogg/receipt libsamplerate-dev/receipt libsamplerate/receipt speex/receipt speexdsp/receipt
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/alsa-firmware/receipt	Thu Mar 01 20:46:32 2018 +0200
     1.3 @@ -0,0 +1,21 @@
     1.4 +# SliTaz package receipt v2.
     1.5 +
     1.6 +PACKAGE="alsa-firmware"
     1.7 +VERSION="1.0.29"
     1.8 +CATEGORY="multimedia"
     1.9 +SHORT_DESC="Sound cards firmware"
    1.10 +MAINTAINER="al.bobylev@gmail.com"
    1.11 +LICENSE="GPL2"
    1.12 +WEB_SITE="http://www.alsa-project.org/"
    1.13 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/alsa-firmware.html"
    1.14 +
    1.15 +TARBALL="$PACKAGE-$VERSION.tar.bz2"
    1.16 +WGET_URL="ftp://ftp.alsa-project.org/pub/firmware/$TARBALL"
    1.17 +
    1.18 +compile_rules() {
    1.19 +	./configure $CONFIGURE_ARGS && make && make install
    1.20 +}
    1.21 +
    1.22 +genpkg_rules() {
    1.23 +	copy @std
    1.24 +}
     2.1 --- a/alsa-lib/receipt	Wed Feb 28 17:32:31 2018 +0200
     2.2 +++ b/alsa-lib/receipt	Thu Mar 01 20:46:32 2018 +0200
     2.3 @@ -1,37 +1,37 @@
     2.4  # SliTaz package receipt v2.
     2.5  
     2.6  PACKAGE="alsa-lib"
     2.7 -VERSION="1.1.3"
     2.8 +VERSION="1.1.5"
     2.9  CATEGORY="multimedia"
    2.10  SHORT_DESC="ALSA sound libraries"
    2.11  MAINTAINER="pankso@slitaz.org"
    2.12  LICENSE="LGPL2.1"
    2.13  WEB_SITE="http://www.alsa-project.org/"
    2.14 -HOST_ARCH="i486 arm"
    2.15 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/alsa-lib.html"
    2.16  
    2.17  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    2.18  WGET_URL="ftp://ftp.alsa-project.org/pub/lib/$TARBALL"
    2.19  
    2.20  SPLIT="alsa-lib-dev"
    2.21  
    2.22 -# Rules to configure and make the package.
    2.23 -compile_rules()
    2.24 -{
    2.25 +compile_rules() {
    2.26  	./configure \
    2.27  		--disable-python \
    2.28  		$CONFIGURE_ARGS &&
    2.29 -	make && make -j1 install
    2.30 +	make && make -j1 install || return 1
    2.31  
    2.32  	mkdir -p $install/etc
    2.33  	cp $stuff/asound.conf $install/etc
    2.34  }
    2.35  
    2.36 -# Rules to gen a SliTaz package suitable for Tazpkg.
    2.37 -genpkg_rules()
    2.38 -{
    2.39 +genpkg_rules() {
    2.40  	# Enable software mixing for multiple audio streams
    2.41  	case $PACKAGE in
    2.42 -		alsa-lib) copy @std; DEPENDS="linux";;
    2.43 -		*-dev)    copy @dev;;
    2.44 +		alsa-lib)
    2.45 +			copy @std
    2.46 +			CONFIG_FILES="/etc/asound.conf"
    2.47 +			DEPENDS="linux"
    2.48 +			;;
    2.49 +		*-dev) copy @dev;;
    2.50  	esac
    2.51  }
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/alsa-oss/receipt	Thu Mar 01 20:46:32 2018 +0200
     3.3 @@ -0,0 +1,35 @@
     3.4 +# SliTaz package receipt v2.
     3.5 +
     3.6 +PACKAGE="alsa-oss"
     3.7 +VERSION="1.0.28"
     3.8 +CATEGORY="multimedia"
     3.9 +SHORT_DESC="ALSA OSS compatibility library"
    3.10 +MAINTAINER="al.bobylev@gmail.com"
    3.11 +LICENSE="GPL2"
    3.12 +WEB_SITE="http://www.alsa-project.org/"
    3.13 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/alsa-oss.html"
    3.14 +
    3.15 +TARBALL="$PACKAGE-$VERSION.tar.bz2"
    3.16 +WGET_URL="ftp://ftp.alsa-project.org/pub/oss-lib/$TARBALL"
    3.17 +
    3.18 +BUILD_DEPENDS="alsa-lib-dev"
    3.19 +SPLIT="alsa-oss-dev"
    3.20 +
    3.21 +compile_rules() {
    3.22 +	./configure \
    3.23 +		--disable-static \
    3.24 +		$CONFIGURE_ARGS &&
    3.25 +	make && make install
    3.26 +}
    3.27 +
    3.28 +genpkg_rules() {
    3.29 +	case $PACKAGE in
    3.30 +		alsa-oss)
    3.31 +			copy @std
    3.32 +			DEPENDS="alsa-lib"
    3.33 +			;;
    3.34 +		*-dev)
    3.35 +			copy @dev
    3.36 +			;;
    3.37 +	esac
    3.38 +}
     4.1 --- a/alsa-plugins/receipt	Wed Feb 28 17:32:31 2018 +0200
     4.2 +++ b/alsa-plugins/receipt	Thu Mar 01 20:46:32 2018 +0200
     4.3 @@ -1,32 +1,27 @@
     4.4 -# SliTaz package receipt.
     4.5 +# SliTaz package receipt v2.
     4.6  
     4.7  PACKAGE="alsa-plugins"
     4.8 -VERSION="1.0.27"
     4.9 +VERSION="1.1.5"
    4.10  CATEGORY="multimedia"
    4.11 -SHORT_DESC="Alsa sound system additionnal plugins."
    4.12 +SHORT_DESC="ALSA sound system additionnal plugins"
    4.13  MAINTAINER="pankso@slitaz.org"
    4.14  LICENSE="LGPL2.1"
    4.15 +WEB_SITE="http://www.alsa-project.org/"
    4.16 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/alsa-plugins.html"
    4.17 +
    4.18  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    4.19 -WEB_SITE="http://www.alsa-project.org/"
    4.20  WGET_URL="ftp://ftp.alsa-project.org/pub/plugins/$TARBALL"
    4.21  
    4.22 -DEPENDS="alsa-lib libsamplerate speex"
    4.23 -BUILD_DEPENDS="pkg-config alsa-lib-dev libsamplerate-dev speex-dev"
    4.24 +BUILD_DEPENDS="alsa-lib-dev libsamplerate-dev speex-dev"
    4.25  
    4.26 -# Rules to configure and make the package.
    4.27 -compile_rules()
    4.28 -{
    4.29 -	cd $src
    4.30 +compile_rules() {
    4.31  	./configure \
    4.32 -		--prefix=/usr \
    4.33  		$CONFIGURE_ARGS &&
    4.34  	make &&
    4.35 -	make -j1 DESTDIR=$DESTDIR install
    4.36 +	make -j1 install
    4.37  }
    4.38  
    4.39 -# Rules to gen a SliTaz package suitable for Tazpkg.
    4.40 -genpkg_rules()
    4.41 -{
    4.42 -	mkdir -p $fs/usr/lib/alsa-lib
    4.43 -	cp -a $install/usr/lib/alsa-lib/*.so $fs/usr/lib/alsa-lib
    4.44 +genpkg_rules() {
    4.45 +	copy @std
    4.46 +	DEPENDS="alsa-lib libsamplerate speex"
    4.47  }
     5.1 --- a/alsa-tools/receipt	Wed Feb 28 17:32:31 2018 +0200
     5.2 +++ b/alsa-tools/receipt	Thu Mar 01 20:46:32 2018 +0200
     5.3 @@ -1,80 +1,142 @@
     5.4  # SliTaz package receipt v2.
     5.5  
     5.6  PACKAGE="alsa-tools"
     5.7 -VERSION="1.0.26.1"
     5.8 +VERSION="1.1.5"
     5.9  CATEGORY="meta"
    5.10 -SHORT_DESC="Alsa sound system additionnal tools (meta package)."
    5.11 +SHORT_DESC="ALSA sound system advanced tools"
    5.12  MAINTAINER="pankso@slitaz.org"
    5.13  LICENSE="GPL2"
    5.14  WEB_SITE="http://www.alsa-project.org/"
    5.15 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/alsa-tools.html"
    5.16 +
    5.17  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    5.18 -WGET_URL="http://alsa.cybermirror.org/tools/$TARBALL"
    5.19 -GENERIC_MENUS="no"
    5.20 +WGET_URL="ftp://ftp.alsa-project.org/pub/tools/$TARBALL"
    5.21  
    5.22 -# We don't want all card mixer as dep.
    5.23 -DEPENDS="alsa-lib alsa-tools-ac3dec"
    5.24 -BUILD_DEPENDS="alsa-lib-dev gtk+-dev fltk-dev autoconf automake"
    5.25 -SPLIT="alsa-tools-ac3dec alsa-tools-echomixer alsa-tools-envy24control \
    5.26 -alsa-tools-hdsp alsa-tools-hwmixvolume alsa-tools-rmedigicontrol"
    5.27 +BUILD_DEPENDS="alsa-lib-dev gtk+-dev fltk-dev autoconf automake gtk+3-dev"
    5.28 +at='alsa-tools'
    5.29 +# skip qlo10k1: it requre old Qt
    5.30 +# skip hdajacksensetest: sysfs-pin-configs.h: No such file or directory
    5.31 +SPLIT="\
    5.32 +$at-as10k1      $at-echomixer      $at-envy24control $at-hda-verb \
    5.33 +$at-hdajack     $at-hdsp           $at-hwmixvolume   $at-ld10k1 \
    5.34 +$at-ld10k1-dev  $at-mixartloader   $at-pcxhrloader   $at-rmedigicontrol \
    5.35 +$at-sb16_csp    $at-seq            $at-sscape_ctl    $at-us428control \
    5.36 +$at-usx2yloader $at-vxloader"
    5.37 +#COOKOPTS="!menus"
    5.38  
    5.39 -# List of tools we want to build, then splited into individual packages
    5.40 -TOOLS="ac3dec envy24control hwmixvolume hdsploader hdspconf hdspmixer \
    5.41 -rmedigicontrol echomixer"
    5.42 -
    5.43 -# Rules to configure and make the package.
    5.44 -compile_rules()
    5.45 -{
    5.46 -	for tool in $TOOLS; do
    5.47 -		cd $src/$tool
    5.48 -		./configure $CONFIGURE_ARGS
    5.49 -		make && make DESTDIR=$DESTDIR install
    5.50 +compile_rules() {
    5.51 +	fix ld
    5.52 +	for i in *; do
    5.53 +		case $i in
    5.54 +			seq) cd $src/seq/sbiload;;
    5.55 +			*)   cd $src/$i;;
    5.56 +		esac
    5.57 +		./configure $CONFIGURE_ARGS &&
    5.58 +		make &&
    5.59 +		make install
    5.60 +		cp $stuff/*.desktop $install/usr/share/applications/
    5.61  	done
    5.62  }
    5.63  
    5.64 -# Rules to gen a SliTaz package suitable for Tazpkg.
    5.65 -genpkg_rules()
    5.66 -{
    5.67 +genpkg_rules() {
    5.68  	case $PACKAGE in
    5.69 -	alsa-tools-ac3dec)
    5.70 -		CAT="multimedia|A free AC-3 stream decoder."
    5.71 -		DEPENDS="alsa-lib"
    5.72 -		mkdir -p $fs/usr/bin
    5.73 -		cp -a $install/usr/bin/ac3dec $fs/usr/bin
    5.74 -		cp -a $install/usr/bin/extract_ac3 $fs/usr/bin
    5.75 -		;;
    5.76 -	alsa-tools-echomixer)
    5.77 -		CAT="multimedia|Control all the features of any Echoaudio soundcard."
    5.78 -		DEPENDS="alsa-lib gtk+"
    5.79 -		mkdir -p $fs/usr/bin
    5.80 -		cp -a $install/usr/bin/echomixer $fs/usr/bin
    5.81 -		;;
    5.82 -	alsa-tools-envy24control)
    5.83 -		CAT="multimedia|Control tool for Envy24 (ice1712) based soundcards."
    5.84 -		DEPENDS="alsa-lib gtk+"
    5.85 -		mkdir -p $fs/usr/bin
    5.86 -		cp -a $install/usr/bin/envy24control $fs/usr/bin
    5.87 -		;;
    5.88 -	alsa-tools-hdsp)
    5.89 -		CAT="multimedia|RME Hammerfall DSP cards firmware loader, mixer and config tool."
    5.90 -		DEPENDS="alsa-lib fltk"
    5.91 -		mkdir -p $fs/usr/bin $fs/usr/share/applications $fs/usr/share/pixmaps
    5.92 -		cp -a $install/usr/bin/hdsp* $fs/usr/bin
    5.93 -		cp -a $install/usr/share/applications/hdsp*.desktop \
    5.94 -			$fs/usr/share/applications
    5.95 -		cp -a $install/usr/share/pixmaps/hdsp*.png \
    5.96 -			$fs/usr/share/pixmaps
    5.97 -		;;
    5.98 -	alsa-tools-hwmixvolume)
    5.99 -		CAT="multimedia|Control the volume of sound cards using hardware mixing."
   5.100 -		DEPENDS="alsa-lib python pygtk"
   5.101 -		mkdir -p $fs/usr/bin
   5.102 -		cp -a $install/usr/bin/hwmixvolume $fs/usr/bin
   5.103 -		;;
   5.104 -	alsa-tools-rmedigicontrol)
   5.105 -		CAT="multimedia|Control tool for RME Digi32 and RME Digi96 soundcards."
   5.106 -		DEPENDS="alsa-lib gtk+"
   5.107 -		mkdir -p $fs/usr/bin
   5.108 -		cp -a $install/usr/bin/rmedigicontrol $fs/usr/bin
   5.109 -		;;
   5.110 +		alsa-tools)
   5.111 +			COOKOPTS="!menus"
   5.112 +			CAT="meta|meta package"
   5.113 +			DEPENDS="alsa-lib"	# We don't want all card mixer as dep.
   5.114 +			;;
   5.115 +		*-as10k1)
   5.116 +			copy as10k1
   5.117 +			CAT="multimedia|assembler for emu10k1 DSP chip"
   5.118 +			DEPENDS=" "
   5.119 +			;;
   5.120 +		*-echomixer)
   5.121 +			copy echomixer echomixer.desktop
   5.122 +			CAT="multimedia|control all the features of any Echoaudio soundcard"
   5.123 +			DEPENDS="alsa-lib glib gtk+"
   5.124 +			;;
   5.125 +		*-envy24control)
   5.126 +			copy envy24control envy24control.desktop
   5.127 +			CAT="multimedia|control tool for Envy24 (ice1712) based soundcards"
   5.128 +			DEPENDS="alsa-lib glib gtk+"
   5.129 +			;;
   5.130 +		*-hda-verb)
   5.131 +			copy hda-verb
   5.132 +			CAT="multimedia|send a HD-audio command"
   5.133 +			DEPENDS=" "
   5.134 +			;;
   5.135 +		*-hdajack)
   5.136 +			copy hdajackretask hdajacksensetest
   5.137 +			CAT="multimedia|HDA Intel tools"
   5.138 +			DEPENDS="glib gtk+3"
   5.139 +			;;
   5.140 +		*-hdsp)
   5.141 +			copy hdspconf hdspconf.desktop hdspconf.png \
   5.142 +			hdsploader \
   5.143 +			hdspmixer hdspmixer.desktop hdspmixer.png
   5.144 +			CAT="multimedia|RME Hammerfall DSP cards firmware loader, mixer and config tool"
   5.145 +			DEPENDS="alsa-lib fltk"
   5.146 +			;;
   5.147 +		*-hwmixvolume)
   5.148 +			copy hwmixvolume
   5.149 +			CAT="multimedia|control the volume of sound cards using hardware mixing"
   5.150 +			DEPENDS="alsa-lib python pygtk" #?
   5.151 +			;;
   5.152 +		*-ld10k1)
   5.153 +			copy init_audigy init_audigy_eq10 init_live lo10k1 liblo10k1.so* \
   5.154 +			dl10k1 ld10k1 ld10k1d ld10k1/effects/
   5.155 +			CAT="multimedia|emu10k1 (emu10k2) patch loader"
   5.156 +			DEPENDS="alsa-lib"
   5.157 +			;;
   5.158 +		*-ld10k1-dev)
   5.159 +			copy lo10k1/ liblo10k1.la ld10k1.m4
   5.160 +			CAT="development|ld10k1 development files"
   5.161 +			DEPENDS="alsa-tools-ld10k1"
   5.162 +			;;
   5.163 +		*-mixartloader)
   5.164 +			copy mixartloader
   5.165 +			CAT="multimedia|firmware loader for Digigram miXart soundcards"
   5.166 +			DEPENDS="alsa-lib"
   5.167 +			;;
   5.168 +		*-pcxhrloader)
   5.169 +			copy pcxhrloader
   5.170 +			CAT="multimedia|firmware loader for Digigram pcxhr compatible soundards"
   5.171 +			DEPENDS="alsa-lib"
   5.172 +			;;
   5.173 +		*-rmedigicontrol)
   5.174 +			copy rmedigicontrol rmedigicontrol.desktop
   5.175 +			CAT="multimedia|control tool for RME Digi32 and RME Digi96 soundcards"
   5.176 +			DEPENDS="alsa-lib glib gtk+"
   5.177 +			;;
   5.178 +		*-sb16_csp)
   5.179 +			copy cspctl
   5.180 +			CAT="multimedia|Sound Blaster 16 ASP/CSP control program"
   5.181 +			DEPENDS="alsa-lib"
   5.182 +			;;
   5.183 +		*-seq)
   5.184 +			copy sbiload opl3/
   5.185 +			CAT="multimedia|OPL2/3 FM instrument loader"
   5.186 +			DEPENDS="alsa-lib"
   5.187 +			;;
   5.188 +		*-sscape_ctl)
   5.189 +			copy sscape_ctl
   5.190 +			CAT="multimedia|SoundScape control utility"
   5.191 +			DEPENDS="alsa-lib"
   5.192 +			;;
   5.193 +		*-us428control)
   5.194 +			copy us428control
   5.195 +			CAT="multimedia|controller for Tascam US-X2Y"
   5.196 +			DEPENDS="alsa-lib"
   5.197 +			;;
   5.198 +		*-usx2yloader)
   5.199 +			copy usx2yloader /etc/hotplug/usb/
   5.200 +			CAT="multimedia|firmware loader for Tascam USX2Y USB soundcards"
   5.201 +			DEPENDS="alsa-lib"
   5.202 +			;;
   5.203 +		*-vxloader)
   5.204 +			copy vxloader
   5.205 +			CAT="multimedia|firmware loader for Digigram VX soundcards"
   5.206 +			DEPENDS="alsa-lib"
   5.207 +			;;
   5.208  	esac
   5.209  }
     6.1 --- a/alsa-tools/stuff/applications/echomixer.desktop	Wed Feb 28 17:32:31 2018 +0200
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,8 +0,0 @@
     6.4 -[Desktop Entry]
     6.5 -Type=Application
     6.6 -Name=Echomixer
     6.7 -GenericName=Echoaudio soundcard tool
     6.8 -Comment=Mixer and GUI control utility for Echo Digital Audio sound cards
     6.9 -Exec=echomixer
    6.10 -Icon=audio-x-generic
    6.11 -Categories=AudioVideo;Audio;
     7.1 --- a/alsa-tools/stuff/applications/envy24control.desktop	Wed Feb 28 17:32:31 2018 +0200
     7.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.3 @@ -1,8 +0,0 @@
     7.4 -[Desktop Entry]
     7.5 -Type=Application
     7.6 -Name=Envy24 Control
     7.7 -GenericName=Envy24 Control Utility
     7.8 -Comment=Mixer and GUI control utility for Envy24-based sound cards
     7.9 -Exec=envy24control
    7.10 -Icon=audio-x-generic
    7.11 -Categories=AudioVideo;Audio;
     8.1 --- a/alsa-tools/stuff/applications/rmedigicontrol.desktop	Wed Feb 28 17:32:31 2018 +0200
     8.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.3 @@ -1,7 +0,0 @@
     8.4 -[Desktop Entry]
     8.5 -Type=Application
     8.6 -Name=RME Digi Control tool
     8.7 -Comment=Control RME Digi32 and RME Digi96 soundcards
     8.8 -Exec=rmedigicontrol
     8.9 -Icon=audio-x-generic
    8.10 -Categories=AudioVideo;Audio;
     9.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2 +++ b/alsa-tools/stuff/echomixer.desktop	Thu Mar 01 20:46:32 2018 +0200
     9.3 @@ -0,0 +1,8 @@
     9.4 +[Desktop Entry]
     9.5 +Type=Application
     9.6 +Name=Echomixer
     9.7 +GenericName=Echoaudio soundcard tool
     9.8 +Comment=Mixer and GUI control utility for Echo Digital Audio sound cards
     9.9 +Exec=echomixer
    9.10 +Icon=audio-x-generic
    9.11 +Categories=AudioVideo;Audio;
    10.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.2 +++ b/alsa-tools/stuff/envy24control.desktop	Thu Mar 01 20:46:32 2018 +0200
    10.3 @@ -0,0 +1,8 @@
    10.4 +[Desktop Entry]
    10.5 +Type=Application
    10.6 +Name=Envy24 Control
    10.7 +GenericName=Envy24 Control Utility
    10.8 +Comment=Mixer and GUI control utility for Envy24-based sound cards
    10.9 +Exec=envy24control
   10.10 +Icon=audio-x-generic
   10.11 +Categories=AudioVideo;Audio;
    11.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.2 +++ b/alsa-tools/stuff/rmedigicontrol.desktop	Thu Mar 01 20:46:32 2018 +0200
    11.3 @@ -0,0 +1,7 @@
    11.4 +[Desktop Entry]
    11.5 +Type=Application
    11.6 +Name=RME Digi Control tool
    11.7 +Comment=Control RME Digi32 and RME Digi96 soundcards
    11.8 +Exec=rmedigicontrol
    11.9 +Icon=audio-x-generic
   11.10 +Categories=AudioVideo;Audio;
    12.1 --- a/alsa-utils/receipt	Wed Feb 28 17:32:31 2018 +0200
    12.2 +++ b/alsa-utils/receipt	Thu Mar 01 20:46:32 2018 +0200
    12.3 @@ -1,13 +1,12 @@
    12.4  # SliTaz package receipt v2.
    12.5  
    12.6  PACKAGE="alsa-utils"
    12.7 -VERSION="1.1.4"
    12.8 +VERSION="1.1.5"
    12.9  CATEGORY="multimedia"
   12.10  SHORT_DESC="Command line utilities for the ALSA project"
   12.11  MAINTAINER="pankso@slitaz.org"
   12.12  LICENSE="GPL2"
   12.13  WEB_SITE="http://www.alsa-project.org/"
   12.14 -HOST_ARCH="i486 arm"
   12.15  LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/alsa-utils.html"
   12.16  
   12.17  TARBALL="$PACKAGE-$VERSION.tar.bz2"
   12.18 @@ -16,9 +15,7 @@
   12.19  BUILD_DEPENDS="alsa-lib-dev ncurses-dev gettext eudev-dev"
   12.20  SPLIT="alsa-utils-test alsa-info alsa-utils"
   12.21  
   12.22 -# Rules to configure and make the package.
   12.23 -compile_rules()
   12.24 -{
   12.25 +compile_rules() {
   12.26  	./configure \
   12.27  		--disable-alsaconf \
   12.28  		--disable-bat \
   12.29 @@ -30,21 +27,17 @@
   12.30  	# Remove empty dir
   12.31  	rmdir $install/usr/share/man/man7
   12.32  
   12.33 -	appdir=$install/usr/share/applications
   12.34 -	mkdir -p $appdir
   12.35 -	cp $stuff/alsamixer.desktop $appdir
   12.36 +	install -Dm644 $stuff/alsamixer.desktop \
   12.37 +		$install/usr/share/applications/alsamixer.desktop
   12.38  
   12.39  	# Declare asound.state
   12.40  	touch $install/var/lib/alsa/asound.state
   12.41  
   12.42  	# For conf we need /var/tmp
   12.43 -	mkdir -p $install/var/tmp
   12.44 -	chmod 1777 $install/var/tmp
   12.45 +	install -dm1777 $install/var/tmp
   12.46  }
   12.47  
   12.48 -# Rules to gen a SliTaz package suitable for Tazpkg.
   12.49 -genpkg_rules()
   12.50 -{
   12.51 +genpkg_rules() {
   12.52  	case $PACKAGE in
   12.53  		alsa-utils-test)
   12.54  			copy speaker-test speaker-test/ *.wav
   12.55 @@ -57,8 +50,7 @@
   12.56  			DEPENDS="alsa-utils bash dialog ncurses-extra pciutils wget"
   12.57  			;;
   12.58  		alsa-utils)
   12.59 -			copy @std
   12.60 -			remove_already_packed
   12.61 +			copy @std @rm
   12.62  			DEPENDS="alsa-lib ncurses ncurses-libform ncurses-libmenu \
   12.63  			ncurses-libpanel"
   12.64  			CONFIG_FILES="/var/lib/alsa/asound.state"
    13.1 --- a/fltk/receipt	Wed Feb 28 17:32:31 2018 +0200
    13.2 +++ b/fltk/receipt	Thu Mar 01 20:46:32 2018 +0200
    13.3 @@ -1,130 +1,121 @@
    13.4  # SliTaz package receipt v2.
    13.5  
    13.6  PACKAGE="fltk"
    13.7 -VERSION="1.3.3"
    13.8 +VERSION="1.3.4"
    13.9  CATEGORY="system-tools"
   13.10 -SHORT_DESC="Fast Light Tool Kit (provide fluid)."
   13.11 +SHORT_DESC="Fast Light Tool Kit"
   13.12  MAINTAINER="pankso@slitaz.org"
   13.13  LICENSE="LGPL2"
   13.14 +WEB_SITE="http://www.fltk.org/"
   13.15 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/x/fltk.html"
   13.16 +
   13.17  TARBALL="$PACKAGE-$VERSION-source.tar.gz"
   13.18 -WEB_SITE="http://www.fltk.org/"
   13.19  WGET_URL="http://fltk.org/pub/fltk/$VERSION/$TARBALL"
   13.20 -HOST_ARCH="i486 arm"
   13.21  
   13.22 -BUILD_DEPENDS="jpeg-dev libpng16-dev libglu-mesa libglu-mesa-dev mesa mesa-dev \
   13.23 -xorg-libXinerama-dev xorg-libXft-dev \
   13.24 -xorg-libXft fontconfig xorg-libX11-dev xorg-libXinerama \
   13.25 -xorg-libXfixes"
   13.26 -SPLIT="fltk-dev fltk-doc fltk-blocks fltk-checkers fltk-colbrowser fltk-editor \
   13.27 -fltk-sudoku"
   13.28 +BUILD_DEPENDS_arm="jpeg-dev libpng16-dev xorg-libXft-dev"
   13.29 +BUILD_DEPENDS="alsa-lib-dev libjpeg-turbo-dev zlib-dev libpng16-dev \
   13.30 +xorg-libX11-dev xorg-libICE-dev xorg-libSM-dev mesa17-dev xorg-libXinerama-dev \
   13.31 +freetype-dev xorg-libXft-dev xorg-libXcursor-dev xorg-xprop"
   13.32 +SPLIT="fltk-blocks fltk-checkers fltk-sudoku fltk-colbrowser fltk-editor \
   13.33 +fltk-doc fltk fltk-dev"
   13.34 +COOKOPTS="!menus"
   13.35  
   13.36 -# Handle cross compilation.
   13.37 -case "$ARCH" in
   13.38 -	#i?86) 
   13.39 -	#	ARCH_ARGS="--with-archflags=i386" ;;
   13.40 -	arm) 
   13.41 -		BUILD_DEPENDS="jpeg-dev libpng16-dev xorg-libXft-dev" 
   13.42 -		ARCH_ARGS="--x-includes=/cross/$ARCH/sysroot/usr/include \
   13.43 -		--x-libraries=/cross/$ARCH/sysroot/usr/lib" ;;
   13.44 -esac
   13.45 +compile_rules() {
   13.46 +	case "$ARCH" in
   13.47 +		arm) ARCH_ARGS="--x-includes=/cross/$ARCH/sysroot/usr/include \
   13.48 +			--x-libraries=/cross/$ARCH/sysroot/usr/lib";;
   13.49 +		*) ARCH_ARGS='';;
   13.50 +	esac
   13.51  
   13.52 -# Rules to configure and make the package.
   13.53 -compile_rules()
   13.54 -{
   13.55 -	patch -p0 < $stuff/Fl_XFont_On_Demand.patch
   13.56 -	./configure ${ARCH_ARGS} \
   13.57 +	sed -i -e '/cat./d' documentation/Makefile
   13.58 +
   13.59 +	fix ld
   13.60 +	./configure \
   13.61  		--enable-shared \
   13.62  		--enable-xft \
   13.63  		--enable-threads \
   13.64 +		$ARCH_ARGS \
   13.65  		$CONFIGURE_ARGS &&
   13.66 -	make lib $MAKEFLAGS &&
   13.67 -	make DESTDIR=$DESTDIR install &&
   13.68 -	cd test
   13.69 -	[ -x ./blocks ] || make blocks
   13.70 -	[ -x ./checkers ] || make checkers
   13.71 -	rm -f colbrowser
   13.72 -	sed -i s'#"rgb.txt"#"/usr/share/fltk/rgb.txt"#' colbrowser.cxx &&
   13.73 -	make colbrowser
   13.74 -	[ -x ./editor ] || make editor
   13.75 -	[ -x ./sudoku ] || make sudoku
   13.76 +	sed -i 's| -shared | -Wl,-Os,--as-needed\0|g' makeinclude &&
   13.77 +	sed -i s'#"rgb.txt"#"/usr/share/fltk/rgb.txt"#' test/colbrowser.cxx &&
   13.78 +	make $MAKEFLAGS &&
   13.79 +	make DESTDIR=$DESTDIR install || return 1
   13.80 +
   13.81 +	sed -i '/mimelnk/d' fluid/Makefile
   13.82 +	make -C fluid install-linux || return 1
   13.83 +
   13.84 +	make -C test  install-linux || return 1
   13.85 +
   13.86 +	for game in blocks checkers sudoku; do
   13.87 +		for file in \
   13.88 +		/usr/bin/$game \
   13.89 +		/usr/share/icons/hicolor/128x128/apps/$game.png \
   13.90 +		/usr/share/icons/hicolor/32x32/apps/$game.png \
   13.91 +		/usr/share/applications/$game.desktop; do
   13.92 +			mv $install$file $install${file/$game/fltk-$game}
   13.93 +		done
   13.94 +		sed -i 's|Exec=|Exec=fltk-|; s|Icon=|Icon=fltk-|; /TryExec/d' \
   13.95 +			$install/usr/share/applications/fltk-$game.desktop
   13.96 +	done
   13.97 +
   13.98 +	install -m755  $src/test/colbrowser $install/usr/bin/fltk-colbrowser
   13.99 +	install -m755  $src/test/editor     $install/usr/bin/fltk-editor
  13.100 +	install -Dm644 $src/test/rgb.txt    $install/usr/share/fltk/rgb.txt
  13.101  }
  13.102  
  13.103 -# Rules to gen a SliTaz package suitable for Tazpkg.
  13.104 -genpkg_rules()
  13.105 -{
  13.106 +genpkg_rules() {
  13.107  	case $PACKAGE in
  13.108 -	fltk)
  13.109 -		# Handle SliTaz arch
  13.110 -		case "$SLITAZ_ARCH" in
  13.111 -		arm*) DEPENDS="expat fontconfig freetype jpeg libpng16 \
  13.112 -				xorg-libXft" ;;
  13.113 -		*) DEPENDS="expat fontconfig freetype libpng16 jpeg xorg-libX11 \
  13.114 -			xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXft \
  13.115 -			xorg-libXrender zlib gcc-lib-base mesa libglu-mesa"
  13.116 -		esac
  13.117 -		mkdir -p $fs/usr/bin $fs/usr/lib $fs/usr/share/pixmaps
  13.118 -		cp -a $install/usr/bin/fluid $fs/usr/bin
  13.119 -		cp -a $install/usr/lib/*.so* $fs/usr/lib
  13.120 -		cp $src/fluid/icons/fluid-32.png $fs/usr/share/pixmaps/fluid.png
  13.121 -		;;
  13.122 -	fltk-dev)
  13.123 -		CAT="development|Fast Light Tool Kit devel files."
  13.124 -		DEPENDS="fltk xorg-libX11-dev xorg-libXinerama"
  13.125 -		mkdir -p $fs/usr/bin $fs/usr/lib
  13.126 -		cp -a $install/usr/bin/fltk-config $fs/usr/bin
  13.127 -		cp -a $install/usr/lib/*.*a $fs/usr/lib
  13.128 -		cp -a $install/usr/include $fs/usr
  13.129 -		;;
  13.130 -	fltk-doc)
  13.131 -		CAT="development|Fast Light Tool Kit documentation and examples."
  13.132 -		mkdir -p $fs/usr/share
  13.133 -		cp -a $install/usr/share/doc $fs/usr/share
  13.134 -		;;
  13.135 -	fltk-blocks)
  13.136 -		CAT="games|FLTK Blocks game."
  13.137 -		DEPENDS="fltk"
  13.138 -		mkdir -p $fs/usr/games $fs/usr/share/pixmaps \
  13.139 -			$fs/usr/share/applications
  13.140 -		cp -a ${src}/test/blocks $fs/usr/games/$PACKAGE
  13.141 -		cp ${src}/test/desktop/blocks-32.png \
  13.142 -			$fs/usr/share/pixmaps/$PACKAGE.png
  13.143 -		cp $stuff/$PACKAGE.desktop $fs/usr/share/applications
  13.144 -		;;
  13.145 -	fltk-checkers)
  13.146 -		CAT="games|FLTK Checkers game."
  13.147 -		DEPENDS="fltk"
  13.148 -		mkdir -p $fs/usr/games $fs/usr/share/pixmaps \
  13.149 -			$fs/usr/share/applications
  13.150 -		cp -a ${src}/test/checkers $fs/usr/games/$PACKAGE
  13.151 -		cp ${src}/test/desktop/checkers-32.png \
  13.152 -			$fs/usr/share/pixmaps/$PACKAGE.png
  13.153 -		cp $stuff/$PACKAGE.desktop $fs/usr/share/applications
  13.154 -		;;
  13.155 -	fltk-colbrowser)
  13.156 -		CAT="graphics|FLT Color browser."
  13.157 -		DEPENDS="fltk xorg-libXinerama"
  13.158 -		mkdir -p $fs/usr/bin $fs/usr/share/fltk \
  13.159 -			$fs/usr/share/applications
  13.160 -		cp -a ${src}/test/colbrowser ${fs}/usr/bin/$PACKAGE
  13.161 -		cp ${src}/test/rgb.txt ${fs}/usr/share/fltk
  13.162 -		cp $stuff/$PACKAGE.desktop $fs/usr/share/applications
  13.163 -		;;
  13.164 -	fltk-editor)
  13.165 -		CAT="development|Fast Light Tool Kit text editor."
  13.166 -		DEPENDS="fltk"
  13.167 -		mkdir -p $fs/usr/bin $fs/usr/share/applications
  13.168 -		cp -a ${src}/test/editor $fs/usr/bin/$PACKAGE
  13.169 -		cp $stuff/$PACKAGE.desktop $fs/usr/share/applications
  13.170 -		;;
  13.171 -	fltk-sudoku)
  13.172 -		CAT="games|FLTK Sudoku game."
  13.173 -		DEPENDS="fltk"
  13.174 -		mkdir -p $fs/usr/games $fs/usr/share/pixmaps \
  13.175 -			$fs/usr/share/applications
  13.176 -		cp -a ${src}/test/sudoku $fs/usr/games/$PACKAGE
  13.177 -		cp ${src}/test/desktop/sudoku-32.png \
  13.178 -			$fs/usr/share/pixmaps/$PACKAGE.png
  13.179 -		cp $stuff/$PACKAGE.desktop $fs/usr/share/applications
  13.180 -		;;
  13.181 +		fltk-blocks)
  13.182 +			copy $PACKAGE*
  13.183 +			CAT="games|FLTK Blocks game"
  13.184 +			DEPENDS="alsa-lib fontconfig xorg-libX11 xorg-libXcursor \
  13.185 +			xorg-libXext xorg-libXfixes xorg-libXft xorg-libXinerama \
  13.186 +			xorg-libXrender"
  13.187 +			;;
  13.188 +		fltk-checkers)
  13.189 +			copy $PACKAGE*
  13.190 +			CAT="games|FLTK Checkers game"
  13.191 +			DEPENDS="fontconfig xorg-libX11 xorg-libXcursor xorg-libXext \
  13.192 +			xorg-libXfixes xorg-libXft xorg-libXinerama xorg-libXrender"
  13.193 +			;;
  13.194 +		fltk-sudoku)
  13.195 +			copy $PACKAGE*
  13.196 +			CAT="games|FLTK Sudoku game"
  13.197 +			DEPENDS="alsa-lib fontconfig libjpeg-turbo libpng16 xorg-libX11 \
  13.198 +			xorg-libXcursor xorg-libXext xorg-libXfixes xorg-libXft \
  13.199 +			xorg-libXinerama xorg-libXrender"
  13.200 +			;;
  13.201 +		fltk-colbrowser)
  13.202 +			copy $PACKAGE* rgb.txt
  13.203 +			CAT="graphics|FLTK Color browser"
  13.204 +			DEPENDS="fontconfig xorg-libX11 xorg-libXcursor xorg-libXext \
  13.205 +			xorg-libXfixes xorg-libXft xorg-libXinerama xorg-libXrender"
  13.206 +			;;
  13.207 +		fltk-editor)
  13.208 +			copy $PACKAGE*
  13.209 +			CAT="development|FLTK text editor"
  13.210 +			DEPENDS="fontconfig xorg-libX11 xorg-libXcursor xorg-libXext \
  13.211 +			xorg-libXfixes xorg-libXft xorg-libXinerama xorg-libXrender"
  13.212 +			;;
  13.213 +		fltk-doc)
  13.214 +			copy doc/
  13.215 +			CAT="development|FLTK documentation and examples"
  13.216 +			;;
  13.217 +		fltk)
  13.218 +			copy @std @rm
  13.219 +			case "$SLITAZ_ARCH" in
  13.220 +				arm*)
  13.221 +					DEPENDS="expat fontconfig freetype jpeg libpng16 \
  13.222 +					xorg-libXft" ;;
  13.223 +				*)
  13.224 +					DEPENDS="fontconfig libjpeg-turbo libpng16 mesa17 \
  13.225 +					xorg-libX11 xorg-libXcursor xorg-libXext xorg-libXfixes \
  13.226 +					xorg-libXft xorg-libXinerama xorg-libXrender"
  13.227 +			esac
  13.228 +			;;
  13.229 +		fltk-dev)
  13.230 +			copy @dev @rm # remove examples in doc
  13.231 +			DEPENDS="fltk"
  13.232 +			;;
  13.233  	esac
  13.234  }
    14.1 --- a/fltk/stuff/Fl_XFont_On_Demand.patch	Wed Feb 28 17:32:31 2018 +0200
    14.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.3 @@ -1,42 +0,0 @@
    14.4 -Index: src/fl_font.cxx
    14.5 -===================================================================
    14.6 ---- src/fl_font.cxx	(revision 10503)
    14.7 -+++ src/fl_font.cxx	(revision 10504)
    14.8 -@@ -55,6 +55,12 @@
    14.9 - #  include "fl_font_x.cxx"
   14.10 - #endif // WIN32
   14.11 - 
   14.12 -+#if ! (defined(WIN32) || defined(__APPLE__))
   14.13 -+XFontStruct *fl_X_core_font()
   14.14 -+{
   14.15 -+  return fl_xfont.value();
   14.16 -+}
   14.17 -+#endif
   14.18 - 
   14.19 - double fl_width(const char* c) {
   14.20 -   if (c) return fl_width(c, (int) strlen(c));
   14.21 -Index: src/gl_draw.cxx
   14.22 -===================================================================
   14.23 ---- src/gl_draw.cxx	(revision 10503)
   14.24 -+++ src/gl_draw.cxx	(revision 10504)
   14.25 -@@ -81,7 +81,7 @@
   14.26 -  * then sorting through them at draw time (for normal X rendering) to find which one can
   14.27 -  * render the current glyph... But for now, just use the first font in the list for GL...
   14.28 -  */
   14.29 --    XFontStruct *font = fl_xfont;
   14.30 -+    XFontStruct *font = fl_X_core_font();
   14.31 -     int base = font->min_char_or_byte2;
   14.32 -     int count = font->max_char_or_byte2-base+1;
   14.33 -     fl_fontsize->listbase = glGenLists(256);
   14.34 -Index: FL/x.H
   14.35 -===================================================================
   14.36 ---- FL/x.H	(revision 10503)
   14.37 -+++ FL/x.H	(revision 10504)
   14.38 -@@ -132,6 +132,7 @@
   14.39 -   XFontStruct *ptr;
   14.40 - };
   14.41 - extern FL_EXPORT Fl_XFont_On_Demand fl_xfont;
   14.42 -+extern FL_EXPORT XFontStruct* fl_X_core_font();
   14.43 - 
   14.44 - // this object contains all X-specific stuff about a window:
   14.45 - // Warning: this object is highly subject to change!  
    15.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    15.2 +++ b/fltk/stuff/applications/fltk-colbrowser.desktop	Thu Mar 01 20:46:32 2018 +0200
    15.3 @@ -0,0 +1,7 @@
    15.4 +[Desktop Entry]
    15.5 +Name=FLTK Color Browser
    15.6 +Exec=fltk-colbrowser
    15.7 +Icon=gcolor2
    15.8 +Terminal=false
    15.9 +Type=Application
   15.10 +Categories=Graphics;
    16.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    16.2 +++ b/fltk/stuff/applications/fltk-editor.desktop	Thu Mar 01 20:46:32 2018 +0200
    16.3 @@ -0,0 +1,7 @@
    16.4 +[Desktop Entry]
    16.5 +Name=FLTK Text Editor
    16.6 +Exec=fltk-editor
    16.7 +Icon=text-editor
    16.8 +Terminal=false
    16.9 +Type=Application
   16.10 +Categories=Utility;
    17.1 --- a/fltk/stuff/applications/fluid.desktop	Wed Feb 28 17:32:31 2018 +0200
    17.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    17.3 @@ -1,6 +0,0 @@
    17.4 -[Desktop Entry]
    17.5 -Name=Fluid FLTK designer
    17.6 -Exec=fluid
    17.7 -Icon=fluid
    17.8 -Type=Application
    17.9 -Categories=Development;
    18.1 --- a/fltk/stuff/fltk-blocks.desktop	Wed Feb 28 17:32:31 2018 +0200
    18.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    18.3 @@ -1,7 +0,0 @@
    18.4 -[Desktop Entry]
    18.5 -Name=Block Attack!
    18.6 -Exec=fltk-blocks
    18.7 -Icon=fltk-blocks
    18.8 -Terminal=false
    18.9 -Type=Application
   18.10 -Categories=Game;BoardGame;
    19.1 --- a/fltk/stuff/fltk-checkers.desktop	Wed Feb 28 17:32:31 2018 +0200
    19.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    19.3 @@ -1,7 +0,0 @@
    19.4 -[Desktop Entry]
    19.5 -Name=Checkers Game
    19.6 -Exec=fltk-checkers
    19.7 -Icon=fltk-checkers
    19.8 -Terminal=false
    19.9 -Type=Application
   19.10 -Categories=Game;BoardGame;
    20.1 --- a/fltk/stuff/fltk-colbrowser.desktop	Wed Feb 28 17:32:31 2018 +0200
    20.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    20.3 @@ -1,7 +0,0 @@
    20.4 -[Desktop Entry]
    20.5 -Name=FLTK Color Browser
    20.6 -Exec=fltk-colbrowser
    20.7 -Icon=gcolor2
    20.8 -Terminal=false
    20.9 -Type=Application
   20.10 -Categories=Graphics;
    21.1 --- a/fltk/stuff/fltk-editor.desktop	Wed Feb 28 17:32:31 2018 +0200
    21.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    21.3 @@ -1,7 +0,0 @@
    21.4 -[Desktop Entry]
    21.5 -Name=FLTK Text Editor
    21.6 -Exec=fltk-editor
    21.7 -Icon=text-editor
    21.8 -Terminal=false
    21.9 -Type=Application
   21.10 -Categories=Utility;
    22.1 --- a/fltk/stuff/fltk-sudoku.desktop	Wed Feb 28 17:32:31 2018 +0200
    22.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    22.3 @@ -1,7 +0,0 @@
    22.4 -[Desktop Entry]
    22.5 -Name=FLTK Sudoku
    22.6 -Exec=fltk-sudoku
    22.7 -Icon=fltk-sudoku
    22.8 -Terminal=false
    22.9 -Type=Application
   22.10 -Categories=Game;LogicGame;
    23.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    23.2 +++ b/fltk/stuff/patches/Fl_XFont_On_Demand.patch	Thu Mar 01 20:46:32 2018 +0200
    23.3 @@ -0,0 +1,42 @@
    23.4 +Index: src/fl_font.cxx
    23.5 +===================================================================
    23.6 +--- src/fl_font.cxx	(revision 10503)
    23.7 ++++ src/fl_font.cxx	(revision 10504)
    23.8 +@@ -55,6 +55,12 @@
    23.9 + #  include "fl_font_x.cxx"
   23.10 + #endif // WIN32
   23.11 + 
   23.12 ++#if ! (defined(WIN32) || defined(__APPLE__))
   23.13 ++XFontStruct *fl_X_core_font()
   23.14 ++{
   23.15 ++  return fl_xfont.value();
   23.16 ++}
   23.17 ++#endif
   23.18 + 
   23.19 + double fl_width(const char* c) {
   23.20 +   if (c) return fl_width(c, (int) strlen(c));
   23.21 +Index: src/gl_draw.cxx
   23.22 +===================================================================
   23.23 +--- src/gl_draw.cxx	(revision 10503)
   23.24 ++++ src/gl_draw.cxx	(revision 10504)
   23.25 +@@ -81,7 +81,7 @@
   23.26 +  * then sorting through them at draw time (for normal X rendering) to find which one can
   23.27 +  * render the current glyph... But for now, just use the first font in the list for GL...
   23.28 +  */
   23.29 +-    XFontStruct *font = fl_xfont;
   23.30 ++    XFontStruct *font = fl_X_core_font();
   23.31 +     int base = font->min_char_or_byte2;
   23.32 +     int count = font->max_char_or_byte2-base+1;
   23.33 +     fl_fontsize->listbase = glGenLists(256);
   23.34 +Index: FL/x.H
   23.35 +===================================================================
   23.36 +--- FL/x.H	(revision 10503)
   23.37 ++++ FL/x.H	(revision 10504)
   23.38 +@@ -132,6 +132,7 @@
   23.39 +   XFontStruct *ptr;
   23.40 + };
   23.41 + extern FL_EXPORT Fl_XFont_On_Demand fl_xfont;
   23.42 ++extern FL_EXPORT XFontStruct* fl_X_core_font();
   23.43 + 
   23.44 + // this object contains all X-specific stuff about a window:
   23.45 + // Warning: this object is highly subject to change!  
    24.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    24.2 +++ b/fltk/stuff/patches/series	Thu Mar 01 20:46:32 2018 +0200
    24.3 @@ -0,0 +1,1 @@
    24.4 +# -p0|Fl_XFont_On_Demand.patch
    25.1 --- a/libogg/receipt	Wed Feb 28 17:32:31 2018 +0200
    25.2 +++ b/libogg/receipt	Thu Mar 01 20:46:32 2018 +0200
    25.3 @@ -7,26 +7,20 @@
    25.4  MAINTAINER="pankso@slitaz.org"
    25.5  LICENSE="BSD"
    25.6  WEB_SITE="http://www.xiph.org/"
    25.7 -HOST_ARCH="i486 arm"
    25.8 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/libogg.html"
    25.9  
   25.10  TARBALL="$PACKAGE-$VERSION.tar.xz"
   25.11  WGET_URL="http://downloads.xiph.org/releases/ogg/$TARBALL"
   25.12  
   25.13  SPLIT="libogg-dev"
   25.14  
   25.15 -# Rules to configure and make the package.
   25.16 -compile_rules()
   25.17 -{
   25.18 -	./configure \
   25.19 -		--docdir=/usr/share/doc/libogg-$VERSION \
   25.20 -		$CONFIGURE_ARGS &&
   25.21 +compile_rules() {
   25.22 +	./configure $CONFIGURE_ARGS &&
   25.23  	make &&
   25.24 -	make -j1 DESTDIR=$DESTDIR install
   25.25 +	make -j1 install
   25.26  }
   25.27  
   25.28 -# Rules to gen a SliTaz package suitable for Tazpkg.
   25.29 -genpkg_rules()
   25.30 -{
   25.31 +genpkg_rules() {
   25.32  	case $PACKAGE in
   25.33  		libogg) copy @std;;
   25.34  		*-dev)  copy @dev;;
    26.1 --- a/libsamplerate-dev/receipt	Wed Feb 28 17:32:31 2018 +0200
    26.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    26.3 @@ -1,23 +0,0 @@
    26.4 -# SliTaz package receipt.
    26.5 -
    26.6 -PACKAGE="libsamplerate-dev"
    26.7 -VERSION="0.1.8"
    26.8 -CATEGORY="development"
    26.9 -SHORT_DESC="Devel files from the Sample Rate Converter for audio."
   26.10 -MAINTAINER="pankso@slitaz.org"
   26.11 -LICENSE="GPL2"
   26.12 -WANTED="libsamplerate"
   26.13 -WEB_SITE="http://www.mega-nerd.com/SRC/"
   26.14 -HOST_ARCH="i486 arm"
   26.15 -
   26.16 -DEPENDS="libsamplerate"
   26.17 -
   26.18 -# Rules to gen a SliTaz package suitable for Tazpkg.
   26.19 -genpkg_rules()
   26.20 -{
   26.21 -	mkdir -p $fs/usr/lib
   26.22 -	cp -a $install/usr/include $fs/usr
   26.23 -	cp -a $install/usr/lib/*.*a $fs/usr/lib
   26.24 -	cp -a $install/usr/lib/pkgconfig $fs/usr/lib 
   26.25 -}
   26.26 -
    27.1 --- a/libsamplerate/receipt	Wed Feb 28 17:32:31 2018 +0200
    27.2 +++ b/libsamplerate/receipt	Thu Mar 01 20:46:32 2018 +0200
    27.3 @@ -1,35 +1,29 @@
    27.4 -# SliTaz package receipt.
    27.5 +# SliTaz package receipt v2.
    27.6  
    27.7  PACKAGE="libsamplerate"
    27.8 -VERSION="0.1.8"
    27.9 +VERSION="0.1.9"
   27.10  CATEGORY="multimedia"
   27.11 -SHORT_DESC="Sample Rate Converter for audio."
   27.12 +SHORT_DESC="Sample Rate Converter for audio"
   27.13  MAINTAINER="pankso@slitaz.org"
   27.14  LICENSE="GPL2"
   27.15 +WEB_SITE="http://www.mega-nerd.com/SRC/"
   27.16 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/libsamplerate.html"
   27.17 +
   27.18  TARBALL="$PACKAGE-$VERSION.tar.gz"
   27.19 -WEB_SITE="http://www.mega-nerd.com/SRC/"
   27.20  WGET_URL="http://www.mega-nerd.com/SRC/$TARBALL"
   27.21 -HOST_ARCH="i486 arm"
   27.22  
   27.23 -DEPENDS=""
   27.24 +SPLIT="libsamplerate-dev"
   27.25  
   27.26 -# Rules to configure and make the package.
   27.27 -compile_rules()
   27.28 -{
   27.29 -	cd $src
   27.30 +compile_rules() {
   27.31  	./configure \
   27.32 -		--prefix=/usr \
   27.33 -		--mandir=/usr/share/man \
   27.34 +		--disable-static \
   27.35  		$CONFIGURE_ARGS &&
   27.36 -	make &&
   27.37 -	make DESTDIR=$DESTDIR install
   27.38 +	make && make install
   27.39  }
   27.40  
   27.41 -# Rules to gen a SliTaz package suitable for Tazpkg.
   27.42 -genpkg_rules()
   27.43 -{
   27.44 -	mkdir -p $fs/usr/lib
   27.45 -	cp -a $install/usr/bin $fs/usr
   27.46 -	cp -a $install/usr/lib/*.so* $fs/usr/lib 
   27.47 +genpkg_rules() {
   27.48 +	case $PACKAGE in
   27.49 +		libsamplerate) copy @std;;
   27.50 +		*-dev)         copy @dev;;
   27.51 +	esac
   27.52  }
   27.53 -
    28.1 --- a/speex/receipt	Wed Feb 28 17:32:31 2018 +0200
    28.2 +++ b/speex/receipt	Thu Mar 01 20:46:32 2018 +0200
    28.3 @@ -8,7 +8,6 @@
    28.4  LICENSE="BSD"
    28.5  WEB_SITE="https://www.speex.org/"
    28.6  LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/speex.html"
    28.7 -HOST_ARCH="i486 arm"
    28.8  
    28.9  TARBALL="$PACKAGE-$VERSION.tar.gz"
   28.10  WGET_URL="https://downloads.xiph.org/releases/speex/$TARBALL"
   28.11 @@ -19,7 +18,6 @@
   28.12  compile_rules() {
   28.13  	./configure \
   28.14  		--disable-static \
   28.15 -		--docdir=/usr/share/doc/$PACKAGE-$VERSION \
   28.16  		\
   28.17  		--enable-binaries \
   28.18  		$CONFIGURE_ARGS &&
    29.1 --- a/speexdsp/receipt	Wed Feb 28 17:32:31 2018 +0200
    29.2 +++ b/speexdsp/receipt	Thu Mar 01 20:46:32 2018 +0200
    29.3 @@ -8,7 +8,6 @@
    29.4  LICENSE="BSD"
    29.5  WEB_SITE="https://www.speex.org/"
    29.6  LFS="http://www.linuxfromscratch.org/blfs/view/stable/multimedia/speex.html"
    29.7 -HOST_ARCH="i486 arm"
    29.8  
    29.9  TARBALL="$PACKAGE-$VERSION.tar.gz"
   29.10  WGET_URL="https://downloads.xiph.org/releases/speex/$TARBALL"
   29.11 @@ -18,7 +17,6 @@
   29.12  compile_rules() {
   29.13  	./configure \
   29.14  		--disable-static \
   29.15 -		--docdir=/usr/share/doc/$PACKAGE-$VERSION \
   29.16  		$CONFIGURE_ARGS &&
   29.17  	make &&
   29.18  	make install