Merge pull request #75 from kimperator/master

Zipit Z2 and other ARM packages.
2025-01-17 23:34:07 +00:00 · 2011-06-10 19:59:08 -07:00 · 2011-06-10 19:59:08 -07:00 · 60456e2e96
commit 60456e2e96
parent 51b74e53c3 7e7b1b6144
17 changed files with 964 additions and 0 deletions
--- a/aur/dropbear/PKGBUILD
+++ b/aur/dropbear/PKGBUILD
@ -0,0 +1,54 @@
+# Maintainer Kai Uwe Jesussek <kajot@gmx.net>
+# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Jason Pierce <`echo 'moc tod liamg ta nosaj tod ecreip' | rev`>
+# Contributor: Jeremy Cowgar <jeremy@cowgar.com>
+
+plugrel=1
+pkgname=dropbear
+pkgver=0.53.1
+pkgrel=1
+pkgdesc="Lightweight replacement for openssh"
+arch=('arm' 'i686' 'x86_64')
+url="http://matt.ucc.asn.au/dropbear/dropbear.html"
+license=('custom')
+depends=('zlib')
+provides=('openssh')
+conflicts=('openssh')
+source=(http://matt.ucc.asn.au/$pkgname/releases/$pkgname-$pkgver.tar.bz2 \
+        $pkgname-conf.d \
+        $pkgname-rc.d)
+sha256sums=('e24d3cbecd3bc850b2b336b8eb50c845a285ceef8e22544938a582e163d36393'
+            'd5a3b08e4e79b841ba1cd592d79cf91cd9cd7948e683d35de550cb08bd3f285f'
+	    '29ab5438d15bfa727620fc04ec52ff55d676577b903c9261ce00bb291ae171a8')
+
+build() {
+  cd ${srcdir}/$pkgname-$pkgver
+
+  sed -i 's:usr/libexec/sftp:usr/lib/ssh/sftp:' options.h
+
+  ./configure --prefix=/usr --enable-pam
+  LIBS="-lcrypt" make PROGRAMS="dropbear dropbearkey dropbearconvert dbclient scp" MULTI=0 STATIC=0 SCPPROGRESS=1
+}
+
+package() {
+  cd ${srcdir}/$pkgname-$pkgver
+
+  make prefix=${pkgdir}/usr install
+
+#make it openssh compatible
+  ln -s /usr/bin/dbclient ${pkgdir}/usr/bin/ssh  
+  install -D -m755 scp ${pkgdir}/usr/bin/scp
+
+#man pages
+  install -D -m644 dbclient.1 ${pkgdir}/usr/share/man/man1/dbclient.1
+  install -D -m644 $pkgname.8 ${pkgdir}/usr/share/man/man8/$pkgname.8
+  install -D -m644 dropbearkey.8 ${pkgdir}/usr/share/man/man8/dropbearkey.8
+
+#configuration files
+  install -d ${pkgdir}/etc/$pkgname
+  install -D -m644 ${srcdir}/$pkgname-conf.d ${pkgdir}/etc/conf.d/$pkgname
+  install -D -m755 ${srcdir}/$pkgname-rc.d ${pkgdir}/etc/rc.d/$pkgname
+
+#license file
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
+}
--- a/aur/dropbear/dropbear-conf.d
+++ b/aur/dropbear/dropbear-conf.d
@ -0,0 +1,15 @@
+# the TCP port that Dropbear listens on
+DROPBEAR_PORT="0.0.0.0:22" # Default to local-only.
+
+# any additional arguments for Dropbear
+DROPBEAR_EXTRA_ARGS="" # Default to no-root logins.
+
+# specify an optional banner file containing a message to be
+# sent to clients before they connect, such as "/etc/issue.net"
+DROPBEAR_BANNER=""
+
+# RSA hostkey file (default: /etc/dropbear/dropbear_rsa_host_key)
+#DROPBEAR_RSAKEY="/etc/dropbear/dropbear_rsa_host_key"
+
+# DSS hostkey file (default: /etc/dropbear/dropbear_dss_host_key)
+DROPBEAR_DSSKEY="/etc/dropbear/dropbear_dss_host_key"
--- a/aur/dropbear/dropbear-rc.d
+++ b/aur/dropbear/dropbear-rc.d
@ -0,0 +1,88 @@
+#!/bin/bash
+daemon_name=dropbear
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+. /etc/conf.d/$daemon_name
+
+for port in $DROPBEAR_PORT; do
+  daemon_args="$daemon_args -p $port"
+done
+
+[ ! -z $DROPBEAR_BANNER ] && daemon_args="$daemon_args -b $DROPBEAR_BANNER"
+[ ! -z $DROPBEAR_DSSKEY ] && daemon_args="$daemon_args -d $DROPBEAR_DSSKEY"
+[ ! -z $DROPBEAR_RSAKEY ] && daemon_args="$daemon_args -r $DROPBEAR_RSAKEY"
+[ ! -z $DROPBEAR_EXTRA_ARGS ] && daemon_args="$daemon_args $DROPBEAR_EXTRA_ARGS"
+[ -z $DROPBEAR_PIDFILE ] && DROPBEAR_PIDFILE="/var/run/$daemon_name.pid"
+daemon_args="$daemon_args -P $DROPBEAR_PIDFILE"
+
+get_pid() {
+  PID=''
+  if [ -r $DROPBEAR_PIDFILE -a -f $DROPBEAR_PIDFILE -a -w $DROPBEAR_PIDFILE ]; then
+    if kill -0 "`< $DROPBEAR_PIDFILE`" &>/dev/null; then # kill -0 == "exit code indicates if a signal may be sent"
+      PID="`< $DROPBEAR_PIDFILE`"
+    else # may not send signals to dropbear, because it's probably not running => remove pidfile
+      rm -f $DROPBEAR_PIDFILE
+    fi
+  fi
+}
+
+case "$1" in
+  start)
+    stat_busy "Starting $daemon_name"
+    get_pid
+    if [ -z "$PID" ]; then
+      printhl "Checking for hostkeys"
+      if [ ! -z $DROPBEAR_DSSKEY ]; then
+        [ ! -f $DROPBEAR_DSSKEY ] && dropbearkey -t dss -f $DROPBEAR_DSSKEY
+      fi;
+      if [ ! -z $DROPBEAR_RSAKEY ]; then
+        [ ! -f $DROPBEAR_RSAKEY ] && dropbearkey -t rsa -f $DROPBEAR_RSAKEY
+      fi;
+
+      $daemon_name $daemon_args # Make it Go Joe!
+      if [ $? -gt 0 ]; then
+        stat_die
+      else
+        add_daemon $daemon_name
+        stat_done
+      fi
+    else
+      stat_die
+    fi
+    ;;
+
+  stop)
+    stat_busy "Stopping $daemon_name"
+
+    get_pid
+    [ ! -z "$PID" ] && kill $PID &> /dev/null # Be dead (please), I say!
+    if [ $? -gt 0 ]; then
+      stat_die
+    else
+      rm_daemon $daemon_name
+      stat_done
+    fi
+    ;;
+
+  restart)
+    $0 stop
+    sleep 3
+    $0 start
+    ;;
+
+  fingerprint)
+    stat_busy "Fingerprinting $daemon_name hostkeys"
+    if [ ! -z $DROPBEAR_DSSKEY ]; then
+      printhl "DSS/DSA Key $(dropbearkey -y -f $DROPBEAR_DSSKEY | grep Fingerprint)"
+    fi;
+    if [ ! -z $DROPBEAR_RSAKEY ]; then
+      printhl "RSA Key $(dropbearkey -y -f $DROPBEAR_RSAKEY | grep Fingerprint)"
+    fi;
+  ;;
+
+  *)
+    echo "usage: $0 {start|stop|restart|fingerprint}"
+esac
+exit 0
--- a/aur/gmu-z2/PKGBUILD
+++ b/aur/gmu-z2/PKGBUILD
@ -0,0 +1,23 @@
+# Maintainer: Kai Uwe Jesussek <kajot@gmx.net>
+
+plugrel=1
+pkgname=gmu-z2
+pkgver=0.7.2
+pkgrel=1
+pkgdesc="A very nice Music Player, based on SDL, optimized for zipit z2"
+arch=('i686' 'x86_64' 'arm')
+url="http://wejp.k.vu"
+license=('GPL2')
+depends=('z2-sdl-profile' 'sdl' 'sdl_image' 'sdl_gfx' 'libvorbisdec-svn' 'flac' 'mpg123-arm' 'libmikmod' 'speex')
+source=('http://wejp.k.vu/files/gmu-0.7.2.tar.gz' 'gmu.conf' 'gmuinput.z2.conf' 'zipit-z2.keymap')
+md5sums=('dea481ab0f8f9f10b38aa21605dbb18d' 'b5e3da96885250a665600c4daac439a6' '705519d822f77ab3f48b7738751798f5' '5befd516c3d8226c5de8b3725cf27ba3')
+provides=('gmu')
+build() {
+	cd ${srcdir}/gmu-${pkgver}
+	make || return 1
+	make DESTDIR=${pkgdir} install
+	cd ${srcdir}
+	mkdir -p ${pkgdir}/usr/local/share/gmu/
+	cp gmu.conf gmuinput.z2.conf zipit-z2.keymap ${pkgdir}/usr/local/share/gmu/
+}
+
--- a/aur/gmu-z2/gmu.conf
+++ b/aur/gmu-z2/gmu.conf
@ -0,0 +1,39 @@
+DefaultPlayMode=random+repeat
+RememberLastPlaylist=yes
+RememberSettings=yes
+EnableCoverArtwork=yes
+CoverArtworkFilePattern=cover.jpg;cover.png;front.jpg;*.jpg;*.png
+LoadEmbeddedCoverArtwork=first
+LyricsFilePattern=$.txt;*.txt;*.nfo
+FileSystemCharset=UTF-8
+PlaylistSavePresets=rock.m3u;pop.m3u;electronic.m3u;classic.m3u;alternative.m3u;soundtrack.m3u;chiptunes.m3u;playlist1.m3u;playlist2.m3u;playlist3.m3u;playlist4.m3u;playlist5.m3u;playlist6.m3u;playlist7.m3u;playlist8.m3u;playlist9.m3u;playlist10.m3u
+TimeDisplay=remaining
+CPUClock=default
+DefaultFileBrowserPath=/
+VolumeControl=Software
+VolumeHardwareMixerChannel=0
+Volume=15
+DefaultSkin=default-modern
+AutoSelectCurrentPlaylistItem=yes
+AutoPlayOnProgramStart=no
+Scroll=always
+FileBrowserFoldersFirst=yes
+BacklightPowerOnOnTrackChange=no
+KeyMap=zipit-z2.keymap
+AllowVolumeControlInHoldState=no
+SecondsUntilBacklightPowerOff=0
+CoverArtworkLarge=no
+SmallCoverArtworkAlignment=right
+FirstRun=no
+ResumePlayback=yes
+InputConfigFile=gmuinput.z2.conf
+Shutdown=0
+ShutdownCommand=/sbin/poweroff
+Log.Enable=no
+Log.MinimumPlaytimeSec=30
+Log.MinimumPlaytimePercent=50
+LastPlayedPlaylistItem=None
+LastPlayedPlaylistItemTime=0
+SDL_frontend.Width=240
+SDL_frontend.Height=240
+SDL_frontend.Fullscreen=no
--- a/aur/gmu-z2/gmuinput.z2.conf
+++ b/aur/gmu-z2/gmuinput.z2.conf
@ -0,0 +1,83 @@
+FullKeyboard=yes
+Button-0=13,Return
+Button-1=32,Space
+Button-2=13,Enter
+Button-3=97,A
+Button-4=98,B
+Button-5=99,C
+Button-6=100,D
+Button-7=101,E
+Button-8=102,F
+Button-9=103,G
+Button-10=104,H
+Button-11=105,I
+Button-12=106,J
+Button-13=107,K
+Button-14=108,L
+Button-15=109,M
+Button-16=110,N
+Button-17=111,O
+Button-18=112,P
+Button-19=113,Q
+Button-20=114,R
+Button-21=115,S
+Button-22=116,T
+Button-23=117,U
+Button-24=118,V
+Button-25=119,W
+Button-26=120,X
+Button-27=121,Y
+Button-28=122,Z
+Button-29=43,+
+Button-30=45,-
+Button-31=32,Space
+Button-32=13,Enter
+Button-33=27,ESC
+Button-34=308,Alt
+Button-35=306,CTRL
+Button-36=305,CTRL_R
+Button-37=313,AltGr
+Button-38=304,ShiftL
+Button-39=303,ShiftR
+Button-40=8,Backspace
+Button-41=127,Delete
+Button-42=277,Insert
+Button-43=48,0
+Button-44=49,1
+Button-45=50,2
+Button-46=51,3
+Button-47=52,4
+Button-48=53,5
+Button-49=54,6
+Button-50=55,7
+Button-51=56,8
+Button-52=57,9
+Button-53=9,Tab
+Button-54=301,CapsLock
+Button-55=282,F1
+Button-56=283,F2
+Button-57=284,F3
+Button-58=285,F4
+Button-59=286,F5
+Button-60=287,F6
+Button-61=288,F7
+Button-62=289,F8
+Button-63=290,F9
+Button-64=291,F10
+Button-65=292,F11
+Button-66=293,F12
+Button-67=44,<
+Button-68=46,>
+Button-69=273,Up
+Button-70=274,Down
+Button-71=276,Left
+Button-72=275,Right
+Button-73=280,Volume+
+Button-74=281,Volume-
+Button-75=279,(B)
+Button-76=278,(A)
+Button-75=9,Tab
+Button-76=303,(L)
+Button-77=305,(R)
+Button-78=46,Dot
+Button-79=44,Comma
--- a/aur/gmu-z2/zipit-z2.keymap
+++ b/aur/gmu-z2/zipit-z2.keymap
@ -0,0 +1,67 @@
+# Gmu key mappings
+# Required keys: Modifier, Up, 
+# Down, Pause, ProgramInfo, Exit,
+# PlaylistPlayItem, PlaylistClear,
+# FileBrowserAddFileToPlaylistOrChDir
+# Buttons names are defined in gmuinput.conf.
+
+Modifier=Alt
+# Global mappings:
+Left=Left
+Right=Right
+Up=Up
+Down=Down
+IncreaseVolume=Volume+
+DecreaseVolume=Volume-
+ToggleTime=T
+Pause=P
+Stop=X
+ToggleView=Space
+PreviousTrack=Comma
+NextTrack=Dot
+SeekForward=M
+SeekBackward=N
+Hold=Mod+Up
+Exit=ESC
+ShutdownTimer=Mod+Down
+Help=H
+
+# Program info mappings:
+ProgramInfo=I
+ProgramInfoOkay=Enter
+# File browser mappings:
+#FileBrowserDirUp=LEFT
+#FileBrowserChDir=RIGHT
+
+FileBrowserPlayFile=A
+FileBrowserAddFileToPlaylistOrChDir=Enter
+FileBrowserAddDirToPlaylist=Y
+FileBrowserInsertFileIntoPlaylist=Mod+B
+FileBrowserNewPlFromDir=Mod+Y
+#FileBrowserDeleteFile=Mod+X
+# Playlist mappings:
+PlaylistPlayItem=Enter
+PlaylistToggleRandomMode=R
+PlaylistRemoveItem=Y
+PlaylistClear=Mod+C
+PlaylistSave=S
+# Playlist save dialog:
+PlaylistSaveSelect=Enter
+PlaylistSaveCancel=C
+PlaylistSaveLoadList=L
+PlaylistSaveAppendList=Mod+Y
+#PlaylistDeleteFile=Mod+X
+PlaylistQueue=Q
+# Track info mappings:
+TrackInfoToggleCover=A
+TrackInfoToggleText=B
+# Question dialog mappings: 
+QuestionYes=Enter
+QuestionNo=C
+# Setup mappings:
+SetupSelect=B
+SetupSaveAndExit=X
+SetupSaveAndRunGmu=Y
+SetupFileBrowserSelect=B
+SetupFileBrowserChDir=A
+SetupFileBrowserCancel=X
--- a/aur/libvorbisidec-svn/PKGBUILD
+++ b/aur/libvorbisidec-svn/PKGBUILD
@ -0,0 +1,36 @@
+# Maintainer: evnu <mamuelle@informatik.hu-berlin.de>
+plugrel=1
+pkgname=libvorbisdec-svn
+pkgver=17636
+pkgrel=1
+pkgdesc="Tremor is a fixed-point version of the Ogg Vorbis decoder for those platforms that can't do floating point math. It can be installed with libvorbis together"
+arch=('arm')
+url="http://wiki.xiph.org/index.php/Tremor"
+license=('GPL')
+depends=('libogg')
+makedepends=('subversion' 'autoconf' 'automake')
+source=()
+md5sums=()
+
+_svntrunk="http://svn.xiph.org/trunk/Tremor/"
+_svnmod=Tremor
+
+build() {
+	cd $srcdir
+			if [ -d "${_svnmod}"/.svn ]
+			then
+				msg "Starting SVN update ..."
+				cd "${_svnmod}"
+				svn up
+				msg "... updating finished."
+			else
+				msg "Starting SVN checkout ..."
+				svn co ${_svntrunk} 
+				msg "... checkout finished."
+			fi
+	cd $srcdir/${_svnmod}	
+	./autogen.sh --prefix=/usr/
+	make || return 1
+	make DESTDIR=${pkgdir} install || return 1
+}
+
--- a/aur/mpg123-arm/PKGBUILD
+++ b/aur/mpg123-arm/PKGBUILD
@ -0,0 +1,34 @@
+# Maintainer:  Kai Uwe Jesussek <kajot@gmx.net>
+
+plugrel=1
+pkgname=mpg123-arm
+_pkgname=mpg123
+pkgver=1.13.3
+pkgrel=1
+pkgdesc="A console-based real-time MPEG-1/2/3 audio player (integer only)"
+arch=('i686' 'x86_64' 'arm')
+url="http://www.mpg123.org/"
+license=('GPL2' 'LGPL2')
+
+makedepends=('sdl')
+optdepends=('alsa-lib: For additional audio support'
+            'sdl: For additional audio support')
+
+provides=("mpg123=$pkgver")
+conflicts=('mpg123')
+
+source=("http://downloads.sourceforge.net/sourceforge/mpg123/mpg123-$pkgver.tar.bz2")
+sha256sums=('6d7b3394e837b1c79854efe64ec2800f88d115d108ec53c3fa384182cc1d9a27')
+
+options=('libtool')
+build() {
+	cd "$srcdir"/$_pkgname-$pkgver
+
+	./configure --with-cpu=arm_nofpu --prefix=/usr --with-audio="alsa sdl"
+	make
+}
+package() {
+	cd "$srcdir"/$_pkgname-$pkgver
+
+	make DESTDIR="$pkgdir" install
+}
--- a/aur/mplayer-z2/PKGBUILD
+++ b/aur/mplayer-z2/PKGBUILD
@ -0,0 +1,52 @@
+# $Id: PKGBUILD 117246 2011-03-30 14:23:30Z ibiru $
+# Maintainer: Kai Uwe Jesussek <kajot@gmx.net>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
+# Contributor: Hugo Doria <hugo@archlinux.org>
+
+plugrel=1
+pkgname=mplayer-z2
+pkgver=1.0rc4
+pkgrel=1
+pkgdesc="A movie player for linux"
+arch=('i686' 'x86_64' 'arm')
+depends=('libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss'
+         'smbclient' 'aalib' 'libcaca' 'x264' 'faac' 'ttf-dejavu' 'libxvmc' 'enca' 'mpg123-arm'
+         'opencore-amr' 'libdca' 'a52dec')
+license=('GPL')
+url="http://www.mplayerhq.hu/"
+makedepends=('unzip' 'yasm')
+backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
+source=('mplayer-1.0rc4-pxa-wejp.patch' 'mplayer.conf' 'http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc4.tar.bz2' )
+conflicts=('mplayer')
+provides=('mplayer')
+md5sums=('480d11daa4962629e6fb26bd61993a0f'
+         '6e960e87b4aee28889f0ea5c65f711fb'
+         '1699c94de39da9c4c5d34e8f58e418f0')
+
+build() {
+  # Custom CFLAGS break the mplayer build
+  unset CFLAGS LDFLAGS
+
+  cd ${srcdir}/MPlayer-1.0rc4
+  patch -p1 < ${srcdir}/mplayer-1.0rc4-pxa-wejp.patch
+  ./configure --enable-armv5te --enable-iwmmxt --enable-pxa \
+  --enable-faad-fixed --enable-tremor-low \
+  --disable-mp3lib --disable-libvorbis --disable-vidix \
+  --extra-cflags="-march=iwmmxt" \
+  --disable-runtime-cpudetection --disable-sighandler \
+  --disable-live --enable-alsa --enable-mpg123 \
+  --extra-ldflags="-lmpg123" \
+  --confdir=/etc/mplayer
+
+  [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
+
+  #make
+  make -j1 DESTDIR=${pkgdir} install
+  install -Dm644 etc/{codecs.conf,input.conf,example.conf} ${pkgdir}/etc/mplayer/
+  mkdir -p ${pkgdir}/etc/mplayer/
+  cp ${srcdir}/mplayer.conf ${pkgdir}/etc/mplayer/
+  install -dm755 ${pkgdir}/usr/share/mplayer/
+  ln -s /usr/share/fonts/TTF/DejaVuSans.ttf ${pkgdir}/usr/share/mplayer/subfont.ttf
+  rm -rf ${pkgdir}/usr/share/mplayer/font
+}
+
--- a/aur/mplayer-z2/mplayer-1.0rc4-pxa-wejp.patch
+++ b/aur/mplayer-z2/mplayer-1.0rc4-pxa-wejp.patch
@ -0,0 +1,393 @@
+diff -ruN MPlayer-1.0rc4/configure MPlayer-1.0rc4-pxa/configure
+--- MPlayer-1.0rc4/configure	2010-07-29 02:31:57.000000000 +0200
+++ MPlayer-1.0rc4-pxa/configure	2011-02-27 14:12:12.000000000 +0100
+@@ -630,6 +630,7 @@
+ _svga=auto
+ _vesa=auto
+ _fbdev=auto
+_pxa=no
+ _dvb=auto
+ _dxr2=auto
+ _dxr3=auto
+@@ -997,6 +998,8 @@
+   --enable-fbdev)       _fbdev=yes      ;;
+   --disable-fbdev)      _fbdev=no       ;;
+   --enable-dvb)         _dvb=yes        ;;
+  --enable-pxa)         _pxa=yes        ;;
+  --disable-pxa)        _pxa=no         ;;
+   --disable-dvb)        _dvb=no         ;;
+   --enable-dxr2)        _dxr2=yes       ;;
+   --disable-dxr2)       _dxr2=no        ;;
+@@ -4875,7 +4878,15 @@
+ fi
+ echores "$_fbdev"
+ 
+-
+echocheck "PXA27x Overlay Support"
+if test "$_pxa" = yes ; then
+  def_pxa='#define CONFIG_PXA 1'
+  vomodules="pxa $vomodules"
+else
+  def_pxa='#undef CONFIG_PXA'
+  novomodules="pxa $novomodules"
+fi
+echores "$_pxa"
+ 
+ echocheck "DVB"
+ if test "$_dvb" = auto ; then
+@@ -8644,6 +8655,7 @@
+ PRIORITY = $_priority
+ PULSE = $_pulse
+ PVR = $_pvr
+PXA = $_pxa
+ QTX_CODECS = $_qtx
+ QTX_CODECS_WIN32 = $_qtx_codecs_win32
+ QTX_EMULATION = $_qtx_emulation
+@@ -9121,6 +9133,7 @@
+ $def_dxr2
+ $def_dxr3
+ $def_fbdev
+$def_pxa
+ $def_ggi
+ $def_ggiwmh
+ $def_gif
+diff -ruN MPlayer-1.0rc4/libvo/video_out.c MPlayer-1.0rc4-pxa/libvo/video_out.c
+--- MPlayer-1.0rc4/libvo/video_out.c	2010-06-13 14:04:13.000000000 +0200
+++ MPlayer-1.0rc4-pxa/libvo/video_out.c	2011-02-27 03:24:10.000000000 +0100
+@@ -114,6 +114,7 @@
+ extern vo_functions_t video_out_fbdev;
+ extern const vo_functions_t video_out_fbdev2;
+ extern vo_functions_t video_out_svga;
+extern const vo_functions_t video_out_pxa;
+ extern const vo_functions_t video_out_png;
+ extern const vo_functions_t video_out_ggi;
+ extern const vo_functions_t video_out_aa;
+@@ -214,6 +215,9 @@
+         &video_out_fbdev,
+         &video_out_fbdev2,
+ #endif
+#ifdef CONFIG_PXA
+        &video_out_pxa,
+#endif
+ #ifdef CONFIG_SVGALIB
+         &video_out_svga,
+ #endif
+diff -ruN MPlayer-1.0rc4/libvo/vo_pxa.c MPlayer-1.0rc4-pxa/libvo/vo_pxa.c
+--- MPlayer-1.0rc4/libvo/vo_pxa.c	1970-01-01 01:00:00.000000000 +0100
+++ MPlayer-1.0rc4-pxa/libvo/vo_pxa.c	2011-02-26 22:18:06.000000000 +0100
+@@ -0,0 +1,304 @@
+/*
+ * Video driver for PXA27x/3xx Overlay 2
+ * by Vasily Khoruzhick <anarsoul@gmail.com>
+ * (C) 2007
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <fcntl.h>
+
+#include <linux/fb.h>
+
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+
+#include "config.h"
+#include "video_out.h"
+#include "video_out_internal.h"
+#include "sub.h"
+#include "aspect.h"
+#include "mp_msg.h"
+#include "subopt-helper.h"
+
+static vo_info_t info = {
+    "PXA27x/3xx overlay",
+    "pxa",
+    "Vasily Khoruzhick <anarsoul@gmail.com>",
+    ""
+};
+
+LIBVO_EXTERN(pxa);
+
+/* VO driver state */
+
+static int overlay_width, overlay_height, overlay_x, overlay_y;
+static int overlay_fd = -1;
+static void *overlay_mem;
+static size_t overlay_mem_size;
+static uint8_t *y_plane;
+static uint8_t *u_plane;
+static uint8_t *v_plane;
+
+static int vo_pxa_check_format(uint32_t format)
+{
+    switch (format)
+    {
+        /* Planar YUV Formats */
+        case IMGFMT_YV12:
+        case IMGFMT_IYUV:
+        case IMGFMT_I420:
+            return( VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW
+                    | VFCAP_ACCEPT_STRIDE );
+            break;
+
+    }
+
+    mp_msg(MSGT_VO, MSGL_ERR, "vo_pxa: format %s is not supported\n",
+        vo_format_name(format));
+
+    return 0;
+}
+
+/*****************************************************************************
+ * preinit
+ *
+ * Preinitializes driver
+ *   arg - currently it's vo_subdevice
+ *   returns: zero on successful initialization, non-zero on error.
+ *
+ ****************************************************************************/
+static int preinit(const char *vo_subdevice)
+{
+    int r, fb = -1;
+    struct fb_var_screeninfo fbvar;
+
+    fb = open("/dev/fb0", O_RDWR);
+    r = ioctl(fb, FBIOGET_VSCREENINFO, &fbvar);
+    if (r) {
+        mp_msg(MSGT_VO, MSGL_V, "vo_pxa: get_vscreeninfo ioctl failed");
+        return -1;
+    }
+
+    overlay_width = fbvar.xres;
+    overlay_height = fbvar.yres;
+
+    mp_msg(MSGT_VO, MSGL_V, "vo_pxa: main plane res is %dx%d\n",
+        overlay_width, overlay_height);
+
+    close(fb);
+
+    return 0;
+}
+
+
+/*****************************************************************************
+ * config
+ *
+ * Config the display driver.
+ * params:
+ *   src_width,srcheight: image source size
+ *   dst_width,dst_height: size of the requested window size, just a hint
+ *   fullscreen: flag, 0=windowd 1=fullscreen, just a hint
+ *   title: window title, if available
+ *   format: fourcc of pixel format
+ * returns : zero on successful initialization, non-zero on error.
+ *
+ ****************************************************************************/
+static int config(uint32_t src_width, uint32_t src_height,
+                  uint32_t dst_width, uint32_t dst_height, uint32_t flags,
+                  char *title, uint32_t format)
+{
+    int r;
+    struct fb_var_screeninfo fbvar;
+    struct fb_fix_screeninfo fbfix;
+    int i;
+
+    mp_msg(MSGT_VO, MSGL_V, "vo_pxa: config() src_width:%d, src_height:%d, dst_width:%d, dst_height:%d\n",
+       src_width, src_height, dst_width, dst_height);
+
+    /* Check format */
+    if (!vo_pxa_check_format(format))
+        goto error;
+
+    /* Check src image */
+    if (src_width > overlay_width || src_height > overlay_height) {
+        mp_msg(MSGT_VO, MSGL_ERR, "vo_pxa: src image is too big, scaling not supported.\n");
+        goto error;
+    }
+
+    if (dst_width > overlay_width || dst_height > overlay_height) {
+        mp_msg(MSGT_VO, MSGL_ERR, "vo_pxa: dst is too big, scaling not supported.\n");
+        goto error;
+    }
+
+    if (src_width != dst_width || src_height != dst_height) {
+        mp_msg(MSGT_VO, MSGL_ERR, "vo_pxa: src != dst, scaling not supported.\n");
+        goto error;
+    }
+
+    overlay_x = (overlay_width - dst_width) / 2;
+    overlay_y = (overlay_height - dst_height) / 2;
+
+    overlay_fd = open("/dev/fb2", O_RDWR);
+    r = ioctl(overlay_fd, FBIOGET_VSCREENINFO, &fbvar);
+    if (r) {
+        mp_msg(MSGT_VO, MSGL_ERR, "vo_pxa: get_vscreeninfo ioctl failed\n");
+        goto error;
+    }
+
+    fbvar.xres_virtual = fbvar.xres = overlay_width;
+    fbvar.yres_virtual = fbvar.yres = overlay_height;
+    fbvar.bits_per_pixel = 16;
+    fbvar.activate = FB_ACTIVATE_NOW;
+
+    fbvar.nonstd = (4 << 20) | (0 << 10) | (0); /* YUV420P, X=0, Y=0 */
+
+    r = ioctl(overlay_fd, FBIOPUT_VSCREENINFO, &fbvar);
+    if (r) {
+        mp_msg(MSGT_VO, MSGL_ERR, "vo_pxa: put_vscreeninfo ioctl failed\n");
+        goto error;
+    }
+    r = ioctl(overlay_fd, FBIOGET_FSCREENINFO, &fbfix);
+    if (r) {
+        mp_msg(MSGT_VO, MSGL_ERR, "vo_pxa: get_fscreeninfo ioctl failed\n");
+        goto error;
+    }
+
+    overlay_mem_size = fbfix.smem_len;
+    overlay_mem = mmap(NULL, overlay_mem_size, (PROT_READ | PROT_WRITE),
+        MAP_SHARED, overlay_fd, 0);
+
+    if (overlay_mem == MAP_FAILED) {
+        mp_msg(MSGT_VO, MSGL_ERR, "vo_pxa: failed to mmap overlay");
+        goto error;
+    }
+
+    y_plane = overlay_mem;
+    u_plane = y_plane + overlay_width * overlay_height;
+    v_plane = u_plane + overlay_width * overlay_height / 4;
+
+    /* Fill the overlay with black */
+    memset(y_plane, 16,
+        overlay_width * overlay_height);
+    memset(u_plane, 128,
+        overlay_width * overlay_height / 4);
+    memset(v_plane, 128,
+        overlay_width * overlay_height / 4);
+
+    mp_msg(MSGT_VO, MSGL_V, "vo_pxa: configured and opened 2nd overlay");
+
+    return 0;
+
+error:
+    if (overlay_mem)
+        munmap(overlay_mem, overlay_mem_size);
+    if (overlay_fd != -1)
+        close(overlay_fd);
+
+    overlay_mem = NULL;
+    overlay_fd = -1;
+
+    return -1;
+}
+
+static int control(uint32_t request, void *data, ...)
+{
+    mp_msg(MSGT_VO, MSGL_V, "vo_pxa: control %08x\n", request );
+
+    switch( request )
+    {
+        case VOCTRL_QUERY_FORMAT:
+            return( vo_pxa_check_format( *(uint32_t *)data ) );
+            break;
+    }
+
+    return VO_NOTIMPL;
+}
+
+
+int draw_frame(uint8_t *src[])
+{
+    return 1;
+}
+
+
+/*****************************************************************************
+ *
+ * draw_slice
+ *
+ * Draw a planar YUV slice to the buffer:
+ * params:
+ *   src[3] = source image planes (Y,U,V)
+ *   stride[3] = source image planes line widths (in bytes)
+ *   w,h = width*height of area to be copied (in Y pixels)
+ *   x,y = position at the destination image (in Y pixels)
+ *
+ ****************************************************************************/
+int draw_slice(uint8_t *src[], int stride[], int w,int h, int x,int y)
+{
+    int i;
+
+    x += overlay_x;
+    y += overlay_y;
+
+    uint8_t *dst_y = y_plane + y * overlay_width + x;
+    uint8_t *dst_u = u_plane + y * overlay_width / 4 + x / 2;
+    uint8_t *dst_v = v_plane + y * overlay_width / 4 + x / 2;
+    uint8_t *src_y = src[0];
+    uint8_t *src_u = src[1];
+    uint8_t *src_v = src[2];
+
+    mp_msg(MSGT_VO, MSGL_V, "vo_pxa: draw_slice() w %d h %d x %d y %d stride %d %d %d\n",
+           w, h, x, y, stride[0], stride[1], stride[2] );
+
+    if (w + x > overlay_width || h + y > overlay_height) {
+        mp_msg(MSGT_VO, MSGL_ERR, "vo_pxa: too big image\n");
+        return 0;
+    }
+
+    for (i = 0; i < h; i++) {
+        fast_memcpy(dst_y, src_y, w);
+        src_y += stride[0];
+        dst_y += overlay_width;
+    }
+    for (i = 0; i < h / 2; i++) {
+        fast_memcpy(dst_u, src_u, w / 2);
+        fast_memcpy(dst_v, src_v, w / 2);
+        src_u += stride[1];
+        src_v += stride[2];
+        dst_u += overlay_width / 2;
+        dst_v += overlay_width / 2;
+    }
+
+    return 0;
+}
+
+static void draw_osd(void)
+{
+    /* FIXME */
+    /* vo_draw_text(in_width, in_height, draw_alpha); */
+}
+
+static void flip_page(void)
+{
+}
+
+static void check_events(void)
+{
+}
+
+static void uninit(void)
+{
+    if (overlay_mem)
+        munmap(overlay_mem, overlay_mem_size);
+    if (overlay_fd != -1)
+        close(overlay_fd);
+
+    overlay_mem = NULL;
+    overlay_fd = -1;
+}
+diff -ruN MPlayer-1.0rc4/Makefile MPlayer-1.0rc4-pxa/Makefile
+--- MPlayer-1.0rc4/Makefile	2010-07-29 19:08:19.000000000 +0200
+++ MPlayer-1.0rc4-pxa/Makefile	2011-02-27 14:14:21.000000000 +0100
+@@ -541,6 +541,7 @@
+ SRCS_MPLAYER-$(DXR3)         += libvo/vo_dxr3.c
+ SRCS_MPLAYER-$(ESD)          += libao2/ao_esd.c
+ SRCS_MPLAYER-$(FBDEV)        += libvo/vo_fbdev.c libvo/vo_fbdev2.c
+SRCS_MPLAYER-$(PXA)          += libvo/vo_pxa.c
+ SRCS_MPLAYER-$(GGI)          += libvo/vo_ggi.c
+ SRCS_MPLAYER-$(GIF)          += libvo/vo_gif89a.c
+ SRCS_MPLAYER-$(GL)           += libvo/gl_common.c libvo/vo_gl.c \
--- a/aur/mplayer-z2/mplayer.conf
+++ b/aur/mplayer-z2/mplayer.conf
@ -0,0 +1,3 @@
+ao=alsa
+vo=pxa
+vf=rotate=2
--- a/aur/samen-git/PKGBUILD
+++ b/aur/samen-git/PKGBUILD
@ -0,0 +1,40 @@
+# Maintainer: Kai Uwe Jesussek <kajot@gmx.net>
+
+plugrel=1
+pkgname=samen-git
+pkgver=20110601
+pkgrel=1
+pkgdesc="samen is a ultra small wpa_supplicant (wpa_cli) action handler."
+arch=('arm' 'i686' 'x86_64')
+license=('GPL')
+provides=('samen')
+makedepends=('git')
+depends=('wpa_supplicant')
+_gitroot=("git://github.com/kimperator/Samen.git")
+_gitname=("Samen")
+
+build() {
+  cd ${srcdir}
+
+ ## Git checkout
+  if [ -d ${srcdir}/${_gitname} ] ; then
+    msg "Git checkout:  Updating existing tree"
+    cd ${_gitname} && git pull origin
+    msg "Git checkout:  Tree has been updated"
+  else
+    msg "Git checkout:  Retrieving sources"
+    git clone --depth 1 ${_gitroot}
+  fi
+  msg "Checkout completed"
+
+ ## Build
+  rm -rf ${srcdir}/${_gitname}-build
+  cp -r ${srcdir}/${_gitname} ${srcdir}/${_gitname}-build
+  cd ${srcdir}/${_gitname}-build
+  mkdir -p ${pkgdir}/usr/sbin/
+  gcc src/samen-handler.c -o ${pkgdir}/usr/sbin/samen-handler
+  cp -r additions/arch/etc ${pkgdir}
+}
+package() {
+  true
+}
--- a/aur/z2-console-font/5x8.psf.gz
+++ b/aur/z2-console-font/5x8.psf.gz
--- a/aur/z2-console-font/PKGBUILD
+++ b/aur/z2-console-font/PKGBUILD
@ -0,0 +1,19 @@
+# Maintainer: Kai Uwe Jesussek <kajot@gmx.net>
+
+plugrel=1
+pkgname=z2-console-font
+pkgver=0.1
+pkgrel=1
+pkgdesc="A nice Font for the Zipit Z2"
+arch=('any')
+url="http://wejp.k.vu"
+license=('GPL2')
+depends=()
+source=('5x8.psf.gz')
+md5sums=('b577db10cf3ae2b004dbe717d16a9798')
+
+build() {
+	cd ${srcdir}
+	install -D -m644 5x8.psf.gz ${pkgdir}/usr/share/kbd/consolefonts/5x8.psf.gz
+}
+
--- a/aur/z2-sdl-profile/PKGBUILD
+++ b/aur/z2-sdl-profile/PKGBUILD
@ -0,0 +1,14 @@
+# Maintainer: Kai Uwe Jesussek <kajot@gmx.net>
+
+plugrel=1
+pkgname=z2-sdl-profile
+pkgver=1.0
+pkgrel=1
+pkgdesc="profile script for changing SDL configs"
+arch=('arm')
+license=('GPL')
+source=('z2.sh')
+md5sums=('0a3395f629009fed584295e6b1b0bba0')
+package() {
+  install -m711 -D ${srcdir}/z2.sh ${pkgdir}/etc/profile.d/z2.sh
+}
--- a/aur/z2-sdl-profile/z2.sh
+++ b/aur/z2-sdl-profile/z2.sh
@ -0,0 +1,4 @@
+#!/bin/sh
+export SDL_AUDIODRIVER=alsa
+export SDL_NOMOUSE=1
+export SDL_VIDEO_FBCON_ROTATION="CCW"