wok-undigest rev 1085
Moved from wok: php-cups fotoxx printoxx gtkaml v4l-dvb
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Thu Dec 26 14:11:02 2013 +0000 (2013-12-26) |
| parents | ccac84247b74 |
| children | 11ecbb12d022 |
| files | fotoxx/receipt fotoxx/stuff/fotoxx.desktop gtkaml/receipt php-cups/receipt printoxx/receipt printoxx/stuff/printoxx.desktop v4l-dvb/receipt v4l-dvb/stuff/414e0bbd99bf v4l-dvb/stuff/d0a2ff731670 v4l-dvb/stuff/d64b014c5253 |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/fotoxx/receipt Thu Dec 26 14:11:02 2013 +0000 1.3 @@ -0,0 +1,34 @@ 1.4 +# SliTaz package receipt. 1.5 + 1.6 +PACKAGE="fotoxx" 1.7 +VERSION="11.05.2" 1.8 +CATEGORY="graphics" 1.9 +SHORT_DESC="lightweight image editor" 1.10 +MAINTAINER="gokhlayeh@slitaz.org" 1.11 +LICENSE="GPL3" 1.12 +SUGGESTED="exiftool ufraw printoxx" 1.13 +TARBALL="$PACKAGE-$VERSION.tar.gz" 1.14 +WEB_SITE="http://kornelix.squarespace.com/fotoxx" 1.15 +WGET_URL="http://kornelix.squarespace.com/storage/downloads/$TARBALL" 1.16 +TAGS="image editor photo jpeg jpg bmp png gif" 1.17 + 1.18 +DEPENDS="gtk+" 1.19 +BUILD_DEPENDS="exiftool gtk+-dev freeimage freeimage-dev xdg-utils" 1.20 + 1.21 +# Rules to configure and make the package. 1.22 +compile_rules() 1.23 +{ 1.24 + cd $src 1.25 + export PREFIX=/usr make 1.26 + make DESTDIR=$DESTDIR install 1.27 +} 1.28 + 1.29 +# Rules to gen a SliTaz package suitable for Tazpkg. 1.30 +genpkg_rules() 1.31 +{ 1.32 + mkdir -p $fs/usr/bin $fs/usr/share/$PACKAGE 1.33 + cp -a $install/usr/bin $fs/usr 1.34 + cp -a $install/usr/share/$PACKAGE/icons $fs/usr/share/$PACKAGE 1.35 + #non-standard locale path 1.36 + cp -a $install/usr/share/$PACKAGE/locales $fs/usr/share/$PACKAGE 1.37 +}
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/fotoxx/stuff/fotoxx.desktop Thu Dec 26 14:11:02 2013 +0000 2.3 @@ -0,0 +1,10 @@ 2.4 +[Desktop Entry] 2.5 +Name=Fotoxx Editor 2.6 +Comment=A fast GTK+ Image Editor 2.7 +Exec=fotoxx %f 2.8 +Terminal=false 2.9 +Type=Application 2.10 +Icon=fotoxx 2.11 +Categories=GTK;Graphics;2DGraphics;Viewer; 2.12 +MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/png;image/tiff 2.13 +
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/gtkaml/receipt Thu Dec 26 14:11:02 2013 +0000 3.3 @@ -0,0 +1,29 @@ 3.4 +# SliTaz package receipt. 3.5 + 3.6 +PACKAGE="gtkaml" 3.7 +VERSION="0.4.2" 3.8 +CATEGORY="development" 3.9 +SHORT_DESC="Markup language based on Vala to create Gtk+ apps in XML" 3.10 +MAINTAINER="pankso@slitaz.org" 3.11 +LICENSE="LGPL2.1" 3.12 +TARBALL="$PACKAGE-$VERSION.tar.bz2" 3.13 +WEB_SITE="http://code.google.com/p/gtkaml/" 3.14 +WGET_URL="http://gtkaml.googlecode.com/files/$TARBALL" 3.15 + 3.16 +DEPENDS="gtk+ libxml2" 3.17 +BUILD_DEPENDS="gtk+-dev libxml2-dev vala" 3.18 + 3.19 +# Rules to configure and make the package. 3.20 +compile_rules() 3.21 +{ 3.22 + cd $src 3.23 + ./configure && make && make install 3.24 +} 3.25 + 3.26 +# Rules to gen a SliTaz package suitable for Tazpkg. 3.27 +genpkg_rules() 3.28 +{ 3.29 + mkdir -p $fs/usr 3.30 + cp -a $install/usr/bin $fs/usr 3.31 + cp -a $install/usr/share $fs/usr 3.32 +}
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/php-cups/receipt Thu Dec 26 14:11:02 2013 +0000 4.3 @@ -0,0 +1,72 @@ 4.4 +# SliTaz package receipt." 4.5 + 4.6 +PACKAGE="php-cups" 4.7 +VERSION="1.6.2" 4.8 +CATEGORY="development" 4.9 +SHORT_DESC="Common UNIX Printing System bindings for php." 4.10 +MAINTAINER="pascal.bellard@slitaz.org" 4.11 +LICENSE="GPL2 LGPL2" 4.12 +WANTED="cups" 4.13 +WEB_SITE="http://www.cups.org/" 4.14 + 4.15 +DEPENDS="cups libtasn1" 4.16 + 4.17 +# Rules to gen a SliTaz package suitable for Tazpkg. 4.18 +genpkg_rules() 4.19 +{ 4.20 + mkdir -p $fs/usr/share/php 4.21 + cp $(find $install | grep phpcups.so) $fs/usr/share/php/cups.so 4.22 +} 4.23 + 4.24 +# Post and pre install commans to stop 4.25 +# and restart Web server if needed. 4.26 +pre_install() 4.27 +{ 4.28 + while read daemon file; do 4.29 + if [ -z "$1" -a -f "/var/run/$file" ]; then 4.30 + /etc/init.d/$daemon stop 4.31 + fi 4.32 + done <<EOT 4.33 +apache apache/httpd.pid 4.34 +lighttpd lighttpd.pid 4.35 +EOT 4.36 +} 4.37 + 4.38 +post_install() 4.39 +{ 4.40 + grep -q ^extension=cups.so $1/etc/php.ini || \ 4.41 + sed -e 's|extension=msql.so|extension=msql.so\nextension=cups.so|' -i $1/etc/php.ini 4.42 + # Start Web server. 4.43 + while read daemon file; do 4.44 + [ -z "$1" ] || continue 4.45 + if [ -z "$1" -a -f "/var/run/$file" ]; then 4.46 + /etc/init.d/$daemon stop 4.47 + sleep 2 4.48 + fi 4.49 + if [ -z "$1" -a -f /etc/init.d/$daemon ]; then 4.50 + /etc/init.d/$daemon start 4.51 + fi 4.52 + done <<EOT 4.53 +apache apache/httpd.pid 4.54 +lighttpd lighttpd.pid 4.55 +EOT 4.56 +} 4.57 + 4.58 +# Pre and post remove commands for Tazpkg. 4.59 +pre_remove() 4.60 +{ 4.61 + sed -i '/.*=cups.so.*/d' /etc/php.ini 4.62 + 4.63 + # Start Web server. 4.64 + while read daemon file; do 4.65 + [ -f "/var/run/$file" ] || continue 4.66 + if [ -f /etc/init.d/$daemon ]; then 4.67 + /etc/init.d/$daemon stop 4.68 + sleep 2 4.69 + /etc/init.d/$daemon start 4.70 + fi 4.71 + done <<EOT 4.72 +apache apache/httpd.pid 4.73 +lighttpd lighttpd.pid 4.74 +EOT 4.75 +}
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/printoxx/receipt Thu Dec 26 14:11:02 2013 +0000 5.3 @@ -0,0 +1,36 @@ 5.4 +# SliTaz package receipt. 5.5 + 5.6 +PACKAGE="printoxx" 5.7 +VERSION="2.8.1" 5.8 +CATEGORY="graphics" 5.9 +SHORT_DESC="fotoxx plugin for printing one or more image files with a user-defined page layout" 5.10 +MAINTAINER="gokhlayeh@slitaz.org" 5.11 +LICENSE="GPL3" 5.12 +SUGGESTED="fotoxx" 5.13 +TARBALL="$PACKAGE-$VERSION.tar.gz" 5.14 +WEB_SITE="http://kornelix.squarespace.com/printoxx" 5.15 +WGET_URL="http://kornelix.squarespace.com/storage/downloads/$TARBALL" 5.16 +TAGS="print images jpeg jpg bmp png gif" 5.17 + 5.18 +DEPENDS="gtk+ " 5.19 +BUILD_DEPENDS="gtk+-dev" 5.20 + 5.21 +# Rules to configure and make the package. 5.22 +compile_rules() 5.23 +{ 5.24 + cd $src 5.25 + export PREFIX=/usr make 5.26 + make DESTDIR=$DESTDIR install 5.27 + 5.28 +} 5.29 + 5.30 +# Rules to gen a SliTaz package suitable for Tazpkg. 5.31 +genpkg_rules() 5.32 +{ 5.33 + mkdir -p $fs/usr/bin $fs/usr/share/$PACKAGE/locales $fs/usr/share/applications 5.34 + cp -a $install/usr/bin $fs/usr 5.35 + cp -a $install/usr/share/$PACKAGE/icons $fs/usr/share/$PACKAGE 5.36 + #non-standard local path 5.37 + cp -a $install/usr/share/$PACKAGE/locales/* $fs/usr/share/$PACKAGE/locales/ 5.38 + cp -a stuff/$PACKAGE.desktop $fs/usr/share/applications 5.39 +} 5.40 \ No newline at end of file
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/printoxx/stuff/printoxx.desktop Thu Dec 26 14:11:02 2013 +0000 6.3 @@ -0,0 +1,10 @@ 6.4 +[Desktop Entry] 6.5 +Name=printoxx 6.6 +Comment=Fotoxx Image adjustment for printing 6.7 +Exec=printoxx %f 6.8 +Terminal=false 6.9 +Type=Application 6.10 +Icon=printer 6.11 +Categories=GTK;Graphics;2DGraphics;Viewer; 6.12 +MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/png; 6.13 +
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 7.2 +++ b/v4l-dvb/receipt Thu Dec 26 14:11:02 2013 +0000 7.3 @@ -0,0 +1,79 @@ 7.4 +# SliTaz package receipt. 7.5 + 7.6 +PACKAGE="v4l-dvb" 7.7 +VERSION="development" 7.8 +CATEGORY="multimedia" 7.9 +MAINTAINER="jozee@slitaz.org" 7.10 +LICENSE="GPL2" 7.11 +SHORT_DESC="v4l-dvb development repository" 7.12 +WEB_SITE="http://linuxtv.org/hg/v4l-dvb/" 7.13 +TARBALL="$PACKAGE-$VERSION.tar.bz2" 7.14 +TAGS="webcam" 7.15 +WGET_URL="hg|$WEB_SITE" 7.16 + 7.17 +DEPENDS="linux" 7.18 +BUILD_DEPENDS="python mercurial coreutils-operations module-init-tools xz" 7.19 + 7.20 +# Rules to configure and make the package. 7.21 +compile_rules() { 7.22 + cd $src 7.23 + patch -p1 < $stuff/414e0bbd99bf 7.24 + patch -p1 < $stuff/d64b014c5253 7.25 + patch -p1 < $stuff/d0a2ff731670 7.26 + sed -i 's/0 | xargs -0n 255 ln -sf --target-directory=\./ | while read file; do ln -sf $file . ; done/' v4l/Makefile 7.27 + grep -rl /sbin/depmod * | xargs sed -i 's|/sbin/depmod|/bin/echo|' 7.28 + grep -rl i2c_new_probed_device * | xargs sed -i 's/i2c_new_probed_device([^)]*/&, NULL/' 7.29 + 7.30 + sed -i 's/\.ioctl/.unlocked_ioctl/' linux/drivers/media/dvb/dvb-core/dmxdev.c \ 7.31 + linux/drivers/media/dvb/dvb-core/dvb_ca_en50221.c \ 7.32 + linux/drivers/media/dvb/dvb-core/dvb_frontend.c \ 7.33 + linux/drivers/media/dvb/dvb-core/dvb_net.c \ 7.34 + linux/drivers/media/dvb/ttpci/av7110*.c \ 7.35 + linux/drivers/media/dvb/firewire/firedtv-ci.c \ 7.36 + linux/drivers/media/video/v4l2-dev.c \ 7.37 + linux/drivers/media/IR/lirc_dev.c \ 7.38 + linux/drivers/media/IR/ir-lirc-codec.c 7.39 + 7.40 + sed -i 's/>ioctl)/>unlocked_ioctl)/' linux/drivers/media/IR/lirc_dev.c 7.41 + sed -i -e 's|/sbin/lsmod|/bin/lsmod|' \ 7.42 + -e 's/print | while.*/exec ln -s {} . \\;/' v4l/Makefile 7.43 + 7.44 + IFS="." ; set -- $kvers ; unset IFS 7.45 + cat > v4l/.version << EOF 7.46 +VERSION=$1 7.47 +PATCHLEVEL:=$2 7.48 +SUBLEVEL:=$3 7.49 +KERNELRELEASE:=$kvers-slitaz 7.50 +EOF 7.51 + [ -x /usr/bin/cook ] && SRCDIR="$WOK/linux/source/linux-$kvers" 7.52 + [ -x /usr/bin/tazwok ] && SRCDIR="$WOK/linux/linux-$kvers" 7.53 + make SRCDIR=$SRCDIR CONFIG_MEDIA_TUNER_CUSTOMISE=n CONFIG_RADIO_ADAPTERS=n \ 7.54 + CONFIG_RADIO_MIROPCM20=n CONFIG_MANTIS_CORE=n && 7.55 + make DESTDIR=$DESTDIR install 7.56 +} 7.57 + 7.58 +# Rules to gen a SliTaz package suitable for Tazpkg. 7.59 +genpkg_rules() 7.60 +{ 7.61 + EXTRAVERSION=_${kvers%.*} 7.62 + 7.63 + mkdir -p $fs/lib/modules/$kvers-slitaz/kernel/ 7.64 + 7.65 + find $install/lib/modules/$kvers-slitaz -name "*.ko" \ 7.66 + -exec xz '{}' \; 2> /dev/null 7.67 + find $install/lib/modules/$kvers-slitaz -name "*.ko" -exec rm '{}' \; 7.68 + cp -a $install/lib/modules/$kvers-slitaz/kernel/drivers \ 7.69 + $fs/lib/modules/$kvers-slitaz/kernel/ 7.70 +} 7.71 + 7.72 +post_install() 7.73 +{ 7.74 + echo "Processing post-install commands..." 7.75 + chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz 7.76 +} 7.77 + 7.78 +post_remove() 7.79 +{ 7.80 + echo "Processing post-remove commands..." 7.81 + depmod -a 7.82 +}
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 8.2 +++ b/v4l-dvb/stuff/414e0bbd99bf Thu Dec 26 14:11:02 2013 +0000 8.3 @@ -0,0 +1,49 @@ 8.4 + 8.5 +# HG changeset patch 8.6 +# User Igor M. Liplianin <liplianin@me.by> 8.7 +# Date 1293902198 -7200 8.8 +# Node ID 414e0bbd99bf23b178c4b8aa539ef8f9f270117e 8.9 +# Parent d64b014c5253e3699e025339619a6f7704f2fb81 8.10 +[PATCH 1/1] [media] i2c: Stop using I2C_CLASS_TV_ANALOG 8.11 + 8.12 +From: Jean Delvare <khali@linux-fr.org> 8.13 + 8.14 +Detection class I2C_CLASS_TV_ANALOG is set by a few adapters but no 8.15 +I2C device driver is setting it anymore, which means it can be 8.16 +dropped. I2C devices on analog TV adapters are instantiated 8.17 +explicitly these days, which is much better. 8.18 + 8.19 +Signed-off-by: Jean Delvare <khali@linux-fr.org> 8.20 +Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> 8.21 + 8.22 +--- a/linux/drivers/media/video/hdpvr/hdpvr-i2c.c Sat Jan 01 19:13:39 2011 +0200 8.23 ++++ b/linux/drivers/media/video/hdpvr/hdpvr-i2c.c Sat Jan 01 19:16:38 2011 +0200 8.24 +@@ -127,7 +127,6 @@ 8.25 + strlcpy(i2c_adap->name, "Hauppauge HD PVR I2C", 8.26 + sizeof(i2c_adap->name)); 8.27 + i2c_adap->algo = &hdpvr_algo; 8.28 +- i2c_adap->class = I2C_CLASS_TV_ANALOG; 8.29 + i2c_adap->owner = THIS_MODULE; 8.30 + i2c_adap->dev.parent = &dev->udev->dev; 8.31 + 8.32 +--- a/linux/drivers/media/video/hexium_gemini.c Sat Jan 01 19:13:39 2011 +0200 8.33 ++++ b/linux/drivers/media/video/hexium_gemini.c Sat Jan 01 19:16:38 2011 +0200 8.34 +@@ -368,7 +368,6 @@ 8.35 + saa7146_write(dev, MC1, (MASK_08 | MASK_24 | MASK_10 | MASK_26)); 8.36 + 8.37 + hexium->i2c_adapter = (struct i2c_adapter) { 8.38 +- .class = I2C_CLASS_TV_ANALOG, 8.39 + .name = "hexium gemini", 8.40 + }; 8.41 + saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480); 8.42 +--- a/linux/drivers/media/video/hexium_orion.c Sat Jan 01 19:13:39 2011 +0200 8.43 ++++ b/linux/drivers/media/video/hexium_orion.c Sat Jan 01 19:16:38 2011 +0200 8.44 +@@ -231,7 +231,6 @@ 8.45 + saa7146_write(dev, MC2, (MASK_09 | MASK_25 | MASK_10 | MASK_26)); 8.46 + 8.47 + hexium->i2c_adapter = (struct i2c_adapter) { 8.48 +- .class = I2C_CLASS_TV_ANALOG, 8.49 + .name = "hexium orion", 8.50 + }; 8.51 + saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480); 8.52 +
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 9.2 +++ b/v4l-dvb/stuff/d0a2ff731670 Thu Dec 26 14:11:02 2013 +0000 9.3 @@ -0,0 +1,181 @@ 9.4 + 9.5 +# HG changeset patch 9.6 +# User Jean Delvare <khali@linux-fr.org> 9.7 +# Date 1293818674 -7200 9.8 +# Node ID d0a2ff731670f853f4e661e8542eacd29fd55131 9.9 +# Parent 3be76b724b85004860ba7c625a735bc8b060bac4 9.10 +[PATCH] [media] i2c: Stop using I2C_CLASS_TV_DIGITAL 9.11 + 9.12 +From: Jean Delvare <khali@linux-fr.org> 9.13 + 9.14 +Detection class I2C_CLASS_TV_DIGITAL is set by many adapters but no 9.15 +I2C device driver is setting it anymore, which means it can be 9.16 +dropped. I2C devices on digital TV adapters are instantiated 9.17 +explicitly these days, which is much better. 9.18 + 9.19 +Signed-off-by: Jean Delvare <khali@linux-fr.org> 9.20 +Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> 9.21 + 9.22 +--- a/linux/drivers/media/dvb/b2c2/flexcop-i2c.c Fri Dec 31 12:33:14 2010 +0100 9.23 ++++ b/linux/drivers/media/dvb/b2c2/flexcop-i2c.c Fri Dec 31 20:04:34 2010 +0200 9.24 +@@ -248,9 +248,6 @@ 9.25 + i2c_set_adapdata(&fc->fc_i2c_adap[1].i2c_adap, &fc->fc_i2c_adap[1]); 9.26 + i2c_set_adapdata(&fc->fc_i2c_adap[2].i2c_adap, &fc->fc_i2c_adap[2]); 9.27 + 9.28 +- fc->fc_i2c_adap[0].i2c_adap.class = 9.29 +- fc->fc_i2c_adap[1].i2c_adap.class = 9.30 +- fc->fc_i2c_adap[2].i2c_adap.class = I2C_CLASS_TV_DIGITAL; 9.31 + fc->fc_i2c_adap[0].i2c_adap.algo = 9.32 + fc->fc_i2c_adap[1].i2c_adap.algo = 9.33 + fc->fc_i2c_adap[2].i2c_adap.algo = &flexcop_algo; 9.34 +--- a/linux/drivers/media/dvb/dm1105/dm1105.c Fri Dec 31 12:33:14 2010 +0100 9.35 ++++ b/linux/drivers/media/dvb/dm1105/dm1105.c Fri Dec 31 20:04:34 2010 +0200 9.36 +@@ -894,7 +894,6 @@ 9.37 + i2c_set_adapdata(&dev->i2c_adap, dev); 9.38 + strcpy(dev->i2c_adap.name, DRIVER_NAME); 9.39 + dev->i2c_adap.owner = THIS_MODULE; 9.40 +- dev->i2c_adap.class = I2C_CLASS_TV_DIGITAL; 9.41 + dev->i2c_adap.dev.parent = &pdev->dev; 9.42 + dev->i2c_adap.algo = &dm1105_algo; 9.43 + dev->i2c_adap.algo_data = dev; 9.44 +--- a/linux/drivers/media/dvb/dvb-usb/af9015.c Fri Dec 31 12:33:14 2010 +0100 9.45 ++++ b/linux/drivers/media/dvb/dvb-usb/af9015.c Fri Dec 31 20:04:34 2010 +0200 9.46 +@@ -1135,11 +1135,6 @@ 9.47 + 9.48 + strncpy(state->i2c_adap.name, d->desc->name, 9.49 + sizeof(state->i2c_adap.name)); 9.50 +-#ifdef I2C_ADAP_CLASS_TV_DIGITAL 9.51 +- state->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL, 9.52 +-#else 9.53 +- state->i2c_adap.class = I2C_CLASS_TV_DIGITAL, 9.54 +-#endif 9.55 + state->i2c_adap.algo = d->props.i2c_algo; 9.56 + state->i2c_adap.algo_data = NULL; 9.57 + state->i2c_adap.dev.parent = &d->udev->dev; 9.58 +--- a/linux/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c Fri Dec 31 12:33:14 2010 +0100 9.59 ++++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c Fri Dec 31 20:04:34 2010 +0200 9.60 +@@ -20,7 +20,6 @@ 9.61 + } 9.62 + 9.63 + strlcpy(d->i2c_adap.name, d->desc->name, sizeof(d->i2c_adap.name)); 9.64 +- d->i2c_adap.class = I2C_CLASS_TV_DIGITAL, 9.65 + d->i2c_adap.algo = d->props.i2c_algo; 9.66 + d->i2c_adap.algo_data = NULL; 9.67 + d->i2c_adap.dev.parent = &d->udev->dev; 9.68 +--- a/linux/drivers/media/dvb/frontends/cx24123.c Fri Dec 31 12:33:14 2010 +0100 9.69 ++++ b/linux/drivers/media/dvb/frontends/cx24123.c Fri Dec 31 20:04:34 2010 +0200 9.70 +@@ -1111,7 +1111,6 @@ 9.71 + 9.72 + strlcpy(state->tuner_i2c_adapter.name, "CX24123 tuner I2C bus", 9.73 + sizeof(state->tuner_i2c_adapter.name)); 9.74 +- state->tuner_i2c_adapter.class = I2C_CLASS_TV_DIGITAL, 9.75 + state->tuner_i2c_adapter.algo = &cx24123_tuner_i2c_algo; 9.76 + state->tuner_i2c_adapter.algo_data = NULL; 9.77 + i2c_set_adapdata(&state->tuner_i2c_adapter, state); 9.78 +--- a/linux/drivers/media/dvb/frontends/dibx000_common.c Fri Dec 31 12:33:14 2010 +0100 9.79 ++++ b/linux/drivers/media/dvb/frontends/dibx000_common.c Fri Dec 31 20:04:34 2010 +0200 9.80 +@@ -172,7 +172,6 @@ 9.81 + struct dibx000_i2c_master *mst) 9.82 + { 9.83 + strncpy(i2c_adap->name, name, sizeof(i2c_adap->name)); 9.84 +- i2c_adap->class = I2C_CLASS_TV_DIGITAL, i2c_adap->algo = algo; 9.85 + i2c_adap->algo_data = NULL; 9.86 + i2c_set_adapdata(i2c_adap, mst); 9.87 + if (i2c_add_adapter(i2c_adap) < 0) 9.88 +--- a/linux/drivers/media/dvb/frontends/s5h1420.c Fri Dec 31 12:33:14 2010 +0100 9.89 ++++ b/linux/drivers/media/dvb/frontends/s5h1420.c Fri Dec 31 20:04:34 2010 +0200 9.90 +@@ -955,7 +955,6 @@ 9.91 + /* create tuner i2c adapter */ 9.92 + strlcpy(state->tuner_i2c_adapter.name, "S5H1420-PN1010 tuner I2C bus", 9.93 + sizeof(state->tuner_i2c_adapter.name)); 9.94 +- state->tuner_i2c_adapter.class = I2C_CLASS_TV_DIGITAL, 9.95 + state->tuner_i2c_adapter.algo = &s5h1420_tuner_i2c_algo; 9.96 + state->tuner_i2c_adapter.algo_data = NULL; 9.97 + i2c_set_adapdata(&state->tuner_i2c_adapter, state); 9.98 +--- a/linux/drivers/media/dvb/mantis/mantis_i2c.c Fri Dec 31 12:33:14 2010 +0100 9.99 ++++ b/linux/drivers/media/dvb/mantis/mantis_i2c.c Fri Dec 31 20:04:34 2010 +0200 9.100 +@@ -159,7 +159,6 @@ 9.101 + .owner = THIS_MODULE, 9.102 + .name = "Mantis I2C", 9.103 + .id = I2C_HW_B_MANTIS, 9.104 +- .class = I2C_CLASS_TV_DIGITAL, 9.105 + .algo = &mantis_algo, 9.106 + }; 9.107 + 9.108 +--- a/linux/drivers/media/dvb/ngene/ngene-i2c.c Fri Dec 31 12:33:14 2010 +0100 9.109 ++++ b/linux/drivers/media/dvb/ngene/ngene-i2c.c Fri Dec 31 20:04:34 2010 +0200 9.110 +@@ -212,11 +212,6 @@ 9.111 + struct i2c_adapter *adap = &(dev->channel[dev_nr].i2c_adapter); 9.112 + 9.113 + i2c_set_adapdata(adap, &(dev->channel[dev_nr])); 9.114 +-#ifdef I2C_CLASS_TV_DIGITAL 9.115 +- adap->class = I2C_CLASS_TV_DIGITAL | I2C_CLASS_TV_ANALOG; 9.116 +-#else 9.117 +- adap->class = I2C_CLASS_TV_ANALOG; 9.118 +-#endif 9.119 + 9.120 + strcpy(adap->name, "nGene"); 9.121 + 9.122 +--- a/linux/drivers/media/dvb/pluto2/pluto2.c Fri Dec 31 12:33:14 2010 +0100 9.123 ++++ b/linux/drivers/media/dvb/pluto2/pluto2.c Fri Dec 31 20:04:34 2010 +0200 9.124 +@@ -655,7 +655,6 @@ 9.125 + i2c_set_adapdata(&pluto->i2c_adap, pluto); 9.126 + strcpy(pluto->i2c_adap.name, DRIVER_NAME); 9.127 + pluto->i2c_adap.owner = THIS_MODULE; 9.128 +- pluto->i2c_adap.class = I2C_CLASS_TV_DIGITAL; 9.129 + pluto->i2c_adap.dev.parent = &pdev->dev; 9.130 + pluto->i2c_adap.algo_data = &pluto->i2c_bit; 9.131 + pluto->i2c_bit.data = pluto; 9.132 +--- a/linux/drivers/media/dvb/pt1/pt1.c Fri Dec 31 12:33:14 2010 +0100 9.133 ++++ b/linux/drivers/media/dvb/pt1/pt1.c Fri Dec 31 20:04:34 2010 +0200 9.134 +@@ -1087,7 +1087,6 @@ 9.135 + pt1_update_power(pt1); 9.136 + 9.137 + i2c_adap = &pt1->i2c_adap; 9.138 +- i2c_adap->class = I2C_CLASS_TV_DIGITAL; 9.139 + i2c_adap->algo = &pt1_i2c_algo; 9.140 + i2c_adap->algo_data = NULL; 9.141 + i2c_adap->dev.parent = &pdev->dev; 9.142 +--- a/linux/drivers/media/dvb/ttpci/av7110.c Fri Dec 31 12:33:14 2010 +0100 9.143 ++++ b/linux/drivers/media/dvb/ttpci/av7110.c Fri Dec 31 20:04:34 2010 +0200 9.144 +@@ -2479,7 +2479,6 @@ 9.145 + get recognized before the main driver is fully loaded */ 9.146 + saa7146_write(dev, GPIO_CTRL, 0x500000); 9.147 + 9.148 +- av7110->i2c_adap.class = I2C_CLASS_TV_DIGITAL; 9.149 + strlcpy(av7110->i2c_adap.name, pci_ext->ext_priv, sizeof(av7110->i2c_adap.name)); 9.150 + 9.151 + saa7146_i2c_adapter_prepare(dev, &av7110->i2c_adap, SAA7146_I2C_BUS_BIT_RATE_120); /* 275 kHz */ 9.152 +--- a/linux/drivers/media/dvb/ttpci/budget-core.c Fri Dec 31 12:33:14 2010 +0100 9.153 ++++ b/linux/drivers/media/dvb/ttpci/budget-core.c Fri Dec 31 20:04:34 2010 +0200 9.154 +@@ -495,8 +495,6 @@ 9.155 + if (bi->type != BUDGET_FS_ACTIVY) 9.156 + saa7146_write(dev, GPIO_CTRL, 0x500000); /* GPIO 3 = 1 */ 9.157 + 9.158 +- budget->i2c_adap.class = I2C_CLASS_TV_DIGITAL; 9.159 +- 9.160 + strlcpy(budget->i2c_adap.name, budget->card->name, sizeof(budget->i2c_adap.name)); 9.161 + 9.162 + saa7146_i2c_adapter_prepare(dev, &budget->i2c_adap, SAA7146_I2C_BUS_BIT_RATE_120); 9.163 +--- a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c Fri Dec 31 12:33:14 2010 +0100 9.164 ++++ b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c Fri Dec 31 20:04:34 2010 +0200 9.165 +@@ -1717,7 +1717,6 @@ 9.166 + 9.167 + i2c_set_adapdata(&ttusb->i2c_adap, ttusb); 9.168 + 9.169 +- ttusb->i2c_adap.class = I2C_CLASS_TV_DIGITAL; 9.170 + ttusb->i2c_adap.algo = &ttusb_dec_algo; 9.171 + ttusb->i2c_adap.algo_data = NULL; 9.172 + ttusb->i2c_adap.dev.parent = &udev->dev; 9.173 +--- a/linux/drivers/media/video/cx88/cx88-vp3054-i2c.c Fri Dec 31 12:33:14 2010 +0100 9.174 ++++ b/linux/drivers/media/video/cx88/cx88-vp3054-i2c.c Fri Dec 31 20:04:34 2010 +0200 9.175 +@@ -121,8 +121,6 @@ 9.176 + memcpy(&vp3054_i2c->algo, &vp3054_i2c_algo_template, 9.177 + sizeof(vp3054_i2c->algo)); 9.178 + 9.179 +- vp3054_i2c->adap.class |= I2C_CLASS_TV_DIGITAL; 9.180 +- 9.181 + vp3054_i2c->adap.dev.parent = &dev->pci->dev; 9.182 + strlcpy(vp3054_i2c->adap.name, core->name, 9.183 + sizeof(vp3054_i2c->adap.name)); 9.184 +
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 10.2 +++ b/v4l-dvb/stuff/d64b014c5253 Thu Dec 26 14:11:02 2013 +0000 10.3 @@ -0,0 +1,37 @@ 10.4 + 10.5 +# HG changeset patch 10.6 +# User Igor M. Liplianin <liplianin@me.by> 10.7 +# Date 1293902019 -7200 10.8 +# Node ID d64b014c5253e3699e025339619a6f7704f2fb81 10.9 +# Parent d0a2ff731670f853f4e661e8542eacd29fd55131 10.10 +V4L/DVB: dvb: Convert "mutex" to semaphore 10.11 + 10.12 +From: Thomas Gleixner <tglx@linutronix.de> 10.13 + 10.14 +Get rid of init_MUTEX[_LOCKED]() and use sema_init() instead. 10.15 + 10.16 +Signed-off-by: Thomas Gleixner <tglx@linutronix.de> 10.17 +Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> 10.18 +--- 10.19 + 10.20 +--- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c Fri Dec 31 20:04:34 2010 +0200 10.21 ++++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c Sat Jan 01 19:13:39 2011 +0200 10.22 +@@ -715,7 +715,7 @@ 10.23 + 10.24 + kthread_stop(fepriv->thread); 10.25 + 10.26 +- init_MUTEX (&fepriv->sem); 10.27 ++ sema_init(&fepriv->sem, 1); 10.28 + fepriv->state = FESTATE_IDLE; 10.29 + 10.30 + /* paranoia check in case a signal arrived */ 10.31 +@@ -2074,7 +2074,7 @@ 10.32 + } 10.33 + fepriv = fe->frontend_priv; 10.34 + 10.35 +- init_MUTEX (&fepriv->sem); 10.36 ++ sema_init(&fepriv->sem, 1); 10.37 + init_waitqueue_head (&fepriv->wait_queue); 10.38 + init_waitqueue_head (&fepriv->events.wait_queue); 10.39 + mutex_init(&fepriv->events.mtx); 10.40 +