# HG changeset patch # User Pascal Bellard # Date 1388067062 0 # Node ID d9b66f23c9efa7d531e5d413aed791f5838d83fe # Parent ccac84247b741995088c0a2860cf0397ad751494 Moved from wok: php-cups fotoxx printoxx gtkaml v4l-dvb diff -r ccac84247b74 -r d9b66f23c9ef fotoxx/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/fotoxx/receipt Thu Dec 26 14:11:02 2013 +0000 @@ -0,0 +1,34 @@ +# SliTaz package receipt. + +PACKAGE="fotoxx" +VERSION="11.05.2" +CATEGORY="graphics" +SHORT_DESC="lightweight image editor" +MAINTAINER="gokhlayeh@slitaz.org" +LICENSE="GPL3" +SUGGESTED="exiftool ufraw printoxx" +TARBALL="$PACKAGE-$VERSION.tar.gz" +WEB_SITE="http://kornelix.squarespace.com/fotoxx" +WGET_URL="http://kornelix.squarespace.com/storage/downloads/$TARBALL" +TAGS="image editor photo jpeg jpg bmp png gif" + +DEPENDS="gtk+" +BUILD_DEPENDS="exiftool gtk+-dev freeimage freeimage-dev xdg-utils" + +# Rules to configure and make the package. +compile_rules() +{ + cd $src + export PREFIX=/usr make + make DESTDIR=$DESTDIR install +} + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr/bin $fs/usr/share/$PACKAGE + cp -a $install/usr/bin $fs/usr + cp -a $install/usr/share/$PACKAGE/icons $fs/usr/share/$PACKAGE + #non-standard locale path + cp -a $install/usr/share/$PACKAGE/locales $fs/usr/share/$PACKAGE +} diff -r ccac84247b74 -r d9b66f23c9ef fotoxx/stuff/fotoxx.desktop --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/fotoxx/stuff/fotoxx.desktop Thu Dec 26 14:11:02 2013 +0000 @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Fotoxx Editor +Comment=A fast GTK+ Image Editor +Exec=fotoxx %f +Terminal=false +Type=Application +Icon=fotoxx +Categories=GTK;Graphics;2DGraphics;Viewer; +MimeType=image/bmp;image/gif;image/jpeg;image/jpg;image/png;image/tiff + diff -r ccac84247b74 -r d9b66f23c9ef gtkaml/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gtkaml/receipt Thu Dec 26 14:11:02 2013 +0000 @@ -0,0 +1,29 @@ +# SliTaz package receipt. + +PACKAGE="gtkaml" +VERSION="0.4.2" +CATEGORY="development" +SHORT_DESC="Markup language based on Vala to create Gtk+ apps in XML" +MAINTAINER="pankso@slitaz.org" +LICENSE="LGPL2.1" +TARBALL="$PACKAGE-$VERSION.tar.bz2" +WEB_SITE="http://code.google.com/p/gtkaml/" +WGET_URL="http://gtkaml.googlecode.com/files/$TARBALL" + +DEPENDS="gtk+ libxml2" +BUILD_DEPENDS="gtk+-dev libxml2-dev vala" + +# Rules to configure and make the package. +compile_rules() +{ + cd $src + ./configure && make && make install +} + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr + cp -a $install/usr/bin $fs/usr + cp -a $install/usr/share $fs/usr +} diff -r ccac84247b74 -r d9b66f23c9ef php-cups/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/php-cups/receipt Thu Dec 26 14:11:02 2013 +0000 @@ -0,0 +1,72 @@ +# SliTaz package receipt." + +PACKAGE="php-cups" +VERSION="1.6.2" +CATEGORY="development" +SHORT_DESC="Common UNIX Printing System bindings for php." +MAINTAINER="pascal.bellard@slitaz.org" +LICENSE="GPL2 LGPL2" +WANTED="cups" +WEB_SITE="http://www.cups.org/" + +DEPENDS="cups libtasn1" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr/share/php + cp $(find $install | grep phpcups.so) $fs/usr/share/php/cups.so +} + +# Post and pre install commans to stop +# and restart Web server if needed. +pre_install() +{ + while read daemon file; do + if [ -z "$1" -a -f "/var/run/$file" ]; then + /etc/init.d/$daemon stop + fi + done <ioctl)/>unlocked_ioctl)/' linux/drivers/media/IR/lirc_dev.c + sed -i -e 's|/sbin/lsmod|/bin/lsmod|' \ + -e 's/print | while.*/exec ln -s {} . \\;/' v4l/Makefile + + IFS="." ; set -- $kvers ; unset IFS + cat > v4l/.version << EOF +VERSION=$1 +PATCHLEVEL:=$2 +SUBLEVEL:=$3 +KERNELRELEASE:=$kvers-slitaz +EOF + [ -x /usr/bin/cook ] && SRCDIR="$WOK/linux/source/linux-$kvers" + [ -x /usr/bin/tazwok ] && SRCDIR="$WOK/linux/linux-$kvers" + make SRCDIR=$SRCDIR CONFIG_MEDIA_TUNER_CUSTOMISE=n CONFIG_RADIO_ADAPTERS=n \ + CONFIG_RADIO_MIROPCM20=n CONFIG_MANTIS_CORE=n && + make DESTDIR=$DESTDIR install +} + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + EXTRAVERSION=_${kvers%.*} + + mkdir -p $fs/lib/modules/$kvers-slitaz/kernel/ + + find $install/lib/modules/$kvers-slitaz -name "*.ko" \ + -exec xz '{}' \; 2> /dev/null + find $install/lib/modules/$kvers-slitaz -name "*.ko" -exec rm '{}' \; + cp -a $install/lib/modules/$kvers-slitaz/kernel/drivers \ + $fs/lib/modules/$kvers-slitaz/kernel/ +} + +post_install() +{ + echo "Processing post-install commands..." + chroot "$1/" depmod -a ${EXTRAVERSION#_}-slitaz +} + +post_remove() +{ + echo "Processing post-remove commands..." + depmod -a +} diff -r ccac84247b74 -r d9b66f23c9ef v4l-dvb/stuff/414e0bbd99bf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/v4l-dvb/stuff/414e0bbd99bf Thu Dec 26 14:11:02 2013 +0000 @@ -0,0 +1,49 @@ + +# HG changeset patch +# User Igor M. Liplianin +# Date 1293902198 -7200 +# Node ID 414e0bbd99bf23b178c4b8aa539ef8f9f270117e +# Parent d64b014c5253e3699e025339619a6f7704f2fb81 +[PATCH 1/1] [media] i2c: Stop using I2C_CLASS_TV_ANALOG + +From: Jean Delvare + +Detection class I2C_CLASS_TV_ANALOG is set by a few adapters but no +I2C device driver is setting it anymore, which means it can be +dropped. I2C devices on analog TV adapters are instantiated +explicitly these days, which is much better. + +Signed-off-by: Jean Delvare +Signed-off-by: Mauro Carvalho Chehab + +--- a/linux/drivers/media/video/hdpvr/hdpvr-i2c.c Sat Jan 01 19:13:39 2011 +0200 ++++ b/linux/drivers/media/video/hdpvr/hdpvr-i2c.c Sat Jan 01 19:16:38 2011 +0200 +@@ -127,7 +127,6 @@ + strlcpy(i2c_adap->name, "Hauppauge HD PVR I2C", + sizeof(i2c_adap->name)); + i2c_adap->algo = &hdpvr_algo; +- i2c_adap->class = I2C_CLASS_TV_ANALOG; + i2c_adap->owner = THIS_MODULE; + i2c_adap->dev.parent = &dev->udev->dev; + +--- a/linux/drivers/media/video/hexium_gemini.c Sat Jan 01 19:13:39 2011 +0200 ++++ b/linux/drivers/media/video/hexium_gemini.c Sat Jan 01 19:16:38 2011 +0200 +@@ -368,7 +368,6 @@ + saa7146_write(dev, MC1, (MASK_08 | MASK_24 | MASK_10 | MASK_26)); + + hexium->i2c_adapter = (struct i2c_adapter) { +- .class = I2C_CLASS_TV_ANALOG, + .name = "hexium gemini", + }; + saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480); +--- a/linux/drivers/media/video/hexium_orion.c Sat Jan 01 19:13:39 2011 +0200 ++++ b/linux/drivers/media/video/hexium_orion.c Sat Jan 01 19:16:38 2011 +0200 +@@ -231,7 +231,6 @@ + saa7146_write(dev, MC2, (MASK_09 | MASK_25 | MASK_10 | MASK_26)); + + hexium->i2c_adapter = (struct i2c_adapter) { +- .class = I2C_CLASS_TV_ANALOG, + .name = "hexium orion", + }; + saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480); + diff -r ccac84247b74 -r d9b66f23c9ef v4l-dvb/stuff/d0a2ff731670 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/v4l-dvb/stuff/d0a2ff731670 Thu Dec 26 14:11:02 2013 +0000 @@ -0,0 +1,181 @@ + +# HG changeset patch +# User Jean Delvare +# Date 1293818674 -7200 +# Node ID d0a2ff731670f853f4e661e8542eacd29fd55131 +# Parent 3be76b724b85004860ba7c625a735bc8b060bac4 +[PATCH] [media] i2c: Stop using I2C_CLASS_TV_DIGITAL + +From: Jean Delvare + +Detection class I2C_CLASS_TV_DIGITAL is set by many adapters but no +I2C device driver is setting it anymore, which means it can be +dropped. I2C devices on digital TV adapters are instantiated +explicitly these days, which is much better. + +Signed-off-by: Jean Delvare +Signed-off-by: Mauro Carvalho Chehab + +--- a/linux/drivers/media/dvb/b2c2/flexcop-i2c.c Fri Dec 31 12:33:14 2010 +0100 ++++ b/linux/drivers/media/dvb/b2c2/flexcop-i2c.c Fri Dec 31 20:04:34 2010 +0200 +@@ -248,9 +248,6 @@ + i2c_set_adapdata(&fc->fc_i2c_adap[1].i2c_adap, &fc->fc_i2c_adap[1]); + i2c_set_adapdata(&fc->fc_i2c_adap[2].i2c_adap, &fc->fc_i2c_adap[2]); + +- fc->fc_i2c_adap[0].i2c_adap.class = +- fc->fc_i2c_adap[1].i2c_adap.class = +- fc->fc_i2c_adap[2].i2c_adap.class = I2C_CLASS_TV_DIGITAL; + fc->fc_i2c_adap[0].i2c_adap.algo = + fc->fc_i2c_adap[1].i2c_adap.algo = + fc->fc_i2c_adap[2].i2c_adap.algo = &flexcop_algo; +--- a/linux/drivers/media/dvb/dm1105/dm1105.c Fri Dec 31 12:33:14 2010 +0100 ++++ b/linux/drivers/media/dvb/dm1105/dm1105.c Fri Dec 31 20:04:34 2010 +0200 +@@ -894,7 +894,6 @@ + i2c_set_adapdata(&dev->i2c_adap, dev); + strcpy(dev->i2c_adap.name, DRIVER_NAME); + dev->i2c_adap.owner = THIS_MODULE; +- dev->i2c_adap.class = I2C_CLASS_TV_DIGITAL; + dev->i2c_adap.dev.parent = &pdev->dev; + dev->i2c_adap.algo = &dm1105_algo; + dev->i2c_adap.algo_data = dev; +--- a/linux/drivers/media/dvb/dvb-usb/af9015.c Fri Dec 31 12:33:14 2010 +0100 ++++ b/linux/drivers/media/dvb/dvb-usb/af9015.c Fri Dec 31 20:04:34 2010 +0200 +@@ -1135,11 +1135,6 @@ + + strncpy(state->i2c_adap.name, d->desc->name, + sizeof(state->i2c_adap.name)); +-#ifdef I2C_ADAP_CLASS_TV_DIGITAL +- state->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL, +-#else +- state->i2c_adap.class = I2C_CLASS_TV_DIGITAL, +-#endif + state->i2c_adap.algo = d->props.i2c_algo; + state->i2c_adap.algo_data = NULL; + state->i2c_adap.dev.parent = &d->udev->dev; +--- a/linux/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c Fri Dec 31 12:33:14 2010 +0100 ++++ b/linux/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c Fri Dec 31 20:04:34 2010 +0200 +@@ -20,7 +20,6 @@ + } + + strlcpy(d->i2c_adap.name, d->desc->name, sizeof(d->i2c_adap.name)); +- d->i2c_adap.class = I2C_CLASS_TV_DIGITAL, + d->i2c_adap.algo = d->props.i2c_algo; + d->i2c_adap.algo_data = NULL; + d->i2c_adap.dev.parent = &d->udev->dev; +--- a/linux/drivers/media/dvb/frontends/cx24123.c Fri Dec 31 12:33:14 2010 +0100 ++++ b/linux/drivers/media/dvb/frontends/cx24123.c Fri Dec 31 20:04:34 2010 +0200 +@@ -1111,7 +1111,6 @@ + + strlcpy(state->tuner_i2c_adapter.name, "CX24123 tuner I2C bus", + sizeof(state->tuner_i2c_adapter.name)); +- state->tuner_i2c_adapter.class = I2C_CLASS_TV_DIGITAL, + state->tuner_i2c_adapter.algo = &cx24123_tuner_i2c_algo; + state->tuner_i2c_adapter.algo_data = NULL; + i2c_set_adapdata(&state->tuner_i2c_adapter, state); +--- a/linux/drivers/media/dvb/frontends/dibx000_common.c Fri Dec 31 12:33:14 2010 +0100 ++++ b/linux/drivers/media/dvb/frontends/dibx000_common.c Fri Dec 31 20:04:34 2010 +0200 +@@ -172,7 +172,6 @@ + struct dibx000_i2c_master *mst) + { + strncpy(i2c_adap->name, name, sizeof(i2c_adap->name)); +- i2c_adap->class = I2C_CLASS_TV_DIGITAL, i2c_adap->algo = algo; + i2c_adap->algo_data = NULL; + i2c_set_adapdata(i2c_adap, mst); + if (i2c_add_adapter(i2c_adap) < 0) +--- a/linux/drivers/media/dvb/frontends/s5h1420.c Fri Dec 31 12:33:14 2010 +0100 ++++ b/linux/drivers/media/dvb/frontends/s5h1420.c Fri Dec 31 20:04:34 2010 +0200 +@@ -955,7 +955,6 @@ + /* create tuner i2c adapter */ + strlcpy(state->tuner_i2c_adapter.name, "S5H1420-PN1010 tuner I2C bus", + sizeof(state->tuner_i2c_adapter.name)); +- state->tuner_i2c_adapter.class = I2C_CLASS_TV_DIGITAL, + state->tuner_i2c_adapter.algo = &s5h1420_tuner_i2c_algo; + state->tuner_i2c_adapter.algo_data = NULL; + i2c_set_adapdata(&state->tuner_i2c_adapter, state); +--- a/linux/drivers/media/dvb/mantis/mantis_i2c.c Fri Dec 31 12:33:14 2010 +0100 ++++ b/linux/drivers/media/dvb/mantis/mantis_i2c.c Fri Dec 31 20:04:34 2010 +0200 +@@ -159,7 +159,6 @@ + .owner = THIS_MODULE, + .name = "Mantis I2C", + .id = I2C_HW_B_MANTIS, +- .class = I2C_CLASS_TV_DIGITAL, + .algo = &mantis_algo, + }; + +--- a/linux/drivers/media/dvb/ngene/ngene-i2c.c Fri Dec 31 12:33:14 2010 +0100 ++++ b/linux/drivers/media/dvb/ngene/ngene-i2c.c Fri Dec 31 20:04:34 2010 +0200 +@@ -212,11 +212,6 @@ + struct i2c_adapter *adap = &(dev->channel[dev_nr].i2c_adapter); + + i2c_set_adapdata(adap, &(dev->channel[dev_nr])); +-#ifdef I2C_CLASS_TV_DIGITAL +- adap->class = I2C_CLASS_TV_DIGITAL | I2C_CLASS_TV_ANALOG; +-#else +- adap->class = I2C_CLASS_TV_ANALOG; +-#endif + + strcpy(adap->name, "nGene"); + +--- a/linux/drivers/media/dvb/pluto2/pluto2.c Fri Dec 31 12:33:14 2010 +0100 ++++ b/linux/drivers/media/dvb/pluto2/pluto2.c Fri Dec 31 20:04:34 2010 +0200 +@@ -655,7 +655,6 @@ + i2c_set_adapdata(&pluto->i2c_adap, pluto); + strcpy(pluto->i2c_adap.name, DRIVER_NAME); + pluto->i2c_adap.owner = THIS_MODULE; +- pluto->i2c_adap.class = I2C_CLASS_TV_DIGITAL; + pluto->i2c_adap.dev.parent = &pdev->dev; + pluto->i2c_adap.algo_data = &pluto->i2c_bit; + pluto->i2c_bit.data = pluto; +--- a/linux/drivers/media/dvb/pt1/pt1.c Fri Dec 31 12:33:14 2010 +0100 ++++ b/linux/drivers/media/dvb/pt1/pt1.c Fri Dec 31 20:04:34 2010 +0200 +@@ -1087,7 +1087,6 @@ + pt1_update_power(pt1); + + i2c_adap = &pt1->i2c_adap; +- i2c_adap->class = I2C_CLASS_TV_DIGITAL; + i2c_adap->algo = &pt1_i2c_algo; + i2c_adap->algo_data = NULL; + i2c_adap->dev.parent = &pdev->dev; +--- a/linux/drivers/media/dvb/ttpci/av7110.c Fri Dec 31 12:33:14 2010 +0100 ++++ b/linux/drivers/media/dvb/ttpci/av7110.c Fri Dec 31 20:04:34 2010 +0200 +@@ -2479,7 +2479,6 @@ + get recognized before the main driver is fully loaded */ + saa7146_write(dev, GPIO_CTRL, 0x500000); + +- av7110->i2c_adap.class = I2C_CLASS_TV_DIGITAL; + strlcpy(av7110->i2c_adap.name, pci_ext->ext_priv, sizeof(av7110->i2c_adap.name)); + + saa7146_i2c_adapter_prepare(dev, &av7110->i2c_adap, SAA7146_I2C_BUS_BIT_RATE_120); /* 275 kHz */ +--- a/linux/drivers/media/dvb/ttpci/budget-core.c Fri Dec 31 12:33:14 2010 +0100 ++++ b/linux/drivers/media/dvb/ttpci/budget-core.c Fri Dec 31 20:04:34 2010 +0200 +@@ -495,8 +495,6 @@ + if (bi->type != BUDGET_FS_ACTIVY) + saa7146_write(dev, GPIO_CTRL, 0x500000); /* GPIO 3 = 1 */ + +- budget->i2c_adap.class = I2C_CLASS_TV_DIGITAL; +- + strlcpy(budget->i2c_adap.name, budget->card->name, sizeof(budget->i2c_adap.name)); + + saa7146_i2c_adapter_prepare(dev, &budget->i2c_adap, SAA7146_I2C_BUS_BIT_RATE_120); +--- a/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c Fri Dec 31 12:33:14 2010 +0100 ++++ b/linux/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c Fri Dec 31 20:04:34 2010 +0200 +@@ -1717,7 +1717,6 @@ + + i2c_set_adapdata(&ttusb->i2c_adap, ttusb); + +- ttusb->i2c_adap.class = I2C_CLASS_TV_DIGITAL; + ttusb->i2c_adap.algo = &ttusb_dec_algo; + ttusb->i2c_adap.algo_data = NULL; + ttusb->i2c_adap.dev.parent = &udev->dev; +--- a/linux/drivers/media/video/cx88/cx88-vp3054-i2c.c Fri Dec 31 12:33:14 2010 +0100 ++++ b/linux/drivers/media/video/cx88/cx88-vp3054-i2c.c Fri Dec 31 20:04:34 2010 +0200 +@@ -121,8 +121,6 @@ + memcpy(&vp3054_i2c->algo, &vp3054_i2c_algo_template, + sizeof(vp3054_i2c->algo)); + +- vp3054_i2c->adap.class |= I2C_CLASS_TV_DIGITAL; +- + vp3054_i2c->adap.dev.parent = &dev->pci->dev; + strlcpy(vp3054_i2c->adap.name, core->name, + sizeof(vp3054_i2c->adap.name)); + diff -r ccac84247b74 -r d9b66f23c9ef v4l-dvb/stuff/d64b014c5253 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/v4l-dvb/stuff/d64b014c5253 Thu Dec 26 14:11:02 2013 +0000 @@ -0,0 +1,37 @@ + +# HG changeset patch +# User Igor M. Liplianin +# Date 1293902019 -7200 +# Node ID d64b014c5253e3699e025339619a6f7704f2fb81 +# Parent d0a2ff731670f853f4e661e8542eacd29fd55131 +V4L/DVB: dvb: Convert "mutex" to semaphore + +From: Thomas Gleixner + +Get rid of init_MUTEX[_LOCKED]() and use sema_init() instead. + +Signed-off-by: Thomas Gleixner +Signed-off-by: Mauro Carvalho Chehab +--- + +--- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c Fri Dec 31 20:04:34 2010 +0200 ++++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c Sat Jan 01 19:13:39 2011 +0200 +@@ -715,7 +715,7 @@ + + kthread_stop(fepriv->thread); + +- init_MUTEX (&fepriv->sem); ++ sema_init(&fepriv->sem, 1); + fepriv->state = FESTATE_IDLE; + + /* paranoia check in case a signal arrived */ +@@ -2074,7 +2074,7 @@ + } + fepriv = fe->frontend_priv; + +- init_MUTEX (&fepriv->sem); ++ sema_init(&fepriv->sem, 1); + init_waitqueue_head (&fepriv->wait_queue); + init_waitqueue_head (&fepriv->events.wait_queue); + mutex_init(&fepriv->events.mtx); +