# HG changeset patch # User Pascal Bellard # Date 1388067099 0 # Node ID 135b6b635ef2b0701e92bcde23682ed88bdcab75 # Parent e10c58dd2635f236541e93362011589b87be9354 Move to undigest: php-cups fotoxx printoxx gtkaml v4l-dvb diff -r e10c58dd2635 -r 135b6b635ef2 fotoxx/receipt --- a/fotoxx/receipt Thu Dec 26 13:52:49 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,34 +0,0 @@ -# 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 e10c58dd2635 -r 135b6b635ef2 fotoxx/stuff/fotoxx.desktop --- a/fotoxx/stuff/fotoxx.desktop Thu Dec 26 13:52:49 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,10 +0,0 @@ -[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 e10c58dd2635 -r 135b6b635ef2 gtkaml/receipt --- a/gtkaml/receipt Thu Dec 26 13:52:49 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -# 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 e10c58dd2635 -r 135b6b635ef2 linmodem-hsfmodem/receipt --- a/linmodem-hsfmodem/receipt Thu Dec 26 13:52:49 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,85 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="linmodem-hsfmodem" -SOURCE="hsfmodem" -VERSION="7.80.02.06full" -CATEGORY="non-free" -SHORT_DESC="Driver for the Conexant (formerly Rockwell) HSF Softmodem family." -MAINTAINER="orphaned@slitaz.org" -LICENSE="other" -TARBALL="$SOURCE-$VERSION.tar.gz" -WEB_SITE="http://www.linuxant.com/drivers" -WGET_URL="http://www.linuxant.com/drivers/hsf/full/archive/$SOURCE-$VERSION/$TARBALL" - -DEPENDS="module-init-tools perl usbutils" -BUILD_DEPENDS="cpio linux lzma linux-module-headers util-linux-getopt \ -usbutils-dev" - -# Rules to configure and make the package. -compile_rules() -{ - cd $src - echo "Apply $file..." - patch -p1 < $(ls $stuff/$SOURCE-*.diff) || return 1 - grep -rl 'uname -r' . | xargs sed -i "s/uname -r/echo $kvers/g" - sed -i 's/DECLARE_MUTEX/DEFINE_SEMAPHORE/' \ - modules/osnvm.c modules/GPL/serial_cnxt.c - sed -i 's/\.ioctl/.unlocked_ioctl/' modules/osdiag.c - # build driver - echo "Build driver" - make ROOT=$DESTDIR install - # build kernel modules - echo "Running $DESTDIR/usr/sbin/hsfconfig -ka..." - $DESTDIR/usr/sbin/hsfconfig -ka - echo " OK" -} - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - # kernel modules - mkdir -p $fs/lib/modules/$kvers - cp -a /lib/modules/$kvers/extra $fs/lib/modules/$kvers - # cleaning up - rm -r /lib/modules/$kvers/extra - # command files - mkdir -p $fs/usr - cp -a $install/usr/sbin $fs/usr - cp -a $install/usr/lib $fs/usr - # config files - mkdir -p $fs/etc - cp -a $install/etc/hsfmodem $fs/etc - cp -a $stuff/zone.tab $fs/etc/hsfmodem -} - -post_install() -{ - depmod -a - echo -n "Install serial port devices" - hsfconfig -s > /dev/null - status - echo -n "Install kernel modules" - modprobe -v /dev/ttySHSF > /dev/null - status - echo -n "Set region" - hsfconfig -c AUTO - echo "-----------------------------------------------------------------------------" - echo "To enable your modem's full functionality (high-speed 56k data and FAX)," - echo "a license registration key must be obtained from Linuxant and entered with" - echo "hsfconfig --license." - echo "" - echo "Without a proper license key, the modem can only operate in FREE mode," - echo "limited to a maximum speed of 14.4Kbps (V.32bis) and the FAX" - echo "functionality will not be available." -} - -pre_remove() -{ - hsfstop -} - -post_remove() -{ - depmod -a - rm -r /etc/hsfmodem -} diff -r e10c58dd2635 -r 135b6b635ef2 linmodem-hsfmodem/stuff/hsfmodem-7.80.02.05full.diff --- a/linmodem-hsfmodem/stuff/hsfmodem-7.80.02.05full.diff Thu Dec 26 13:52:49 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,207 +0,0 @@ ---- hsfmodem-7.80.02.05full/config.mak Fri Feb 20 22:30:12 2009 -+++ hsfmodem-7.80.02.05full+patch2/config.mak Sun Apr 11 19:29:08 2010 -@@ -131,4 +131,4 @@ - -e "s!@SCR_SUPPORT@!`test ! \"$(IMPORTED_SCR_SUPPORT)\" = yes; echo $$?`!g" \ - -e "s!@DMP_SUPPORT@!`test -z \"$(IMPORTED_DMP_SUPPORT)\"; echo $$?`!g" \ - < $< > $@ -- chmod --reference=$< $@ -+ chmod 755 $@ ---- hsfmodem-7.80.02.05full/makefile Mon Feb 23 22:51:37 2009 -+++ hsfmodem-7.80.02.05full+patch2/makefile Sun Apr 11 19:29:08 2010 -@@ -149,7 +149,7 @@ - ifeq ($(RPMOPTEVAL),yes) - RPMTARGETCPU=$(shell rpm --eval '%_target_cpu') - else --RPMTARGETCPU=$(shell uname -i) -+RPMTARGETCPU=$(shell uname -m) - endif - - ifneq ($(RPMOPTDEFINE),yes) ---- hsfmodem-7.80.02.05full/modules/Makefile Thu Oct 22 00:35:59 2009 -+++ hsfmodem-7.80.02.05full+patch2/modules/Makefile Sun Apr 11 19:49:54 2010 -@@ -20,7 +20,7 @@ - include $(TOP)/config.mak - - IMPORTED = $(TOP)/modules/imported --MACHINE_ARCH := $(shell if uname --hardware-platform >/dev/null 2>&1 && ! uname --hardware-platform | grep -q "unknown"; then uname --hardware-platform; else uname --machine | sed 's/^i.86$$/i386/'; fi) -+MACHINE_ARCH := $(shell if uname -p >/dev/null 2>&1 && ! uname -p | grep -q "unknown"; then uname -p; else uname -m | sed 's/^i.86$$/i386/'; fi) - ifneq ($(subst powerpc,ppc,$(IMPORTED_ARCH)),$(MACHINE_ARCH)) - $(warning *** WARNING: Trying to compile kernel modules on a $(MACHINE_ARCH) system while the installed $(CNXTTARGET) driver package is for $(IMPORTED_ARCH), this is likely to fail... ***) - endif -@@ -56,6 +56,7 @@ - CNXT_KERNELSRC := /usr/src/kernel-headers-$(shell uname -r) - else - CNXT_KERNELSRC := /usr/src/linux -+CNXT_KERNELSRC := ../../../linux/linux-$(shell uname -r | sed s/-slitaz//) - endif - KERNELSRC_EXISTS := $(shell test -r ${CNXT_KERNELSRC}/include/linux/version.h && echo yes || echo no) - endif - ---- hsfmodem-7.80.02.05full/nvm/linksame Fri Jan 13 20:23:51 2006 -+++ hsfmodem-7.80.02.05full+patch2/nvm/linksame Sun Apr 11 19:29:08 2010 -@@ -17,7 +17,7 @@ - - if $dryrun; then - echo "dry run.." -- find . -type f ! -empty -exec md5sum {} \; | sort | while read sum file ; do -+ find . -type f ! -size 0 -exec md5sum {} \; | sort | while read sum file ; do - if [ "$sum" = "$prevsum" ] && cmp -s "$file" "$prevfile"; then - echo ln "$prevfile" "$file" - else -@@ -28,7 +28,7 @@ - exit $? - fi - --find . -type f ! -empty -exec md5sum {} \; | sort | while read sum file ; do -+find . -type f ! -size 0 -exec md5sum {} \; | sort | while read sum file ; do - if [ "$sum" = "$prevsum" ] && cmp -s "$file" "$prevfile"; then - rm -f "$file" - echo ln "$prevfile" "$file" ---- hsfmodem-7.80.02.05full/nvm/makefile Wed Oct 1 17:23:26 2008 -+++ hsfmodem-7.80.02.05full+patch2/nvm/makefile Sun Apr 11 19:29:08 2010 -@@ -52,7 +52,7 @@ - all: $(ALL) - - $(NVMCVTDIR)/.linksame: $(NVMDIRS_CVT) -- cd $(NVMCVTDIR) && find . -type f ! -empty -exec md5sum {} ';' | sort | \ -+ cd $(NVMCVTDIR) && find . -type f ! -size 0 -exec md5sum {} ';' | sort | \ - while read sum file ; do \ - if [ "$$sum" = "$$prevsum" ] && cmp -s "$$file" "$$prevfile"; then \ - rm -f "$$file"; \ ---- hsfmodem-7.80.02.05full/scripts/cnxtconfig.in Thu Oct 22 00:35:59 2009 -+++ hsfmodem-7.80.02.05full+patch2/scripts/cnxtconfig.in Sun Apr 11 19:29:08 2010 -@@ -74,7 +74,7 @@ - answer="${region}" - ;; - *) -- answer="`echo \"${answer}\" | tr '[a-z ]' '[A-Z_]'`" -+ answer="`echo \"${answer}\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`" - ;; - esac - fi -@@ -109,15 +109,13 @@ - { - # Try to guess what region we're in, using the timezone settings - -- localtime_size="`/bin/ls -lL /etc/localtime 2>/dev/null | ${AWK} '{print $5}'`" -- -- if ! [ ${localtime_size} -gt 0 ]; then -+ if [ ! -e /etc/TZ ]; then - return 1 - fi - -- zoneinfo_dir=/usr/share/zoneinfo -+ zoneinfo_dir=/etc/hsfmodem - -- if [ ! -d ${zoneinfo_dir} -o ! -f ${zoneinfo_dir}/zone.tab ]; then -+ if [ ! -f ${zoneinfo_dir}/zone.tab ]; then - return 1 - fi - -@@ -206,18 +204,11 @@ - iso_VN=00BC # VIETNAM - - ( -- cd ${zoneinfo_dir} 2>/dev/null || return 1 -- find . -type f -size "${localtime_size}"c -print | sed 's@^\./@@' | \ -- while read file; do -- cmp -s /etc/localtime $file || continue --# in the egrep and sed regular expressions below, it is very important to --# have tabs, not spaces -- egrep " $file( .*|\$)" ${zoneinfo_dir}/zone.tab -- done | sed -n '/^[^#]/s/ .*//p' | sort | uniq | \ -- while read code; do -- eval "echo \${iso_${code}}" -- done | sort | uniq -+ zone=`cat /etc/TZ` -+ code=`grep $zone ${zoneinfo_dir}/zone.tab | awk '{print $1}' | sort | uniq` -+ eval "echo \${iso_${code}}" - return 0 -+ - ) - } - -@@ -271,7 +262,7 @@ - # The md5sum is used for input verification. - disptokey() - { -- k="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/FREE/00000000/' | tr -d -c '[0-9A-F\012]'`" -+ k="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/FREE/00000000/' | tr -d -c '[0-9][A-F][\012]'`" - case $k in - 00000000) - echo "$k" -@@ -1655,7 +1646,7 @@ - update-modules - else - if ("$@" "${modulesconf}" | "${filter}"; cat ${f}) > ${modulesconf}.$$; then -- if ! cmp --silent ${modulesconf}.$$ ${modulesconf}; then -+ if ! cmp -s ${modulesconf}.$$ ${modulesconf}; then - if ! cp ${modulesconf}.$$ ${modulesconf}; then - rm -f ${modulesconf}.$$ ${f} - exit 1 -@@ -1681,7 +1672,7 @@ - fi - - if ("$@" "${modprobeconf}" | "${filter}"; cat ${f}) > ${modprobeconf}.$$; then -- if ! cmp --silent ${modprobeconf}.$$ ${modprobeconf}; then -+ if ! cmp -s ${modprobeconf}.$$ ${modprobeconf}; then - if ! cp ${modprobeconf}.$$ ${modprobeconf}; then - rm -f ${modprobeconf}.$$ ${f} - exit 1 -@@ -2214,6 +2205,10 @@ - elif [ -d /var/lib/LST ]; then - OSDISTNAME=Caldera - OSDISTIDNT=caldera -+ elif [ -f /etc/slitaz-release ]; then -+ OSDISTNAME=SliTaz -+ OSDISTIDNT=slitaz -+ OSDISTVERS="`cat /etc/slitaz-release`" - fi - - OSKERNNAME="`uname -s | tr '[A-Z]' '[a-z]'`" -@@ -2268,7 +2263,7 @@ - - dump_file() - { -- dump_cmd cat -v $@ -+ dump_cmd cat $@ - } - - dump_diagnostics() -@@ -2587,7 +2582,7 @@ - fi - units="${specificunit}" - if [ -z "${units}" ]; then -- units=`ls --ignore=flush_nvm ${procdrvdir}` -+ units=`ls ${procdrvdir} | grep -v flush_nvm` - - if [ -z "${units}" ]; then - echo "" -@@ -2884,7 +2879,7 @@ - explicitopt=true - do_cfgregion=true - if [ -n "$2" ]; then -- setregion="`echo \"$2\" | tr '[a-z ]' '[A-Z_]'`" -+ setregion="`echo \"$2\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`" - fi - shift 2 - ;; -@@ -2954,7 +2949,7 @@ - - # Accept --region as equivalent to --region= - if ${do_cfgregion} && [ $# -ge 1 -a -z "${setregion}" ]; then -- setregion="`echo \"$1\" | tr '[a-z ]' '[A-Z_]'`" -+ setregion="`echo \"$1\" | tr '[a-z]' '[A-Z]' | sed 's/\s/_/g'`" - shift - fi - -@@ -3033,7 +3028,7 @@ - - if ${do_cfgnewinstance}; then - if [ ! -d "${cnxtnvmdir}/dynamic/${newinstance}" ]; then -- mkdir --mode=700 --parents "${cnxtnvmdir}/dynamic/${newinstance}" || exit $? -+ mkdir -m 700 -p "${cnxtnvmdir}/dynamic/${newinstance}" || exit $? - # The purpose of --info here is to ensure module reload: - (sleep 2; exec @CNXTTARGET@config --auto --region=AUTO --info) /dev/null 2>&1 & - fi - diff -r e10c58dd2635 -r 135b6b635ef2 linmodem-hsfmodem/stuff/zone.tab --- a/linmodem-hsfmodem/stuff/zone.tab Thu Dec 26 13:52:49 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,407 +0,0 @@ -# @(#)zone.tab 1.32 -# -# TZ zone descriptions -# -# From Paul Eggert (1996-08-05): -# -# This file contains a table with the following columns: -# 1. ISO 3166 2-character country code. See the file `iso3166.tab'. -# 2. Latitude and longitude of the zone's principal location -# in ISO 6709 sign-degrees-minutes-seconds format, -# either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS, -# first latitude (+ is north), then longitude (+ is east). -# 3. Zone name used in value of TZ environment variable. -# 4. Comments; present if and only if the country has multiple rows. -# -# Columns are separated by a single tab. -# The table is sorted first by country, then an order within the country that -# (1) makes some geographical sense, and -# (2) puts the most populous zones first, where that does not contradict (1). -# -# Lines beginning with `#' are comments. -# -#country- -#code coordinates TZ comments -AD +4230+00131 Europe/Andorra -AE +2518+05518 Asia/Dubai -AF +3431+06912 Asia/Kabul -AG +1703-06148 America/Antigua -AI +1812-06304 America/Anguilla -AL +4120+01950 Europe/Tirane -AM +4011+04430 Asia/Yerevan -AN +1211-06900 America/Curacao -AO -0848+01314 Africa/Luanda -AQ -7750+16636 Antarctica/McMurdo McMurdo Station, Ross Island -AQ -9000+00000 Antarctica/South_Pole Amundsen-Scott Station, South Pole -AQ -6734-06808 Antarctica/Rothera Rothera Station, Adelaide Island -AQ -6448-06406 Antarctica/Palmer Palmer Station, Anvers Island -AQ -6736+06253 Antarctica/Mawson Mawson Station, Holme Bay -AQ -6835+07758 Antarctica/Davis Davis Station, Vestfold Hills -AQ -6617+11031 Antarctica/Casey Casey Station, Bailey Peninsula -AQ -7824+10654 Antarctica/Vostok Vostok Station, S Magnetic Pole -AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Base, Terre Adelie -AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I -AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF) -AR -3124-06411 America/Argentina/Cordoba most locations (CB, CC, CN, ER, FM, LP, MN, NQ, RN, SA, SE, SF, SL) -AR -2411-06518 America/Argentina/Jujuy Jujuy (JY) -AR -3124-06411 America/Argentina/Tucuman Tucuman (TM) -AR -2828-06547 America/Argentina/Catamarca Catamarca (CT), Chubut (CH) -AR -2926-06651 America/Argentina/La_Rioja La Rioja (LR) -AR -3132-06831 America/Argentina/San_Juan San Juan (SJ) -AR -3253-06849 America/Argentina/Mendoza Mendoza (MZ) -AR -5138-06913 America/Argentina/Rio_Gallegos Santa Cruz (SC) -AR -5448-06818 America/Argentina/Ushuaia Tierra del Fuego (TF) -AS -1416-17042 Pacific/Pago_Pago -AT +4813+01620 Europe/Vienna -AU -3133+15905 Australia/Lord_Howe Lord Howe Island -AU -4253+14719 Australia/Hobart Tasmania - most locations -AU -3956+14352 Australia/Currie Tasmania - King Island -AU -3749+14458 Australia/Melbourne Victoria -AU -3352+15113 Australia/Sydney New South Wales - most locations -AU -3157+14127 Australia/Broken_Hill New South Wales - Yancowinna -AU -2728+15302 Australia/Brisbane Queensland - most locations -AU -2016+14900 Australia/Lindeman Queensland - Holiday Islands -AU -3455+13835 Australia/Adelaide South Australia -AU -1228+13050 Australia/Darwin Northern Territory -AU -3157+11551 Australia/Perth Western Australia -AW +1230-06858 America/Aruba -AX +6006+01957 Europe/Mariehamn -AZ +4023+04951 Asia/Baku -BA +4352+01825 Europe/Sarajevo -BB +1306-05937 America/Barbados -BD +2343+09025 Asia/Dhaka -BE +5050+00420 Europe/Brussels -BF +1222-00131 Africa/Ouagadougou -BG +4241+02319 Europe/Sofia -BH +2623+05035 Asia/Bahrain -BI -0323+02922 Africa/Bujumbura -BJ +0629+00237 Africa/Porto-Novo -BM +3217-06446 Atlantic/Bermuda -BN +0456+11455 Asia/Brunei -BO -1630-06809 America/La_Paz -BR -0351-03225 America/Noronha Atlantic islands -BR -0127-04829 America/Belem Amapa, E Para -BR -0343-03830 America/Fortaleza NE Brazil (MA, PI, CE, RN, PB) -BR -0803-03454 America/Recife Pernambuco -BR -0712-04812 America/Araguaina Tocantins -BR -0940-03543 America/Maceio Alagoas, Sergipe -BR -1259-03831 America/Bahia Bahia -BR -2332-04637 America/Sao_Paulo S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS) -BR -2027-05437 America/Campo_Grande Mato Grosso do Sul -BR -1535-05605 America/Cuiaba Mato Grosso -BR -0846-06354 America/Porto_Velho W Para, Rondonia -BR +0249-06040 America/Boa_Vista Roraima -BR -0308-06001 America/Manaus E Amazonas -BR -0640-06952 America/Eirunepe W Amazonas -BR -0958-06748 America/Rio_Branco Acre -BS +2505-07721 America/Nassau -BT +2728+08939 Asia/Thimphu -BW -2545+02555 Africa/Gaborone -BY +5354+02734 Europe/Minsk -BZ +1730-08812 America/Belize -CA +4734-05243 America/St_Johns Newfoundland Island -CA +4439-06336 America/Halifax Atlantic Time - Nova Scotia (most places), NB, W Labrador, E Quebec & PEI -CA +4612-05957 America/Glace_Bay Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971 -CA +5320-06025 America/Goose_Bay Atlantic Time - E Labrador -CA +4531-07334 America/Montreal Eastern Time - Quebec - most locations -CA +4339-07923 America/Toronto Eastern Time - Ontario - most locations -CA +4901-08816 America/Nipigon Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973 -CA +4823-08915 America/Thunder_Bay Eastern Time - Thunder Bay, Ontario -CA +6608-06544 America/Pangnirtung Eastern Time - Pangnirtung, Nunavut -CA +6344-06828 America/Iqaluit Eastern Time - east Nunavut -CA +6408-08310 America/Coral_Harbour Eastern Standard Time - Southampton Island -CA +6245-09210 America/Rankin_Inlet Central Time - central Nunavut -CA +4953-09709 America/Winnipeg Central Time - Manitoba & west Ontario -CA +4843-09429 America/Rainy_River Central Time - Rainy River & Fort Frances, Ontario -CA +6903-10505 America/Cambridge_Bay Central Time - west Nunavut -CA +5024-10439 America/Regina Central Standard Time - Saskatchewan - most locations -CA +5017-10750 America/Swift_Current Central Standard Time - Saskatchewan - midwest -CA +5333-11328 America/Edmonton Mountain Time - Alberta, east British Columbia & west Saskatchewan -CA +6227-11421 America/Yellowknife Mountain Time - central Northwest Territories -CA +6825-11330 America/Inuvik Mountain Time - west Northwest Territories -CA +5946-12014 America/Dawson_Creek Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia -CA +4916-12307 America/Vancouver Pacific Time - west British Columbia -CA +6043-13503 America/Whitehorse Pacific Time - south Yukon -CA +6404-13925 America/Dawson Pacific Time - north Yukon -CC -1210+09655 Indian/Cocos -CD -0418+01518 Africa/Kinshasa west Dem. Rep. of Congo -CD -1140+02728 Africa/Lubumbashi east Dem. Rep. of Congo -CF +0422+01835 Africa/Bangui -CG -0416+01517 Africa/Brazzaville -CH +4723+00832 Europe/Zurich -CI +0519-00402 Africa/Abidjan -CK -2114-15946 Pacific/Rarotonga -CL -3327-07040 America/Santiago most locations -CL -2710-10927 Pacific/Easter Easter Island & Sala y Gomez -CM +0403+00942 Africa/Douala -CN +3114+12128 Asia/Shanghai east China - Beijing, Guangdong, Shanghai, etc. -CN +4545+12641 Asia/Harbin Heilongjiang -CN +2934+10635 Asia/Chongqing central China - Gansu, Guizhou, Sichuan, Yunnan, etc. -CN +4348+08735 Asia/Urumqi Tibet & most of Xinjiang Uyghur -CN +3929+07559 Asia/Kashgar southwest Xinjiang Uyghur -CO +0436-07405 America/Bogota -CR +0956-08405 America/Costa_Rica -CS +4450+02030 Europe/Belgrade -CU +2308-08222 America/Havana -CV +1455-02331 Atlantic/Cape_Verde -CX -1025+10543 Indian/Christmas -CY +3510+03322 Asia/Nicosia -CZ +5005+01426 Europe/Prague -DE +5230+01322 Europe/Berlin -DJ +1136+04309 Africa/Djibouti -DK +5540+01235 Europe/Copenhagen -DM +1518-06124 America/Dominica -DO +1828-06954 America/Santo_Domingo -DZ +3647+00303 Africa/Algiers -EC -0210-07950 America/Guayaquil mainland -EC -0054-08936 Pacific/Galapagos Galapagos Islands -EE +5925+02445 Europe/Tallinn -EG +3003+03115 Africa/Cairo -EH +2709-01312 Africa/El_Aaiun -ER +1520+03853 Africa/Asmera -ES +4024-00341 Europe/Madrid mainland -ES +3553-00519 Africa/Ceuta Ceuta & Melilla -ES +2806-01524 Atlantic/Canary Canary Islands -ET +0902+03842 Africa/Addis_Ababa -FI +6010+02458 Europe/Helsinki -FJ -1808+17825 Pacific/Fiji -FK -5142-05751 Atlantic/Stanley -FM +0725+15147 Pacific/Truk Truk (Chuuk) and Yap -FM +0658+15813 Pacific/Ponape Ponape (Pohnpei) -FM +0519+16259 Pacific/Kosrae Kosrae -FO +6201-00646 Atlantic/Faeroe -FR +4852+00220 Europe/Paris -GA +0023+00927 Africa/Libreville -GB +512830-0001845 Europe/London -GD +1203-06145 America/Grenada -GE +4143+04449 Asia/Tbilisi -GF +0456-05220 America/Cayenne -GH +0533-00013 Africa/Accra -GI +3608-00521 Europe/Gibraltar -GL +6411-05144 America/Godthab most locations -GL +7646-01840 America/Danmarkshavn east coast, north of Scoresbysund -GL +7030-02215 America/Scoresbysund Scoresbysund / Ittoqqortoormiit -GL +7634-06847 America/Thule Thule / Pituffik -GM +1328-01639 Africa/Banjul -GN +0931-01343 Africa/Conakry -GP +1614-06132 America/Guadeloupe -GQ +0345+00847 Africa/Malabo -GR +3758+02343 Europe/Athens -GS -5416-03632 Atlantic/South_Georgia -GT +1438-09031 America/Guatemala -GU +1328+14445 Pacific/Guam -GW +1151-01535 Africa/Bissau -GY +0648-05810 America/Guyana -HK +2217+11409 Asia/Hong_Kong -HN +1406-08713 America/Tegucigalpa -HR +4548+01558 Europe/Zagreb -HT +1832-07220 America/Port-au-Prince -HU +4730+01905 Europe/Budapest -ID -0610+10648 Asia/Jakarta Java & Sumatra -ID -0002+10920 Asia/Pontianak west & central Borneo -ID -0507+11924 Asia/Makassar east & south Borneo, Celebes, Bali, Nusa Tengarra, west Timor -ID -0232+14042 Asia/Jayapura Irian Jaya & the Moluccas -IE +5320-00615 Europe/Dublin -IL +3146+03514 Asia/Jerusalem -IN +2232+08822 Asia/Calcutta -IO -0720+07225 Indian/Chagos -IQ +3321+04425 Asia/Baghdad -IR +3540+05126 Asia/Tehran -IS +6409-02151 Atlantic/Reykjavik -IT +4154+01229 Europe/Rome -JM +1800-07648 America/Jamaica -JO +3157+03556 Asia/Amman -JP +353916+1394441 Asia/Tokyo -KE -0117+03649 Africa/Nairobi -KG +4254+07436 Asia/Bishkek -KH +1133+10455 Asia/Phnom_Penh -KI +0125+17300 Pacific/Tarawa Gilbert Islands -KI -0308-17105 Pacific/Enderbury Phoenix Islands -KI +0152-15720 Pacific/Kiritimati Line Islands -KM -1141+04316 Indian/Comoro -KN +1718-06243 America/St_Kitts -KP +3901+12545 Asia/Pyongyang -KR +3733+12658 Asia/Seoul -KW +2920+04759 Asia/Kuwait -KY +1918-08123 America/Cayman -KZ +4315+07657 Asia/Almaty most locations -KZ +4448+06528 Asia/Qyzylorda Qyzylorda (Kyzylorda, Kzyl-Orda) -KZ +5017+05710 Asia/Aqtobe Aqtobe (Aktobe) -KZ +4431+05016 Asia/Aqtau Atyrau (Atirau, Gur'yev), Mangghystau (Mankistau) -KZ +5113+05121 Asia/Oral West Kazakhstan -LA +1758+10236 Asia/Vientiane -LB +3353+03530 Asia/Beirut -LC +1401-06100 America/St_Lucia -LI +4709+00931 Europe/Vaduz -LK +0656+07951 Asia/Colombo -LR +0618-01047 Africa/Monrovia -LS -2928+02730 Africa/Maseru -LT +5441+02519 Europe/Vilnius -LU +4936+00609 Europe/Luxembourg -LV +5657+02406 Europe/Riga -LY +3254+01311 Africa/Tripoli -MA +3339-00735 Africa/Casablanca -MC +4342+00723 Europe/Monaco -MD +4700+02850 Europe/Chisinau -MG -1855+04731 Indian/Antananarivo -MH +0709+17112 Pacific/Majuro most locations -MH +0905+16720 Pacific/Kwajalein Kwajalein -MK +4159+02126 Europe/Skopje -ML +1239-00800 Africa/Bamako -MM +1647+09610 Asia/Rangoon -MN +4755+10653 Asia/Ulaanbaatar most locations -MN +4801+09139 Asia/Hovd Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan -MN +4804+11430 Asia/Choibalsan Dornod, Sukhbaatar -MO +2214+11335 Asia/Macau -MP +1512+14545 Pacific/Saipan -MQ +1436-06105 America/Martinique -MR +1806-01557 Africa/Nouakchott -MS +1644-06213 America/Montserrat -MT +3554+01431 Europe/Malta -MU -2010+05730 Indian/Mauritius -MV +0410+07330 Indian/Maldives -MW -1547+03500 Africa/Blantyre -MX +1924-09909 America/Mexico_City Central Time - most locations -MX +2105-08646 America/Cancun Central Time - Quintana Roo -MX +2058-08937 America/Merida Central Time - Campeche, Yucatan -MX +2540-10019 America/Monterrey Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas -MX +2313-10625 America/Mazatlan Mountain Time - S Baja, Nayarit, Sinaloa -MX +2838-10605 America/Chihuahua Mountain Time - Chihuahua -MX +2904-11058 America/Hermosillo Mountain Standard Time - Sonora -MX +3232-11701 America/Tijuana Pacific Time -MY +0310+10142 Asia/Kuala_Lumpur peninsular Malaysia -MY +0133+11020 Asia/Kuching Sabah & Sarawak -MZ -2558+03235 Africa/Maputo -NA -2234+01706 Africa/Windhoek -NC -2216+16530 Pacific/Noumea -NE +1331+00207 Africa/Niamey -NF -2903+16758 Pacific/Norfolk -NG +0627+00324 Africa/Lagos -NI +1209-08617 America/Managua -NL +5222+00454 Europe/Amsterdam -NO +5955+01045 Europe/Oslo -NP +2743+08519 Asia/Katmandu -NR -0031+16655 Pacific/Nauru -NU -1901+16955 Pacific/Niue -NZ -3652+17446 Pacific/Auckland most locations -NZ -4357-17633 Pacific/Chatham Chatham Islands -OM +2336+05835 Asia/Muscat -PA +0858-07932 America/Panama -PE -1203-07703 America/Lima -PF -1732-14934 Pacific/Tahiti Society Islands -PF -0900-13930 Pacific/Marquesas Marquesas Islands -PF -2308-13457 Pacific/Gambier Gambier Islands -PG -0930+14710 Pacific/Port_Moresby -PH +1435+12100 Asia/Manila -PK +2452+06703 Asia/Karachi -PL +5215+02100 Europe/Warsaw -PM +4703-05620 America/Miquelon -PN -2504-13005 Pacific/Pitcairn -PR +182806-0660622 America/Puerto_Rico -PS +3130+03428 Asia/Gaza -PT +3843-00908 Europe/Lisbon mainland -PT +3238-01654 Atlantic/Madeira Madeira Islands -PT +3744-02540 Atlantic/Azores Azores -PW +0720+13429 Pacific/Palau -PY -2516-05740 America/Asuncion -QA +2517+05132 Asia/Qatar -RE -2052+05528 Indian/Reunion -RO +4426+02606 Europe/Bucharest -RU +5443+02030 Europe/Kaliningrad Moscow-01 - Kaliningrad -RU +5545+03735 Europe/Moscow Moscow+00 - west Russia -RU +5312+05009 Europe/Samara Moscow+01 - Caspian Sea -RU +5651+06036 Asia/Yekaterinburg Moscow+02 - Urals -RU +5500+07324 Asia/Omsk Moscow+03 - west Siberia -RU +5502+08255 Asia/Novosibirsk Moscow+03 - Novosibirsk -RU +5601+09250 Asia/Krasnoyarsk Moscow+04 - Yenisei River -RU +5216+10420 Asia/Irkutsk Moscow+05 - Lake Baikal -RU +6200+12940 Asia/Yakutsk Moscow+06 - Lena River -RU +4310+13156 Asia/Vladivostok Moscow+07 - Amur River -RU +4658+14242 Asia/Sakhalin Moscow+07 - Sakhalin Island -RU +5934+15048 Asia/Magadan Moscow+08 - Magadan -RU +5301+15839 Asia/Kamchatka Moscow+09 - Kamchatka -RU +6445+17729 Asia/Anadyr Moscow+10 - Bering Sea -RW -0157+03004 Africa/Kigali -SA +2438+04643 Asia/Riyadh -SB -0932+16012 Pacific/Guadalcanal -SC -0440+05528 Indian/Mahe -SD +1536+03232 Africa/Khartoum -SE +5920+01803 Europe/Stockholm -SG +0117+10351 Asia/Singapore -SH -1555-00542 Atlantic/St_Helena -SI +4603+01431 Europe/Ljubljana -SJ +7800+01600 Arctic/Longyearbyen Svalbard -SJ +7059-00805 Atlantic/Jan_Mayen Jan Mayen -SK +4809+01707 Europe/Bratislava -SL +0830-01315 Africa/Freetown -SM +4355+01228 Europe/San_Marino -SN +1440-01726 Africa/Dakar -SO +0204+04522 Africa/Mogadishu -SR +0550-05510 America/Paramaribo -ST +0020+00644 Africa/Sao_Tome -SV +1342-08912 America/El_Salvador -SY +3330+03618 Asia/Damascus -SZ -2618+03106 Africa/Mbabane -TC +2128-07108 America/Grand_Turk -TD +1207+01503 Africa/Ndjamena -TF -492110+0701303 Indian/Kerguelen -TG +0608+00113 Africa/Lome -TH +1345+10031 Asia/Bangkok -TJ +3835+06848 Asia/Dushanbe -TK -0922-17114 Pacific/Fakaofo -TL -0833+12535 Asia/Dili -TM +3757+05823 Asia/Ashgabat -TN +3648+01011 Africa/Tunis -TO -2110+17510 Pacific/Tongatapu -TR +4101+02858 Europe/Istanbul -TT +1039-06131 America/Port_of_Spain -TV -0831+17913 Pacific/Funafuti -TW +2503+12130 Asia/Taipei -TZ -0648+03917 Africa/Dar_es_Salaam -UA +5026+03031 Europe/Kiev most locations -UA +4837+02218 Europe/Uzhgorod Ruthenia -UA +4750+03510 Europe/Zaporozhye Zaporozh'ye, E Lugansk -UA +4457+03406 Europe/Simferopol central Crimea -UG +0019+03225 Africa/Kampala -UM +1700-16830 Pacific/Johnston Johnston Atoll -UM +2813-17722 Pacific/Midway Midway Islands -UM +1917+16637 Pacific/Wake Wake Island -US +404251-0740023 America/New_York Eastern Time -US +421953-0830245 America/Detroit Eastern Time - Michigan - most locations -US +381515-0854534 America/Kentucky/Louisville Eastern Time - Kentucky - Louisville area -US +364947-0845057 America/Kentucky/Monticello Eastern Time - Kentucky - Wayne County -US +394606-0860929 America/Indiana/Indianapolis Eastern Standard Time - Indiana - most locations -US +382232-0862041 America/Indiana/Marengo Eastern Standard Time - Indiana - Crawford County -US +411745-0863730 America/Indiana/Knox Eastern Standard Time - Indiana - Starke County -US +384452-0850402 America/Indiana/Vevay Eastern Standard Time - Indiana - Switzerland County -US +415100-0873900 America/Chicago Central Time -US +450628-0873651 America/Menominee Central Time - Michigan - Wisconsin border -US +470659-1011757 America/North_Dakota/Center Central Time - North Dakota - Oliver County -US +394421-1045903 America/Denver Mountain Time -US +433649-1161209 America/Boise Mountain Time - south Idaho & east Oregon -US +364708-1084111 America/Shiprock Mountain Time - Navajo -US +332654-1120424 America/Phoenix Mountain Standard Time - Arizona -US +340308-1181434 America/Los_Angeles Pacific Time -US +611305-1495401 America/Anchorage Alaska Time -US +581807-1342511 America/Juneau Alaska Time - Alaska panhandle -US +593249-1394338 America/Yakutat Alaska Time - Alaska panhandle neck -US +643004-1652423 America/Nome Alaska Time - west Alaska -US +515248-1763929 America/Adak Aleutian Islands -US +211825-1575130 Pacific/Honolulu Hawaii -UY -3453-05611 America/Montevideo -UZ +3940+06648 Asia/Samarkand west Uzbekistan -UZ +4120+06918 Asia/Tashkent east Uzbekistan -VA +4154+01227 Europe/Vatican -VC +1309-06114 America/St_Vincent -VE +1030-06656 America/Caracas -VG +1827-06437 America/Tortola -VI +1821-06456 America/St_Thomas -VN +1045+10640 Asia/Saigon -VU -1740+16825 Pacific/Efate -WF -1318-17610 Pacific/Wallis -WS -1350-17144 Pacific/Apia -YE +1245+04512 Asia/Aden -YT -1247+04514 Indian/Mayotte -ZA -2615+02800 Africa/Johannesburg -ZM -1525+02817 Africa/Lusaka -ZW -1750+03103 Africa/Harare diff -r e10c58dd2635 -r 135b6b635ef2 php-cups/receipt --- a/php-cups/receipt Thu Dec 26 13:52:49 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,72 +0,0 @@ -# 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 e10c58dd2635 -r 135b6b635ef2 v4l-dvb/stuff/414e0bbd99bf --- a/v4l-dvb/stuff/414e0bbd99bf Thu Dec 26 13:52:49 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ - -# 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 e10c58dd2635 -r 135b6b635ef2 v4l-dvb/stuff/d0a2ff731670 --- a/v4l-dvb/stuff/d0a2ff731670 Thu Dec 26 13:52:49 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,181 +0,0 @@ - -# 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 e10c58dd2635 -r 135b6b635ef2 v4l-dvb/stuff/d64b014c5253 --- a/v4l-dvb/stuff/d64b014c5253 Thu Dec 26 13:52:49 2013 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ - -# 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); -