From cfd0a42c44bdaa9f341a7750d20165140e4d4f12 Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Tue, 26 May 2009 13:49:40 -0700 Subject: Bumped to latest fixes and VDPAU 20549 patch. --- abs/extra-testing/community/mythtv-vdpau/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/extra-testing/community/mythtv-vdpau/PKGBUILD b/abs/extra-testing/community/mythtv-vdpau/PKGBUILD index 42a97a6..9c293e2 100644 --- a/abs/extra-testing/community/mythtv-vdpau/PKGBUILD +++ b/abs/extra-testing/community/mythtv-vdpau/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv-vdpau pkgver=0.21 -pkgrel=22 +pkgrel=23 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') depends=('bash' 'mysql-clients>=5.0' 'qt3' 'lame' 'lirc-utils' 'ffmpeg' \ @@ -10,7 +10,7 @@ backup=(etc/mythtv/mythbackend.conf etc/mythtv/mysql.txt usr/share/mythtv/is.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) + http://www.avenard.org/files/media/vdpau/mythtv-fixes-glvdpau20549.patch.gz mpegpspatch mythbackend.lr mythfrontend.lr) #md5sums=('e316ed18d7ac837cf8c4af54b1478793' '7ef6de58240e7aad389a0b13d91b1cf6'\ # 'a0ecb7f476cb71c0c1ac90d349fc7695') @@ -34,7 +34,7 @@ build() { # 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 + patch -p1 < ../mythtv-fixes-glvdpau20549.patch cd libs/libavformat patch -p0 < $startdir/src/mpegpspatch cd - -- cgit v0.12 From 5c3ece41cf07fa4ca8cbd447e285649856c86429 Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Tue, 26 May 2009 14:08:26 -0700 Subject: Bumped for latest -fixes. --- abs/core-testing/mythtv/stable/mythtv/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs/core-testing/mythtv/stable/mythtv/PKGBUILD b/abs/core-testing/mythtv/stable/mythtv/PKGBUILD index a3bd7d3..be8358a 100644 --- a/abs/core-testing/mythtv/stable/mythtv/PKGBUILD +++ b/abs/core-testing/mythtv/stable/mythtv/PKGBUILD @@ -1,6 +1,6 @@ pkgname=mythtv pkgver=0.21 -pkgrel=68 +pkgrel=69 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') depends=('bash' 'mysql-clients>=5.0' 'qt3' 'lame' 'lirc-utils' 'ffmpeg' \ -- cgit v0.12 From 6a0c0ca53bf4b5ab154c86e93d761a70448b6d5a Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Tue, 26 May 2009 14:20:11 -0700 Subject: Bumped to ensure latest -fixes. --- abs/core-testing/mythtv/stable/mythgallery/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs/core-testing/mythtv/stable/mythgallery/PKGBUILD b/abs/core-testing/mythtv/stable/mythgallery/PKGBUILD index abfd919..bdf7b57 100644 --- a/abs/core-testing/mythtv/stable/mythgallery/PKGBUILD +++ b/abs/core-testing/mythtv/stable/mythgallery/PKGBUILD @@ -4,7 +4,7 @@ pkgname=mythgallery pkgver=0.21 -pkgrel=4 +pkgrel=5 pkgdesc="Image gallery plugin for MythTV" arch=('i686' 'x86_64') url="http://www.mythtv.org" -- cgit v0.12 From 0bfe3ad2fcbd4c63926755231fd26af51b7c1f03 Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Tue, 26 May 2009 14:21:19 -0700 Subject: Bumped to ensure latest -fixes. --- abs/core-testing/mythtv/stable/mythnews/PKGBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/abs/core-testing/mythtv/stable/mythnews/PKGBUILD b/abs/core-testing/mythtv/stable/mythnews/PKGBUILD index 6ebda97..1f22161 100644 --- a/abs/core-testing/mythtv/stable/mythnews/PKGBUILD +++ b/abs/core-testing/mythtv/stable/mythnews/PKGBUILD @@ -4,7 +4,7 @@ pkgname=mythnews pkgver=0.21 -pkgrel=3 +pkgrel=4 pkgdesc="News checking plugin for MythTV" arch=('i686' 'x86_64') url="http://www.mythtv.org" @@ -17,6 +17,7 @@ groups=('mythtv-extras') build() { cd $startdir/src/mythplugins . /etc/profile.d/qt3.sh + svn update # use QT3 qmake export PATH=$QTDIR/bin:$PATH -- cgit v0.12 From 8d4079978f8e0dae6b986ac21456a50c938990de Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Tue, 26 May 2009 20:31:06 -0700 Subject: Included ffpresets. Closes FS #359. --- abs/core-testing/ffmpeg/PKGBUILD | 4 +++- abs/core-testing/ffmpeg/__changelog | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 abs/core-testing/ffmpeg/__changelog diff --git a/abs/core-testing/ffmpeg/PKGBUILD b/abs/core-testing/ffmpeg/PKGBUILD index f975d34..7e0e8d8 100644 --- a/abs/core-testing/ffmpeg/PKGBUILD +++ b/abs/core-testing/ffmpeg/PKGBUILD @@ -4,7 +4,7 @@ pkgname=ffmpeg pkgver=20081220 -pkgrel=2 +pkgrel=3 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=(i686 x86_64) url="http://ffmpeg.mplayerhq.hu/" @@ -41,6 +41,8 @@ build() { # since makepkg currently declines to strip .a files, do this for now strip --strip-debug $startdir/pkg/usr/lib/*.a || return 1 + mkdir $startdir/pkg/usr/share/ffmpeg + cp $startdir/src/ffmpeg/ffpreset/* $startdir/pkg/usr/share/ffmpeg } # vim:set ts=2 sw=2 et: diff --git a/abs/core-testing/ffmpeg/__changelog b/abs/core-testing/ffmpeg/__changelog new file mode 100644 index 0000000..b27f318 --- /dev/null +++ b/abs/core-testing/ffmpeg/__changelog @@ -0,0 +1,2 @@ +CHW 5/25/09 +Added ffpresets to package. -- cgit v0.12 From 14ba1c33c43fec12a5e0ab982d4932f55fa19f0e Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Tue, 26 May 2009 20:31:21 -0700 Subject: Fixed typo. --- abs/core-testing/ffmpeg/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs/core-testing/ffmpeg/PKGBUILD b/abs/core-testing/ffmpeg/PKGBUILD index 7e0e8d8..2b63545 100644 --- a/abs/core-testing/ffmpeg/PKGBUILD +++ b/abs/core-testing/ffmpeg/PKGBUILD @@ -42,7 +42,7 @@ build() { # since makepkg currently declines to strip .a files, do this for now strip --strip-debug $startdir/pkg/usr/lib/*.a || return 1 mkdir $startdir/pkg/usr/share/ffmpeg - cp $startdir/src/ffmpeg/ffpreset/* $startdir/pkg/usr/share/ffmpeg + cp $startdir/src/ffmpeg/ffpresets/* $startdir/pkg/usr/share/ffmpeg } # vim:set ts=2 sw=2 et: -- cgit v0.12 From b44b91ed634790a49fcca1dcf4eef856b7588cb0 Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Wed, 27 May 2009 19:40:43 -0700 Subject: Latest version. Closes FS 365. --- abs/extra-testing/mkvtoolnix/PKGBUILD | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/abs/extra-testing/mkvtoolnix/PKGBUILD b/abs/extra-testing/mkvtoolnix/PKGBUILD index ff6f2f0..2e37e8e 100644 --- a/abs/extra-testing/mkvtoolnix/PKGBUILD +++ b/abs/extra-testing/mkvtoolnix/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 29417 2009-03-08 17:05:04Z giovanni $ +# $Id: PKGBUILD 39931 2009-05-23 08:10:22Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: 03/08/04 pkgname=mkvtoolnix -pkgver=2.5.3 +pkgver=2.9.0 pkgrel=1 pkgdesc="Set of tools to create, edit and inspect Matroska files" arch=('i686' 'x86_64') @@ -11,11 +11,12 @@ license=('GPL2') url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" depends=('libmatroska>=0.8.1' 'flac>=1.1.4' 'libvorbis' 'wxgtk>=2.8.0.1' 'file' 'boost' 'lzo2') source=("http://www.bunkus.org/videotools/${pkgname}/sources/${pkgname}-${pkgver}.tar.bz2") -md5sums=('de0b41f0dc9b3c7c59a23be4b6e3ee46') +md5sums=('4b3afa60ed96a9898e9f598b1694cbef') build() { cd ${srcdir}/${pkgname}-${pkgver}/ - ./configure --prefix=/usr --with-boost-libdir=/usr/lib + ./configure --prefix=/usr \ + --with-boost-libdir=/usr/lib make || return 1 make DESTDIR=${pkgdir}/ install } -- cgit v0.12 From ef7c855c840e4bb3e98c3bd636795ba0d366b02d Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Fri, 29 May 2009 12:16:27 -0700 Subject: Removed fuppes. --- abs/extra-testing/fuppes/PKGBUILD | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 abs/extra-testing/fuppes/PKGBUILD diff --git a/abs/extra-testing/fuppes/PKGBUILD b/abs/extra-testing/fuppes/PKGBUILD deleted file mode 100644 index 18508b7..0000000 --- a/abs/extra-testing/fuppes/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -pkgname=fuppes -pkgver=624 -pkgrel=1 -pkgdesc="A free, multiplatform Universal Plug and Play A/V MediaServer" -arch=('i686' 'x86_64') -url="http://fuppes.ulrich-voelkel.de/" -license=('GPL2') -#depends=('pcre' 'libxml2' 'sqlite3' 'gettext' 'taglib' 'imagemagick' 'ffmpeg' 'libmp4v2' 'lame' 'libvorbis' 'libmpcdec' 'flac' 'faad2' 'libmad') -depends=('pcre' 'libxml2' 'sqlite3' 'gettext' 'taglib' 'imagemagick' 'ffmpeg' 'libmp4v2' 'lame' 'libvorbis' 'flac' 'faad2' 'libmad') -makdepends=('pkgconfig' 'autoconf' 'subversion') -source=() -md5sums=() - -_svntrunk="https://fuppes.svn.sourceforge.net/svnroot/fuppes/trunk" -_svnmod="fuppes" - -build() -{ - cd ${startdir}/src - - msg "Getting sources..." - svn co ${_svntrunk} ${_svnmod} - msg "Done getting sources or failed to connect to server." - - cd ${_svnmod} - - # generate ./configure - autoreconf -vfi - - ./configure --prefix=/usr \ - --enable-video-transcoding \ - --disable-twolame || return 1 - - make || return 1 - make DESTDIR=$startdir/pkg install || return 1 -} -- cgit v0.12 From c96322a192159b81b4cda5e94c79c087bf49dfeb Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Fri, 29 May 2009 12:17:00 -0700 Subject: Updated to fuppes-svn. --- abs/extra-testing/fuppes-svn/PKGBUILD | 39 +++++++++ .../fuppes-svn/fuppes-r634-archlinux.patch | 93 ++++++++++++++++++++++ 2 files changed, 132 insertions(+) create mode 100644 abs/extra-testing/fuppes-svn/PKGBUILD create mode 100644 abs/extra-testing/fuppes-svn/fuppes-r634-archlinux.patch diff --git a/abs/extra-testing/fuppes-svn/PKGBUILD b/abs/extra-testing/fuppes-svn/PKGBUILD new file mode 100644 index 0000000..b019c6e --- /dev/null +++ b/abs/extra-testing/fuppes-svn/PKGBUILD @@ -0,0 +1,39 @@ +# Contributor: Andrew Krawchyk +# patch for svn r634: Ivan Yurasov + +pkgname=fuppes-svn +pkgver=634 +pkgrel=1 +pkgdesc="A free, multiplatform Universal Plug and Play A/V MediaServer" +arch=('i686' 'x86_64') +url="http://fuppes.ulrich-voelkel.de/" +license=('GPL2') +depends=('pcre' 'libxml2' 'sqlite3' 'gettext' 'taglib' 'imagemagick' 'ffmpeg' 'libmp4v2' 'lame' 'libvorbis' 'libmpcdec' 'flac' 'faad2' 'libmad') +makdepends=('pkgconfig' 'autoconf' 'subversion') +source=(fuppes-r634-archlinux.patch) +md5sums=('5d9f6331cc91b64aab69449ce327b214') + +_svnmod="fuppes" +_svntrunk="https://fuppes.svn.sourceforge.net/svnroot/fuppes/trunk" + +build() +{ + cd ${startdir}/src + + msg "Getting sources..." + svn co ${_svntrunk} ${_svnmod} + msg "Done getting sources or failed to connect to server." + + cd ${_svnmod} + + patch -Np0 -i ../fuppes-r634-archlinux.patch + autoreconf -vfi + + ./configure --prefix=/usr \ + --enable-video-transcoding \ + --disable-twolame || return 1 + + make || return 1 + make DESTDIR=$startdir/pkg install || return 1 +} + diff --git a/abs/extra-testing/fuppes-svn/fuppes-r634-archlinux.patch b/abs/extra-testing/fuppes-svn/fuppes-r634-archlinux.patch new file mode 100644 index 0000000..feaccfa --- /dev/null +++ b/abs/extra-testing/fuppes-svn/fuppes-r634-archlinux.patch @@ -0,0 +1,93 @@ +Index: src/plugins/ffmpeg/ffmpeg.cpp +=================================================================== +--- src/plugins/ffmpeg/ffmpeg.cpp (revision 634) ++++ src/plugins/ffmpeg/ffmpeg.cpp (working copy) +@@ -2190,7 +2190,7 @@ + p=NULL; + for(p = av_codec_next(p); p != NULL; p = av_codec_next(p) ) { + #else +- for(p = first_avcodec; p != NULL; p = p->next) { ++ for(p = av_codec_next(NULL); p != NULL; p = p->next) { + #endif + + if((p2==NULL || strcmp(p->name, p2->name)<0) && +@@ -2269,7 +2269,7 @@ + } + avformat_opts = av_alloc_format_context(); + #ifdef HAVE_LIBSWSCALE +- sws_opts = sws_getContext(16,16,0, 16,16,0, sws_flags, NULL,NULL,NULL); ++ sws_opts = sws_getContext(16,16,(PixelFormat)0, 16,16,(PixelFormat)0, sws_flags, NULL,NULL,NULL); + #endif + + +Index: src/plugins/ffmpeg/ffmpeg.h +=================================================================== +--- src/plugins/ffmpeg/ffmpeg.h (revision 634) ++++ src/plugins/ffmpeg/ffmpeg.h (working copy) +@@ -38,7 +38,7 @@ + #include + #include + +-#if FFMPEG_VERSION >= 52 && !defined(OLD_INCLUDES_PATH) ++/* #if FFMPEG_VERSION >= 52 && !defined(OLD_INCLUDES_PATH) */ + #include + #include + #include +@@ -51,27 +51,27 @@ + #ifdef HAVE_AVSTRING_H + #include + #endif +-#else ++/* #else + #include + #include + #include +- #include ++ #include */ + + + #ifdef HAVE_LIBSWSCALE +- #include ++ #include + #endif + + #ifdef HAVE_AVSTRING_H +- #include ++ #include + #endif +-#endif ++/* #endif */ + + + #include + #include + #include +- //#include ++ //#include + + } + #endif // __cplusplus +Index: version.sh +=================================================================== +--- version.sh (revision 634) ++++ version.sh (working copy) +@@ -1,8 +1,15 @@ + #!/bin/sh + +-svn_revision=`cd "$1" && LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2` +-test $svn_revision || svn_revision=`cd "$1" && grep revision .svn/entries 2>/dev/null | cut -d '"' -f2` +-test $svn_revision || svn_revision=`cd "$1" && sed -n -e '/^dir$/{n;p;q}' .svn/entries 2>/dev/null` ++if [ "$1" == "" ] ++then ++DIR="." ++else ++DIR="$1" ++fi ++ ++svn_revision=`cd "$DIR" && LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2` ++test $svn_revision || svn_revision=`cd "$DIR" && grep revision .svn/entries 2>/dev/null | cut -d '"' -f2` ++test $svn_revision || svn_revision=`cd "$DIR" && sed -n -e '/^dir$/{n;p;q}' .svn/entries 2>/dev/null` + test $svn_revision || svn_revision=UNKNOWN + + NEW_REVISION="#define FUPPES_VERSION \"0.$svn_revision\"" + -- cgit v0.12 From c6b0802f9cd9e6986af3fc8aab86410b73cccc59 Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Fri, 29 May 2009 12:18:06 -0700 Subject: Initial inclusion, needed for fuppes. --- abs/extra-testing/libmpcdec/PKGBUILD | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 abs/extra-testing/libmpcdec/PKGBUILD diff --git a/abs/extra-testing/libmpcdec/PKGBUILD b/abs/extra-testing/libmpcdec/PKGBUILD new file mode 100644 index 0000000..feeaf8b --- /dev/null +++ b/abs/extra-testing/libmpcdec/PKGBUILD @@ -0,0 +1,22 @@ +# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ +# Maintainer: Jan de Groot + +pkgname=libmpcdec +pkgver=1.2.6 +pkgrel=1 +pkgdesc="Musepack decoding library" +arch=(i686 x86_64) +license=('custom') +depends=('glibc') +options=('!libtool') +source=(http://files.musepack.net/source/${pkgname}-${pkgver}.tar.bz2) +url="http://musepack.net/" +md5sums=('7f7a060e83b4278acf4b77d7a7b9d2c0') + +build() { + cd ${startdir}/src/${pkgname}-${pkgver} + ./configure --prefix=/usr --disable-static + make || return 1 + make DESTDIR=${startdir}/pkg install || return 1 + install -Dm644 COPYING ${startdir}/pkg/usr/share/licenses/${pkgname}/COPYING +} -- cgit v0.12 From 170c4c7f3df183b6a65e9f2e52eec1544e5f3157 Mon Sep 17 00:00:00 2001 From: Cecil Hugh Watson Date: Fri, 29 May 2009 13:28:56 -0700 Subject: Added patch needed for FUPPES for compile. --- abs/extra-testing/fuppes-svn/PKGBUILD | 7 ++++--- abs/extra-testing/fuppes-svn/fuppes.diff | 25 +++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 abs/extra-testing/fuppes-svn/fuppes.diff diff --git a/abs/extra-testing/fuppes-svn/PKGBUILD b/abs/extra-testing/fuppes-svn/PKGBUILD index b019c6e..82576b1 100644 --- a/abs/extra-testing/fuppes-svn/PKGBUILD +++ b/abs/extra-testing/fuppes-svn/PKGBUILD @@ -10,8 +10,8 @@ url="http://fuppes.ulrich-voelkel.de/" license=('GPL2') depends=('pcre' 'libxml2' 'sqlite3' 'gettext' 'taglib' 'imagemagick' 'ffmpeg' 'libmp4v2' 'lame' 'libvorbis' 'libmpcdec' 'flac' 'faad2' 'libmad') makdepends=('pkgconfig' 'autoconf' 'subversion') -source=(fuppes-r634-archlinux.patch) -md5sums=('5d9f6331cc91b64aab69449ce327b214') +source=(fuppes-r634-archlinux.patch fuppes.diff) +md5sums=('5d9f6331cc91b64aab69449ce327b214' 'c495fa1bd9a870ae36820632434319ee') _svnmod="fuppes" _svntrunk="https://fuppes.svn.sourceforge.net/svnroot/fuppes/trunk" @@ -21,12 +21,13 @@ build() cd ${startdir}/src msg "Getting sources..." - svn co ${_svntrunk} ${_svnmod} + svn co ${_svntrunk} ${_svnmod} -r 634 msg "Done getting sources or failed to connect to server." cd ${_svnmod} patch -Np0 -i ../fuppes-r634-archlinux.patch + patch -Np0 -i ../fuppes.diff autoreconf -vfi ./configure --prefix=/usr \ diff --git a/abs/extra-testing/fuppes-svn/fuppes.diff b/abs/extra-testing/fuppes-svn/fuppes.diff new file mode 100644 index 0000000..9b7b6a8 --- /dev/null +++ b/abs/extra-testing/fuppes-svn/fuppes.diff @@ -0,0 +1,25 @@ +--- src/plugins/ffmpeg/ffmpeg.cpp.orig 2009-05-29 20:12:09.000000000 +0000 ++++ src/plugins/ffmpeg/ffmpeg.cpp 2009-05-29 20:10:01.000000000 +0000 +@@ -1021,19 +1021,9 @@ + if (subtitle_to_free) { + if (subtitle_to_free->rects != NULL) { + for (i = 0; i < subtitle_to_free->num_rects; i++) { +- +-#ifndef LIBAVCODEC_VERSION_MINOR +-#define LIBAVCODEC_VERSION_MINOR 0 +-#endif +- +-#if LIBAVCODEC_VERSION_MINOR >= 11 +- av_freep(subtitle_to_free->rects[i]->pict.data[0]); +- av_freep(subtitle_to_free->rects[i]->pict.data[1]); +- av_freep(subtitle_to_free->rects[i]); +-#else +- av_free(subtitle_to_free->rects[i].bitmap); +- av_free(subtitle_to_free->rects[i].rgba_palette); +-#endif ++ av_freep(&subtitle_to_free->rects[i]->pict.data[0]); ++ av_freep(&subtitle_to_free->rects[i]->pict.data[1]); ++ av_freep(&subtitle_to_free->rects[i]); + } + av_freep(&subtitle_to_free->rects); + } -- cgit v0.12 From 10b9e6d826382b950763f0e969dd07793f412165 Mon Sep 17 00:00:00 2001 From: Greg Frost Date: Sat, 30 May 2009 10:25:40 +0930 Subject: lirc: added support for other mce remotes --- abs/core-testing/lirc/PKGBUILD | 4 +- abs/core-testing/lirc/lirc_mod_mce.patch | 89 +++++++++++++++++++++++++++++++- 2 files changed, 89 insertions(+), 4 deletions(-) diff --git a/abs/core-testing/lirc/PKGBUILD b/abs/core-testing/lirc/PKGBUILD index 285afcc..d8cfe29 100644 --- a/abs/core-testing/lirc/PKGBUILD +++ b/abs/core-testing/lirc/PKGBUILD @@ -3,7 +3,7 @@ pkgname=lirc pkgver=0.8.5CVS -pkgrel=10 +pkgrel=11 _kernver=2.6.28-LinHES pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel" arch=(i686 x86_64) @@ -71,6 +71,6 @@ md5sums=('b96dae91b566143b3af433fa2714ec9a' '6f151eb4e81fc7776a06c9063e6ad9a5' '7eccd7826ab99e5cf1b9154171c8b927' '21ce358809105f005e888e3b138c59e6' - '5e6c3e8586ce7abdcbf881c1a4939d44' + 'd299b696b007fc9b663a73cc1758a1ef' 'f059f4030afc682c9539a03bf837c1cf' '4e698654cc44fc6c4163814acda5a7ee') diff --git a/abs/core-testing/lirc/lirc_mod_mce.patch b/abs/core-testing/lirc/lirc_mod_mce.patch index c794961..314f2d7 100644 --- a/abs/core-testing/lirc/lirc_mod_mce.patch +++ b/abs/core-testing/lirc/lirc_mod_mce.patch @@ -1,7 +1,92 @@ diff -Naru lirc_mod_mce.orig/lirc_mod_mce.c lirc_mod_mce/lirc_mod_mce.c --- lirc_mod_mce.orig/lirc_mod_mce.c 2008-04-18 02:12:28.000000000 +0930 -+++ lirc_mod_mce/lirc_mod_mce.c 2009-05-11 22:10:39.000000000 +0930 -@@ -1108,7 +1108,7 @@ ++++ lirc_mod_mce/lirc_mod_mce.c 2009-05-28 07:53:10.000000000 +0930 +@@ -171,17 +171,76 @@ + #define VENDOR_TATUNG 0x1460 + #define VENDOR_GATEWAY 0x107b + #define VENDOR_SHUTTLE 0x1308 ++#define VENDOR_PHILIPS 0x0471 ++#define VENDOR_SMK 0x0609 ++#define VENDOR_TATUNG 0x1460 ++#define VENDOR_GATEWAY 0x107b ++#define VENDOR_SHUTTLE 0x1308 ++#define VENDOR_SHUTTLE2 0x051c ++#define VENDOR_MITSUMI 0x03ee ++#define VENDOR_TOPSEED 0x1784 ++#define VENDOR_RICAVISION 0x179d ++#define VENDOR_ITRON 0x195d ++#define VENDOR_FIC 0x1509 ++#define VENDOR_LG 0x043e ++#define VENDOR_MICROSOFT 0x045e ++#define VENDOR_FORMOSA 0x147a ++#define VENDOR_FINTEK 0x1934 + #define VENDOR_PINNACLE 0x2304 + +- + static struct usb_device_id usb_remote_table [] = { +- { USB_DEVICE(VENDOR_PHILIPS, 0x0815) }, /* Philips eHome Infrared Transciever */ +- { USB_DEVICE(VENDOR_SMK, 0x031d) }, /* SMK/Toshiba G83C0004D410 */ +- { USB_DEVICE(VENDOR_TATUNG, 0x9150) }, /* Tatung eHome Infrared Transceiver */ +- { USB_DEVICE(VENDOR_SHUTTLE, 0xc001) }, /* Shuttle eHome Infrared Transceiver */ +- { USB_DEVICE(VENDOR_GATEWAY, 0x3009) }, /* Gateway eHome Infrared Transceiver */ +- { USB_DEVICE(VENDOR_PINNACLE, 0x0225) }, /* Pinnacle Remote USB RC6 */ +- { } /* Terminating entry */ ++ /* Philips eHome Infrared Transciever */ ++ { USB_DEVICE(VENDOR_PHILIPS, 0x0815) }, ++ /* Philips Infrared Transciever - HP branded */ ++ { USB_DEVICE(VENDOR_PHILIPS, 0x060c) }, ++ /* Philips SRM5100 */ ++ { USB_DEVICE(VENDOR_PHILIPS, 0x060d) }, ++ /* SMK/Toshiba G83C0004D410 */ ++ { USB_DEVICE(VENDOR_SMK, 0x031d) }, ++ /* SMK eHome Infrared Transceiver (Sony VAIO) */ ++ { USB_DEVICE(VENDOR_SMK, 0x0322) }, ++ /* bundled with Hauppauge PVR-150 */ ++ { USB_DEVICE(VENDOR_SMK, 0x0334) }, ++ /* Tatung eHome Infrared Transceiver */ ++ { USB_DEVICE(VENDOR_TATUNG, 0x9150) }, ++ /* Shuttle eHome Infrared Transceiver */ ++ { USB_DEVICE(VENDOR_SHUTTLE, 0xc001) }, ++ /* Shuttle eHome Infrared Transceiver */ ++ { USB_DEVICE(VENDOR_SHUTTLE2, 0xc001) }, ++ /* Gateway eHome Infrared Transceiver */ ++ { USB_DEVICE(VENDOR_GATEWAY, 0x3009) }, ++ /* Mitsumi */ ++ { USB_DEVICE(VENDOR_MITSUMI, 0x2501) }, ++ /* Topseed eHome Infrared Transceiver */ ++ { USB_DEVICE(VENDOR_TOPSEED, 0x0001) }, ++ /* Topseed HP eHome Infrared Transceiver */ ++ { USB_DEVICE(VENDOR_TOPSEED, 0x0006) }, ++ /* Topseed eHome Infrared Transceiver */ ++ { USB_DEVICE(VENDOR_TOPSEED, 0x0007) }, ++ /* Topseed eHome Infrared Transceiver */ ++ { USB_DEVICE(VENDOR_TOPSEED, 0x0008) }, ++ /* Ricavision internal Infrared Transceiver */ ++ { USB_DEVICE(VENDOR_RICAVISION, 0x0010) }, ++ /* Itron ione Libra Q-11 */ ++ { USB_DEVICE(VENDOR_ITRON, 0x7002) }, ++ /* FIC eHome Infrared Transceiver */ ++ { USB_DEVICE(VENDOR_FIC, 0x9242) }, ++ /* LG eHome Infrared Transceiver */ ++ { USB_DEVICE(VENDOR_LG, 0x9803) }, ++ /* Microsoft MCE Infrared Transceiver */ ++ { USB_DEVICE(VENDOR_MICROSOFT, 0x00a0) }, ++ /* Formosa eHome Infrared Transceiver */ ++ { USB_DEVICE(VENDOR_FORMOSA, 0xe015) }, ++ /* Formosa aim / Trust MCE Infrared Receiver */ ++ { USB_DEVICE(VENDOR_FORMOSA, 0xe017) }, ++ /* Formosa Industrial Computing / Beanbag Emulation Device */ ++ { USB_DEVICE(VENDOR_FORMOSA, 0xe018) }, ++ /* Fintek eHome Infrared Transceiver */ ++ { USB_DEVICE(VENDOR_FINTEK, 0x0602) }, ++ /* Pinnacle Remote USB RC6 */ ++ { USB_DEVICE(VENDOR_PINNACLE, 0x0225) }, ++ /* Terminating entry */ ++ { } + }; + + static unsigned char usb_kbd_keycode[256] = { +@@ -1108,7 +1167,7 @@ input_dev->name = ir->name; input_dev->phys = ir->phys; usb_to_input_id(dev, &input_dev->id); -- cgit v0.12 From 676ec60eae2d5176c16bbb2d490cf29bcc54e7f4 Mon Sep 17 00:00:00 2001 From: Greg Frost Date: Sat, 30 May 2009 12:50:32 +0930 Subject: lirc: add udev rule for the dvico remote --- abs/core-testing/lirc/dvicoIR.rules | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 abs/core-testing/lirc/dvicoIR.rules diff --git a/abs/core-testing/lirc/dvicoIR.rules b/abs/core-testing/lirc/dvicoIR.rules new file mode 100644 index 0000000..5d6d066 --- /dev/null +++ b/abs/core-testing/lirc/dvicoIR.rules @@ -0,0 +1,5 @@ +# Added to get DVICO remote to be consistant device +SUBSYSTEMS=="usb", KERNEL=="hiddev*", \ + ATTRS{product}=="DVICO USB HID Remocon V1.00", \ + SYMLINK+="usb/dvicoIR" + -- cgit v0.12 From 1ff84d8aab36f76ca79c37d41dcd6b5f0d517b1d Mon Sep 17 00:00:00 2001 From: Greg Frost Date: Sat, 30 May 2009 12:54:13 +0930 Subject: lirc: update PKGBUILD to install dvico udev rule --- abs/core-testing/lirc/PKGBUILD | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/abs/core-testing/lirc/PKGBUILD b/abs/core-testing/lirc/PKGBUILD index d8cfe29..30c5052 100644 --- a/abs/core-testing/lirc/PKGBUILD +++ b/abs/core-testing/lirc/PKGBUILD @@ -3,7 +3,7 @@ pkgname=lirc pkgver=0.8.5CVS -pkgrel=11 +pkgrel=12 _kernver=2.6.28-LinHES pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel" arch=(i686 x86_64) @@ -21,7 +21,8 @@ source=(http://www.blushingpenguin.com/mark/lmilk/lirc-0.8.5-CVS-pvr150.tar.bz2 http://superb-east.dl.sourceforge.net/sourceforge/mod-mce/lirc_mod_mce-0.1.5.tar.bz2 lirc_mod_mce.patch hw_commandir.c - hw_commandir.h) + hw_commandir.h + dvicoIR.rules) build() { # configure @@ -65,6 +66,9 @@ build() { rm $startdir/pkg/lib/modules/$_kernver/kernel/drivers/misc/lirc_cmdir.ko rm $startdir/pkg/lib/modules/$_kernver/kernel/drivers/misc/commandir.ko + # Add a udev rule for the DVICO remote so that if there is more than + # one hiddev device, the systm cant get confused. + install -D -m644 $srcdir/dvicoIR.rules $pkgdir/etc/udev/rules.d/dvicoIR.rules } md5sums=('b96dae91b566143b3af433fa2714ec9a' '1753acd774f50b638e6173d364de53fd' @@ -73,4 +77,5 @@ md5sums=('b96dae91b566143b3af433fa2714ec9a' '21ce358809105f005e888e3b138c59e6' 'd299b696b007fc9b663a73cc1758a1ef' 'f059f4030afc682c9539a03bf837c1cf' - '4e698654cc44fc6c4163814acda5a7ee') + '4e698654cc44fc6c4163814acda5a7ee' + 'd79400e2e3069b14039ca07d3317965c') -- cgit v0.12 From 528268bf6b14f8e3c9f4941d5587d982ff1892d6 Mon Sep 17 00:00:00 2001 From: Greg Frost Date: Sat, 30 May 2009 13:12:51 +0930 Subject: runit-scripts: update the lircd run script to use the dvicoIR sym link --- abs/core-testing/runit-scripts/PKGBUILD | 3 ++- abs/core-testing/runit-scripts/runitscripts/services/lircd/run | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/abs/core-testing/runit-scripts/PKGBUILD b/abs/core-testing/runit-scripts/PKGBUILD index 6596371..0644c3b 100755 --- a/abs/core-testing/runit-scripts/PKGBUILD +++ b/abs/core-testing/runit-scripts/PKGBUILD @@ -1,6 +1,6 @@ pkgname=runit-scripts pkgver=1.8.0 -pkgrel=83 +pkgrel=84 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" license="BSD" @@ -28,3 +28,4 @@ build() { install -m0755 reboot-runit halt-runit logger $startdir/pkg/sbin rsync -a --exclude=.svn services/* $startdir/pkg/etc/sv } +md5sums=('c6cbd6af3657783bd1ce8f75f574d72f') diff --git a/abs/core-testing/runit-scripts/runitscripts/services/lircd/run b/abs/core-testing/runit-scripts/runitscripts/services/lircd/run index 59206ae..6d67537 100755 --- a/abs/core-testing/runit-scripts/runitscripts/services/lircd/run +++ b/abs/core-testing/runit-scripts/runitscripts/services/lircd/run @@ -106,7 +106,7 @@ else if [ $RunDvico = "true" -a $num_lirc -lt 0 ] then #only run dvicio - LCMD="/usr/sbin/lircd -n -d /dev/usb/hiddev0 --driver=dvico --output /dev/lircd" + LCMD="/usr/sbin/lircd -n -d /dev/usb/dvicoIR --driver=dvico --output /dev/lircd" # echo $LCMD printhl " Device Dvicio" @@ -115,7 +115,7 @@ else then #chain them together i=$((i+1)) - CMD="/usr/sbin/lircd -d /dev/usb/hiddev0 --driver=dvico --output=/dev/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i" + CMD="/usr/sbin/lircd -d /dev/usb/dvicoIR --driver=dvico --output=/dev/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i" # echo $CMD $CMD >> $LOG LASTCMD="--connect=localhost:876$i $LASTCMD " -- cgit v0.12