From d51e88d864876da3582e1a0bfa7e2890c383c126 Mon Sep 17 00:00:00 2001
From: Michael Hanson <mihanson@linhes.org>
Date: Tue, 24 Jul 2012 00:49:41 +0000
Subject: linhes-scripts: fix for myth2mkv

---
 abs/core/linhes-scripts/PKGBUILD | 4 ++--
 abs/core/linhes-scripts/myth2mkv | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD
index 829694b..5458b28 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=42
 pkgdesc="Various scripts that help to make LinHES, LinHES."
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -104,4 +104,4 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5'
          'd8838461af9d446a1fd7e7883fdc75d1'
          'cc9cdabcdfc969c2829b58c0e513488c'
          '54a478660d0f8150fe10112a9ecf2740'
-         '980423e07c8c6ffd0ea1bf9a1959fdc2')
+         '8fa34662c686b210c9943324b7df2feb')
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
-- 
cgit v0.12


From c30bce893f57b62c0966278c5758ded160f4a98a Mon Sep 17 00:00:00 2001
From: Cecil <knoppmyth@gmail.com>
Date: Mon, 23 Jul 2012 23:56:55 -0700
Subject: lsdvd:initial inclusion. For use with ripD.

---
 abs/core/lsdvd/PKGBUILD           | 28 ++++++++++++++++++++++++++++
 abs/core/lsdvd/stdint_usage.patch | 22 ++++++++++++++++++++++
 2 files changed, 50 insertions(+)
 create mode 100644 abs/core/lsdvd/PKGBUILD
 create mode 100644 abs/core/lsdvd/stdint_usage.patch

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 ()
+ {
-- 
cgit v0.12


From dded86a4a063bbb25b68ccbed9ed21836cba912f Mon Sep 17 00:00:00 2001
From: Cecil <knoppmyth@gmail.com>
Date: Sun, 29 Jul 2012 13:57:52 -0700
Subject: linhes-scripts:Added scripts to backup one's DVD.

---
 abs/core/linhes-scripts/LinHES-osd    |  19 ++++++
 abs/core/linhes-scripts/PKGBUILD      |  10 ++-
 abs/core/linhes-scripts/ripD_eject.sh | 122 ++++++++++++++++++++++++++++++++++
 3 files changed, 148 insertions(+), 3 deletions(-)
 create mode 100755 abs/core/linhes-scripts/LinHES-osd
 create mode 100755 abs/core/linhes-scripts/ripD_eject.sh

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 5458b28..6de0e85 100644
--- a/abs/core/linhes-scripts/PKGBUILD
+++ b/abs/core/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=linhes-scripts
 pkgver=7
-pkgrel=42
+pkgrel=43
 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'
-         '8fa34662c686b210c9943324b7df2feb')
+         '8fa34662c686b210c9943324b7df2feb'
+         'b608044c9e7530a400d8f5b88fdfe6e6'
+         'a9f112b9fa85df60194a210aec261d8f')
diff --git a/abs/core/linhes-scripts/ripD_eject.sh b/abs/core/linhes-scripts/ripD_eject.sh
new file mode 100755
index 0000000..33c37a5
--- /dev/null
+++ b/abs/core/linhes-scripts/ripD_eject.sh
@@ -0,0 +1,122 @@
+#!/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"
+	FILE=$TITLE.avi
+	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"
+	FILE=$TITLE.avi
+	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"
+	FILE=$TITLE.avi
+	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
-- 
cgit v0.12


From f7a481c6186506baff2868b02e226bdce2b5f945 Mon Sep 17 00:00:00 2001
From: Cecil <knoppmyth@gmail.com>
Date: Sun, 29 Jul 2012 23:10:45 -0700
Subject: mythplugins:Bumped to compiles latest 0.25.2.

---
 abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.25/mythplugins/PKGBUILD
index 2ebe525..f8b7cbb 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"
-- 
cgit v0.12


From 62ae119f3120c49f8142c02a4d9def9d74b00864 Mon Sep 17 00:00:00 2001
From: Cecil <knoppmyth@gmail.com>
Date: Sun, 29 Jul 2012 23:11:09 -0700
Subject: mythtv:Bumped to compiles latest 0.25.2. Added DVD backup menu.

---
 abs/core/mythtv/stable-0.25/git_src/git_hash       |  2 +-
 abs/core/mythtv/stable-0.25/mythtv/PKGBUILD        |  2 +-
 .../stable-0.25/mythtv/menu-xml/dvd_backup.xml     | 39 ++++++++++++++++++++++
 .../stable-0.25/mythtv/menu-xml/mainmenu.xml.patch | 10 +++---
 .../mythtv/menu-xml/optical_menu.xml.patch         | 13 ++++++--
 5 files changed, 57 insertions(+), 9 deletions(-)
 create mode 100644 abs/core/mythtv/stable-0.25/mythtv/menu-xml/dvd_backup.xml

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 ae0574c..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 @@
-f0e2ad85dbdd6dd4041a8b1e7d8b17e7b8746b63
+a72e341a4653a1b683b7ae5ac87bcaa3092d20fa
diff --git a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
index 0d5f979..2f0b8b7 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=10
 commit_hash=`cat ../git_src/git_hash`
 pkgdesc="A Homebrew PVR project $commit_hash"
 arch=('i686' 'x86_64')
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>
-- 
cgit v0.12


From a93c630b80a72ccafea73b550ec73cad11b0e2c9 Mon Sep 17 00:00:00 2001
From: Cecil <knoppmyth@gmail.com>
Date: Sun, 29 Jul 2012 23:28:02 -0700
Subject: mythtv:Bumped to add deps for backing up DVD.

---
 abs/core/mythtv/stable-0.25/mythtv/PKGBUILD | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.25/mythtv/PKGBUILD
index 2f0b8b7..53288a6 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=10
+pkgrel=11
 commit_hash=`cat ../git_src/git_hash`
 pkgdesc="A Homebrew PVR project $commit_hash"
 arch=('i686' 'x86_64')
@@ -43,7 +43,9 @@ depends=('mysql-clients'
          'perl-io-socket-inet6'
          'glew'
          'openssl'
-         'libxml2')
+         'libxml2'
+	 'lsdvd'
+	 'dvdbackup')
 
 #glew for gpu commerical flagging
 #openssl for roap
-- 
cgit v0.12


From d5c50a9533df2fc6a88d9d423bbeb8aeab9bba47 Mon Sep 17 00:00:00 2001
From: Cecil <knoppmyth@gmail.com>
Date: Sun, 29 Jul 2012 23:48:32 -0700
Subject: handbrake:Bumped to 0.9.8. Closes #838.

---
 abs/extra/handbrake/PKGBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/abs/extra/handbrake/PKGBUILD b/abs/extra/handbrake/PKGBUILD
index 386eb08..b70180a 100644
--- a/abs/extra/handbrake/PKGBUILD
+++ b/abs/extra/handbrake/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id$
+# $Id: PKGBUILD 74053 2012-07-18 17:33:26Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sebastien Piccand <sebcactus gmail com>
 
 pkgname=('handbrake' 'handbrake-cli')
-pkgver=0.9.6
+pkgver=0.9.8
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://handbrake.fr/"
@@ -12,7 +12,7 @@ license=('GPL')
 makedepends=('intltool' 'python2' 'yasm' 'wget' 'bzip2' 'gcc-libs' 'libnotify'
              'gstreamer0.10-base' 'gtk2' 'dbus-glib' 'fribidi')
 source=(http://downloads.sourceforge.net/project/handbrake/$pkgver/HandBrake-$pkgver.tar.bz2)
-sha256sums=('8e7d3dd6d9eb10ba633bf0b6cabcc50a995699ec448f86cb9579c0d2fc7005f5')
+sha256sums=('dba75a9ff772e419c01d75532c1bf0d7253e73d7ead184eee755cd4c133dc798')
 
 build() {
   cd "$srcdir/HandBrake-$pkgver"
-- 
cgit v0.12


From 4c3ea6d71a1ab76d5432a4616a2f7080e828d28b Mon Sep 17 00:00:00 2001
From: Michael Hanson <mihanson@linhes.org>
Date: Tue, 31 Jul 2012 00:01:31 +0000
Subject: mplayer: minor correction to PKGBUILD. No pkg built.

---
 abs/core/mplayer/PKGBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/abs/core/mplayer/PKGBUILD b/abs/core/mplayer/PKGBUILD
index 465aef4..05ef462 100644
--- a/abs/core/mplayer/PKGBUILD
+++ b/abs/core/mplayer/PKGBUILD
@@ -18,7 +18,7 @@ md5sums=('512a0309ba5979a41ae93b740f4592f4'
          'c0d6ef795cf6de48e3b87ff7c23f0319')
 
 build() {
-    cd ${srcdir}/${pkgname}
+    cd ${srcdir}/${pkgbase}
 
     ./configure --prefix=/usr \
         --enable-runtime-cpudetection \
-- 
cgit v0.12


From 507895c8452fe0a3a0f4f4be7fe9c85a64c10185 Mon Sep 17 00:00:00 2001
From: Cecil <knoppmyth@gmail.com>
Date: Mon, 30 Jul 2012 21:38:42 -0700
Subject: linhes-scripts:Modifed ripD_eject.sh to use HandBrakeCLI.

---
 abs/core/linhes-scripts/PKGBUILD      |  4 ++--
 abs/core/linhes-scripts/ripD_eject.sh | 15 +++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD
index 6de0e85..4676966 100644
--- a/abs/core/linhes-scripts/PKGBUILD
+++ b/abs/core/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=linhes-scripts
 pkgver=7
-pkgrel=43
+pkgrel=44
 pkgdesc="Various scripts that help to make LinHES, LinHES."
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -108,4 +108,4 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5'
          '54a478660d0f8150fe10112a9ecf2740'
          '8fa34662c686b210c9943324b7df2feb'
          'b608044c9e7530a400d8f5b88fdfe6e6'
-         'a9f112b9fa85df60194a210aec261d8f')
+         'bcb3b4cddd328f16ad8023ac88c0b9ec')
diff --git a/abs/core/linhes-scripts/ripD_eject.sh b/abs/core/linhes-scripts/ripD_eject.sh
index 33c37a5..73005d8 100755
--- a/abs/core/linhes-scripts/ripD_eject.sh
+++ b/abs/core/linhes-scripts/ripD_eject.sh
@@ -86,16 +86,19 @@ 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"
-	FILE=$TITLE.avi
+#	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/$FILE --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"
-	FILE=$TITLE.avi
+#	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/$FILE --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"
-	FILE=$TITLE.avi
+#	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/$FILE --preset \"Classic\" --main-feature"
+	FILE=$TITLE.mp4
 	elif [ $1 = i ]
 	then
 	COMMAND="dd if=$DEV of=$dir/$TITLE.iso bs=2048"
-- 
cgit v0.12


From 52c649aa6460de0071ebd0f48c3cac8cb864392f Mon Sep 17 00:00:00 2001
From: Cecil <knoppmyth@gmail.com>
Date: Tue, 31 Jul 2012 00:30:37 -0700
Subject: linhes-scripts:Corrected scripting errors in ripD_eject.sh.

---
 abs/core/linhes-scripts/PKGBUILD      | 4 ++--
 abs/core/linhes-scripts/ripD_eject.sh | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/abs/core/linhes-scripts/PKGBUILD b/abs/core/linhes-scripts/PKGBUILD
index 4676966..0fb3dee 100644
--- a/abs/core/linhes-scripts/PKGBUILD
+++ b/abs/core/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=linhes-scripts
 pkgver=7
-pkgrel=44
+pkgrel=45
 pkgdesc="Various scripts that help to make LinHES, LinHES."
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -108,4 +108,4 @@ md5sums=('f56985b2d602e11dc1e10d3e7848b2a5'
          '54a478660d0f8150fe10112a9ecf2740'
          '8fa34662c686b210c9943324b7df2feb'
          'b608044c9e7530a400d8f5b88fdfe6e6'
-         'bcb3b4cddd328f16ad8023ac88c0b9ec')
+         'e2e24dd59d5d576cc33feafb329fa302')
diff --git a/abs/core/linhes-scripts/ripD_eject.sh b/abs/core/linhes-scripts/ripD_eject.sh
index 73005d8..99947a8 100755
--- a/abs/core/linhes-scripts/ripD_eject.sh
+++ b/abs/core/linhes-scripts/ripD_eject.sh
@@ -87,17 +87,17 @@ then
 	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/$FILE --preset \"High Profile\" --main-feature"
+	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/$FILE --preset \"Normal\" --main-feature"
+	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/$FILE --preset \"Classic\" --main-feature"
+	COMMAND="HandBrakeCLI -i $DEV -o $dir/$TITLE.mp4 --preset "Classic" --main-feature"
 	FILE=$TITLE.mp4
 	elif [ $1 = i ]
 	then
-- 
cgit v0.12


From 5a0ef4ad14fe0b9ea671f2a77b3450931d65f828 Mon Sep 17 00:00:00 2001
From: Michael Hanson <mihanson@linhes.org>
Date: Thu, 2 Aug 2012 00:29:15 +0000
Subject: bluez: update to 4.101

---
 abs/core/mplayer/PKGBUILD | 72 -----------------------------------------------
 abs/extra/bluez/PKGBUILD  |  4 +--
 2 files changed, 2 insertions(+), 74 deletions(-)
 delete mode 100644 abs/core/mplayer/PKGBUILD

diff --git a/abs/core/mplayer/PKGBUILD b/abs/core/mplayer/PKGBUILD
deleted file mode 100644
index 05ef462..0000000
--- a/abs/core/mplayer/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Id$
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-
-pkgbase=mplayer
-pkgname=('mplayer' 'mencoder')
-pkgver=33805
-pkgrel=4
-arch=('i686' 'x86_64')
-makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
-'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
-'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray')
-license=('GPL')
-url="http://www.mplayerhq.hu/"
-options=(!buildflags !emptydirs)
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz mplayer.desktop)
-md5sums=('512a0309ba5979a41ae93b740f4592f4'
-         'c0d6ef795cf6de48e3b87ff7c23f0319')
-
-build() {
-    cd ${srcdir}/${pkgbase}
-
-    ./configure --prefix=/usr \
-        --enable-runtime-cpudetection \
-        --disable-gui \
-        --disable-arts \
-        --disable-liblzo \
-        --disable-speex \
-        --disable-openal \
-        --disable-libdv \
-        --disable-musepack \
-        --disable-esd \
-        --disable-mga \
-        --disable-ass-internal \
-        --disable-pulse \
-        --enable-xvmc \
-        --language=all \
-        --confdir=/etc/mplayer
-    [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
-
-    make
-}
-
-package_mplayer() {
-    pkgdesc="A movie player for linux"
-    install=mplayer.install
-    backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-    depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'  'libgl'
-    'libxinerama' 'libvdpau' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
-    'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libbluray')
-
-    cd ${srcdir}/${pkgbase}
-
-    make DESTDIR=${pkgdir} install-mplayer  install-mplayer-man
-    install -Dm644 etc/{codecs.conf,input.conf,example.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
-    #desktop file  FS#14770
-    install -Dm644 ${srcdir}/mplayer.desktop ${pkgdir}/usr/share/applications/mplayer.desktop
-    install -Dm644 etc/mplayer.png ${pkgdir}/usr/share/pixmaps/mplayer.png
-}
-
-package_mencoder() {
-    pkgdesc="Free command line video decoding, encoding and filtering tool"
-    depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'cdparanoia'
-    'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2' 'schroedinger' 'mpg123' 'libass')
-
-    cd ${srcdir}/${pkgbase}
-    make DESTDIR=${pkgdir} install-mencoder
-#    find $pkgdir/usr/share/man -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \;
-}
diff --git a/abs/extra/bluez/PKGBUILD b/abs/extra/bluez/PKGBUILD
index a26b874..758e858 100644
--- a/abs/extra/bluez/PKGBUILD
+++ b/abs/extra/bluez/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
 
 pkgname=bluez
-pkgver=4.100
+pkgver=4.101
 pkgrel=1
 pkgdesc="Libraries and tools for the Bluetooth protocol stack"
 url="http://www.bluez.org/"
@@ -82,7 +82,7 @@ package() {
     "${pkgdir}"/usr/bin/bluez-test-device \
     "${pkgdir}"/usr/bin/bluez-test-input
 }
-md5sums=('54809d476c52665ff64594b6828016b5'
+md5sums=('902b390af95c6c5d6d1a17d94c8344ab'
          '7412982b440f29fa7f76a41a87fef985'
          '54c7de598327bf11d56592235d0702f4'
          'cc9c86af1ced7ad46fc7be114d32adfb')
-- 
cgit v0.12


From 90514910be147bd0aa416dc29ab4cb0791844cc4 Mon Sep 17 00:00:00 2001
From: Michael Hanson <mihanson@linhes.org>
Date: Thu, 2 Aug 2012 00:36:17 +0000
Subject: mplayer: nothing to see here

---
 abs/core/mplayer/PKGBUILD | 72 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 abs/core/mplayer/PKGBUILD

diff --git a/abs/core/mplayer/PKGBUILD b/abs/core/mplayer/PKGBUILD
new file mode 100644
index 0000000..05ef462
--- /dev/null
+++ b/abs/core/mplayer/PKGBUILD
@@ -0,0 +1,72 @@
+# $Id$
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# Contributor: Hugo Doria <hugo@archlinux.org>
+
+pkgbase=mplayer
+pkgname=('mplayer' 'mencoder')
+pkgver=33805
+pkgrel=4
+arch=('i686' 'x86_64')
+makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
+'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
+'fribidi' 'unzip' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray')
+license=('GPL')
+url="http://www.mplayerhq.hu/"
+options=(!buildflags !emptydirs)
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz mplayer.desktop)
+md5sums=('512a0309ba5979a41ae93b740f4592f4'
+         'c0d6ef795cf6de48e3b87ff7c23f0319')
+
+build() {
+    cd ${srcdir}/${pkgbase}
+
+    ./configure --prefix=/usr \
+        --enable-runtime-cpudetection \
+        --disable-gui \
+        --disable-arts \
+        --disable-liblzo \
+        --disable-speex \
+        --disable-openal \
+        --disable-libdv \
+        --disable-musepack \
+        --disable-esd \
+        --disable-mga \
+        --disable-ass-internal \
+        --disable-pulse \
+        --enable-xvmc \
+        --language=all \
+        --confdir=/etc/mplayer
+    [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
+
+    make
+}
+
+package_mplayer() {
+    pkgdesc="A movie player for linux"
+    install=mplayer.install
+    backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
+    depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'  'libgl'
+    'libxinerama' 'libvdpau' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
+    'libjpeg' 'faac' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libbluray')
+
+    cd ${srcdir}/${pkgbase}
+
+    make DESTDIR=${pkgdir} install-mplayer  install-mplayer-man
+    install -Dm644 etc/{codecs.conf,input.conf,example.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
+    #desktop file  FS#14770
+    install -Dm644 ${srcdir}/mplayer.desktop ${pkgdir}/usr/share/applications/mplayer.desktop
+    install -Dm644 etc/mplayer.png ${pkgdir}/usr/share/pixmaps/mplayer.png
+}
+
+package_mencoder() {
+    pkgdesc="Free command line video decoding, encoding and filtering tool"
+    depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'cdparanoia'
+    'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faac' 'faad2' 'schroedinger' 'mpg123' 'libass')
+
+    cd ${srcdir}/${pkgbase}
+    make DESTDIR=${pkgdir} install-mencoder
+#    find $pkgdir/usr/share/man -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \;
+}
-- 
cgit v0.12