Merge remote-tracking branch 'origin/testing' into testing

# By Cecil (8) and Michael Hanson (4)
# Via Cecil (2) and Michael Hanson (1)
* origin/testing:
  mplayer: nothing to see here
  bluez: update to 4.101
  linhes-scripts:Corrected scripting errors in ripD_eject.sh.
  linhes-scripts:Modifed ripD_eject.sh to use HandBrakeCLI.
  mplayer: minor correction to PKGBUILD. No pkg built.
  handbrake:Bumped to 0.9.8. Closes #838.
  mythtv:Bumped to add deps for backing up DVD.
  mythtv:Bumped to compiles latest 0.25.2. Added DVD backup menu.
  mythplugins:Bumped to compiles latest 0.25.2.
  linhes-scripts:Added scripts to backup one's DVD.
  lsdvd:initial inclusion. For use with ripD.
  linhes-scripts: fix for myth2mkv

Conflicts:
	abs/core/mplayer/PKGBUILD
	abs/core/mythtv/stable-0.25/git_src/git_hash
	abs/core/mythtv/stable-0.25/mythtv/PKGBUILD

13 files changed, 274 insertions, 24 deletions

diff --git a/abs/core/linhes-scripts/LinHES-osd b/abs/core/linhes-scripts/LinHES-osd
new file mode 100755
index 0000000..85f4a40
--- /dev/null
+++ b/abs/core/linhes-scripts/LinHES-osd
@@ -0,0 +1,19 @@
+#!/bin/bash
+#   /usr/local/bin/KnoppMyth-osd
+#	A script to put up text for on screen.
+#
+########################################################################
+FONT="-adobe-helvetica-bold-r-*-*-34-*-*-*-*-*-*-*"	# Default
+OPTS="-f $FONT -s 2 -p bottom -A left -i 50 -l 5"	#  values.
+#-----------------------------------------------------------------------
+[ -r /etc/rip.cfg ] && . /etc/rip.cfg
+########################################################################
+# $1=text,  $2=color,  $3=delay.
+JUNK=$(killall osd_cat >& /dev/null)
+color='' ; delay=''
+[ -z "$1" ] && exit 0
+[ -n "$2" ] && color="--color=$2"
+[ -n "$3" ] && delay="--delay=$3"
+JUNK=$(echo -e "$1" | osd_cat $OPTS $color $delay &)
+########################################################################
+# End
diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD
index 829694b..0fb3dee 100644
--- a/abs/core/linhes-scripts/PKGBUILD
+++ b/abs/core/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=linhes-scripts
 pkgver=7
-pkgrel=41
+pkgrel=45
 pkgdesc="Various scripts that help to make LinHES, LinHES."
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -51,13 +51,15 @@ find_orphans.py
 acl_fix_fstab.py 
 stop_xss.sh
 myth2mkv
+LinHES-osd
+ripD_eject.sh
 )
 
 build() {
   cd ${srcdir}
   install -d ${pkgdir}/usr/LH/bin
   install -d ${pkgdir}/usr/LH/etc
-  install -D -m755 myth2* *.sh *.pl *.py vdpau* run-* pause_* ${pkgdir}/usr/LH/bin/
+  install -D -m755 myth2* *.sh *.pl *.py vdpau* run-* pause_* LinHES* ${pkgdir}/usr/LH/bin/
   install -D -m755 upgrade_screen_rc ${pkgdir}/usr/LH/etc/
   mkdir -p ${pkgdir}/etc/sv/pause-mythcommflag/supervise
   cp run-pause-mythcommflag ${pkgdir}/etc/sv/pause-mythcommflag/run
@@ -104,4 +106,6 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5'
          'd8838461af9d446a1fd7e7883fdc75d1'
          'cc9cdabcdfc969c2829b58c0e513488c'
          '54a478660d0f8150fe10112a9ecf2740'
-         '980423e07c8c6ffd0ea1bf9a1959fdc2')
+         '8fa34662c686b210c9943324b7df2feb'
+         'b608044c9e7530a400d8f5b88fdfe6e6'
+         'e2e24dd59d5d576cc33feafb329fa302')
diff --git a/abs/core/linhes-scripts/myth2mkv b/abs/core/linhes-scripts/myth2mkv
index 5035748..f180b31 100644
--- a/abs/core/linhes-scripts/myth2mkv
+++ b/abs/core/linhes-scripts/myth2mkv
@@ -2,7 +2,7 @@
 #
 # Convert video to AVC-1 / h264
 #
-# version 0.25-001
+# version 0.25-002
 #
 # Prerequisites:
 #   - mythtv >= 0.25
@@ -156,6 +156,11 @@ if [[ ${FPS} = "29.970" ]] ; then
   FPS="29.97"
 fi
 
+# HandBrake does not like a framerate of 59.940, so let's drop the 0
+if [[ ${FPS} = "59.940" ]] ; then
+  FPS="59.94"
+fi
+
 # A rough guestimation that if the video width is 1920, 1440, 852, 704, 640 or
 # 528 pixels it is probably interlaced.
 if [[ ${DEINT} = Y ]] ; then
diff --git a/abs/core/linhes-scripts/ripD_eject.sh b/abs/core/linhes-scripts/ripD_eject.sh
new file mode 100755
index 0000000..99947a8
--- /dev/null
+++ b/abs/core/linhes-scripts/ripD_eject.sh
@@ -0,0 +1,125 @@
+#!/bin/bash
+#   /usr/LH/bin/ripD_eject.sh
+#	A DVD rip and eject script.
+########################################################################
+DEV='/dev/sr0'				# DVD device
+MPNT='media/cdrom'				# Mount Point
+Ddir='/myth/video'		# DVD output dir List
+Bsnd='/usr/share/sounds/init.wav'	# Begin sound file
+Esnd='/usr/share/sounds/complete.wav'	# End   sound file
+DATE=$(date +%Y%m%d_%H%M)		# current date/time
+LOG='/var/log/mythtv/ripD.log'			# name of Log file.
+TRACK=$(lsdvd | grep -i longest | awk '{print $3}')		#Finds longest track
+FILE=$TITLE
+#-----------------------------------------------------------------------
+FONT="-adobe-helvetica-bold-*-*-*-34-*-*-*-*-*-*-*"
+OPTS="-f $FONT -s 2 -p bottom -A left -i 50 -l 4"
+#-----------------------------------------------------------------------
+[ -r /etc/rip.cfg ] && . /etc/rip.cfg
+#-----------------------------------------------------------------------
+LOCK=/tmp/.ripLock.$$
+[ "$DISPLAY" == "" ] && export DISPLAY=:0
+########################################################################
+function osd { # $1=text, $2=color, $3=delay
+    cmd="osd_cat $OPTS"
+    [ -n "$2" ] && cmd="$cmd --color=$2"
+    [ -n "$3" ] && cmd="$cmd -d $3"
+    killall osd_cat
+    echo -e "$1" | $cmd
+} >& /dev/null
+function osd_loop() {
+    FN=$1 ; shift
+#   TXT="$MAX  to  $dir"
+    TXT="$MAX  to  $dir/$FILE"
+    N=0
+    while [ -f "$LOCK" ]; do
+	#osd "\nbacking up DVD:  '$@'\n$TXT" gray 60
+	osd "\nbacking up DVD:  '$TITLE'\n$TXT" gray 60
+	N=$(($N+1))
+	[ -d "$FN" ] && SIZE=$(du -sh $FN | awk '{print $1}')
+#	TXT="$SIZE of $MAX @ $N min. elapsed"
+	TXT="$N min. elapsed"
+    done
+}
+########################################################################
+LinHES-osd "\nDetecting DVD" gray20 5 &
+echo "`date` detected DVD" >> $LOG
+rm -f /tmp/.ripLock.*
+#=======================================================================
+for dir in $Ddir ; do
+    if [ -d $dir -a -w $dir ]; then
+	break
+    fi
+done
+#-----------------------------------------------------------------------
+if [ ! -d "$dir" ]; then
+    echo "no $dir" >> $LOG
+    osd "\ndirectory:  $dir\nnot found!" red 10 &
+    eject ; eject
+    exit 0
+fi
+if [ ! -w "$dir" ]; then
+    echo "$dir not writable" >> $LOG
+    osd "\ndirectory:  $Cdir\nnot writable!" red 10 &
+    eject ; eject
+    exit 0
+fi
+#-----------------------------------------------------------------------
+mount $DEV >& /dev/null
+dev=$(readlink $DEV)
+df=$(df -h /dev/$dev | grep /dev/$dev)
+MAX=$(echo $df | while read d v r ; do echo $v ; done)
+echo " backup $MAX to $dir" >> $LOG
+#=======================================================================
+# first make sure DMA is on:
+sudo hdparm -d1 -u1 $DEV >& /dev/null
+# attempt to get the DVD information:
+TITLE=$(dvdbackup -i /dev/sr0 -I | grep information | awk '{ s = ""; for (i = 8; i <= NF; i++) s = s $i " "; print s }' | tr -d '"' | sed 's/ /_/g' | sed 's/_$//g')
+if [ "$TITLE" == "DVD_VIDEO" -o "$TITLE" == "" \
+	-o "$TITLE" == " " -o "$TITLE" == "[ ].*" ]; then
+    # if not a good title,
+    TITLE="dvdbackup_$DATE"
+fi
+echo " $TITLE" >> $LOG
+if [ $1 = m ]
+then
+	COMMAND="dvdbackup -M -i $DEV -o $dir -n $TITLE"
+	elif [ $1 = h ]
+	then
+#	COMMAND="mencoder dvd://$TRACK -alang en -oac mp3lame -lameopts br=320:cbr -ovc lavc -lavcopts vcodec=mpeg4:vhq -vf scale -zoom -xy 720 -o $dir/$TITLE.avi"
+	COMMAND="HandBrakeCLI -i $DEV -o $dir/$TITLE.mp4 --preset "High\ Profile" --main-feature"
+	FILE=$TITLE.mp4
+	elif [ $1 = n ]
+	then
+#	COMMAND="mencoder dvd://$TRACK -alang en -oac mp3lame -lameopts br=160:cbr -ovc lavc -lavcopts vcodec=mpeg4:vhq -vf scale -zoom -xy 512 -o $dir/$TITLE.avi"
+	COMMAND="HandBrakeCLI -i $DEV -o $dir/$TITLE.mp4 --preset "Normal" --main-feature"
+	FILE=$TITLE.mp4
+	elif [ $1 = l ]
+	then
+#	COMMAND="mencoder dvd://$TRACK -alang en -oac mp3lame -lameopts br=96:cbr -ovc lavc -lavcopts vcodec=mpeg4:vhq -vf scale -zoom -xy 320 -o $dir/$TITLE.avi"
+	COMMAND="HandBrakeCLI -i $DEV -o $dir/$TITLE.mp4 --preset "Classic" --main-feature"
+	FILE=$TITLE.mp4
+	elif [ $1 = i ]
+	then
+	COMMAND="dd if=$DEV of=$dir/$TITLE.iso bs=2048"
+	FILE=$TITLE.iso
+fi
+{ # for the redir below:
+    # Begin:
+    touch $LOCK
+    osd_loop "$dir/$TITLE" "$TITLE" &
+    dvdbackup -i $DEV -I
+    sleep 1 ; aplay $Bsnd
+    $COMMAND
+    # Finish:
+    rm -f $LOCK
+    osd "\nfinish DVD:  '$TITLE'\ninto $dir/$FILE" gray20 5 &
+    sleep 1 ; aplay $Esnd
+    # Eject the media:
+    sudo eject ; sudo eject
+} > $dir/.$TITLE.log 2>&1
+echo " `du -sh $dir/$FILE`" >> $LOG
+echo " `date` finished DVD"  >> $LOG
+exit 0
+########################################################################
+# End
diff --git a/abs/core/lsdvd/PKGBUILD b/abs/core/lsdvd/PKGBUILD
new file mode 100644
index 0000000..0323625
--- /dev/null
+++ b/abs/core/lsdvd/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 150946 2012-02-24 09:46:48Z pierre $
+# Maintainer: Aaron Griffin <aaron@archlinux.org>
+
+pkgname=lsdvd
+pkgver=0.16
+pkgrel=6
+pkgdesc="A C application for reading the contents of a DVD and printing the contents to your terminal"
+arch=('i686' 'x86_64')
+url="http://sourceforge.net/projects/lsdvd/"
+depends=('libdvdread')
+license=('GPL2')
+#Special thanks to Mathieu Clabaut <mathieu.clabaut@gmail.com> for patches
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'stdint_usage.patch')
+md5sums=('340e1abe5c5e5abf7ff8031e78f49ee7'
+         '6cbcbfde873f894bd3c784f65141b2fc')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/stdint_usage.patch"
+  ./configure --prefix=/usr --mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/abs/core/lsdvd/stdint_usage.patch b/abs/core/lsdvd/stdint_usage.patch
new file mode 100644
index 0000000..67b9ee8
--- /dev/null
+++ b/abs/core/lsdvd/stdint_usage.patch
@@ -0,0 +1,22 @@
+--- a/lsdvd.c	2006-03-02 07:48:11.000000000 -0600
++++ b/lsdvd.c	2007-09-27 19:15:28.000000000 -0500
+@@ -13,6 +13,7 @@
+  *  2003-04-19  Cleanups get_title_name, added dvdtime2msec, added helper macros,
+  *			  output info structures in form of a Perl module, by Henk Vergonet.
+  */
++#include <stdint.h>
+ #include <dvdread/ifo_read.h>
+ #include <string.h>
+ #include <sys/stat.h>
+--- a/configure	2005-12-12 14:22:45.000000000 -0600
++++ b/configure	2007-09-27 19:15:13.000000000 -0500
+@@ -2887,8 +2887,8 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <dvdread/ifo_read.h>
+ 		#include <stdint.h>
++#include <dvdread/ifo_read.h>
+ int
+ main ()
+ {
diff --git a/abs/core/mplayer/PKGBUILD b/abs/core/mplayer/PKGBUILD
index 66a0c9c..c725fc3 100644
--- a/abs/core/mplayer/PKGBUILD
+++ b/abs/core/mplayer/PKGBUILD
@@ -34,7 +34,6 @@ build() {
         --disable-ass-internal \
         --disable-cdparanoia \
         --enable-radio \
-        --enable-radio-capture \
         --language=all \
         --confdir=/etc/mplayer 
     [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
diff --git a/abs/core/mythtv/stable-0.25/git_src/git_hash b/abs/core/mythtv/stable-0.25/git_src/git_hash
index 83e574c..0891f19 100644
--- a/abs/core/mythtv/stable-0.25/git_src/git_hash
+++ b/abs/core/mythtv/stable-0.25/git_src/git_hash
@@ -1 +1 @@
-46cab93562429cd19029402a2387f63a72aeb898
+a72e341a4653a1b683b7ae5ac87bcaa3092d20fa
diff --git a/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD
index 51549e6..bd4a40c 100644
--- a/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD
+++ b/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD
@@ -12,7 +12,7 @@ pkgname=('mytharchive'
          'mythweather'
          'mythzoneminder')
 pkgver=0.25
-pkgrel=4
+pkgrel=6
 
 arch=('i686' 'x86_64')
 url="http://www.mythtv.org"
diff --git a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
index 8ed3ef1..8d77484 100644
--- a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
+++ b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=mythtv
 pkgver=0.25
-pkgrel=9
+pkgrel=11
 commit_hash=`cat ../git_src/git_hash`
 pkgdesc="A Homebrew PVR project $commit_hash"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ url="http://www.mythtv.org/"
 license=('GPL')
 depends=('mysql-clients' 
          'qt'
-	 'qtwebkit'
+         'qtwebkit'
          'lame'
          'lirc-utils'
          'ffmpeg'
@@ -45,7 +45,9 @@ depends=('mysql-clients'
          'glew'
          'openssl'
          'libxml2'
-	 'libass' )
+         'lsdvd'
+         'libass'
+         'dvdbackup')
 
 #glew for gpu commerical flagging
 #openssl for roap
@@ -121,13 +123,11 @@ package() {
   # patch the xml LinHES style
   cp -r ${startdir}/menu-xml/*.xml ${pkgdir}/usr/share/mythtv/themes/defaultmenu/
 #  mv ${pkgdir}/usr/share/mythtv/themes/defaultmenu/is.xml ${pkgdir}/usr/share/mythtv/
-
-#jM
-#  cd ${pkgdir}/usr/share/mythtv
-#  patch -p0 < ${startdir}/menu-xml/mainmenu.xml.patch || return 1
-#  patch -p0 < ${startdir}/menu-xml/optical_menu.xml.patch || return 1
-#  patch -p0 < ${startdir}/menu-xml/library.xml.patch || return 1
-#  patch -p0 < ${startdir}/menu-xml/util_menu.xml.patch || return 1
+  cd ${pkgdir}/usr/share/mythtv
+  patch -p0 < ${startdir}/menu-xml/mainmenu.xml.patch || return 1
+  patch -p0 < ${startdir}/menu-xml/optical_menu.xml.patch || return 1
+  patch -p0 < ${startdir}/menu-xml/library.xml.patch || return 1
+  patch -p0 < ${startdir}/menu-xml/util_menu.xml.patch || return 1
 
   # make log dir
   mkdir -p ${pkgdir}/var/log/mythtv
diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/dvd_backup.xml b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/dvd_backup.xml
new file mode 100644
index 0000000..2647d81
--- /dev/null
+++ b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/dvd_backup.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<mythmenu name="OPTICAL_DISK">
+
+    <button>
+        <type>DVD_RIP</type>
+        <text>Mirror DVD</text>
+        <description>Creates a mirror of your DVD</description>
+	<action>EXEC /usr/LH/bin/ripD_eject.sh m &amp;</action>
+    </button>
+
+    <button>
+        <type>DVD_RIP</type>
+        <text>ISO of DVD</text>
+        <description>Creates an ISO of your DVD</description>
+	<action>EXEC /usr/LH/bin/ripD_eject.sh i &amp;</action>
+    </button>
+
+    <button>
+        <type>DVD_RIP</type>
+        <text>High Quality</text>
+        <description>Creates a high quality MPEG4 of your DVD</description>
+	<action>EXEC /usr/LH/bin/ripD_eject.sh h &amp;</action>
+    </button>
+
+    <button>
+        <type>DVD_RIP</type>
+        <text>Normal Quality</text>
+        <description>Creates a normal quality MPEG4 of your DVD</description>
+	<action>EXEC /usr/LH/bin/ripD_eject.sh n &amp;</action>
+    </button>
+
+    <button>
+        <type>DVD_RIP</type>
+        <text>Low Quality</text>
+        <description>Creates a low quality MPEG4 of your DVD</description>
+	<action>EXEC /usr/LH/bin/ripD_eject.sh l &amp;</action>
+    </button>
+
+</mythmenu>
diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mainmenu.xml.patch b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mainmenu.xml.patch
index 9b083ac..73a8940 100644
--- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mainmenu.xml.patch
+++ b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/mainmenu.xml.patch
@@ -1,5 +1,5 @@
---- themes/defaultmenu/mainmenu.xml.orig	2012-04-21 17:33:52.176349680 +0000
-+++ themes/defaultmenu/mainmenu.xml	2012-04-21 17:35:03.369680109 +0000
+--- themes/defaultmenu/mainmenu.xml.orig	2012-07-29 21:39:46.000000000 +0000
++++ themes/defaultmenu/mainmenu.xml	2012-07-29 21:41:50.000000000 +0000
 @@ -1,5 +1,11 @@
  <?xml version="1.0" encoding="UTF-8" ?>
  <mythmenu name="MAIN">
@@ -12,7 +12,7 @@
  
      <button>
          <type>MENU_MEDIA_LIBRARY</type>
-@@ -30,17 +36,10 @@
+@@ -30,18 +36,11 @@
      </button>
  
      <button>
@@ -27,9 +27,11 @@
 -        <text>Setup</text>
 -        <description>Configure MythTV and plugins</description>
 -        <action>MENU main_settings.xml</action>
+-        <password>SetupPinCode</password>
 +        <text>Service Menu</text>
 +        <description>Configure your system</description>
-+        <action>MENU linhes.xml</action>
++	<action>MENU linhes.xml</action>
++	<password>SetupPinCode</password>
      </button>
  
  </mythmenu>
diff --git a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/optical_menu.xml.patch b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/optical_menu.xml.patch
index 143424f..1ff2db2 100644
--- a/abs/core/mythtv/stable-0.25/mythtv/menu-xml/optical_menu.xml.patch
+++ b/abs/core/mythtv/stable-0.25/mythtv/menu-xml/optical_menu.xml.patch
@@ -1,10 +1,17 @@
---- themes/defaultmenu/optical_menu.xml.orig	2010-11-06 00:39:43.000000000 +0000
-+++ themes/defaultmenu/optical_menu.xml	2010-11-06 00:42:59.000000000 +0000
-@@ -26,6 +26,13 @@
+--- themes/defaultmenu/optical_menu.xml.orig	2012-05-02 18:41:38.000000000 +0000
++++ themes/defaultmenu/optical_menu.xml	2012-07-30 05:33:03.000000000 +0000
+@@ -17,6 +17,20 @@
      </button>
  
      <button>
 +        <type>DVD_RIP</type>
++        <text>Backup DVD</text>
++       <description>Backup your DVDs</description>
++        <action>MENU dvd_backup.xml</action>
++    </button>
++
++    <button>
++        <type>DVD_RIP</type>
 +        <text>Import video files from DVD</text>
 +       <description>Import video files from a data DVD</description>
 +        <action>EXEC /usr/LH/bin/importfiles.sh</action>