summaryrefslogtreecommitdiffstats
path: root/abs/extra
diff options
context:
space:
mode:
authorMichael Hanson <mihanson@linhes.org>2011-11-04 19:21:13 (GMT)
committerMichael Hanson <mihanson@linhes.org>2011-11-04 19:21:13 (GMT)
commit94f21428c8ed60129ee5e14b1914a8cfe1bcdb2a (patch)
tree27c63c2fa679256dbc46bbff241c41db98e9d244 /abs/extra
parente3a0f9ba95aa059d76a57c7821a5ccc6a80a5f84 (diff)
parent67989fe1be117ac23fa3a98acbc2794a17d7d0ed (diff)
downloadlinhes_pkgbuild-94f21428c8ed60129ee5e14b1914a8cfe1bcdb2a.zip
linhes_pkgbuild-94f21428c8ed60129ee5e14b1914a8cfe1bcdb2a.tar.gz
linhes_pkgbuild-94f21428c8ed60129ee5e14b1914a8cfe1bcdb2a.tar.bz2
Merge branch 'testing' of knoppmyth.net:linhes_pkgbuild into testing
Diffstat (limited to 'abs/extra')
-rw-r--r--abs/extra/community/libv4l/PKGBUILD19
-rw-r--r--abs/extra/community/mythtv-vdpau/2.6.28_dvb_api_version.diff22
-rw-r--r--abs/extra/community/mythtv-vdpau/PKGBUILD102
-rw-r--r--abs/extra/community/mythtv-vdpau/PKGBUILD.orig102
-rw-r--r--abs/extra/community/mythtv-vdpau/QUICKSTART.archlinux69
-rwxr-xr-xabs/extra/community/mythtv-vdpau/menu-xml/HOST_SETTINGS.xml87
-rw-r--r--abs/extra/community/mythtv-vdpau/menu-xml/is.xml3
-rw-r--r--abs/extra/community/mythtv-vdpau/menu-xml/library.xml.patch15
-rw-r--r--abs/extra/community/mythtv-vdpau/menu-xml/linhes.xml54
-rw-r--r--abs/extra/community/mythtv-vdpau/menu-xml/mainmenu.xml.patch39
-rw-r--r--abs/extra/community/mythtv-vdpau/menu-xml/mythbackup.xml20
-rw-r--r--abs/extra/community/mythtv-vdpau/menu-xml/mythrestore.xml20
-rw-r--r--abs/extra/community/mythtv-vdpau/menu-xml/optical_menu.xml.patch15
-rw-r--r--abs/extra/community/mythtv-vdpau/menu-xml/original/create_patch.sh5
-rw-r--r--abs/extra/community/mythtv-vdpau/menu-xml/setup.xml111
-rw-r--r--abs/extra/community/mythtv-vdpau/menu-xml/siriusmenu.xml419
-rw-r--r--abs/extra/community/mythtv-vdpau/menu-xml/util_menu.xml.patch17
-rw-r--r--abs/extra/community/mythtv-vdpau/menu-xml/xmmenu.xml574
-rw-r--r--abs/extra/community/mythtv-vdpau/mpegpspatch66
-rwxr-xr-xabs/extra/community/mythtv-vdpau/mythbackend38
-rw-r--r--abs/extra/community/mythtv-vdpau/mythbackend.lr9
-rw-r--r--abs/extra/community/mythtv-vdpau/mythfrontend.lr9
-rw-r--r--abs/extra/community/mythtv-vdpau/myththemedmenu.cpp.patch125
-rw-r--r--abs/extra/community/mythtv-vdpau/myththemedmenu.h.patch25
-rw-r--r--abs/extra/community/mythtv-vdpau/mythtv.install61
-rw-r--r--abs/extra/community/mythtv-vdpau/pretty2
-rw-r--r--abs/extra/community/mythtv-vdpau/smolt_jump.patch9
-rw-r--r--abs/extra/gnome-common/PKGBUILD18
-rwxr-xr-xabs/extra/hdhgrab/PKGBUILD19
-rw-r--r--abs/extra/iw/PKGBUILD22
-rw-r--r--abs/extra/iw/README2
-rw-r--r--abs/extra/libnl/PKGBUILD27
-rw-r--r--abs/extra/libnl/fix-compilation.patch10
-rw-r--r--abs/extra/libnl/ulong_max.patch11
-rw-r--r--abs/extra/neon/PKGBUILD35
-rw-r--r--abs/extra/openjdk6/PKGBUILD155
-rw-r--r--abs/extra/openjdk6/aatext_by_default.diff35
-rw-r--r--abs/extra/openjdk6/fix_corba_cmds_path.diff33
-rw-r--r--abs/extra/openjdk6/fix_jdk_cmds_path.diff33
-rw-r--r--abs/extra/openjdk6/fontconfig-paths.diff43
-rw-r--r--abs/extra/openjdk6/openjdk6.install12
-rw-r--r--abs/extra/openjdk6/openjdk6.profile4
-rw-r--r--abs/extra/quilt/PKGBUILD14
-rw-r--r--abs/extra/subversion/PKGBUILD4
-rw-r--r--abs/extra/v4l-dvb-dvico2/PKGBUILD24
-rw-r--r--abs/extra/v4l-dvb-dvico2/fix-jdelvare-i2c-i2c-constify-client-address-data.patch25
-rw-r--r--abs/extra/v4l-dvb-dvico2/v4l-dvb.install23
-rw-r--r--abs/extra/v4l-dvb-dvico2/xc-bluebird.patch896
-rw-r--r--abs/extra/wireless-regdb/PKGBUILD46
-rw-r--r--abs/extra/wireless-regdb/crda.conf.d4
-rw-r--r--abs/extra/wireless-regdb/wireless-regdb.install13
51 files changed, 159 insertions, 3386 deletions
diff --git a/abs/extra/community/libv4l/PKGBUILD b/abs/extra/community/libv4l/PKGBUILD
deleted file mode 100644
index 3afcf6c..0000000
--- a/abs/extra/community/libv4l/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# $Id: PKGBUILD 28297 2009-02-28 18:20:12Z thomas $
-# Maintainer: Thomas Baechler <thomas@archlinux.org>
-pkgname=libv4l
-pkgver=0.5.8
-pkgrel=1
-pkgdesc="Userspace library for Video 4 Linux (1 and 2)"
-arch=('i686' 'x86_64')
-url="http://hansdegoede.livejournal.com/3636.html"
-license=('LGPL')
-depends=('glibc')
-source=(http://people.atrpms.net/~hdegoede/$pkgname-$pkgver.tar.gz)
-md5sums=('4f8ae9c743b215c8ac0e553eaa01e980')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make || return 1
- make install PREFIX="/usr" DESTDIR="$pkgdir/"
-}
diff --git a/abs/extra/community/mythtv-vdpau/2.6.28_dvb_api_version.diff b/abs/extra/community/mythtv-vdpau/2.6.28_dvb_api_version.diff
deleted file mode 100644
index 0116023..0000000
--- a/abs/extra/community/mythtv-vdpau/2.6.28_dvb_api_version.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: libs/libmythtv/dvbtypes.h
-===================================================================
---- libs/libmythtv/dvbtypes.h (revision 19792)
-+++ libs/libmythtv/dvbtypes.h (working copy)
-@@ -19,7 +19,7 @@
- #include <linux/dvb/frontend.h>
- #include <linux/dvb/dmx.h>
-
--#if (DVB_API_VERSION != 3)
-+#if (DVB_API_VERSION != 3 && DVB_API_VERSION != 5)
- # error "DVB driver includes with API version 3 not found!"
- #endif
-
-@@ -27,7 +27,7 @@
- # define DVB_API_VERSION_MINOR 0
- #endif
-
--#if (DVB_API_VERSION >= 3 && DVB_API_VERSION_MINOR >= 1)
-+#if ((DVB_API_VERSION == 3 && DVB_API_VERSION_MINOR >= 1) || DVB_API_VERSION == 5)
- # define USE_ATSC
- #else
- #warning DVB API version < 3.1
diff --git a/abs/extra/community/mythtv-vdpau/PKGBUILD b/abs/extra/community/mythtv-vdpau/PKGBUILD
deleted file mode 100644
index 9c293e2..0000000
--- a/abs/extra/community/mythtv-vdpau/PKGBUILD
+++ /dev/null
@@ -1,102 +0,0 @@
-pkgname=mythtv-vdpau
-pkgver=0.21
-pkgrel=23
-pkgdesc="A Homebrew PVR project"
-arch=('i686' 'x86_64')
-depends=('bash' 'mysql-clients>=5.0' 'qt3' 'lame' 'lirc-utils' 'ffmpeg' \
- 'libxvmc' 'libavc1394' 'libdc1394' 'libiec61883' 'nvidia>=180.29' \
- 'perl-net-upnp')
-backup=(etc/mythtv/mythbackend.conf etc/mythtv/mysql.txt usr/share/mythtv/is.xml usr/share/mythtv/media_settings.xml)
-source=(ftp://ftp.knoppmyth.net/R6/sources/mythtv-${pkgver}-fixes.tar.bz2 \
- mythbackend myththemedmenu.cpp.patch myththemedmenu.h.patch \
- smolt_jump.patch pretty \
- http://www.avenard.org/files/media/vdpau/mythtv-fixes-glvdpau20549.patch.gz mpegpspatch mythbackend.lr mythfrontend.lr)
-
-#md5sums=('e316ed18d7ac837cf8c4af54b1478793' '7ef6de58240e7aad389a0b13d91b1cf6'\
-# 'a0ecb7f476cb71c0c1ac90d349fc7695')
-conflicts=('mythtv')
-provides=('mythtv'=${pkgver})
-license=('GPL2')
-makedepends=(libgl subversion 'nvidia-utils>=180.29' python perl)
-groups=('pvr')
-options=(!strip)
-url="http://www.mythtv.org/"
-install=mythtv.install
-
-build() {
- cd $startdir/src/mythtv-${pkgver} || return 1
- svn update
-
-#apply patches
- patch -p0 < ../myththemedmenu.cpp.patch
- patch -p0 < ../myththemedmenu.h.patch
-# patch -p0 < ../pop_be_restart.h.patch
-# patch -p0 < ../pop_be_restart.cpp.patch
- patch -p0 < ../smolt_jump.patch
-# patch -p0 < ../2.6.28_dvb_api_version.diff
- patch -p1 < ../mythtv-fixes-glvdpau20549.patch
- cd libs/libavformat
- patch -p0 < $startdir/src/mpegpspatch
- cd -
-
- . /etc/profile.d/qt3.sh
-
- # use QT3 qmake
- export PATH=$QTDIR/bin:$PATH
- [ "$CARCH" = "i686" ] && ARCH="i686"
- [ "$CARCH" = "x86_64" ] && ARCH="x86-64"
-
- ./configure --prefix=/usr --cpu=${ARCH} --enable-mmx --enable-audio-oss \
- --enable-audio-alsa --enable-dvb --enable-lirc --enable-joystick-menu \
- --enable-firewire --enable-v4l --enable-ivtv --enable-dvb \
- --dvb-path=/usr/include --enable-xvmc --disable-ffmpeg \
- --enable-xvmc-pro --enable-xvmc-vld --enable-opengl-vsync \
- --disable-audio-jack --disable-audio-arts --disable-directfb \
- --enable-vdpau --enable-opengl-video --compile-type=debug || return 1
-
- # build
- #needs the subversion program
- pkgversubversion=`svnversion`
- echo $pkgversubversion
- sed -i -e "s/\`(svnversion \$\${SVNTREEDIR} 2>\/dev\/null) || echo Unknown\`/$pkgversubversion/" version.pro
-
-
-# qmake mythtv.pro || return 1
-# make qmake || return 1
- make || return 1
-
- # basic install
- make INSTALL_ROOT=$startdir/pkg install || return 1
-
- # install db schema
- install -m0644 database/mc.sql $startdir/pkg/usr/share/mythtv/ \
- || return 1
- install -D -m0755 ../mythbackend $startdir/pkg/etc/rc.d/mythbackend \
- || return 1
- cp -r docs $startdir/pkg/usr/share/mythtv/ || return 1
- # cp ../QUICKSTART.archlinux $startdir/pkg/usr/share/mythtv/ \
-# || return 1
-
- # install contrib
- mkdir -p $startdir/pkg/usr/share/mythtv/contrib || return 1
- install -m0755 contrib/* $startdir/pkg/usr/share/mythtv/contrib
-
- # set suid on mythfrontend
- #chmod a+s $startdir/pkg/usr/bin/mythfrontend
-
-#Patch the xml LinHES style
- cp -r $startdir/menu-xml/*.xml $startdir/pkg/usr/share/mythtv
- cd $startdir/pkg/usr/share/mythtv
- patch -p0 < $startdir/menu-xml/mainmenu.xml.patch
- patch -p0 < $startdir/menu-xml/optical_menu.xml.patch
- patch -p0 < $startdir/menu-xml/library.xml.patch
- patch -p0 < $startdir/menu-xml/util_menu.xml.patch
-
-#Make log dir
- mkdir -p $startdir/pkg/var/log/mythtv
- chown 1000.1000 $startdir/pkg/var/log/mythtv
- mkdir -p $startdir/pkg/etc/cron.hourly
- install -m0755 $startdir/src/pretty $startdir/pkg/etc/cron.hourly/
- mkdir -p $startdir/pkg/etc/logrotate.d
- cp $startdir/src/*.lr $startdir/pkg/etc/logrotate.d
-}
diff --git a/abs/extra/community/mythtv-vdpau/PKGBUILD.orig b/abs/extra/community/mythtv-vdpau/PKGBUILD.orig
deleted file mode 100644
index 9299fa1..0000000
--- a/abs/extra/community/mythtv-vdpau/PKGBUILD.orig
+++ /dev/null
@@ -1,102 +0,0 @@
-pkgname=mythtv-vdpau
-pkgver=0.21
-pkgrel=19
-pkgdesc="A Homebrew PVR project"
-arch=('i686' 'x86_64')
-depends=('bash' 'mysql-clients>=5.0' 'qt3' 'lame' 'lirc-utils' 'ffmpeg' \
- 'libxvmc' 'libavc1394' 'libdc1394' 'libiec61883' 'nvidia>=180.29' \
- 'perl-net-upnp')
-backup=(etc/mythtv/mythbackend.conf etc/mythtv/mysql.txt usr/share/mythtv/is.xml usr/share/mythtv/media_settings.xml)
-source=(ftp://ftp.knoppmyth.net/R6/sources/mythtv-${pkgver}-fixes.tar.bz2 \
- mythbackend myththemedmenu.cpp.patch myththemedmenu.h.patch \
- smolt_jump.patch pretty \
- http://www.avenard.org/files/media/vdpau/mythtv-fixes-glvdpau20462.patch.gz mpegpspatch mythbackend.lr mythfrontend.lr)
-
-#md5sums=('e316ed18d7ac837cf8c4af54b1478793' '7ef6de58240e7aad389a0b13d91b1cf6'\
-# 'a0ecb7f476cb71c0c1ac90d349fc7695')
-conflicts=('mythtv')
-provides=('mythtv'=${pkgver})
-license=('GPL2')
-makedepends=(libgl subversion 'nvidia-utils>=180.29' python perl)
-groups=('pvr')
-url="http://www.mythtv.org/"
-install=mythtv.install
-
-build() {
- cd $startdir/src/mythtv-${pkgver} || return 1
- svn update
-
-#apply patches
- patch -p0 < ../myththemedmenu.cpp.patch
- patch -p0 < ../myththemedmenu.h.patch
-# patch -p0 < ../pop_be_restart.h.patch
-# patch -p0 < ../pop_be_restart.cpp.patch
- patch -p0 < ../smolt_jump.patch
-# patch -p0 < ../2.6.28_dvb_api_version.diff
- patch -p1 < ../mythtv-fixes-glvdpau20462.patch
- cd libs/libavformat
- patch -p0 < $startdir/src/mpegpspatch
- cd -
-
- . /etc/profile.d/qt3.sh
-
- # use QT3 qmake
- export PATH=$QTDIR/bin:$PATH
- [ "$CARCH" = "i686" ] && ARCH="i686"
- [ "$CARCH" = "x86_64" ] && ARCH="x86-64"
-
- ./configure --prefix=/usr --cpu=${ARCH} --enable-mmx --enable-audio-oss \
- --enable-audio-alsa --enable-dvb --enable-lirc --enable-joystick-menu \
- --disable-firewire --enable-v4l --enable-ivtv --enable-dvb \
- --dvb-path=/usr/include --enable-xvmc --disable-ffmpeg \
- --enable-xvmc-pro --enable-xvmc-vld --enable-opengl-vsync \
- --disable-audio-jack --disable-audio-arts --disable-directfb \
- --enable-vdpau --enable-opengl-video --enable-ffmpeg-pthreads \
- --enable-glx-procaddrarb || return 1
-
- # build
- #needs the subversion program
- pkgversubversion=`svnversion`
- echo $pkgversubversion
- sed -i -e "s/\`(svnversion \$\${SVNTREEDIR} 2>\/dev\/null) || echo Unknown\`/$pkgversubversion/" version.pro
-
-
-# qmake mythtv.pro || return 1
-# make qmake || return 1
- make || return 1
-
- # basic install
- make INSTALL_ROOT=$startdir/pkg install || return 1
-
- # install db schema
- install -m0644 database/mc.sql $startdir/pkg/usr/share/mythtv/ \
- || return 1
- install -D -m0755 ../mythbackend $startdir/pkg/etc/rc.d/mythbackend \
- || return 1
- cp -r docs $startdir/pkg/usr/share/mythtv/ || return 1
- # cp ../QUICKSTART.archlinux $startdir/pkg/usr/share/mythtv/ \
-# || return 1
-
- # install contrib
- mkdir -p $startdir/pkg/usr/share/mythtv/contrib || return 1
- install -m0755 contrib/* $startdir/pkg/usr/share/mythtv/contrib
-
- # set suid on mythfrontend
- #chmod a+s $startdir/pkg/usr/bin/mythfrontend
-
-#Patch the xml LinHES style
- cp -r $startdir/menu-xml/*.xml $startdir/pkg/usr/share/mythtv
- cd $startdir/pkg/usr/share/mythtv
- patch -p0 < $startdir/menu-xml/mainmenu.xml.patch
- patch -p0 < $startdir/menu-xml/optical_menu.xml.patch
- patch -p0 < $startdir/menu-xml/library.xml.patch
- patch -p0 < $startdir/menu-xml/util_menu.xml.patch
-
-#Make log dir
- mkdir -p $startdir/pkg/var/log/mythtv
- chown 1000.1000 $startdir/pkg/var/log/mythtv
- mkdir -p $startdir/pkg/etc/cron.hourly
- install -m0755 $startdir/src/pretty $startdir/pkg/etc/cron.hourly/
- mkdir -p $startdir/pkg/etc/logrotate.d
- cp $startdir/src/*.lr $startdir/pkg/etc/logrotate.d
-}
diff --git a/abs/extra/community/mythtv-vdpau/QUICKSTART.archlinux b/abs/extra/community/mythtv-vdpau/QUICKSTART.archlinux
deleted file mode 100644
index 310705c..0000000
--- a/abs/extra/community/mythtv-vdpau/QUICKSTART.archlinux
+++ /dev/null
@@ -1,69 +0,0 @@
-MythTV QUICKSTART
-=================
-This Arch Linux package provides a generic MythTV installation. It
-requires extensive user configuration. This is a skeletal document, and
-more extensive information is available in /usr/share/mythtv/docs.
-
-MythTV is split into a backend and a frontend. The backend records
-television programming, keeps up with scheduling, does commercial
-flagging, transcoding, and other such jobs. The frontend provides a
-pretty GUI which allows playback and edition of the recorded programs.
-It also provides a means to schedule recordings. There are a number of
-plugins available for MythTV, and most of the official ones are
-available as Arch packages. There are two configurations; the backend
-and frontend can be on the same machine, or on two different machines on
-the same network.
-
-Backend Configuration
----------------------
-MythTV keeps the majority of its settings and program information in a
-mysql database. Before running the backend configuration program, it is
-necessary to initialize the datase. Make sure mysql is running properly.
-
-# mysql < /usr/share/mythtv/mc.sql
-
-If your frontend is going to be remote, you must allow other computers
-on your network to have access to your database. Substitute 192.168.1.%
-with whatever IP range you use. If you have a root mysql password (as
-you should), leave the -p in the mysql command line. Otherwise remove
-the switch.
-
-# mysql -u root -p
- mysql> connect mythconverg;
- mysql> grant all on mythconverg.* to mythtv@"192.168.1.%" identified by "mythtv";
- mysql> flush privileges;
- mysql> quit
-
-In order to configure the MythTV backend, you will need to run the
-mythtv-setup program. Note that this requires X. If your backend is
-headless, considering using vnc as a quick and dirty "fix".
-
-# mythtv-setup
-
-Go through all the menus. You will need to know information like your
-capture card device (/dev/v4l/video[0-9]) and your program information
-acquisition method. United States users will most likely subscribe to
-Zap2it Labs' DataDirect service. It requires that users take a survey
-every three months in order to continue service. This isn't as hard as
-it sounds.
-
-It is necessary to update the database with all the current TV listings.
-Run the mythfilldatabase program to grab the listings using whatever
-method you specified in mythtv-setup.
-
-# mythfilldatabase
-
-Run mythbackend from the command line to make sure everything starts ok.
-
-# mythbackend
-
-If so, you may kill the task with "ctrl-c" on your keyboard, and add the
-backend to /etc/rc.conf. In the DAEMONS line, just add "mythbackend" to
-the list.
-
-In the future, you will need to run mythfilldatabase regularly. I allow
-my frontend computer to do this, as it runs continuously, and it is an
-option within MythTV. Otherwise, you can set up a cron job, or move
-mythfilldatabasecron to /etc/cron.daily
-
-cp /usr/share/mythtv/mythfilldatabasecron /etc/cron.daily
diff --git a/abs/extra/community/mythtv-vdpau/menu-xml/HOST_SETTINGS.xml b/abs/extra/community/mythtv-vdpau/menu-xml/HOST_SETTINGS.xml
deleted file mode 100755
index f257920..0000000
--- a/abs/extra/community/mythtv-vdpau/menu-xml/HOST_SETTINGS.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<mythmenu name="HOST_SETTINGS">
-
- <button>
- <type>MV_NETWORK_SETUP_MENU</type>
- <text>Network Settings</text>
- <action>EXEC mythinstall -s network </action>
- </button>
-
- <button>
- <type>MV_SYSTEM_SETUP_MENU</type>
- <text>System type</text>
- <action>EXEC mythinstall -s hostype </action>
- </button>
-
- <button>
- <type>MV_MISC_SETUP_MENU</type>
- <text>Misc Settings</text>
- <action>EXEC mythinstall -s misc </action>
- </button>
-
- <button>
- <type>MV_SOFTWARE_MENU</type>
- <text>Software</text>
- <action>EXEC mythinstall -s plugins </action>
- </button>
-
- <button>
- <type>MV_SHUTDOWN_SETUP_MENU</type>
- <text>Shutdown settings</text>
- <action>EXEC mythinstall -s sleep </action>
- </button>
-
-
-<button>
- <type>MV_ADVANCED_X_SETUP_MENU</type>
- <text>Display</text>
- <action>EXEC mythinstall -s advancedX</action>
-</button>
-
-<button>
- <type>MV_ADVANCED_SETUP_MENU</type>
- <text>Advanced settings</text>
- <action>EXEC mythinstall -s advanced</action>
-</button>
-
-
-<button>
- <type>MV_AUDIO_SETUP_MENU</type>
- <text>Audio settings</text>
- <action>EXEC mythinstall -s sound </action>
-</button>
-
-
-<button>
- <type>MV_ACCESS_SETUP_MENU</type>
- <text>Access</text>
- <action>EXEC mythinstall -s accesscontrol </action>
-</button>
-
-<button>
- <type>MV_USER_SETUP_MENU</type>
- <text>Password </text>
- <action>EXEC mythinstall -s user </action>
-</button>
-
-<button>
- <type>MV_WEBACCESS_SETUP_MENU</type>
- <text>Web security</text>
- <action>EXEC mythinstall -s webuser </action>
-</button>
-
-
-
-
- <!--
- <button>
- <type>SETUP_MENU</type>
- <text>Settings profile manager</text>
- <action>EXEC mythinstall -t </action>
-
- </button>
- -->
-
-
-
-
-</mythmenu>
diff --git a/abs/extra/community/mythtv-vdpau/menu-xml/is.xml b/abs/extra/community/mythtv-vdpau/menu-xml/is.xml
deleted file mode 100644
index 88b7e6b..0000000
--- a/abs/extra/community/mythtv-vdpau/menu-xml/is.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<mythmenu name="Internet Steams">
-
-</mythmenu>
diff --git a/abs/extra/community/mythtv-vdpau/menu-xml/library.xml.patch b/abs/extra/community/mythtv-vdpau/menu-xml/library.xml.patch
deleted file mode 100644
index efc8623..0000000
--- a/abs/extra/community/mythtv-vdpau/menu-xml/library.xml.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- library.xml.orig 2009-02-09 04:30:04.000000000 +0000
-+++ library.xml 2009-02-09 04:31:50.000000000 +0000
-@@ -119,10 +119,9 @@
-
- <button>
- <type>STREAM</type>
-- <text>Play Online Streams</text>
-+ <text>Online Streams</text>
- <text lang="HE">נגן מדיה מכוונת</text>
-- <action>PLUGIN mythstream</action>
-- <depends>mythstream</depends>
-+ <action>MENU is.xml</action>
- </button>
-
- <button>
diff --git a/abs/extra/community/mythtv-vdpau/menu-xml/linhes.xml b/abs/extra/community/mythtv-vdpau/menu-xml/linhes.xml
deleted file mode 100644
index 8bc929f..0000000
--- a/abs/extra/community/mythtv-vdpau/menu-xml/linhes.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<mythmenu name="LinHES">
-
- <button>
- <type>SETUP_GENERAL</type>
- <text>MythTV Configuration</text>
- <text lang="IT">Impostazioni</text>
- <text lang="ES">Configuración</text>
- <text lang="CA">Configurar</text>
- <text lang="FR">paramètres</text>
- <text lang="DE">Zubehör / Konfiguration</text>
- <text lang="DK">Tilbehør/Indstillinger</text>
- <text lang="IS">Uppsetning</text>
- <text lang="NL">Configuratie</text>
- <text lang="PT">Utensílios</text>
- <text lang="SV">Verktyg / Inställningar</text>
- <text lang="JA">設定</text>
- <text lang="FI">Oheis/Asetukset</text>
- <text lang="ZH_TW">工具/設定</text>
- <text lang="SI">Nastavitve</text>
- <text lang="ET">Utiliidid / sätted</text>
- <text lang="NB">Verktøy/Oppsett</text>
- <text lang="CZ">Pomůcky</text>
- <text lang="RU">Утилиты / Настройки</text>
- <text lang="AR">تضبيطات</text>
- <text lang="PL">Narzędzia / ustawienia</text>
- <text lang="HE">עזרים / הגדרות</text>
- <alttext lang="DE">Verschiedenes</alttext>
- <alttext lang="SV">Inställningar</alttext>
- <alttext lang="ET">Sätted</alttext>
- <alttext lang="RU">Настройки</alttext>
- <alttext lang="AR">تضبيطات</alttext>
- <action>MENU util_menu.xml</action>
- </button>
-
- <button>
- <type>LINHES_SETUP</type>
- <text>LinHES Configuration</text>
- <action>MENU HOST_SETTINGS.xml</action>
- </button>
-
- <button>
- <type>BACKUP</type>
- <text>Backup LinHES</text>
- <action>MENU mythbackup.xml</action>
- </button>
-
- <button>
- <type>RESTORE</type>
- <text>Restore LinHES</text>
- <action>MENU mythrestore.xml</action>
- </button>
-
-</mythmenu>
-
diff --git a/abs/extra/community/mythtv-vdpau/menu-xml/mainmenu.xml.patch b/abs/extra/community/mythtv-vdpau/menu-xml/mainmenu.xml.patch
deleted file mode 100644
index a299325..0000000
--- a/abs/extra/community/mythtv-vdpau/menu-xml/mainmenu.xml.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- mainmenu.xml.orig 2009-01-09 02:45:07.000000000 +0000
-+++ mainmenu.xml 2009-01-22 08:04:28.000000000 +0000
-@@ -158,34 +158,8 @@
-
- <button>
- <type>MENU_UTILITIES_SETUP</type>
-- <text>Utilities / Setup</text>
-- <text lang="IT">Impostazioni</text>
-- <text lang="ES">Configuración</text>
-- <text lang="CA">Configurar</text>
-- <text lang="FR">paramètres</text>
-- <text lang="DE">Zubehör / Konfiguration</text>
-- <text lang="DK">Tilbehør/Indstillinger</text>
-- <text lang="IS">Uppsetning</text>
-- <text lang="NL">Configuratie</text>
-- <text lang="PT">Utensílios</text>
-- <text lang="SV">Verktyg / Inställningar</text>
-- <text lang="JA">設定</text>
-- <text lang="FI">Oheis/Asetukset</text>
-- <text lang="ZH_TW">工具/設定</text>
-- <text lang="SI">Nastavitve</text>
-- <text lang="ET">Utiliidid / sätted</text>
-- <text lang="NB">Verktøy/Oppsett</text>
-- <text lang="CZ">Pomůcky</text>
-- <text lang="RU">Утилиты / Настройки</text>
-- <text lang="AR">تضبيطات</text>
-- <text lang="PL">Narzędzia / ustawienia</text>
-- <text lang="HE">עזרים / הגדרות</text>
-- <alttext lang="DE">Verschiedenes</alttext>
-- <alttext lang="SV">Inställningar</alttext>
-- <alttext lang="ET">Sätted</alttext>
-- <alttext lang="RU">Настройки</alttext>
-- <alttext lang="AR">تضبيطات</alttext>
-- <action>MENU util_menu.xml</action>
-+ <text>Service Menu</text>
-+ <action>MENU linhes.xml</action>
- </button>
-
- <!-- <button>
diff --git a/abs/extra/community/mythtv-vdpau/menu-xml/mythbackup.xml b/abs/extra/community/mythtv-vdpau/menu-xml/mythbackup.xml
deleted file mode 100644
index 656860d..0000000
--- a/abs/extra/community/mythtv-vdpau/menu-xml/mythbackup.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<mythmenu name="LinHES">
-
- <button>
- <type>BACKUP</type>
- <text>Do you wish to backup?</text>
- <action>NONE</action>
- </button>
-
- <button>
- <type>BACKUP</type>
- <text>Yes</text>
- <action>EXEC sudo /usr/LH/bin/mythbackup</action>
- </button>
-
- <button>
- <type>BACKUP</type>
- <text>No</text>
- <action>MENU linhes.xml</action>
- </button>
-</mythmenu>
diff --git a/abs/extra/community/mythtv-vdpau/menu-xml/mythrestore.xml b/abs/extra/community/mythtv-vdpau/menu-xml/mythrestore.xml
deleted file mode 100644
index 05cb0a7..0000000
--- a/abs/extra/community/mythtv-vdpau/menu-xml/mythrestore.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<mythmenu name="LinHES">
-
- <button>
- <type>RESTORE</type>
- <text>Do you wish to restore?</text>
- <action>NONE</action>
- </button>
-
- <button>
- <type>RESTORE</type>
- <text>Yes</text>
- <action>EXEC sudo /usr/LH/bin/mythrestore</action>
- </button>
-
- <button>
- <type>BACKUP</type>
- <text>No</text>
- <action>MENU linhes.xml</action>
- </button>
-</mythmenu>
diff --git a/abs/extra/community/mythtv-vdpau/menu-xml/optical_menu.xml.patch b/abs/extra/community/mythtv-vdpau/menu-xml/optical_menu.xml.patch
deleted file mode 100644
index d1cb70c..0000000
--- a/abs/extra/community/mythtv-vdpau/menu-xml/optical_menu.xml.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- optical_menu.xml.orig 2008-10-02 22:46:30.000000000 +0000
-+++ optical_menu.xml 2008-07-02 04:05:15.000000000 +0000
-@@ -129,6 +129,12 @@
- </button>
-
- <button>
-+ <type>DVD_RIP</type>
-+ <text>Import video files from DVD</text>
-+ <action>EXEC /usr/LH/bin/importfiles.sh</action>
-+ </button>
-+
-+ <button>
- <type>EJECT</type>
- <text>Eject media</text>
- <text lang="IT">Espelli Media</text>
diff --git a/abs/extra/community/mythtv-vdpau/menu-xml/original/create_patch.sh b/abs/extra/community/mythtv-vdpau/menu-xml/original/create_patch.sh
deleted file mode 100644
index 34d8b8c..0000000
--- a/abs/extra/community/mythtv-vdpau/menu-xml/original/create_patch.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-for i in *.xml
-do
- diff -u $i.orig $i > ../$i.patch
-done
diff --git a/abs/extra/community/mythtv-vdpau/menu-xml/setup.xml b/abs/extra/community/mythtv-vdpau/menu-xml/setup.xml
deleted file mode 100644
index f56bb6f..0000000
--- a/abs/extra/community/mythtv-vdpau/menu-xml/setup.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<mythmenu name="MAIN">
-
- <button>
- <type>SETUP_GENERAL</type>
- <text>1. General</text>
- <text lang="IT">1. Generale</text>
- <text lang="PT">1. Geral</text>
- <text lang="SV">1. Generellt</text>
- <text lang="JA">1. 一般</text>
- <text lang="DE">1. Allgemeines</text>
- <text lang="FI">1. Yleiset</text>
- <text lang="FR">1. Général</text>
- <text lang="SI">1. Splošno</text>
- <text lang="ET">1. Üldine</text>
- <text lang="NB">1 Generelt</text>
- <text lang="DK">1. Generelt</text>
- <text lang="ES">1. General</text>
- <text lang="CZ">1. Obecný</text>
- <text lang="RU">1. Общие</text>
- <action>GENERAL</action>
- </button>
-
- <button>
- <type>SETUP_CAPTURE_CARDS</type>
- <text>2. Capture cards</text>
- <text lang="IT">2. Schede di Acquisizione</text>
- <text lang="PT">2. Placas de Captura</text>
- <text lang="SV">2. TV-kort</text>
- <text lang="JA">2. キャプチャカード</text>
- <text lang="DE">2. TV-Karten</text>
- <text lang="FI">2. TV-kortit</text>
- <text lang="FR">2. Cartes d'acquisition</text>
- <text lang="SI">2. Kartice za zajem</text>
- <text lang="ET">2. TV-kaardid</text>
- <text lang="NB">2 TV-kort</text>
- <text lang="DK">2. TV-kort</text>
- <text lang="ES">2. Capturadoras</text>
- <text lang="CZ">2. Zachytávací karty</text>
- <text lang="RU">2. Карты захвата</text>
- <action>CAPTURE CARDS</action>
- </button>
-
- <button>
- <type>SETUP_VIDEO_SOURCES</type>
- <text>3. Video sources</text>
- <text lang="IT">3. Fonte Video</text>
- <text lang="PT">3. Fontes de Vídeo</text>
- <text lang="SV">3. Videokällor</text>
- <text lang="JA">3. ビデオソース</text>
- <text lang="DE">3. Videoquellen</text>
- <text lang="FI">3. Kuvanlähteet</text>
- <text lang="FR">3. Sources vidéo</text>
- <text lang="SI">3. Video viri</text>
- <text lang="ET">3. Videosisendid</text>
- <text lang="NB">3 Videokilder</text>
- <text lang="DK">3. Videokilder</text>
- <text lang="ES">3. Fuentes de Vídeo</text>
- <text lang="CZ">3. Zdroje obrazu</text>
- <text lang="RU">3. Видео источники</text>
- <action>VIDEO SOURCES</action>
- </button>
-
- <button>
- <type>SETUP_INPUT_CONNECTIONS</type>
- <text>4. Input connections</text>
- <text lang="IT">4. Connessioni di Ingresso</text>
- <text lang="PT">4. Ligações de Entrada</text>
- <text lang="SV">4. Anslutningar</text>
- <text lang="JA">4. 入力とソースの接続</text>
- <text lang="DE">4. Verknüpfungen</text>
- <text lang="FI">4. Sisääntuloasetukset</text>
- <text lang="FR">4. Entrées Vidéos</text>
- <text lang="SI">4. Vhodne povezave</text>
- <text lang="ET">4. Sisendite ühendused</text>
- <text lang="NB">4 Inndata</text>
- <text lang="DK">4. Indgange</text>
- <text lang="ES">4. Conexiones</text>
- <text lang="CZ">4. Připojení vstupů</text>
- <text lang="RU">4. Соединение входов</text>
- <action>CARD INPUTS</action>
- </button>
-
- <button>
- <type>SETUP_CHANNEL_EDITOR</type>
- <text>5. Channel Editor</text>
- <text lang="IT">5. Modifica Canali</text>
- <text lang="SV">5. Kanaleditor</text>
- <text lang="JA">5. チャンネル設定</text>
- <text lang="DE">5. Sender bearbeiten</text>
- <text lang="FI">5. Kanavanviritys</text>
- <text lang="FR">5. Editeur de chaînes</text>
- <text lang="SI">5. Urejanje kanalov</text>
- <text lang="ET">5. Kanaliredaktor</text>
- <text lang="NB">5 Kanalredigerer</text>
- <text lang="DK">5. Kanal opsætning</text>
- <text lang="ES">5. Editor Canales</text>
- <text lang="CZ">5. Editor kanálů</text>
- <text lang="RU">5. Редактор каналов</text>
- <action>CHANNEL EDITOR</action>
- </button>
-
- <button>
- <type>SETUP_STORAGE_GROUPS</type>
- <text>6. Storage Directories</text>
- <text lang="IT">6. Cartelle</text>
- <text lang="FI">Tallennusryhmät</text>
- <text lang="SV">Lagringsgrupper</text>
- <action>STORAGE GROUPS</action>
- </button>
-
-</mythmenu>
diff --git a/abs/extra/community/mythtv-vdpau/menu-xml/siriusmenu.xml b/abs/extra/community/mythtv-vdpau/menu-xml/siriusmenu.xml
deleted file mode 100644
index e317b36..0000000
--- a/abs/extra/community/mythtv-vdpau/menu-xml/siriusmenu.xml
+++ /dev/null
@@ -1,419 +0,0 @@
-<mythmenu name="SIRIUS">
- <button>
- <type>MUSIC</type>
- <text>Sirius Hits 1</text>
- <action>EXEC /usr/bin/cliSipie siriushits1</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>StarLite</text>
- <action>EXEC /usr/bin/cliSipie starlite</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Sirius Love</text>
- <action>EXEC /usr/bin/cliSipie siriuslove</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Movin EZ</text>
- <action>EXEC /usr/bin/cliSipie movineasy</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Sirius Gold</text>
- <action>EXEC /usr/bin/cliSipie siriusgold</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>'60s Vibrations</text>
- <action>EXEC /usr/bin/cliSipie 60svibrations</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Totally '70s</text>
- <action>EXEC /usr/bin/cliSipie totally70s</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Big '80s</text>
- <action>EXEC /usr/bin/cliSipie big80s</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>ThePulse</text>
- <action>EXEC /usr/bin/cliSipie thepulse</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Bridge</text>
- <action>EXEC /usr/bin/cliSipie thebridge</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>BBC Radio 1</text>
- <action>EXEC /usr/bin/cliSipie bbcradio1</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Super Shuffle</text>
- <action>EXEC /usr/bin/cliSipie supershuffle</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Elvis Radio</text>
- <action>EXEC /usr/bin/cliSipie elvisradio</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Classic Vinyl</text>
- <action>EXEC /usr/bin/cliSipie classicvinyl</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Classic Rewind</text>
- <action>EXEC /usr/bin/cliSipie classicrewind</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>TheVault</text>
- <action>EXEC /usr/bin/cliSipie thevault</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Jam_ON</text>
- <action>EXEC /usr/bin/cliSipie jamon</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Spectrum</text>
- <action>EXEC /usr/bin/cliSipie thespectrum</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>BuzzSaw</text>
- <action>EXEC /usr/bin/cliSipie buzzsaw</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Octane</text>
- <action>EXEC /usr/bin/cliSipie octane</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Alt Nation</text>
- <action>EXEC /usr/bin/cliSipie altnation</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>1st Wave</text>
- <action>EXEC /usr/bin/cliSipie firstwave</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Hair Nation</text>
- <action>EXEC /usr/bin/cliSipie hairnation</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>'90s Alternative</text>
- <action>EXEC /usr/bin/cliSipie 90salternative</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Garage</text>
- <action>EXEC /usr/bin/cliSipie undergroundgarage</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Left of Center</text>
- <action>EXEC /usr/bin/cliSipie leftofcenter</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Hard Attack</text>
- <action>EXEC /usr/bin/cliSipie hardattack</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Faction</text>
- <action>EXEC /usr/bin/cliSipie faction</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Punk</text>
- <action>EXEC /usr/bin/cliSipie punk</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>The Coffee House</text>
- <action>EXEC /usr/bin/cliSipie coffeehouse</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Margaritaville</text>
- <action>EXEC /usr/bin/cliSipie radiomargaritaville</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Sirius Disorder</text>
- <action>EXEC /usr/bin/cliSipie siriusdisorder</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Reggae</text>
- <action>EXEC /usr/bin/cliSipie reggaerhythms</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Area 33</text>
- <action>EXEC /usr/bin/cliSipie area33</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Boombox</text>
- <action>EXEC /usr/bin/cliSipie boombox</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Chill</text>
- <action>EXEC /usr/bin/cliSipie chill</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>The Beat</text>
- <action>EXEC /usr/bin/cliSipie thebeat</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Strobe</text>
- <action>EXEC /usr/bin/cliSipie thestrobe</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Hip-Hop Nation</text>
- <action>EXEC /usr/bin/cliSipie hiphopnation</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>BackSpin</text>
- <action>EXEC /usr/bin/cliSipie backspin</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Shade 45</text>
- <action>EXEC /usr/bin/cliSipie shade45</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Hot Jamz</text>
- <action>EXEC /usr/bin/cliSipie hotjamz</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Heart &amp; Soul</text>
- <action>EXEC /usr/bin/cliSipie heartandsoul</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>SoulTown</text>
- <action>EXEC /usr/bin/cliSipie soultown</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>New Country</text>
- <action>EXEC /usr/bin/cliSipie newcountry</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Prime Country</text>
- <action>EXEC /usr/bin/cliSipie primecountry</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Roadhouse</text>
- <action>EXEC /usr/bin/cliSipie theroadhouse</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Outlaw Country</text>
- <action>EXEC /usr/bin/cliSipie outlawcountry</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Bluegrass</text>
- <action>EXEC /usr/bin/cliSipie bluegrass</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Spirit</text>
- <action>EXEC /usr/bin/cliSipie spirit</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Praise</text>
- <action>EXEC /usr/bin/cliSipie praise</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Planet Jazz</text>
- <action>EXEC /usr/bin/cliSipie planetjazz</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>JazzCafe</text>
- <action>EXEC /usr/bin/cliSipie jazzcafe</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>PureJazz</text>
- <action>EXEC /usr/bin/cliSipie purejazz</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Spa 73</text>
- <action>EXEC /usr/bin/cliSipie spa73</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Blues</text>
- <action>EXEC /usr/bin/cliSipie siriusblues</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Siriusly Sinatra</text>
- <action>EXEC /usr/bin/cliSipie siriuslysinatra</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Broadway's Best</text>
- <action>EXEC /usr/bin/cliSipie broadwaysbest</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Symphony Hall</text>
- <action>EXEC /usr/bin/cliSipie symphonyhall</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Met Opera Radio</text>
- <action>EXEC /usr/bin/cliSipie metropolitanopera</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Sirius Pops</text>
- <action>EXEC /usr/bin/cliSipie siriuspops</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Universo Latino</text>
- <action>EXEC /usr/bin/cliSipie universolatino</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Rumbon</text>
- <action>EXEC /usr/bin/cliSipie rumbon</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Martha Stewart</text>
- <action>EXEC /usr/bin/cliSipie marthastewartlivingradio</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Sirius Stars</text>
- <action>EXEC /usr/bin/cliSipie siriusstars</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>OutQ Gay Radio</text>
- <action>EXEC /usr/bin/cliSipie siriusoutq</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Patriot</text>
- <action>EXEC /usr/bin/cliSipie siriuspatriot</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Left</text>
- <action>EXEC /usr/bin/cliSipie siriusleft</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>CNN</text>
- <action>EXEC /usr/bin/cliSipie cnn</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>wrn</text>
- <action>EXEC /usr/bin/cliSipie wrn</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Blue Collar Comedy</text>
- <action>EXEC /usr/bin/cliSipie bluecollarcomedy</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Raw Dog Comedy</text>
- <action>EXEC /usr/bin/cliSipie rawdog</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Laugh Break Comedy</text>
- <action>EXEC /usr/bin/cliSipie laughbreak</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>thefoxxhole</text>
- <action>EXEC /usr/bin/cliSipie thefoxxhole</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>lime</text>
- <action>EXEC /usr/bin/cliSipie lime</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Kids Stuff</text>
- <action>EXEC /usr/bin/cliSipie kidsstuff</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Catholic Channel</text>
- <action>EXEC /usr/bin/cliSipie thecatholicchannel</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>EWTN</text>
- <action>EXEC /usr/bin/cliSipie ewtnglobal</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>christiantalk</text>
- <action>EXEC /usr/bin/cliSipie christiantalk</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Sirius NFL Radio</text>
- <action>EXEC /usr/bin/cliSipie siriusnflradio</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Maxim Radio</text>
- <action>EXEC /usr/bin/cliSipie maximradio</action>
- </button>
- <button>
- <type>MUSIC</type>
- <text>Cosmo Radio</text>
- <action>EXEC /usr/bin/cliSipie cosmopolitanradio</action>
- </button>
- <button>
- <type>TV_DELETE</type>
- <text>Stop Listening</text>
- <action>EXEC /usr/bin/sipie_kill</action>
- </button>
-
-</mythmenu>
-
diff --git a/abs/extra/community/mythtv-vdpau/menu-xml/util_menu.xml.patch b/abs/extra/community/mythtv-vdpau/menu-xml/util_menu.xml.patch
deleted file mode 100644
index 26ac863..0000000
--- a/abs/extra/community/mythtv-vdpau/menu-xml/util_menu.xml.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- util_menu.xml.orig 2009-01-09 02:45:07.000000000 +0000
-+++ util_menu.xml 2009-01-22 08:04:28.000000000 +0000
-@@ -76,7 +76,13 @@
- <action>PLUGIN mythcontrols</action>
- <depends>mythcontrols</depends>
- </button>
--
-+
-+ <button>
-+ <type>VIDEO_SCREENSHOOTER</type>
-+ <text>Thumbnail Generator</text>
-+ <action>EXEC /usr/LH/bin/shootscreens-mythtv.sh</action>
-+ </button>
-+
- <button>
- <type>SETUP_MENU</type>
- <text>Setup</text>
diff --git a/abs/extra/community/mythtv-vdpau/menu-xml/xmmenu.xml b/abs/extra/community/mythtv-vdpau/menu-xml/xmmenu.xml
deleted file mode 100644
index 6b26d11..0000000
--- a/abs/extra/community/mythtv-vdpau/menu-xml/xmmenu.xml
+++ /dev/null
@@ -1,574 +0,0 @@
-<!-- Current as of April 25, 2007 -->
-<mythmenu name="XM">
-
- <button>
- <type>MUSIC</type>
- <text>The '40s</text>
- <action>EXEC /usr/bin/xamp kill 4</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The '50s</text>
- <action>EXEC /usr/bin/xamp kill 5</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The '60s</text>
- <action>EXEC /usr/bin/xamp kill 6</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The '70s</text>
- <action>EXEC /usr/bin/xamp kill 7</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The '80s</text>
- <action>EXEC /usr/bin/xamp kill 8</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The '90s</text>
- <action>EXEC /usr/bin/xamp kill 9</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>America</text>
- <action>EXEC /usr/bin/xamp kill 10</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>X Country</text>
- <action>EXEC /usr/bin/xamp kill 12</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Willie's Place</text>
- <action>EXEC /usr/bin/xamp kill 13</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Bluegrass Junction</text>
- <action>EXEC /usr/bin/xamp kill 14</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The Village</text>
- <action>EXEC /usr/bin/xamp kill 15</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Highway 16</text>
- <action>EXEC /usr/bin/xamp kill 16</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>US Country</text>
- <action>EXEC /usr/bin/xamp kill 17</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>20 on 20</text>
- <action>EXEC /usr/bin/xamp kill 20</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The Heart</text>
- <action>EXEC /usr/bin/xamp kill 23</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The Blend</text>
- <action>EXEC /usr/bin/xamp kill 25</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Flight 26</text>
- <action>EXEC /usr/bin/xamp kill 26</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Cinemagic</text>
- <action>EXEC /usr/bin/xamp kill 27</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>On Broadway</text>
- <action>EXEC /usr/bin/xamp kill 28</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>U-Pop</text>
- <action>EXEC /usr/bin/xamp kill 29</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>XM Hitlist</text>
- <action>EXEC /usr/bin/xamp kill 30</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Torch</text>
- <action>EXEC /usr/bin/xamp kill 31</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The Message</text>
- <action>EXEC /usr/bin/xamp kill 32</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Spirit</text>
- <action>EXEC /usr/bin/xamp kill 33</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>enLighten</text>
- <action>EXEC /usr/bin/xamp kill 34</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Deep Tracks</text>
- <action>EXEC /usr/bin/xamp kill 40</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Boneyard</text>
- <action>EXEC /usr/bin/xamp kill 41</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>XM Liquid Metal</text>
- <action>EXEC /usr/bin/xamp kill 42</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>XMU</text>
- <action>EXEC /usr/bin/xamp kill 43</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Fred</text>
- <action>EXEC /usr/bin/xamp kill 44</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>XM Cafe</text>
- <action>EXEC /usr/bin/xamp kill 45</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Top Tracks</text>
- <action>EXEC /usr/bin/xamp kill 46</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Ethel</text>
- <action>EXEC /usr/bin/xamp kill 47</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Squizz</text>
- <action>EXEC /usr/bin/xamp kill 48</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Big Tracks</text>
- <action>EXEC /usr/bin/xamp kill 49</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The Loft</text>
- <action>EXEC /usr/bin/xamp kill 50</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>XM Music Lab</text>
- <action>EXEC /usr/bin/xamp kill 51</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The Verge</text>
- <action>EXEC /usr/bin/xamp kill 52</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Fungus</text>
- <action>EXEC /usr/bin/xamp kill 53</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Lucy</text>
- <action>EXEC /usr/bin/xamp kill 54</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Soul Street</text>
- <action>EXEC /usr/bin/xamp kill 60</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The Flow</text>
- <action>EXEC /usr/bin/xamp kill 61</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Suite 62</text>
- <action>EXEC /usr/bin/xamp kill 62</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The Groove</text>
- <action>EXEC /usr/bin/xamp kill 64</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The Rhyme</text>
- <action>EXEC /usr/bin/xamp kill 65</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>RAW</text>
- <action>EXEC /usr/bin/xamp kill 66</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The City</text>
- <action>EXEC /usr/bin/xamp kill 67</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The Heat</text>
- <action>EXEC /usr/bin/xamp kill 68</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Real Jazz</text>
- <action>EXEC /usr/bin/xamp kill 70</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Watercolors</text>
- <action>EXEC /usr/bin/xamp kill 71</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Beyond Jazz</text>
- <action>EXEC /usr/bin/xamp kill 72</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>High Standards</text>
- <action>EXEC /usr/bin/xamp kill 73</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Bluesville</text>
- <action>EXEC /usr/bin/xamp kill 74</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Hear Music</text>
- <action>EXEC /usr/bin/xamp kill 75</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Fine Tuning</text>
- <action>EXEC /usr/bin/xamp kill 76</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Audio Visions</text>
- <action>EXEC /usr/bin/xamp kill 77</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Escape</text>
- <action>EXEC /usr/bin/xamp kill 78</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>On The Rocks</text>
- <action>EXEC /usr/bin/xamp kill 79</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The Move</text>
- <action>EXEC /usr/bin/xamp kill 80</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>BPM</text>
- <action>EXEC /usr/bin/xamp kill 81</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The System</text>
- <action>EXEC /usr/bin/xamp kill 82</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Chrome</text>
- <action>EXEC /usr/bin/xamp kill 83</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>XM-Chill</text>
- <action>EXEC /usr/bin/xamp kill 84</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Fuego</text>
- <action>EXEC /usr/bin/xamp kill 90</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Viva</text>
- <action>EXEC /usr/bin/xamp kill 91</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Aguila</text>
- <action>EXEC /usr/bin/xamp kill 92</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Caliente</text>
- <action>EXEC /usr/bin/xamp kill 94</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Luna</text>
- <action>EXEC /usr/bin/xamp kill 95</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Air Musique</text>
- <action>EXEC /usr/bin/xamp kill 100</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The Joint</text>
- <action>EXEC /usr/bin/xamp kill 101</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Sur La Route</text>
- <action>EXEC /usr/bin/xamp kill 102</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>World Zone</text>
- <action>EXEC /usr/bin/xamp kill 103</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Ngoma</text>
- <action>EXEC /usr/bin/xamp kill 104</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>XM Classics</text>
- <action>EXEC /usr/bin/xamp kill 110</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Vox</text>
- <action>EXEC /usr/bin/xamp kill 112</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>XM Pops</text>
- <action>EXEC /usr/bin/xamp kill 113</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>XM Kids</text>
- <action>EXEC /usr/bin/xamp kill 116</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Bob Edwards Show</text>
- <action>EXEC /usr/bin/xamp kill 133</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>XM Comedy</text>
- <action>EXEC /usr/bin/xamp kill 150</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Laugh USA</text>
- <action>EXEC /usr/bin/xamp kill 151</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Special X</text>
- <action>EXEC /usr/bin/xamp kill 154</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The Agenda</text>
- <action>EXEC /usr/bin/xamp kill 134</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Oprah and Friends</text>
- <action>EXEC /usr/bin/xamp kill 156</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>The Virus</text>
- <action>EXEC /usr/bin/xamp kill 202</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>1 Hit Wonders</text>
- <action>EXEC /usr/bin/xamp kill 300</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Metalcore</text>
- <action>EXEC /usr/bin/xamp kill 301</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>New Indie First</text>
- <action>EXEC /usr/bin/xamp kill 302</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Late Night Mix</text>
- <action>EXEC /usr/bin/xamp kill 303</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Sessions@AOL</text>
- <action>EXEC /usr/bin/xamp kill 304</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>Shuffle</text>
- <action>EXEC /usr/bin/xamp kill 305</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>New Rock First</text>
- <action>EXEC /usr/bin/xamp kill 306</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>New Country First</text>
- <action>EXEC /usr/bin/xamp kill 307</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>New Hip Hop First</text>
- <action>EXEC /usr/bin/xamp kill 308</action>
- </button>
-
- <button>
- <type>MUSIC</type>
- <text>New Pop First</text>
- <action>EXEC /usr/bin/xamp kill 309</action>
- </button>
-
- <button>
- <type>TV_DELETE</type>
- <text>Stop Listening</text>
- <action>EXEC /usr/bin/xamp kill</action>
- </button>
-
-</mythmenu>
diff --git a/abs/extra/community/mythtv-vdpau/mpegpspatch b/abs/extra/community/mythtv-vdpau/mpegpspatch
deleted file mode 100644
index eed08eb..0000000
--- a/abs/extra/community/mythtv-vdpau/mpegpspatch
+++ /dev/null
@@ -1,66 +0,0 @@
---- orig_mpeg.c 2009-03-23 11:26:22.000000000 -0700
-+++ mpeg.c 2009-03-23 11:28:09.000000000 -0700
-@@ -66,35 +66,40 @@
-
- static int mpegps_probe(AVProbeData *p)
- {
-+ uint32_t code= -1;
-+ int sys=0, pspack=0, priv1=0, vid=0, audio=0, invalid=0;
- int i;
-- int size= FFMIN(2048, p->buf_size);
-- uint32_t code=0xFF;
-+ int score=0;
-
-- /* we search the first start code. If it is a packet start code,
-- then we decide it is mpeg ps. We do not send highest value to
-- give a chance to mpegts */
-- /* NOTE: the search range was restricted to avoid too many false
-- detections */
--
-- for (i = 0; i < size; i++) {
-- code = (code << 8) | p->buf[i];
-+ for(i=0; i<p->buf_size; i++){
-+ code = (code<<8) + p->buf[i];
- if ((code & 0xffffff00) == 0x100) {
-- if (code == PACK_START_CODE ||
-- code == SYSTEM_HEADER_START_CODE ||
-- (code >= 0x1e0 && code <= 0x1ef) ||
-- (code >= 0x1c0 && code <= 0x1df) ||
-- code == PRIVATE_STREAM_2 ||
-- code == PROGRAM_STREAM_MAP ||
-- code == PRIVATE_STREAM_1 ||
-- code == PADDING_STREAM ||
-- code >= 0x100 && code <= 0x1b0)
-- return AVPROBE_SCORE_MAX - 2;
-- else
-- return 0;
-+ int pes= check_pes(p->buf+i, p->buf+p->buf_size);
-+
-+ if(code == SYSTEM_HEADER_START_CODE) sys++;
-+ else if(code == PRIVATE_STREAM_1) priv1++;
-+ else if(code == PACK_START_CODE) pspack++;
-+ else if((code & 0xf0) == VIDEO_ID && pes) vid++;
-+ else if((code & 0xe0) == AUDIO_ID && pes) audio++;
-+
-+ else if((code & 0xf0) == VIDEO_ID && !pes) invalid++;
-+ else if((code & 0xe0) == AUDIO_ID && !pes) invalid++;
- }
- }
-
-- return 0;
-+ if(vid+audio > invalid) /* invalid VDR files nd short PES streams */
-+ score= AVPROBE_SCORE_MAX/4;
-+
-+//av_log(NULL, AV_LOG_ERROR, "%d %d %d %d %d len:%d\n", sys, priv1, pspack,vid, audio, p->buf_size);
-+ if(sys>invalid && sys*9 <= pspack*10)
-+ return AVPROBE_SCORE_MAX/2+2; // +1 for .mpg
-+ if(priv1 + vid + audio > invalid && (priv1+vid+audio)*9 <= pspack*10)
-+ return AVPROBE_SCORE_MAX/2+2; // +1 for .mpg
-+ if((!!vid ^ !!audio) && (audio > 4 || vid > 1) && !sys && !pspack && p->buf_size>2048) /* PES stream */
-+ return AVPROBE_SCORE_MAX/2+2;
-+
-+ //02-Penguin.flac has sys:0 priv1:0 pspack:0 vid:0 audio:1
-+ return score;
- }
-
- typedef struct MpegDemuxContext {
diff --git a/abs/extra/community/mythtv-vdpau/mythbackend b/abs/extra/community/mythtv-vdpau/mythbackend
deleted file mode 100755
index 93773a2..0000000
--- a/abs/extra/community/mythtv-vdpau/mythbackend
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/mythbackend`
-case "$1" in
- start)
- stat_busy "Starting MythTV Backend"
- [ ! -e /var/run/mysqld.pid ] && echo -n "mysqld not started" && stat_fail && exit
- [ -z "$PID" ] && /usr/bin/mythbackend -d -l /var/log/mythbackend.log -v important
- if [ $? -gt 0 ]; then
- stat_fail
- else
- echo $PID > /var/run/mythbackend.pid
- add_daemon mythbackend
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping MythTV Backend"
- [ ! -z "$PID" ] && kill $PID &>/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon mythbackend
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1s
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/abs/extra/community/mythtv-vdpau/mythbackend.lr b/abs/extra/community/mythtv-vdpau/mythbackend.lr
deleted file mode 100644
index 4f218bc..0000000
--- a/abs/extra/community/mythtv-vdpau/mythbackend.lr
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/mythtv/mythbackend.log {
- copytruncate
- daily
- size 10M
- missingok
- rotate 7
- compress
- notifempty
-}
diff --git a/abs/extra/community/mythtv-vdpau/mythfrontend.lr b/abs/extra/community/mythtv-vdpau/mythfrontend.lr
deleted file mode 100644
index 1580533..0000000
--- a/abs/extra/community/mythtv-vdpau/mythfrontend.lr
+++ /dev/null
@@ -1,9 +0,0 @@
-/var/log/mythtv/mythfrontend.log {
- copytruncate
- daily
- size 10M
- missingok
- rotate 7
- compress
- notifempty
-}
diff --git a/abs/extra/community/mythtv-vdpau/myththemedmenu.cpp.patch b/abs/extra/community/mythtv-vdpau/myththemedmenu.cpp.patch
deleted file mode 100644
index e5c57ef..0000000
--- a/abs/extra/community/mythtv-vdpau/myththemedmenu.cpp.patch
+++ /dev/null
@@ -1,125 +0,0 @@
---- libs/libmythui/myththemedmenu.cpp.orig 2008-01-31 15:26:38.000000000 +0000
-+++ libs/libmythui/myththemedmenu.cpp 2008-02-07 22:24:27.000000000 +0000
-@@ -2102,6 +2102,10 @@
- }
- lastbutton = NULL;
- }
-+ else if (action == "MENU")
-+ {
-+ parent->doMenu();
-+ }
- else if (action == "EJECT")
- {
- myth_eject();
-@@ -2482,6 +2486,8 @@
-
- if (d->foundtheme)
- d->parseMenu(menufile);
-+
-+ m_menuPopup = NULL;
- }
-
- MythThemedMenu::~MythThemedMenu(void)
-@@ -2592,3 +2598,102 @@
- MythScreenType::aboutToShow();
- d->updateLCD();
- }
-+void MythThemedMenu::doMenu()
-+{
-+ int allowsd = gContext->GetNumSetting("AllowQuitShutdown");
-+ if (m_menuPopup)
-+ return;
-+ QString label = "System Menu";
-+ MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
-+ m_menuPopup = new MythDialogBox(label, mainStack, "menuPopup");
-+ if (m_menuPopup->Create())
-+ mainStack->AddScreen(m_menuPopup);
-+
-+ //changed line to always show shutdown/reboot
-+ if ( allowsd != 10 && allowsd !=14 )
-+ {
-+ m_menuPopup->SetReturnEvent(this,"popmenu_exit");
-+ m_menuPopup->AddButton("Power off");
-+ m_menuPopup->AddButton("Reboot");
-+ m_menuPopup->AddButton("About");
-+ m_menuPopup->AddButton("Cancel");
-+ }
-+ else
-+ {
-+ m_menuPopup->SetReturnEvent(this,"popmenu_noexit");
-+ m_menuPopup->AddButton("About");
-+ m_menuPopup->AddButton("Cancel");
-+ }
-+}
-+
-+void MythThemedMenu::aboutScreen()
-+{
-+{
-+ extern const char *myth_source_version;
-+ extern const char *myth_source_path;
-+ QString distro_line;
-+ distro_line="";
-+
-+ QFile file("/etc/os_myth_release");
-+ if ( file.open(IO_ReadOnly | IO_Translate) )
-+ {
-+ QTextStream t( &file ); // use a text stream
-+ distro_line = t.readLine();
-+ file.close();
-+ }
-+
-+ QString label = "";
-+ label.append(QObject::tr("Revision: ") + myth_source_version + " \n Branch:" + myth_source_path + "\n" + distro_line );
-+
-+ MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
-+ m_menuPopup = new MythDialogBox(label, mainStack, "About");
-+ if (m_menuPopup->Create())
-+ mainStack->AddScreen(m_menuPopup);
-+
-+ m_menuPopup->SetReturnEvent(this,"About");
-+ m_menuPopup->AddButton("OK!");
-+ }
-+}
-+
-+void MythThemedMenu::customEvent(QCustomEvent *event)
-+{
-+ if (event->type() == kMythDialogBoxCompletionEventType)
-+ {
-+ DialogCompletionEvent *dce =
-+ dynamic_cast<DialogCompletionEvent*>(event);
-+
-+ QString resultid= dce->GetId();
-+ int buttonnum = dce->GetResult();
-+ if (resultid == "popmenu_exit")
-+ {
-+ if (buttonnum == 0)
-+ {
-+ QString halt_cmd = gContext->GetSetting("HaltCommand",
-+ "sudo /sbin/halt -p");
-+ if (!halt_cmd.isEmpty())
-+ system(halt_cmd.ascii());
-+ }
-+
-+ if (buttonnum == 1)
-+ {
-+ QString reboot_cmd = gContext->GetSetting("RebootCommand",
-+ "sudo /sbin/reboot");
-+ if (!reboot_cmd.isEmpty())
-+ system(reboot_cmd.ascii());
-+ }
-+
-+ if (buttonnum == 2)
-+ {
-+ aboutScreen();
-+ }
-+ }
-+
-+ if (resultid == "popmenu_noexit")
-+ {
-+ if (buttonnum == 0)
-+ aboutScreen();
-+ }
-+
-+ m_menuPopup = NULL;
-+ }
-+}
diff --git a/abs/extra/community/mythtv-vdpau/myththemedmenu.h.patch b/abs/extra/community/mythtv-vdpau/myththemedmenu.h.patch
deleted file mode 100644
index 9744b11..0000000
--- a/abs/extra/community/mythtv-vdpau/myththemedmenu.h.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- libs/libmythui/myththemedmenu.h.orig 2008-01-31 15:26:45.000000000 +0000
-+++ libs/libmythui/myththemedmenu.h 2008-02-07 21:00:22.000000000 +0000
-@@ -2,6 +2,7 @@
- #define MYTHTHEMEDMENU_H_
-
- #include "mythscreentype.h"
-+#include "mythdialogbox.h"
-
- class MythMainWindow;
- class MythThemedMenuPrivate;
-@@ -26,8 +27,14 @@
-
- void ReloadTheme(void);
- void ReloadExitKey(void);
-+
- virtual void aboutToShow(void);
-
-+ void doMenu();
-+ void aboutScreen();
-+ MythDialogBox *m_menuPopup;
-+ void customEvent(QCustomEvent *event);
-+
- protected:
- virtual bool keyPressEvent(QKeyEvent *e);
- virtual void gestureEvent(MythUIType *origtype, MythGestureEvent *ge);
diff --git a/abs/extra/community/mythtv-vdpau/mythtv.install b/abs/extra/community/mythtv-vdpau/mythtv.install
deleted file mode 100644
index a063766..0000000
--- a/abs/extra/community/mythtv-vdpau/mythtv.install
+++ /dev/null
@@ -1,61 +0,0 @@
-# arg 1: the new package version
-post_install() {
- if [ ! -d /var/log/mythtv ]
- then
- mkdir -p /var/log/mythv
- chown -R mythtv /var/log/mythtv
- echo "---" > /var/log/mythtv/mythbackend.log
- chown mythtv /var/log/mythtv/mythbackend.log
- fi
- if [ -e /tmp/is.xml ]
- then
- cp /tmp/is.xml /usr/share/mythtv/is.xml
- fi
-
- if [ -e /tmp/media_settings.xml ]
- then
- cp /tmp/media_settings.xml /usr/share/mythtv/media_settings.xml
- fi
-
- echo
- echo
- echo "As is with no guarantee, please don't file any bu reports against this package."
-}
-pre_upgrade() {
- if [ -e /usr/share/mythtv/is.xml ]
- then
- cp /usr/share/mythtv/is.xml /tmp
- fi
-
- if [ -e /usr/share/mythtv/media_settings.xml ]
- then
- cp /usr/share/mythtv/media_settings.xml /tmp
- fi
-}
-
-post_upgrade() {
- cp /tmp/is.xml /usr/share/mythtv/
- cp /tmp/media_settings.xml /usr/share/mythtv/
- if [ ! -d /var/log/mythtv ]
- then
- mkdir -p /var/log/mythv
- chown -R mythtv /var/log/mythtv
- fi
- echo
- echo
- echo "As is with no guarantee, please don't file any bu reports against this package."
-
-}
-pre_remove () {
- pre_upgrade
-}
-
-# arg 1: the old package version
-post_remove() {
- /bin/true
-
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra/community/mythtv-vdpau/pretty b/abs/extra/community/mythtv-vdpau/pretty
deleted file mode 100644
index eed6f9c..0000000
--- a/abs/extra/community/mythtv-vdpau/pretty
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-su - mythtv -c "/usr/bin/perl /usr/share/mythtv/contrib/mythrename.pl --link /myth/pretty"
diff --git a/abs/extra/community/mythtv-vdpau/smolt_jump.patch b/abs/extra/community/mythtv-vdpau/smolt_jump.patch
deleted file mode 100644
index 696be80..0000000
--- a/abs/extra/community/mythtv-vdpau/smolt_jump.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- programs/mythfrontend/networkcontrol.cpp.orig 2008-03-23 23:00:25.000000000 +0000
-+++ programs/mythfrontend/networkcontrol.cpp 2008-03-23 23:01:33.000000000 +0000
-@@ -81,6 +81,7 @@
- jumpMap["zoneminderliveview"] = "ZoneMinder Live View";
- jumpMap["zoneminderevents"] = "ZoneMinder Events";
-+ jumpMap["mythsmolt"] = "MythSmolt";
-
- // These jump point names match the (lowercased) locations from gContext
- jumpMap["channelrecpriority"] = "Channel Recording Priorities";
diff --git a/abs/extra/gnome-common/PKGBUILD b/abs/extra/gnome-common/PKGBUILD
index e0078dd..c2c42b0 100644
--- a/abs/extra/gnome-common/PKGBUILD
+++ b/abs/extra/gnome-common/PKGBUILD
@@ -1,19 +1,23 @@
-# $Id: PKGBUILD 54859 2009-10-11 19:55:23Z jgc $
+# $Id$
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=gnome-common
-pkgver=2.28.0
+pkgver=2.34.0
pkgrel=1
pkgdesc="Common development macros for GNOME2"
arch=(any)
license=('GPL')
url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('dd4817103d23745d00c735dd137951552ba7b576cb8f68e6a529d06661e9b6a1')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.34/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('7a9c4f9ab975501c36be3192aa61641abca045a215d519d7d00527706f1de1df')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr || return 1
- make || return 1
- make DESTDIR="${pkgdir}" install || return 1
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
}
diff --git a/abs/extra/hdhgrab/PKGBUILD b/abs/extra/hdhgrab/PKGBUILD
deleted file mode 100755
index be4fc7f..0000000
--- a/abs/extra/hdhgrab/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=hdhgrab
-pkgver=1
-pkgrel=1
-arch=("i686")
-pkgdesc="A multimedia framework based on the MPEG-4 Systems standard"
-url="myth2ipod.com"
-depends=('hdhomerun' )
-source=(http://ops.nocc.us/hdh/hdhgrab.tar.gz)
-
-
-build() {
- cd $startdir/src
-
- install -D -m 755 hdhscan $startdir/pkg/usr/bin/hdhscan
- install -D -m 755 hdhgrab $startdir/pkg/usr/bin/hdhgrab
- install -D -m755 README $startdir/pkg/usr/share/README.hdhgrab
-
-
-}
diff --git a/abs/extra/iw/PKGBUILD b/abs/extra/iw/PKGBUILD
index 2f66bdc..86b6865 100644
--- a/abs/extra/iw/PKGBUILD
+++ b/abs/extra/iw/PKGBUILD
@@ -1,20 +1,24 @@
-# $Id: PKGBUILD 24436 2009-01-17 00:02:46Z thomas $
-# Maintainer: Thomas Baechler <thomas@archlinux.org>
+# $Id: PKGBUILD 135526 2011-08-14 20:37:19Z thomas $
+# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=iw
-pkgver=0.9.20
-pkgrel=1
+pkgver=3.0
+pkgrel=2
pkgdesc="nl80211 based CLI configuration utility for wireless devices"
arch=("i686" "x86_64")
-url="http://www.linuxwireless.org/en/users/Documentation/iw"
+url="http://wireless.kernel.org/en/users/Documentation/iw"
license=("GPL")
depends=("libnl")
makedepends=("kernel-headers")
source=(http://wireless.kernel.org/download/$pkgname/$pkgname-$pkgver.tar.bz2)
+sha256sums=('a0ccbf1ce71ae4bdb05495ca18ab00a87c06dce2c3bf8b8358c615e60c4632fb')
build() {
- cd $pkgname-$pkgver
- make || return 1
- make DESTDIR=$pkgdir install
+ cd "$srcdir"/$pkgname-$pkgver
+ make
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
}
-md5sums=('1055799b544b3e08169d155bb6c21bb0')
diff --git a/abs/extra/iw/README b/abs/extra/iw/README
new file mode 100644
index 0000000..d330c95
--- /dev/null
+++ b/abs/extra/iw/README
@@ -0,0 +1,2 @@
+version.sh does a git describe that fails because it's not a git repo.
+
diff --git a/abs/extra/libnl/PKGBUILD b/abs/extra/libnl/PKGBUILD
index 4a6465a..8136059 100644
--- a/abs/extra/libnl/PKGBUILD
+++ b/abs/extra/libnl/PKGBUILD
@@ -1,21 +1,28 @@
-# $Id: PKGBUILD 930 2008-04-24 22:14:40Z jgc $
+# $Id$
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: William Rea <sillywilly@gmail.com>
+
pkgname=libnl
pkgver=1.1
-pkgrel=2
+pkgrel=3
pkgdesc="Library for applications dealing with netlink sockets"
arch=('i686' 'x86_64')
-url="http://people.suug.ch/~tgr/libnl"
+url="http://www.infradead.org/~tgr/libnl/"
license=('GPL')
depends=('glibc')
-source=(http://people.suug.ch/~tgr/${pkgname}/files/${pkgname}-${pkgver}.tar.gz ulong_max.patch)
-md5sums=('ae970ccd9144e132b68664f98e7ceeb1' '255bb3740149d518766032675810c590')
+source=("http://www.infradead.org/~tgr/libnl/files/${pkgname}-${pkgver}.tar.gz"
+ 'fix-compilation.patch')
build() {
- cd ${startdir}/src/libnl-${pkgver}
- patch -p1 < ../ulong_max.patch
- ./configure --prefix=/usr || return 1
- make || return 1
- make DESTDIR=${startdir}/pkg install || return 1
+ cd ${srcdir}/libnl-${pkgver}
+ patch -Np1 -i ${srcdir}/fix-compilation.patch
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${srcdir}/libnl-${pkgver}
+ make DESTDIR=${pkgdir} install
}
+md5sums=('ae970ccd9144e132b68664f98e7ceeb1'
+ '2490289a9edcc5c03802d151bcf3acc4')
diff --git a/abs/extra/libnl/fix-compilation.patch b/abs/extra/libnl/fix-compilation.patch
new file mode 100644
index 0000000..92c0696
--- /dev/null
+++ b/abs/extra/libnl/fix-compilation.patch
@@ -0,0 +1,10 @@
+--- libnl-1.1.orig/include/netlink-local.h 2008-01-14 16:48:45.000000000 +0100
++++ libnl-1.1/include/netlink-local.h 2009-06-26 11:15:33.186011844 +0200
+@@ -26,6 +26,7 @@
+ #include <sys/socket.h>
+ #include <inttypes.h>
+ #include <assert.h>
++#include <limits.h>
+
+ #include <arpa/inet.h>
+ #include <netdb.h>
diff --git a/abs/extra/libnl/ulong_max.patch b/abs/extra/libnl/ulong_max.patch
deleted file mode 100644
index d9ef218..0000000
--- a/abs/extra/libnl/ulong_max.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libnl-1.1/include/netlink-local.h.orig 2008-06-08 19:09:20.000000000
-+0200
-+++ libnl-1.1/include/netlink-local.h 2008-06-08 19:09:33.000000000 +0200
-@@ -26,6 +26,7 @@
- #include <sys/socket.h>
- #include <inttypes.h>
- #include <assert.h>
-+#include <limits.h>
-
- #include <arpa/inet.h>
- #include <netdb.h>
diff --git a/abs/extra/neon/PKGBUILD b/abs/extra/neon/PKGBUILD
new file mode 100644
index 0000000..64e21c5
--- /dev/null
+++ b/abs/extra/neon/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 129362 2011-06-27 05:41:06Z andrea $
+# Maintainer:
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Contributor: Juergen Hoetzel <juergen@archlinux.org>
+
+pkgname=neon
+pkgver=0.29.6
+pkgrel=2
+pkgdesc="HTTP and WebDAV client library with a C interface"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL')
+depends=('heimdal' 'expat' 'ca-certificates')
+url="http://www.webdav.org/neon/"
+source=("http://www.webdav.org/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('591e0c82e6979e7e615211b386b8f6bc')
+options=('libtool') # FS#16067
+
+build() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+ ./configure --prefix=/usr \
+ --with-expat \
+ --enable-shared \
+ --disable-static \
+ --with-ssl=openssl \
+ --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt
+ make
+
+ # fix invalid .so links in man pages (FS#24902)
+ sed -i '/^\.so/s|\.so \([^.]\+\)\.\([[:digit:]]\)|.so man\2/\1.\2|' doc/man/*
+}
+
+package() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/abs/extra/openjdk6/PKGBUILD b/abs/extra/openjdk6/PKGBUILD
deleted file mode 100644
index 22ee813..0000000
--- a/abs/extra/openjdk6/PKGBUILD
+++ /dev/null
@@ -1,155 +0,0 @@
-# $Id: PKGBUILD 29222 2009-03-06 20:55:45Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=openjdk6
-pkgver=1.5
-_icedteaver=1.5pre
-pkgrel=0.1
-_date=20090305
-pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.'
-url='http://icedtea.classpath.org'
-arch=('i686' 'x86_64')
-license=('GPL')
-_openjdk_version=b14
-_openjdk_date=25_nov_2008
-_hotspotver=fc6a5ae3fef5 # what it downlopads itself / remove from configure to get it
-depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme')
-makedepends=('alsa-lib' 'libxtst' 'giflib' 'libxp' 'gtk2' 'nspr' 'zlib' 'freetype2' 'libjpeg' 'libx11' 'libcups' 'patch' 'xalan-java' 'xulrunner>=1.9.0.3' 'apache-ant>=1.7.0' 'autoconf' 'unzip' 'rhino' 'mercurial')
-conflicts=('java-environment' 'java-runtime')
-provides=('java-environment=6' 'java-runtime=6')
-options=(!emptydirs)
-install=openjdk6.install
-source=(http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
- #http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz
- ftp://ftp.archlinux.org/other/openjdk6/icedtea6-${_date}.tar.bz2
- http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/${_hotspotver}.tar.gz
- fix_jdk_cmds_path.diff
- fix_corba_cmds_path.diff
- gcjwebplugin_xulrunner.diff
- aatext_by_default.diff
- fontconfig-paths.diff
- openjdk6.profile)
-noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz ${_hotspotver}.tar.gz)
-md5sums=('9f9773a822156dd3d576d83d794364ce'
- 'd57bf545dc50d41588b43112393dac26'
- '1c3510387dccdb4907d0fd2f1c58e372'
- '5da3e39fa60985576c4f37d1491efbe2'
- 'f7e7a212e50abb56a6ef1a2b1bd27405'
- 'ed2e808df2d2fc2ea7dae5139d475192'
- 'ef60d567c0d9bad111212851220deafd'
- '104380f0b900c840141e572a7fb70c27'
- 'd0703088e10aa957c037644ab88d716d')
-
-build() {
- # for hg checkout install mercurial and
-# mkdir ${srcdir}/icedtea6-${_date}
-# cd ${srcdir}/icedtea6-${_date}
-# hg clone http://icedtea.classpath.org/hg/icedtea6 || return 1
-# tar -cvjf ../../icedtea6-${_date}.tar.bz2 *
-# return 1
-
- unset JAVA_HOME
- unset CLASSPATH
- if [ "${CARCH}" = "x86_64" ]; then
- _arch=amd64
- else
- _arch=i586
- fi
- _javaver=1.6.0
- _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
- cd ${srcdir}/icedtea6
-# cd ${srcdir}/icedtea6-${_icedteaver}
- ln -s ${srcdir}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz .
- ln -s ${srcdir}/${_hotspotver}.tar.gz .
-
- # fix xulrunner linking
- patch -Np0 -i ${srcdir}/gcjwebplugin_xulrunner.diff || return 1
-
- cp ${srcdir}/*.diff ${srcdir}/icedtea6/patches/
-# cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/
- export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fix_corba_cmds_path.diff patches/aatext_by_default.diff patches/fontconfig-paths.diff"
-
- ./autogen.sh
- autoreconf # needed due to mercurial build
-
- export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
- export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
- unset MAKEFLAGS
-
- if [ -x ${_jvmdir}/bin/javac ]; then
- JCONF="--with-openjdk --with-openjdk-home=${_jvmdir}"
- elif [ -x /opt/java/bin/javac ]; then
- JCONF="--with-openjdk --with-openjdk-home=/opt/java"
- elif [ -x /usr/lib/jvm/java-1.5.0-gcj-1.5.0.0/bin/javac ]; then
- JCONF="--with-gcj-home=/usr/lib/jvm/java-1.5.0-gcj-1.5.0.0 --with-javac"
- elif [ -x /usr/lib/java-${_javaver}-openjdk/bin/javac ]; then
- JCONF="--with-openjdk --with-openjdk-home=/usr/lib/java-${_javaver}-openjdk"
- # ^ only fallback to build with broken 1.2-3, can be removed later
- else
- echo "No supported java installation found, install either openjdk6, jdk or java-gcj-compat"
- return 1
- fi
-
- ./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
- --with-xalan2-jar=/usr/share/java/xalan.jar \
- --with-hotspot-src-zip=${_hotspotver}.tar.gz \
- --with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH $JCONF
- LD_PRELOAD="" make || return 1
-
- install -m755 -d ${pkgdir}/${_jvmdir}/jre
-
- pushd ${srcdir}/icedtea6/openjdk/control/build/linux-${_arch}/j2sdk-image
-# pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk/control/build/linux-${_arch}/j2sdk-image
- # Install main files.
- cp -a bin include lib src.zip ${pkgdir}/${_jvmdir}/ || return 1
- cp -a jre/bin jre/lib ${pkgdir}/${_jvmdir}/jre/ || return 1
-
- mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.properties.src \
- ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.properties.src || return 1
- mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.bfc \
- ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.bfc || return 1
- rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.bfc
- rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.properties.src
-
- # Install man pages.
- install -m755 -d ${pkgdir}/usr/share/man/man1
- install -m644 man/man1/*.1 ${pkgdir}/usr/share/man/man1/ || return 1
-
- # Install demos and samples.
- cp -a demo ${pkgdir}/${_jvmdir}/ || return 1
- install -m755 -d sample/rmi
- mv bin/java-rmi.cgi sample/rmi || return 1
- cp -a sample ${pkgdir}/${_jvmdir}/ || return 1
- popd
-
- # Install icons and menu entries.
- for s in 16 24 32 48 ; do
- install -m755 -d ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps
- install -m644 openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \
- ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png || return 1
- done
-
- # Install desktop files.
- install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps}
- install -m644 javaws.png ${pkgdir}/usr/share/pixmaps || return 1
- install -m644 {javaws,jconsole,policytool}.desktop ${pkgdir}/usr/share/applications || return 1
-
- # link the mozilla-plugin
- install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/
- ln -sf ${_jvmdir}/jre/lib/${_arch/i586/i386}/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/ || return 1
-
- # link binaries into /usr/bin
- install -m755 -d ${pkgdir}/usr/bin
- pushd ${pkgdir}/${_jvmdir}/bin
- for file in *; do
- ln -sf ${_jvmdir}/bin/${file} \
- ${pkgdir}/usr/bin || return 1
- done
- popd
-
- # set some variables
- install -m755 -d ${pkgdir}/etc/profile.d
- install -m755 ${srcdir}/openjdk6.profile ${pkgdir}/etc/profile.d/openjdk6.sh || return 1
-}
diff --git a/abs/extra/openjdk6/aatext_by_default.diff b/abs/extra/openjdk6/aatext_by_default.diff
deleted file mode 100644
index 268ea99..0000000
--- a/abs/extra/openjdk6/aatext_by_default.diff
+++ /dev/null
@@ -1,35 +0,0 @@
---- openjdk/jdk/src/share/classes/sun/awt/SunToolkit.java.old 2008-01-08 20:23:56.000000000 +0200
-+++ openjdk/jdk/src/share/classes/sun/awt/SunToolkit.java 2008-02-24 12:39:19.000000000 +0200
-@@ -1875,7 +1875,6 @@
- */
- private static boolean useSystemAAFontSettings() {
- if (!checkedSystemAAFontSettings) {
-- useSystemAAFontSettings = true; /* initially set this true */
- String systemAAFonts = null;
- Toolkit tk = Toolkit.getDefaultToolkit();
- if (tk instanceof SunToolkit) {
-@@ -1883,20 +1882,10 @@
- (String)AccessController.doPrivileged(
- new GetPropertyAction("awt.useSystemAAFontSettings"));
- }
-- if (systemAAFonts != null) {
-- useSystemAAFontSettings =
-- Boolean.valueOf(systemAAFonts).booleanValue();
-- /* If it is anything other than "true", then it may be
-- * a hint name , or it may be "off, "default", etc.
-- */
-- if (!useSystemAAFontSettings) {
-- desktopFontHints = getDesktopAAHintsByName(systemAAFonts);
-- }
-- }
-- /* If its still true, apply the extra condition */
-- if (useSystemAAFontSettings) {
-- useSystemAAFontSettings = lastExtraCondition;
-- }
-+ if (systemAAFonts == null || Boolean.parseBoolean(systemAAFonts))
-+ systemAAFonts = "on";
-+ desktopFontHints = getDesktopAAHintsByName(systemAAFonts);
-+ useSystemAAFontSettings = desktopFontHints != null;
- checkedSystemAAFontSettings = true;
- }
- return useSystemAAFontSettings;
diff --git a/abs/extra/openjdk6/fix_corba_cmds_path.diff b/abs/extra/openjdk6/fix_corba_cmds_path.diff
deleted file mode 100644
index 8426578..0000000
--- a/abs/extra/openjdk6/fix_corba_cmds_path.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- openjdk/corba/make/common/shared/Defs-utils.gmk.old 2008-04-13 13:26:12.000000000 +0300
-+++ openjdk/corba/make/common/shared/Defs-utils.gmk 2008-04-14 15:35:13.000000000 +0300
-@@ -86,10 +86,10 @@
- CHMOD = $(UTILS_COMMAND_PATH)chmod
- CMP = $(UTILS_USR_BIN_PATH)cmp
- COMM = $(UTILS_USR_BIN_PATH)comm
--COMPRESS = $(UTILS_USR_BIN_PATH)compress
-+COMPRESS = $(UTILS_COMMAND_PATH)compress
- CP = $(UTILS_COMMAND_PATH)cp
- CPIO = $(UTILS_COMMAND_PATH)cpio
--CUT = $(UTILS_USR_BIN_PATH)cut
-+CUT = $(UTILS_COMMAND_PATH)cut
- DATE = $(UTILS_COMMAND_PATH)date
- DF = $(UTILS_COMMAND_PATH)df
- DIFF = $(UTILS_USR_BIN_PATH)diff
-@@ -136,7 +136,7 @@
- TAR = $(UTILS_COMMAND_PATH)tar
- TEST = $(UTILS_USR_BIN_PATH)test
- TOUCH = $(UTILS_COMMAND_PATH)touch
--TR = $(UTILS_USR_BIN_PATH)tr
-+TR = $(UTILS_COMMAND_PATH)tr
- TRUE = $(UTILS_COMMAND_PATH)true
- UNAME = $(UTILS_COMMAND_PATH)uname
- UNIQ = $(UTILS_USR_BIN_PATH)uniq
-@@ -186,7 +186,7 @@
- # others have it in /usr/bin.
- SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
- $(wildcard $(UTILS_USR_BIN_PATH)sort))
-- NAWK = $(USRBIN_PATH)gawk
-+ NAWK = $(UTILS_COMMAND_PATH)gawk
- # Intrinsic unix command, with backslash-escaped character interpretation
- ECHO = /bin/echo -e
- # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
diff --git a/abs/extra/openjdk6/fix_jdk_cmds_path.diff b/abs/extra/openjdk6/fix_jdk_cmds_path.diff
deleted file mode 100644
index 7e16e17..0000000
--- a/abs/extra/openjdk6/fix_jdk_cmds_path.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- openjdk/jdk/make/common/shared/Defs-utils.gmk.old 2008-04-13 13:33:23.000000000 +0300
-+++ openjdk/jdk/make/common/shared/Defs-utils.gmk 2008-04-14 15:37:34.000000000 +0300
-@@ -76,10 +76,10 @@
- CHMOD = $(UTILS_COMMAND_PATH)chmod
- CMP = $(UTILS_USR_BIN_PATH)cmp
- COMM = $(UTILS_USR_BIN_PATH)comm
--COMPRESS = $(UTILS_USR_BIN_PATH)compress
-+COMPRESS = $(UTILS_COMMAND_PATH)compress
- CP = $(UTILS_COMMAND_PATH)cp
- CPIO = $(UTILS_COMMAND_PATH)cpio
--CUT = $(UTILS_USR_BIN_PATH)cut
-+CUT = $(UTILS_COMMAND_PATH)cut
- DATE = $(UTILS_COMMAND_PATH)date
- DF = $(UTILS_COMMAND_PATH)df
- DIFF = $(UTILS_USR_BIN_PATH)diff
-@@ -126,7 +126,7 @@
- TAR = $(UTILS_COMMAND_PATH)tar
- TEST = $(UTILS_USR_BIN_PATH)test
- TOUCH = $(UTILS_COMMAND_PATH)touch
--TR = $(UTILS_USR_BIN_PATH)tr
-+TR = $(UTILS_COMMAND_PATH)tr
- TRUE = $(UTILS_COMMAND_PATH)true
- UNAME = $(UTILS_COMMAND_PATH)uname
- UNIQ = $(UTILS_USR_BIN_PATH)uniq
-@@ -173,7 +173,7 @@
- BASENAME=$(firstword $(wildcard $(UTILS_COMMAND_PATH)basename) \
- $(wildcard $(UTILS_USR_BIN_PATH)basename))
-
-- NAWK = $(USRBIN_PATH)gawk
-+ NAWK = $(UTILS_COMMAND_PATH)gawk
- # Intrinsic unix command, with backslash-escaped character interpretation
- ECHO = /bin/echo -e
- # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
diff --git a/abs/extra/openjdk6/fontconfig-paths.diff b/abs/extra/openjdk6/fontconfig-paths.diff
deleted file mode 100644
index 77d3e03..0000000
--- a/abs/extra/openjdk6/fontconfig-paths.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.orig 2008-08-06 14:11:55.000000000 +0200
-+++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties 2008-08-06 14:15:36.000000000 +0200
-@@ -128,23 +128,23 @@
-
- # Font File Names
-
--filename.DejaVu_Sans=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
--filename.DejaVu_Sans_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf
--filename.DejaVu_Sans_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf
--filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf
-+filename.DejaVu_Sans=/usr/share/fonts/TTF/DejaVuSans.ttf
-+filename.DejaVu_Sans_Bold=/usr/share/fonts/TTF/DejaVuSans-Bold.ttf
-+filename.DejaVu_Sans_Oblique=/usr/share/fonts/TTF/DejaVuSans-Oblique.ttf
-+filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSans-BoldOblique.ttf
-
--filename.DejaVu_Sans_Mono=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf
--filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf
--filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf
--filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf
-+filename.DejaVu_Sans_Mono=/usr/share/fonts/TTF/DejaVuSansMono.ttf
-+filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf
-+filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf
-+filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-BoldOblique.ttf
-
--filename.DejaVu_Serif=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf
--filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf
--filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Oblique.ttf
--filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldOblique.ttf
-+filename.DejaVu_Serif=/usr/share/fonts/TTF/DejaVuSerif.ttf
-+filename.DejaVu_Serif_Bold=/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf
-+filename.DejaVu_Serif_Oblique=/usr/share/fonts/TTF/DejaVuSerif-Oblique.ttf
-+filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSerif-BoldOblique.ttf
-
--filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic-subst.ttf
--filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho-subst.ttf
--filename.AR_PL_ZenKai_Uni=/usr/share/fonts//truetype/arphic/ukai.ttf
--filename.Baekmuk_Dotum=/usr/share/fonts/truetype/baekmuk/dotum.ttf
--filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf
-+filename.Kochi_Gothic=/usr/share/fonts/TTF/kochi-gothic-subst.ttf
-+filename.Kochi_Mincho=/usr/share/fonts/TTF/kochi-mincho-subst.ttf
-+filename.AR_PL_ZenKai_Uni=/usr/share/fonts/TTF/ukai.ttf
-+filename.Baekmuk_Dotum=/usr/share/fonts/TTF/dotum.ttf
-+filename.Baekmuk_Batang=/usr/share/fonts/TTF/batang.ttf
diff --git a/abs/extra/openjdk6/openjdk6.install b/abs/extra/openjdk6/openjdk6.install
deleted file mode 100644
index 3557847..0000000
--- a/abs/extra/openjdk6/openjdk6.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-
-post_remove() {
- post_install
-}
diff --git a/abs/extra/openjdk6/openjdk6.profile b/abs/extra/openjdk6/openjdk6.profile
deleted file mode 100644
index 4af417f..0000000
--- a/abs/extra/openjdk6/openjdk6.profile
+++ /dev/null
@@ -1,4 +0,0 @@
-export J2SDKDIR=/usr/lib/jvm/java-1.6.0-openjdk
-export J2REDIR=$J2SDKDIR/jre
-export JAVA_HOME=/usr/lib/jvm/java-1.6.0-openjdk
-#export CLASSPATH="${CLASSPATH:+$CLASSPATH:}$J2SDKDIR/lib:$J2REDIR/lib"
diff --git a/abs/extra/quilt/PKGBUILD b/abs/extra/quilt/PKGBUILD
index e5c50bc..1775294 100644
--- a/abs/extra/quilt/PKGBUILD
+++ b/abs/extra/quilt/PKGBUILD
@@ -1,22 +1,20 @@
-# $Id: PKGBUILD,v 1.3 2008/05/26 08:06:11 BaSh Exp $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
pkgname=quilt
-pkgver=0.47
-pkgrel=1
+pkgver=0.48
+pkgrel=3
pkgdesc="Manage a series of patches by keeping track of the changes each patch makes."
arch=('i686' 'x86_64')
url="http://savannah.nongnu.org/projects/quilt"
license=('GPL')
-depends=('perl' 'diffstat' 'gawk' 'patch' 'diffutils' 'mktemp' 'gettext')
+depends=('perl' 'diffstat' 'gawk' 'patch' 'diffutils' 'gettext')
source=(http://savannah.nongnu.org/download/quilt/${pkgname}-${pkgver}.tar.gz)
-md5sums=('d33d2442bd34387260b1c1db3e623af0')
-
build() {
- cd ${startdir}/src/${pkgname}-${pkgver}
+ cd ${srcdir}/${pkgname}-${pkgver}
./configure --prefix=/usr --mandir=/usr/share/man || return 1
make || return 1
- make prefix=${startdir}/pkg/usr mandir=${startdir}/pkg/usr/share/man install || return 1
+ make prefix=${pkgdir}/usr mandir=${pkgdir}/usr/share/man install || return 1
}
+md5sums=('f77adda60039ffa753f3c584a286f12b')
diff --git a/abs/extra/subversion/PKGBUILD b/abs/extra/subversion/PKGBUILD
index eab07f3..6e7efe0 100644
--- a/abs/extra/subversion/PKGBUILD
+++ b/abs/extra/subversion/PKGBUILD
@@ -10,7 +10,7 @@ arch=('i686' 'x86_64')
license=('apache' 'bsd')
depends=('neon' 'apr-util')
makedepends=('heimdal' 'apache' 'python2' 'perl' 'swig' 'ruby' 'jdk'
- 'autoconf' 'sqlite3' 'db' 'e2fsprogs')
+ 'autoconf' 'sqlite3' 'db' 'e2fsprogs' )
source=(http://subversion.tigris.org/downloads/$pkgname-$pkgver.tar.bz2
svnserve svn svnserve.conf svnmerge.py
subversion.rpath.fix.patch
@@ -35,7 +35,7 @@ build() {
autoreconf
./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
--with-zlib=/usr --with-neon=/usr --with-sqlite=/usr \
- --enable-javahl --with-gnome-keyring --with-apxs \
+ --enable-javahl --without-gnome-keyring --with-apxs \
--with-sqlite=/usr --with-jdk
# build
diff --git a/abs/extra/v4l-dvb-dvico2/PKGBUILD b/abs/extra/v4l-dvb-dvico2/PKGBUILD
deleted file mode 100644
index 4886027..0000000
--- a/abs/extra/v4l-dvb-dvico2/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 5936 2008-07-21 20:24:16Z thomas $
-# Maintainer: Cecil Watson<knoppmyth@gmail.com>
-
-pkgname=v4l-dvb-dvico2
-_kernver=2.6.28-ARCH
-pkgver=1
-pkgrel=1
-pkgdesc="V4L-DVB drivers from mercurial for some dvico cards."
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://linuxtv.org/"
-depends=('kernel26')
-makedepends=(kernel-headers)
-install=v4l-dvb.install
-source=(http://linuxtv.org/hg/v4l-dvb/archive/401393656ebc.tar.bz2)
-
-build() {
- cd $startdir/src/v4l*
- make KERNDIR=/lib/modules/$_kernver/build \
- DESTDIR=$startdir/pkg KERNELRELEASE=$_kernver all || return 1
- make KERNDIR=/lib/modules/$_kernver/build \
- DESTDIR=$startdir/pkg KERNELRELEASE=$_kernver install || return 1
- rm -fr $startdir/pkg/lib/modules/$_kernver/modules*
-}
diff --git a/abs/extra/v4l-dvb-dvico2/fix-jdelvare-i2c-i2c-constify-client-address-data.patch b/abs/extra/v4l-dvb-dvico2/fix-jdelvare-i2c-i2c-constify-client-address-data.patch
deleted file mode 100644
index 8c603f6..0000000
--- a/abs/extra/v4l-dvb-dvico2/fix-jdelvare-i2c-i2c-constify-client-address-data.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Andrew Morton <akpm@linux-foundation.org>
-
-drivers/media/video/tvaudio.c:147: error: conflicting type qualifiers for 'addr_data'
-include/media/v4l2-i2c-drv-legacy.h:37: error: previous declaration of 'addr_data' was here
-
-Cc: Jean Delvare <khali@linux-fr.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
----
-
- include/media/v4l2-i2c-drv-legacy.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff -puN include/media/v4l2-i2c-drv-legacy.h~fix-jdelvare-i2c-i2c-constify-client-address-data include/media/v4l2-i2c-drv-legacy.h
---- a/include/media/v4l2-i2c-drv-legacy.h~fix-jdelvare-i2c-i2c-constify-client-address-data
-+++ a/include/media/v4l2-i2c-drv-legacy.h
-@@ -34,7 +34,7 @@ struct v4l2_i2c_driver_data {
- };
-
- static struct v4l2_i2c_driver_data v4l2_i2c_data;
--static struct i2c_client_address_data addr_data;
-+static const struct i2c_client_address_data addr_data;
- static struct i2c_driver v4l2_i2c_driver_legacy;
- static char v4l2_i2c_drv_name_legacy[32];
-
-_
diff --git a/abs/extra/v4l-dvb-dvico2/v4l-dvb.install b/abs/extra/v4l-dvb-dvico2/v4l-dvb.install
deleted file mode 100644
index c87bb82..0000000
--- a/abs/extra/v4l-dvb-dvico2/v4l-dvb.install
+++ /dev/null
@@ -1,23 +0,0 @@
-# arg 1: the new package version
-post_install() {
- KERNEL_VERSION='2.6.26-ARCH'
- depmod -ae -v $KERNEL_VERSION > /dev/null 2>&1
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- KERNEL_VERSION='2.6.26-ARCH'
- depmod -ae -v $KERNEL_VERSION > /dev/null 2>&1
-
-}
-
-# arg 1: the old package version
-post_remove() {
- KERNEL_VERSION='2.6.26-ARCH'
- depmod -ae -v $KERNEL_VERSION > /dev/null 2>&1
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra/v4l-dvb-dvico2/xc-bluebird.patch b/abs/extra/v4l-dvb-dvico2/xc-bluebird.patch
deleted file mode 100644
index c54594d..0000000
--- a/abs/extra/v4l-dvb-dvico2/xc-bluebird.patch
+++ /dev/null
@@ -1,896 +0,0 @@
-[PATCH] Add support for FusionHDTV DVB-T NANO 2 / Dual Digital 4
-
-Firmware required:
-
-Mirror 1: http://konstantin.filtschew.de/v4l-firmware/
-
-Mirror 2: http://www.tuxamito.com.es/em2880/
-
-This patch is for users, and NOT meant to be merged into the kernel.
-
-For AU support, apply Rogers patch afterwards:
-http://linuxtv.org/~mkrufky/pending/xc/dd4.au.patch
-
-From: Michael Krufky <mkrufky@linuxtv.org>
----
- linux/drivers/media/dvb/dvb-usb/cxusb.c | 157 +++++++
- linux/drivers/media/dvb/dvb-usb/cxusb.h | 2
- linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 2
- linux/drivers/media/dvb/frontends/Kconfig | 7
- linux/drivers/media/dvb/frontends/Makefile | 1
- linux/drivers/media/dvb/frontends/xc3028-fe.c | 532 ++++++++++++++++++++++++++
- linux/drivers/media/dvb/frontends/xc3028.h | 56 ++
- v4l/versions.txt | 1
- 8 files changed, 757 insertions(+), 1 deletion(-)
-
---- v4l-dvb.orig/linux/drivers/media/dvb/dvb-usb/cxusb.c
-+++ v4l-dvb/linux/drivers/media/dvb/dvb-usb/cxusb.c
-@@ -30,6 +30,7 @@
- #include "mt352.h"
- #include "mt352_priv.h"
- #include "zl10353.h"
-+#include "xc3028.h"
-
- /* debug */
- int dvb_usb_cxusb_debug;
-@@ -72,6 +73,28 @@
- st->gpio_write_state[GPIO_TUNER] = onoff;
- }
-
-+static void cxusb_bluebird_gpio(struct dvb_usb_device *d, u8 pin)
-+{
-+ u8 o[2],i;
-+
-+ o[0] = 0xff & ~pin;
-+ o[1] = 0x00;
-+
-+ cxusb_ctrl_msg(d, CMD_BLUEBIRD_GPIO_WRITE, o, 2, &i, 1);
-+ msleep(140);
-+
-+ if ((i & pin) != 0x00)
-+ deb_info("gpio_write failed.\n");
-+
-+ o[1] = pin;
-+
-+ cxusb_ctrl_msg(d, CMD_BLUEBIRD_GPIO_WRITE, o, 2, &i, 1);
-+ msleep(140);
-+
-+ if ((i & pin) != pin)
-+ deb_info("gpio_write failed.\n");
-+}
-+
- /* I2C */
- static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
- int num)
-@@ -351,6 +374,64 @@
- .demod_init = cxusb_mt352_demod_init,
- };
-
-+static struct zl10353_config cxusb_zl10353_dualdig4_config = {
-+ .demod_address = 0x0f,
-+ .no_tuner = 1,
-+ .parallel_ts = 1,
-+};
-+
-+struct bcode {
-+ int reg;
-+ char *txt;
-+ int len;
-+ int delay;
-+};
-+
-+static int cxusb_xc3028_zl353_gpio_reset(struct dvb_frontend* fe, int ptr)
-+{
-+ struct dvb_usb_adapter *adap = fe->dvb->priv;
-+ struct dvb_usb_device *d = adap->dev;
-+ int j;
-+ struct bcode zlconf[] = {
-+ /* borrowed from em2880-dvb
-+ * this should be fixed in zl10353.c instead */
-+ {0x1e,"\x60\x00",2,0},
-+ {0x1e,"\x61\x4d",2,0},
-+
-+ {0x1e,"\x50\x0b",2,0},
-+ {0x1e,"\x51\x44",2,0},
-+ {0x1e,"\x52\x46",2,0},
-+ {0x1e,"\x53\x15",2,0},
-+ {0x1e,"\x54\x0f",2,0},
-+ {0x1e,"\x5e\x00",2,0},
-+ {0x1e,"\x5f\x12",2,0},
-+
-+
-+ {0x1e,"\x55\x80",2,0}, /* reset */
-+ {0x1e,"\xea\x01",2,0},
-+ {0x1e,"\xea\x00",2,0},
-+ {0x1e,"\x5a\xcd",2,0},
-+
-+
-+ {0x1e,"\x6c\xe6",2,0}, // set input frequency
-+ {0x1e,"\x6d\x09",2,0},
-+ {}
-+ };
-+
-+ if (ptr == 0 || ptr == 1)
-+ /* pulse the GPIO tuner reset pin */
-+ cxusb_bluebird_gpio(d,0x01);
-+ else if (ptr == 2)
-+ for(j = 0; zlconf[j].txt; j++)
-+ d->adapter[0].fe->ops.write(d->adapter[0].fe, zlconf[j].txt,zlconf[j].len);
-+
-+ return 0;
-+}
-+
-+static struct xc3028_config cxusb_xc3028_config = {
-+ .gpio_reset = cxusb_xc3028_zl353_gpio_reset,
-+};
-+
- /* Callbacks for DVB USB */
- static int cxusb_fmd1216me_tuner_attach(struct dvb_usb_adapter *adap)
- {
-@@ -386,6 +467,12 @@
- return 0;
- }
-
-+static int cxusb_xc3028_tuner_attach(struct dvb_usb_adapter *adap)
-+{
-+ dvb_attach(xc3028_attach,adap->fe, &adap->dev->i2c_adap, &cxusb_xc3028_config);
-+ return 0;
-+}
-+
- static int cxusb_cx22702_frontend_attach(struct dvb_usb_adapter *adap)
- {
- u8 b;
-@@ -401,6 +488,24 @@
- return -EIO;
- }
-
-+static int cxusb_dualdig4_frontend_attach(struct dvb_usb_adapter *adap)
-+{
-+ if (usb_set_interface(adap->dev->udev, 0, 1) < 0)
-+ err("set interface failed");
-+
-+ cxusb_ctrl_msg(adap->dev, CMD_DIGITAL, NULL, 0, NULL, 0);
-+
-+ /* pulse the GPIO demod reset pin */
-+ cxusb_bluebird_gpio(adap->dev,0x02);
-+
-+ if ((adap->fe = dvb_attach(zl10353_attach,
-+ &cxusb_zl10353_dualdig4_config,
-+ &adap->dev->i2c_adap)) != NULL)
-+ return 0;
-+
-+ return -EIO;
-+}
-+
- static int cxusb_lgdt3303_frontend_attach(struct dvb_usb_adapter *adap)
- {
- if (usb_set_interface(adap->dev->udev, 0, 7) < 0)
-@@ -479,6 +584,7 @@
- static struct dvb_usb_device_properties cxusb_bluebird_dee1601_properties;
- static struct dvb_usb_device_properties cxusb_bluebird_lgz201_properties;
- static struct dvb_usb_device_properties cxusb_bluebird_dtt7579_properties;
-+static struct dvb_usb_device_properties cxusb_bluebird_dualdig4_properties;
-
- static int cxusb_probe(struct usb_interface *intf,
- const struct usb_device_id *id)
-@@ -487,7 +593,8 @@
- dvb_usb_device_init(intf,&cxusb_bluebird_lgh064f_properties,THIS_MODULE,NULL) == 0 ||
- dvb_usb_device_init(intf,&cxusb_bluebird_dee1601_properties,THIS_MODULE,NULL) == 0 ||
- dvb_usb_device_init(intf,&cxusb_bluebird_lgz201_properties,THIS_MODULE,NULL) == 0 ||
-- dvb_usb_device_init(intf,&cxusb_bluebird_dtt7579_properties,THIS_MODULE,NULL) == 0) {
-+ dvb_usb_device_init(intf,&cxusb_bluebird_dtt7579_properties,THIS_MODULE,NULL) == 0 ||
-+ dvb_usb_device_init(intf,&cxusb_bluebird_dualdig4_properties,THIS_MODULE,NULL) == 0) {
- return 0;
- }
-
-@@ -508,6 +615,8 @@
- { USB_DEVICE(USB_VID_DVICO, USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_WARM) },
- { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_2_COLD) },
- { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_2_WARM) },
-+ { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_4) },
-+ { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DVBT_NANO_2) },
- {} /* Terminating entry */
- };
- MODULE_DEVICE_TABLE (usb, cxusb_table);
-@@ -766,6 +875,52 @@
- }
- };
-
-+static struct dvb_usb_device_properties cxusb_bluebird_dualdig4_properties = {
-+ .caps = DVB_USB_IS_AN_I2C_ADAPTER,
-+
-+ .usb_ctrl = CYPRESS_FX2,
-+
-+ .size_of_priv = sizeof(struct cxusb_state),
-+
-+ .num_adapters = 1,
-+ .adapter = {
-+ {
-+ .streaming_ctrl = cxusb_streaming_ctrl,
-+ .frontend_attach = cxusb_dualdig4_frontend_attach,
-+ .tuner_attach = cxusb_xc3028_tuner_attach,
-+ /* parameter for the MPEG2-data transfer */
-+ .stream = {
-+ .type = USB_BULK,
-+ .count = 5,
-+ .endpoint = 0x02,
-+ .u = {
-+ .bulk = {
-+ .buffersize = 8192,
-+ }
-+ }
-+ },
-+ },
-+ },
-+
-+ .power_ctrl = cxusb_bluebird_power_ctrl,
-+
-+ .i2c_algo = &cxusb_i2c_algo,
-+
-+ .generic_bulk_ctrl_endpoint = 0x01,
-+
-+ .num_device_descs = 2,
-+ .devices = {
-+ { "DViCO FusionHDTV DVB-T Dual Digital 4",
-+ { NULL },
-+ { &cxusb_table[13], NULL },
-+ },
-+ { "DViCO FusionHDTV DVB-T NANO2",
-+ { NULL },
-+ { &cxusb_table[14], NULL },
-+ },
-+ }
-+};
-+
- static struct usb_driver cxusb_driver = {
- #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,15)
- .owner = THIS_MODULE,
---- v4l-dvb.orig/linux/drivers/media/dvb/dvb-usb/cxusb.h
-+++ v4l-dvb/linux/drivers/media/dvb/dvb-usb/cxusb.h
-@@ -28,6 +28,8 @@
- #define CMD_ANALOG 0x50
- #define CMD_DIGITAL 0x51
-
-+#define CMD_BLUEBIRD_GPIO_WRITE 0x05
-+
- struct cxusb_state {
- u8 gpio_write_state[3];
- };
---- v4l-dvb.orig/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
-+++ v4l-dvb/linux/drivers/media/dvb/dvb-usb/dvb-usb-ids.h
-@@ -142,6 +142,8 @@
- #define USB_PID_DVICO_BLUEBIRD_DUAL_1_WARM 0xdb51
- #define USB_PID_DVICO_BLUEBIRD_DUAL_2_COLD 0xdb58
- #define USB_PID_DVICO_BLUEBIRD_DUAL_2_WARM 0xdb59
-+#define USB_PID_DVICO_BLUEBIRD_DUAL_4 0xdb78
-+#define USB_PID_DVICO_BLUEBIRD_DVBT_NANO_2 0xdb70
- #define USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_COLD 0xdb54
- #define USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_WARM 0xdb55
- #define USB_PID_MEDION_MD95700 0x0932
---- v4l-dvb.orig/linux/drivers/media/dvb/frontends/Kconfig
-+++ v4l-dvb/linux/drivers/media/dvb/frontends/Kconfig
-@@ -353,6 +353,13 @@
- This device is only used inside a SiP called togther with a
- demodulator for now.
-
-+config DVB_XC3028
-+ tristate "Xceive XC3028 silicon tuner"
-+ depends on I2C
-+ default m if DVB_FE_CUSTOMISE
-+ help
-+ A driver for the silicon tuner XC3028 from Xceive.
-+
- comment "Miscellaneous devices"
- depends on DVB_CORE
-
---- v4l-dvb.orig/linux/drivers/media/dvb/frontends/Makefile
-+++ v4l-dvb/linux/drivers/media/dvb/frontends/Makefile
-@@ -4,6 +4,7 @@
-
- EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core/
-
-+obj-$(CONFIG_DVB_XC3028) += xc3028-fe.o
- obj-$(CONFIG_DVB_PLL) += dvb-pll.o
- obj-$(CONFIG_DVB_STV0299) += stv0299.o
- obj-$(CONFIG_DVB_SP8870) += sp8870.o
---- /dev/null
-+++ v4l-dvb/linux/drivers/media/dvb/frontends/xc3028-fe.c
-@@ -0,0 +1,532 @@
-+/*
-+
-+ Xceive - xc3028 tuner interface (Firmware 2.7)
-+
-+ Copyright (c) 2007 Michael Krufky <mkrufky@linuxtv.org>
-+ Copyright (c) 2006 Markus Rechberger <mrechberger@gmail.com>
-+
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2 of the License, or
-+ (at your option) any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program; if not, write to the Free Software
-+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+
-+*/
-+
-+#include <linux/i2c.h>
-+#include "compat.h"
-+#include <linux/firmware.h>
-+#include <linux/delay.h>
-+#include <media/tuner.h>
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
-+#include "i2c-compat.h"
-+#endif
-+#include "dvb_frontend.h"
-+#include "xc3028.h"
-+
-+
-+struct xc3028_priv {
-+ u8 tuning_code[12];
-+ enum v4l2_tuner_type type;
-+ v4l2_std_id std;
-+ // unsigned int mode;
-+
-+ struct xc3028_config *cfg;
-+
-+ struct i2c_adapter *i2c_adap;
-+ u32 frequency;
-+ int bandwidth;
-+};
-+
-+MODULE_DESCRIPTION("Xceive xc3028 dvb frontend driver");
-+MODULE_AUTHOR("Michael Krufky <mkrufky@linuxtv.org>");
-+MODULE_AUTHOR("Markus Rechberger <mrechberger@gmail.com>");
-+MODULE_LICENSE("GPL");
-+
-+
-+/* hack */
-+#define V4L2_TUNER_DVBT_TV 19
-+#define V4L2_TUNER_DVBC_TV 29
-+#define V4L2_TUNER_ATSC_TV 39
-+
-+/* firmware functions */
-+#define XC3028_BYTECODE 0
-+#define XC3028_RESET 1
-+#define XC3028_SLEEP 2
-+
-+#define XC3028_BW8MHZ 0
-+#define XC3028_BW7MHZ 1
-+#define XC3028_BW6MHZ 2
-+#define XC3028_ATSC_BW6MHZ 3
-+#define XC3028_RADIO 4
-+
-+
-+#define XC3028_ANALOGUE_FW "xc3028_init0.i2c.fw"
-+#define XC3028_DIGITAL_FW "xc3028_8MHz_init0.i2c.fw"
-+#define XC3028_RADIO_FW "xc3028_FM_init0.i2c.fw"
-+#define XC3028_SPECIFIC_RADIO_FW "xc3028_specific_radio.fw"
-+
-+#define TUNING_GRANULARITY 15625
-+
-+static int firmware_loader(struct dvb_frontend *fe, const struct firmware *fw);
-+static int upload_firmware(struct dvb_frontend *fe);
-+static int xc3028_set_mode(struct dvb_frontend *fe, enum v4l2_tuner_type type);
-+
-+static struct _analogue_standards{
-+ v4l2_std_id standard;
-+ u8 filename[50];
-+} xc3028_standards[]={
-+ {V4L2_STD_PAL_BG,"xc3028_BG_PAL_A2_A.i2c.fw"},
-+ {V4L2_STD_PAL_I,"xc3028_I_PAL_NICAM.i2c.fw"},
-+ {V4L2_STD_PAL_DK,"xc3028_DK_PAL_A2.i2c.fw"},
-+ {V4L2_STD_MN,"xc3028_MN_NTSCPAL_A2.i2c.fw"},
-+ {V4L2_STD_PAL, "xc3028_BG_PAL_A2_A.i2c.fw"},
-+
-+ {V4L2_STD_SECAM_DK,"xc3028_DK_SECAM_A2_DK1.i2c.fw"},
-+ {V4L2_STD_SECAM_L,"xc3028_L_SECAM_NICAM.i2c.fw"},
-+ {V4L2_STD_SECAM_LC,"xc3028_L'_SECAM_NICAM.i2c.fw"},
-+ {V4L2_STD_SECAM_K1,"xc3028_DK_SECAM_A2_DK1.i2c.fw"},
-+};
-+
-+/* TODO: add the other standards here
-+ The linux DVB framework sends us following values
-+ from 0..2 to set up the correct channel bandwidth
-+
-+ 0 ... 8 mhz
-+ 1 ... 7 mhz
-+ 2 ... 6 mhz
-+
-+ we do not have any settings for 6MHz at least I haven't found one,
-+ feel free to complete this list
-+
-+ */
-+
-+static struct _digital_standards{
-+ unsigned int dvb:1;
-+ unsigned int atsc:1;
-+ int bandwidth;
-+ char filename[50];
-+} xc3028_dtv_standards[]={
-+ {1, 0, XC3028_BW8MHZ /* 8mhz */, "xc3028_DTV8_2633.i2c.fw" },
-+ {1, 0, XC3028_BW7MHZ /* 7mhz */, "xc3028_DTV7_2633.i2c.fw" },
-+ /* 2 6mhz */
-+ {0, 1, 0 /* ???? */, "xc3028_DTV6_ATSC_2620.i2c.fw"},
-+ {0, 1, 1 /* ???? */, "xc3028_DTV6_ATSC_2620.i2c.fw"},
-+ {0, 1, XC3028_ATSC_BW6MHZ, "xc3028_DTV6_ATSC_2620.i2c.fw"},
-+};
-+
-+/* ---------------------------------------------------------------------- */
-+#define XC3028_I2C_ADDR 0x61
-+
-+static int xc3028_i2c_xfer(struct i2c_adapter* adap, char *buf, int len)
-+{
-+ int ret;
-+ struct i2c_msg msg = { .addr = XC3028_I2C_ADDR, .flags = 0,
-+ .buf = buf, .len = len };
-+
-+ ret = i2c_transfer(adap, &msg, 1);
-+
-+ /* If everything went ok (i.e. 1 msg transmitted), return #bytes
-+ transmitted, else error code. */
-+ return (ret == 1) ? len : ret;
-+}
-+
-+/* ---------------------------------------------------------------------- */
-+
-+static int xc3028_set_params(struct dvb_frontend *fe,
-+ struct dvb_frontend_parameters *params)
-+{
-+ struct xc3028_priv *priv = fe->tuner_priv;
-+ const struct firmware *fw = NULL;
-+ unsigned char chanbuf[4];
-+ unsigned long frequency=0;
-+ unsigned long value;
-+ int bandwidth;
-+ int i;
-+ enum v4l2_tuner_type type;
-+
-+ if (fe->ops.info.type == FE_ATSC) {
-+ type = V4L2_TUNER_ATSC_TV;
-+ } else { // if (fe->ops.info.type == FE_OFDM)
-+ type = V4L2_TUNER_DVBT_TV;
-+ }
-+
-+ xc3028_set_mode(fe, type);
-+
-+ if (priv->type == V4L2_TUNER_ATSC_TV) {
-+ bandwidth = XC3028_ATSC_BW6MHZ;
-+ } else {
-+ bandwidth = params->u.ofdm.bandwidth;
-+ }
-+
-+ if (priv->bandwidth != bandwidth) {
-+ switch(bandwidth) {
-+ case -1:
-+ /* analogue */
-+ priv->bandwidth = bandwidth;
-+ break;
-+ case XC3028_ATSC_BW6MHZ:
-+ for (i = 0; i < ARRAY_SIZE(xc3028_dtv_standards); i++) {
-+ if (xc3028_dtv_standards[i].bandwidth == XC3028_ATSC_BW6MHZ) {
-+ printk("Loading 6MHz Bandwidth settings: %s\n",xc3028_dtv_standards[i].filename);
-+ if (request_firmware(&fw, xc3028_dtv_standards[i].filename, &priv->i2c_adap->dev) == 0) {
-+ if (firmware_loader(fe,fw) != 0) {
-+ release_firmware(fw);
-+ printk("xc3028-tuner.c: error uploading firmware!\n");
-+ return -EINVAL;
-+ }
-+ release_firmware(fw);
-+ break;
-+ } else
-+ printk("Loading firmware from file failed!\n");
-+ }
-+ }
-+ priv->bandwidth = bandwidth;
-+ break;
-+ case XC3028_BW8MHZ: /* 8 MHz */
-+ for (i = 0; i < ARRAY_SIZE(xc3028_dtv_standards); i++) {
-+ if (xc3028_dtv_standards[i].bandwidth == XC3028_BW8MHZ) {
-+ printk("Loading 8MHz Bandwidth settings: %s\n",xc3028_dtv_standards[i].filename);
-+ if (request_firmware(&fw, xc3028_dtv_standards[i].filename, &priv->i2c_adap->dev) == 0) {
-+ if (firmware_loader(fe,fw) != 0) {
-+ release_firmware(fw);
-+ printk("xc3028-tuner.c: error uploading firmware!\n");
-+ return -EINVAL;
-+ }
-+ release_firmware(fw);
-+ break;
-+ } else
-+ printk("Loading firmware from file failed!\n");
-+ }
-+ }
-+ priv->bandwidth = bandwidth;
-+ break;
-+ case XC3028_BW7MHZ: /* 7 MHz */
-+ for (i = 0; i < ARRAY_SIZE(xc3028_dtv_standards); i++) {
-+ if (xc3028_dtv_standards[i].bandwidth == XC3028_BW7MHZ) {
-+ printk("Loading 7MHz Bandwidth settings: %s\n",xc3028_dtv_standards[i].filename);
-+ if (request_firmware(&fw, xc3028_dtv_standards[i].filename, &priv->i2c_adap->dev) == 0) {
-+ if (firmware_loader(fe,fw) != 0) {
-+ release_firmware(fw);
-+ printk("xc3028-tuner.c: error uploading firmware!\n");
-+ return -EINVAL;
-+ }
-+ release_firmware(fw);
-+ break;
-+ } else
-+ printk("Loading firmware from file failed!\n");
-+ }
-+ }
-+ priv->bandwidth = bandwidth;
-+ break;
-+ default:
-+ printk("xc3028-tuner.c: sorry [%d] bandwidth isn't supported (please report)\n",bandwidth);
-+ }
-+ }
-+ /* TODO: 7 MHz (1) has the same offset as 8 MHz -- this depends on the used firmware */
-+#if 0
-+ if(t->mode == V4L2_TUNER_RADIO){
-+ frequency=(unsigned long long)f->frequency*1000/16;
-+ } else { }
-+#endif
-+ switch(bandwidth) {
-+ case XC3028_BW8MHZ:
-+ case XC3028_BW7MHZ:
-+ frequency=(unsigned long long)params->frequency-2750000;
-+ break;
-+ case XC3028_BW6MHZ:
-+ case XC3028_ATSC_BW6MHZ:
-+ frequency=(unsigned long long)params->frequency-1750000;
-+ break;
-+ default:
-+ frequency=(unsigned long long)params->frequency;
-+ }
-+
-+ value=(frequency+(TUNING_GRANULARITY/2))/TUNING_GRANULARITY;
-+ chanbuf[0]=0;
-+ chanbuf[1]=0;
-+ chanbuf[2]=(value&0xff00)>>8;
-+ chanbuf[3]=value&0x00ff;
-+
-+#if 0
-+ /* seems like it's not needed! */
-+ rc=i2c_master_send(c,"\xa0\x00\x00\x00",4);
-+ if(priv && priv->tuning_code)
-+ i2c_master_send(c,priv->tuning_code,12);
-+ else
-+ printk("ERROR: *** NO TUNING CODE SET **\n");
-+ i2c_master_send(c,"\x00\x8c",2);
-+#endif
-+ xc3028_i2c_xfer(priv->i2c_adap,"\x80\x02\x00\x00",4);
-+ xc3028_i2c_xfer(priv->i2c_adap,chanbuf,4);
-+ return 0;
-+}
-+
-+static int firmware_loader(struct dvb_frontend *fe, const struct firmware *fw)
-+{
-+ int txtlen=0;
-+ int current_ptr=0;
-+ int version;
-+ int function;
-+ int x;
-+ struct xc3028_priv *priv = fe->tuner_priv;
-+
-+ if (fw->size == 0)
-+ return -EINVAL;
-+
-+ version = fw->data[current_ptr++];
-+
-+ switch (version) {
-+ case 1:
-+ while (current_ptr < fw->size) {
-+ function = fw->data[current_ptr++];
-+ switch (function) {
-+ case XC3028_BYTECODE:
-+ txtlen = fw->data[current_ptr++];
-+ if ((current_ptr + txtlen) > fw->size)
-+ return -EINVAL;
-+ if (fw->data[current_ptr]==0x1e && txtlen == 12){
-+ memcpy(priv->tuning_code, &fw->data[current_ptr], 12);
-+ }
-+ if (txtlen != xc3028_i2c_xfer(priv->i2c_adap,&fw->data[current_ptr],txtlen)) {
-+ printk("failed: %02x| ",txtlen);
-+ for(x=0; x < txtlen; x++) {
-+ printk("%02x ",(unsigned char)fw->data[current_ptr+x]);
-+ }
-+ printk("\n");
-+ }
-+
-+ current_ptr += txtlen;
-+ break;
-+ case XC3028_RESET:
-+ x = fw->data[current_ptr++];
-+
-+ if ((priv->cfg) && (priv->cfg->gpio_reset))
-+ priv->cfg->gpio_reset(fe,x);
-+ else
-+ printk("XC3028: NO GPIO CALLBACK FUNCTION PROVIDED - SWITCHING MODES WON'T WORK (GPIO FW ARG: %d)!\n",x);
-+ break;
-+ case XC3028_SLEEP:
-+ msleep(fw->data[current_ptr++]);
-+ break;
-+ default:
-+ printk("xc3028-tuner.c: error while loading firmware!\n");
-+ return -EINVAL;
-+ }
-+ }
-+ break;
-+ default:
-+ printk("xc3028-tuner.c: Firmware Loader: Unknown firmware version (%d)\n",version);
-+ return -EINVAL;
-+ }
-+ return 0;
-+}
-+
-+static int upload_firmware(struct dvb_frontend *fe) {
-+ struct xc3028_priv *priv = fe->tuner_priv;
-+ const struct firmware *fw = NULL;
-+ int i;
-+
-+ switch (priv->type) {
-+ case V4L2_TUNER_ANALOG_TV:
-+ printk("Loading base firmware: %s\n", XC3028_ANALOGUE_FW);
-+ if (request_firmware(&fw, XC3028_ANALOGUE_FW, &priv->i2c_adap->dev) == 0) {
-+ firmware_loader(fe,fw);
-+ release_firmware(fw);
-+ } else {
-+ printk("xc3028-tuner.c: Unable to load firmware\n");
-+ printk("xc3028-tuner.c: ** PLEASE HAVE A LOOK AT **\n");
-+ printk("xc3028-tuner.c: http://linuxtv.org/v4lwiki/index.php/Talk:Em2880#Firmware\n");
-+ return -EINVAL;
-+ }
-+ for (i = 0; i < ARRAY_SIZE(xc3028_standards); i++) {
-+ if (xc3028_standards[i].standard & priv->std) {
-+ printk("%s, Loading specific analogue TV settings: %s\n",__FUNCTION__, xc3028_standards[i].filename);
-+ if (request_firmware(&fw, xc3028_standards[i].filename, &priv->i2c_adap->dev) == 0){
-+ if(firmware_loader(fe,fw)==0){
-+ release_firmware(fw);
-+ return 0;
-+ }
-+ release_firmware(fw);
-+ } else {
-+ printk("Loading configuration from file failed!\n");
-+ }
-+ break;
-+ }
-+ }
-+ printk("Loading default analogue TV settings: %s\n",xc3028_standards[0].filename);
-+ priv->std=xc3028_standards[0].standard;
-+ if (request_firmware(&fw, xc3028_standards[0].filename, &priv->i2c_adap->dev) == 0) {
-+ if (firmware_loader(fe,fw) == 0) {
-+ release_firmware(fw);
-+ return 0;
-+ }
-+ release_firmware(fw);
-+ }
-+ printk("xc3028-tuner.c: error loading firmware (analogue TV)! (please report -> mrechberger@gmail.com)\n");
-+ break;
-+ case V4L2_TUNER_DVBT_TV:
-+ case V4L2_TUNER_DVBC_TV:
-+ case V4L2_TUNER_ATSC_TV:
-+ printk("Loading base firmware: %s\n", XC3028_DIGITAL_FW);
-+ /* reset analog standard */
-+ priv->std = 0;
-+ if (request_firmware(&fw, XC3028_DIGITAL_FW, &priv->i2c_adap->dev) == 0) {
-+ firmware_loader(fe,fw);
-+ release_firmware(fw);
-+ } else {
-+ printk("xc3028-tuner.c: Unable to load firmware\n");
-+ printk("xc3028-tuner.c: ** PLEASE HAVE A LOOK AT **\n");
-+ printk("xc3028-tuner.c: http://linuxtv.org/v4lwiki/index.php/Talk:Em2880#Firmware\n");
-+ return -EINVAL;
-+ }
-+ for( i = 0; i < ARRAY_SIZE(xc3028_dtv_standards); i++) {
-+ if ((xc3028_dtv_standards[i].dvb==1 &&
-+ xc3028_dtv_standards[i].bandwidth == priv->bandwidth) ||
-+ (priv->type == V4L2_TUNER_ATSC_TV &&
-+ xc3028_dtv_standards[i].atsc == 1)) {
-+ printk("Loading specific dtv settings: %s\n",xc3028_dtv_standards[i].filename);
-+ if (request_firmware(&fw, xc3028_dtv_standards[i].filename, &priv->i2c_adap->dev) == 0) {
-+ if (firmware_loader(fe,fw) == 0) {
-+ release_firmware(fw);
-+ return 0;
-+ }
-+ release_firmware(fw);
-+ }
-+ }
-+ i++;
-+ }
-+
-+ /* this gets accessed if a switchover occures, t->bandwidth will be set to -1 */
-+ printk("Loading default dtv settings: %s\n",xc3028_dtv_standards[0].filename);
-+ priv->bandwidth = xc3028_dtv_standards[0].bandwidth;
-+ if (request_firmware(&fw, xc3028_dtv_standards[0].filename, &priv->i2c_adap->dev) == 0) {
-+ if (firmware_loader(fe,fw) == 0) {
-+ release_firmware(fw);
-+ return 0;
-+ }
-+ release_firmware(fw);
-+ }
-+ printk("xc3028-tuner.c: error loading firmware (analogue TV)! (please report -> mrechberger@gmail.com)\n");
-+ break;
-+ case V4L2_TUNER_RADIO:
-+ printk("Loading base firmware: %s\n", XC3028_RADIO_FW);
-+ if (request_firmware(&fw, XC3028_RADIO_FW, &priv->i2c_adap->dev) == 0) {
-+ firmware_loader(fe,fw);
-+ release_firmware(fw);
-+ } else {
-+ printk("xc3028-tuner.c: Unable to load (radio) firmware\n");
-+ printk("xc3028-tuner.c: ** PLEASE HAVE A LOOK AT **\n");
-+ printk("xc3028-tuner.c: http://linuxtv.org/v4lwiki/index.php/Talk:Em2880#Firmware\n");
-+ return -EINVAL;
-+ }
-+ printk("%s, Loading specific radio firmware: %s\n",__FUNCTION__, XC3028_SPECIFIC_RADIO_FW);
-+ if (request_firmware(&fw, XC3028_SPECIFIC_RADIO_FW, &priv->i2c_adap->dev) == 0) {
-+ if (firmware_loader(fe,fw) == 0) {
-+ release_firmware(fw);
-+ return 0;
-+ }
-+ release_firmware(fw);
-+ } else {
-+ printk("Loading configuration from file failed!\n");
-+ }
-+ return 0;
-+ default:
-+ printk("ERROR TUNER TYPE NOT SUPPORTED (%d)\n",priv->type);
-+ return -EINVAL;
-+ }
-+
-+ printk("xc3028-tuner.c: *********************************************************\n");
-+ printk("xc3028-tuner.c: no firmware uploaded\n" );
-+ printk("xc3028-tuner.c: ** please have a look at: **\n");
-+ printk("xc3028-tuner.c: http://linuxtv.org/v4lwiki/index.php/Talk:Em2880#Firmware\n");
-+ printk("xc3028-tuner.c: *********************************************************\n");
-+
-+ return -EINVAL;
-+}
-+
-+static int xc3028_set_mode(struct dvb_frontend *fe, enum v4l2_tuner_type type)
-+{
-+ struct xc3028_priv *priv = fe->tuner_priv;
-+
-+ priv->type = type;
-+
-+ upload_firmware(fe);
-+
-+ if (priv->cfg && priv->cfg->gpio_reset && (priv->type == V4L2_TUNER_DVBT_TV ||
-+ priv->type == V4L2_TUNER_DVBC_TV ||
-+ priv->type == V4L2_TUNER_ATSC_TV )) {
-+ printk("xc3028-tuner.c: sending extra call for DVB-T\n");
-+ priv->cfg->gpio_reset(fe,2);
-+ }
-+
-+ return 0;
-+}
-+
-+/* dvb tuner api */
-+static int xc3028_release(struct dvb_frontend *fe)
-+{
-+ kfree(fe->tuner_priv);
-+ fe->tuner_priv = NULL;
-+ return 0;
-+}
-+
-+static int xc3028_get_frequency(struct dvb_frontend *fe, u32 *frequency)
-+{
-+ struct xc3028_priv *priv = fe->tuner_priv;
-+
-+ *frequency = priv->frequency*1000/16*1000;
-+ return 0;
-+}
-+
-+static int xc3028_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth)
-+{
-+ struct xc3028_priv *priv = fe->tuner_priv;
-+
-+ *bandwidth = priv->bandwidth;
-+ return 0;
-+}
-+
-+static const struct dvb_tuner_ops xc3028_tuner_ops = {
-+ .info = {
-+ .name = "Xceive XC3028",
-+#if 0
-+ .frequency_min = ,
-+ .frequency_max =
-+#endif
-+ },
-+ .release = xc3028_release,
-+ .set_params = xc3028_set_params,
-+ .get_frequency = xc3028_get_frequency,
-+ .get_bandwidth = xc3028_get_bandwidth,
-+};
-+
-+struct dvb_frontend *xc3028_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, struct xc3028_config *cfg)
-+{
-+ struct xc3028_priv *priv = kzalloc(sizeof(struct xc3028_priv),GFP_KERNEL);
-+
-+ priv->i2c_adap = i2c;
-+ priv->bandwidth=XC3028_BW8MHZ;
-+ priv->cfg = cfg;
-+
-+ memcpy(&fe->ops.tuner_ops, &xc3028_tuner_ops, sizeof(struct dvb_tuner_ops));
-+ fe->tuner_priv = priv;
-+ return fe;
-+}
-+EXPORT_SYMBOL(xc3028_attach);
-+
-+/*
-+ * Overrides for Emacs so that we follow Linus's tabbing style.
-+ * ---------------------------------------------------------------------------
-+ * Local variables:
-+ * c-basic-offset: 8
-+ * End:
-+ */
---- /dev/null
-+++ v4l-dvb/linux/drivers/media/dvb/frontends/xc3028.h
-@@ -0,0 +1,56 @@
-+ /*
-+ Header for Xceive Silicon tuners
-+
-+ (c) 2007 Michael Krufky
-+
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2 of the License, or
-+ (at your option) any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program; if not, write to the Free Software
-+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+
-+ */
-+
-+#ifndef __DVB_XC3028_H__
-+#define __DVB_XC3028_H__
-+
-+#include <linux/i2c.h>
-+#include "dvb_frontend.h"
-+
-+/**
-+ * Attach a xc3028 tuner to the supplied frontend structure.
-+ *
-+ * @param fe Frontend to attach to.
-+ * @param i2c i2c adapter to use.
-+ * @param cfg config struct with gpio reset callback.
-+ * @return FE pointer on success, NULL on failure.
-+ */
-+
-+struct xc3028_config {
-+ int (*gpio_reset) (struct dvb_frontend *fe, int ptr);
-+};
-+
-+#if defined(CONFIG_DVB_XC3028) || (defined(CONFIG_DVB_XC3028_MODULE) && defined(MODULE))
-+extern struct dvb_frontend* xc3028_attach(struct dvb_frontend *fe,
-+ struct i2c_adapter *i2c,
-+ struct xc3028_config *cfg);
-+#else
-+static inline struct dvb_frontend* xc3028_attach(struct dvb_frontend *fe,
-+ struct i2c_adapter *i2c,
-+ struct xc3028_config *cfg)
-+{
-+ printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __FUNCTION__);
-+ return NULL;
-+}
-+#endif // CONFIG_DVB_XC3028
-+
-+#endif // __DVB_XC3028_H__
---- v4l-dvb.orig/v4l/versions.txt
-+++ v4l-dvb/v4l/versions.txt
-@@ -228,3 +228,4 @@
- USB_ZC0301
- USB_ET61X251
- USB_ZR364XX
-+DVB_XC3028
diff --git a/abs/extra/wireless-regdb/PKGBUILD b/abs/extra/wireless-regdb/PKGBUILD
new file mode 100644
index 0000000..60628d6
--- /dev/null
+++ b/abs/extra/wireless-regdb/PKGBUILD
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: Thomas Bächler <thomas@archlinux.org>
+
+pkgname=wireless-regdb
+pkgver=2011.04.28
+pkgrel=1
+pkgdesc="Central Regulatory Domain Database"
+arch=('any')
+url="http://wireless.kernel.org/en/developers/Regulatory/CRDA"
+backup=(etc/conf.d/wireless-regdom)
+license=('custom')
+depends=('sh')
+install=wireless-regdb.install
+source=(http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+ crda.conf.d)
+sha256sums=('ed1c3e134e34ba5f93594f6f76b90861fe8d24359c064839a2bb78736416642b'
+ '192428fd959806705356107bffc97b8b379854e79bd013c4ee140e5202326e2b')
+
+package() {
+ # Install and verify regulatory.bin file
+ msg "Installing and verifying the regulatory.bin file ..."
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+ # If crda is installed, the wireless regdb can be verified using regdbdump
+ # Keep this step optional so no depend/makedepend loop is created
+ if [ -x /sbin/regdbdump ]; then
+ if /sbin/regdbdump ${pkgdir}/usr/lib/crda/regulatory.bin > /dev/null; then
+ msg "Regulatory database verification was succesful."
+ else
+ error "Regulatory database verification failed."
+ return 1
+ fi
+ else
+ warning "Crda is not installed, regulatory database could not be verified."
+ fi
+
+ msg "Installing /etc/conf.d/wireless-regdom ..."
+ install -D -m644 ${srcdir}/crda.conf.d ${pkgdir}/etc/conf.d/wireless-regdom
+ for dom in $(grep ^country ${srcdir}/${pkgname}-${pkgver}/db.txt | cut -d' ' -f2 | sed 's|:||g'); do
+ echo "#WIRELESS_REGDOM=\"${dom}\"" >> ${pkgdir}/etc/conf.d/wireless-regdom.tmp
+ done
+ sort -u ${pkgdir}/etc/conf.d/wireless-regdom.tmp >> ${pkgdir}/etc/conf.d/wireless-regdom
+ rm -f ${pkgdir}/etc/conf.d/wireless-regdom.tmp
+
+ install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/abs/extra/wireless-regdb/crda.conf.d b/abs/extra/wireless-regdb/crda.conf.d
new file mode 100644
index 0000000..8511238
--- /dev/null
+++ b/abs/extra/wireless-regdb/crda.conf.d
@@ -0,0 +1,4 @@
+#
+# Wireless regulatory domain configuration
+#
+
diff --git a/abs/extra/wireless-regdb/wireless-regdb.install b/abs/extra/wireless-regdb/wireless-regdb.install
new file mode 100644
index 0000000..ae712db
--- /dev/null
+++ b/abs/extra/wireless-regdb/wireless-regdb.install
@@ -0,0 +1,13 @@
+post_install() {
+ post_upgrade
+}
+
+post_upgrade() {
+ # If crda is installed, we verify the integrity of the database
+ # If not, we skip this step silently
+ if [ -x /sbin/regdbdump ]; then
+ if ! /sbin/regdbdump /usr/lib/crda/regulatory.bin > /dev/null; then
+ echo "Failed to verify the integrity of the wireless regulatory database, CRDA will not work."
+ fi
+ fi
+}