From e7cd231a27e5f65ed92b56c85e0e05aeb3645132 Mon Sep 17 00:00:00 2001
From: Nathan Harris <nharris@eoimaging.com>
Date: Tue, 19 May 2009 10:50:29 -0400
Subject: Bumped xbmc-svn to 20449 plus added common remote support

---
 abs/extra-testing/community/xbmc-svn/CHANGELOG   |  20 ++
 abs/extra-testing/community/xbmc-svn/Lircmap.xml | 233 +++++++++++++++++++++++
 abs/extra-testing/community/xbmc-svn/PKGBUILD    |  31 +--
 abs/extra-testing/community/xbmc-svn/__changelog |   1 +
 4 files changed, 273 insertions(+), 12 deletions(-)
 create mode 100644 abs/extra-testing/community/xbmc-svn/Lircmap.xml
 create mode 100644 abs/extra-testing/community/xbmc-svn/__changelog

diff --git a/abs/extra-testing/community/xbmc-svn/CHANGELOG b/abs/extra-testing/community/xbmc-svn/CHANGELOG
index 3db76d1..170990b 100644
--- a/abs/extra-testing/community/xbmc-svn/CHANGELOG
+++ b/abs/extra-testing/community/xbmc-svn/CHANGELOG
@@ -1,5 +1,25 @@
 xbmc-svn Change log:
 --------------------
+
+19th May 2009
+20449-1 richy: 1. Removed the autoreconf line as it didn't seem to help
+               2. Added !makeflags
+               3. Rev push :-)
+
+16th May 2009
+20343-1 richy: 1. added python as a depenency and removed x-server (namcap advised),
+               2. added autoreconf to goom before aclocal - another pot-shot at the goom compile prob.
+               3. added flax and bison to makedepends - I thought they were implicitely provided, but
+                    some users didn't have them.
+               4. Rev push to 20343
+               5. Removed the --quiet flag form SVN for now as sourcforge was timing out and
+                    failing silently.
+ 
+               Note: namcap advised a number of other changes which I ignored for now.
+
+15th May 2009
+20231-3 - haggy: added libsamplerate as a dependency, it is needed for the recent smoothvideo patches
+
 14th May 2009
 20231-2 - haggy: another shot in the dark to fix that damn goom compilation error
 
diff --git a/abs/extra-testing/community/xbmc-svn/Lircmap.xml b/abs/extra-testing/community/xbmc-svn/Lircmap.xml
new file mode 100644
index 0000000..600567f
--- /dev/null
+++ b/abs/extra-testing/community/xbmc-svn/Lircmap.xml
@@ -0,0 +1,233 @@
+<!-- This file contains the mapping of LIRC keys to XBMC keys used in Keymap.xml  -->
+<!--                                                                              -->
+<!-- How to add remotes                                                           -->
+<!-- <remote device="name_Lirc_calls_the_remote">                                 -->
+<!--                                                                              -->
+<!-- For the commands the layout following layout is used                         -->
+<!-- <XBMC_COMMAND>LircButtonName</XBMC_COMMAND>                                  -->
+<!--                                                                              -->
+<!-- For a list of XBMC_COMMAND's check out the <remote> sections of keymap.xml   -->
+
+<lircmap>
+	<remote device="mceusb">
+		<pause>Pause</pause>
+		<stop>Stop</stop>
+		<forward>Forward</forward>
+		<reverse>Rewind</reverse>
+		<left>Left</left>
+		<right>Right</right>
+		<up>Up</up>
+		<down>Down</down>
+		<select>OK</select>
+		<pageplus>ChanUp</pageplus>
+		<pageminus>ChanDown</pageminus>
+		<back>Back</back>
+		<menu>PreviousMenu</menu>
+		<title>Play</title>
+		<info>More</info>
+		<skipplus>Skip</skipplus>
+		<skipminus>Replay</skipminus>
+		<display>Teletext</display>
+		<start>Home</start>
+		<record>Record</record>
+		<volumeplus>VolUp</volumeplus>
+		<volumeminus>VolDown</volumeminus>
+		<mute>Mute</mute>
+		<power>Power</power>
+		<myvideo>Videos</myvideo>
+		<mymusic>Music</mymusic>
+		<mypictures>Pictures</mypictures>
+		<mytv>TV</mytv>
+		<one>One</one>
+		<two>Two</two>
+		<three>Three</three>
+		<four>Four</four>
+		<five>Five</five>
+		<six>Six</six>
+		<seven>Seven</seven>
+		<eight>Eight</eight>
+		<nine>Nine</nine>
+		<zero>Zero</zero>
+		<mytv>Red</mytv>
+		<mymusic>Green</mymusic>
+		<mypictures>Yellow</mypictures>
+		<myvideo>Blue</myvideo>
+	</remote>
+	
+	<remote device="mceusb2">
+		<pause>Pause</pause>
+		<stop>Stop</stop>
+		<forward>Forward</forward>
+		<reverse>Rewind</reverse>
+		<left>Left</left>
+		<right>Right</right>
+		<up>Up</up>
+		<down>Down</down>
+		<select>OK</select>
+		<pageplus>ChanUp</pageplus>
+		<pageminus>ChanDown</pageminus>
+		<back>Back</back>
+		<menu>PreviousMenu</menu>
+		<title>Play</title>
+		<info>More</info>
+		<skipplus>Skip</skipplus>
+		<skipminus>Replay</skipminus>
+		<display>Teletext</display>
+		<start>Home</start>
+		<record>Record</record>
+		<volumeplus>VolUp</volumeplus>
+		<volumeminus>VolDown</volumeminus>
+		<mute>Mute</mute>
+		<power>Power</power>
+		<myvideo>Videos</myvideo>
+		<mymusic>Music</mymusic>
+		<mypictures>Pictures</mypictures>
+		<mytv>TV</mytv>
+		<one>One</one>
+		<two>Two</two>
+		<three>Three</three>
+		<four>Four</four>
+		<five>Five</five>
+		<six>Six</six>
+		<seven>Seven</seven>
+		<eight>Eight</eight>
+		<nine>Nine</nine>
+		<zero>Zero</zero>
+		<mytv>Red</mytv>
+		<mymusic>Green</mymusic>
+		<mypictures>Yellow</mypictures>
+		<myvideo>Blue</myvideo>
+	</remote>
+	
+	<remote device="XboxDVDDongle">
+		<play>PLAY</play>
+		<pause>PAUSE</pause>
+		<stop>STOP</stop>
+		<forward>FORWARD</forward>
+		<reverse>REVERSE</reverse>
+		<left>LEFT</left>
+		<right>RIGHT</right>
+		<up>UP</up>
+		<down>DOWN</down>
+		<select>SELECT</select>
+		<back>BACK</back>
+		<menu>MENU</menu>
+		<title>TITLE</title>
+		<info>INFO</info>
+		<skipplus>SKIP+</skipplus>
+		<skipminus>SKIP-</skipminus>
+		<display>DISPLAY</display>
+		<one>1</one>
+		<two>2</two>
+		<three>3</three>
+		<four>4</four>
+		<five>5</five>
+		<six>6</six>
+		<seven>7</seven>
+		<eight>8</eight>
+		<nine>9</nine>
+		<zero>0</zero>
+	</remote>
+
+	<remote device="Microsoft_Xbox">
+		<play>PLAY</play>
+		<pause>PAUSE</pause>
+		<stop>STOP</stop>
+		<forward>FORWARD</forward>
+		<reverse>REVERSE</reverse>
+		<left>LEFT</left>
+		<right>RIGHT</right>
+		<up>UP</up>
+		<down>DOWN</down>
+		<select>SELECT</select>
+		<back>BACK</back>
+		<menu>MENU</menu>
+		<title>TITLE</title>
+		<info>INFO</info>
+		<skipplus>SKIP+</skipplus>
+		<skipminus>SKIP-</skipminus>
+		<display>DISPLAY</display>
+		<one>1</one>
+		<two>2</two>
+		<three>3</three>
+		<four>4</four>
+		<five>5</five>
+		<six>6</six>
+		<seven>7</seven>
+		<eight>8</eight>
+		<nine>9</nine>
+		<zero>0</zero>
+	</remote>
+
+	<remote device="PinnacleSysPCTVRemote">
+		<play>Play</play>
+		<pause>pause</pause>
+		<stop>Stop</stop>
+		<forward>FForward</forward>
+		<reverse>Rewind</reverse>
+		<left>Vol-Rew</left>
+		<right>Vol+FF</right>
+		<up>Chan+Play</up>
+		<down>Chan-Stop</down>
+		<pageplus>channel+</pageplus>
+		<pageminus>channel-</pageminus>
+		<select>middle</select>
+		<back>undo</back>
+		<menu>Menu</menu>
+		<title>L</title>
+		<info>Info</info>
+		<skipplus>next</skipplus>
+		<display>Fullscreen</display>
+		<record>Record</record>
+		<volumeplus>vol+</volumeplus>
+		<volumeminus>vol-</volumeminus>
+		<mute>Mute</mute>
+		<power>Power</power>
+		<one>1</one>
+		<two>2</two>
+		<three>3</three>
+		<four>4</four>
+		<five>5</five>
+		<six>6</six>
+		<seven>7</seven>
+		<eight>8</eight>
+		<nine>9</nine>
+		<zero>0</zero>
+	</remote>
+
+        <remote device="Streamzap_PC_Remote">
+                <play>PLAY</play>
+                <pause>PAUSE</pause>
+                <stop>STOP</stop>
+                <forward>&gt;&gt;</forward>
+                <reverse>&lt;&lt;</reverse>
+                <left>LEFT</left>
+                <right>RIGHT</right>
+                <up>UP</up>
+                <down>DOWN</down>
+                <pageplus>CH_UP</pageplus>
+                <pageminus>CH_DOWN</pageminus>
+                <select>OK</select>
+                <back>EXIT</back>
+                <menu>MENU</menu>
+                <title>RED</title>
+                <info>GREEN</info>
+                <skipplus>&gt;&gt;|</skipplus>
+                <display>YELLOW</display>
+                <record>RECORD</record>
+                <volumeplus>VOL_UP</volumeplus>
+                <volumeminus>VOL_DOWN</volumeminus>
+                <mute>MUTE</mute>
+                <power>POWER</power>
+                <one>1</one>
+                <two>2</two>
+                <three>3</three>
+                <four>4</four>
+                <five>5</five>
+                <six>6</six>
+                <seven>7</seven>
+                <eight>8</eight>
+                <nine>9</nine>
+                <zero>0</zero>
+        </remote>
+</lircmap>
diff --git a/abs/extra-testing/community/xbmc-svn/PKGBUILD b/abs/extra-testing/community/xbmc-svn/PKGBUILD
index 2e90b20..e583600 100644
--- a/abs/extra-testing/community/xbmc-svn/PKGBUILD
+++ b/abs/extra-testing/community/xbmc-svn/PKGBUILD
@@ -5,8 +5,8 @@
 # for his xbmc-vdpau-vdr PKGBUILD at https://archvdr.svn.sourceforge.net/svnroot/archvdr/trunk/archvdr/xbmc-vdpau-vdr/PKGBUILD
 
 pkgname=xbmc-svn
-pkgver=20231
-pkgrel=3
+pkgver=20449
+pkgrel=1
 pkgdesc="XBMC Media Center from SVN (linuxport branch)"
 provides=('xbmc')
 conflicts=('xbmc' 'xbmc-smoothvideo' 'xbmc-vdpau')
@@ -16,9 +16,9 @@ license=('GPL' 'LGPL')
 depends=('alsa-lib' 'curl' 'enca' 'faac' 'freetype2' 'fribidi' 'gawk' 'glew' \
          'hal' 'jasper' 'libgl' 'libjpeg>=6b-5' 'libmad' 'libmysqlclient' \
          'libxinerama' 'libxrandr' 'lzo2' 'sdl_image' 'sdl_mixer' 'sqlite3' \
-         'tre' 'unzip' 'x-server' 'libcdio' 'libsamplerate')
+         'tre' 'unzip' 'libcdio' 'libsamplerate' 'python')
 makedepends=('subversion' 'autoconf' 'automake' 'boost' 'cmake' 'gcc' 'gperf' 
-             'libtool>=2.2.6a-1' 'make' 'nasm' 'patch' 'pkgconfig' 'zip')
+             'libtool>=2.2.6a-1' 'make' 'nasm' 'patch' 'pkgconfig' 'zip' 'flex' 'bison')
 optdepends=('lirc: remote controller support'
             'pmount: mount removable devices as normal user'
             'smbclient: access windows shares'
@@ -26,14 +26,18 @@ optdepends=('lirc: remote controller support'
 install=("${pkgname}.install")
 source=('libcurl-not-in-lib64.patch' \
         'libfaad2-enable-AC_PROG_CXX.patch' \
-        'xbmc-safe-fullscreen.patch')
+        'xbmc-safe-fullscreen.patch'
+	'Lircmap.xml')
 noextract=('libcurl-not-in-lib64.patch' \
            'libfaad2-enable-AC_PROG_CXX.patch' \
            'xbmc-safe-fullscreen.patch')
-md5sums=('96636ee964e37b78ca62235eb10d29c1' \
-         '6864778d6adc3ccc79130c294f2fffd9' \
-         'c4d53522773846d8670884cc38f94aa0')
-options=(makeflags)
+
+md5sums=('96636ee964e37b78ca62235eb10d29c1'
+         '6864778d6adc3ccc79130c294f2fffd9'
+         'c4d53522773846d8670884cc38f94aa0'
+	 '3f93186f1ea4aad73011d00754c7265a')
+
+options=(!makeflags)
 
 build() {
 	
@@ -44,10 +48,10 @@ build() {
     cd ${srcdir}/
     if [ -d $_svnmod/.svn ]; then
         msg "SVN tree found, reverting changes and updating to -r$pkgver"
-        (cd $_svnmod && svn revert --quiet -R . && svn up --quiet -r $pkgver) || return 1
+        (cd $_svnmod && svn revert -R . && svn up -r $pkgver) || return 1
     else
         msg "Checking out SVN tree of -r$pkgver"
-        svn co $_svntrunk --config-dir ./ --quiet -r $pkgver $_svnmod || return 1
+        svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod || return 1
     fi
     msg "Done. Starting make..."
 
@@ -83,7 +87,7 @@ build() {
     cd "$srcdir/$_svnmod"
     make distclean
     ./configure --prefix=${_prefix} \
-                --disable-debug --disable-pulse --enable-vdpau || return 1
+                --disable-debug || return 1
     
     # Fix false negative detections of realloc that happens some times
     if grep -q 'HAVE_REALLOC 0' config.h; then
@@ -121,4 +125,7 @@ build() {
         mv ${pkgdir}${_prefix}/share/xbmc/${licensef} \
            ${pkgdir}${_prefix}/share/licenses/${pkgname} || return 1
     done
+
+    # Use custom Lircmap to support StreamZap remote
+    cp $srcdir/Lircmap.xml ${pkgdir}${_prefix}/share/xbmc/system/Lircmap.xml
 }
diff --git a/abs/extra-testing/community/xbmc-svn/__changelog b/abs/extra-testing/community/xbmc-svn/__changelog
new file mode 100644
index 0000000..bbf1705
--- /dev/null
+++ b/abs/extra-testing/community/xbmc-svn/__changelog
@@ -0,0 +1 @@
+Added Lircmap.xml to PKGBUILD to support MCE2 and StreamZap remotes
-- 
cgit v0.12

