Merge branch 'master' of ssh://gregfrost@knoppmyth.net/mount/repository/LinHES-PKGBUILD

6 files changed, 112 insertions, 4 deletions

diff --git a/abs/core-testing/LinHES-system/LinHES-run b/abs/core-testing/LinHES-system/LinHES-run
index 7a9a899..959fe84 100644
--- a/abs/core-testing/LinHES-system/LinHES-run
+++ b/abs/core-testing/LinHES-system/LinHES-run
@@ -63,6 +63,7 @@ then
 	sudo pacman -R myth2ipod myt2xvid3
 	sudo pacman -S --noconfirm myth2ipod myt2xvid3
         sudo sv stop mythbackend
+	cat /data/database/dvd_transcode_r6.sql | mysql -u root mythconverg
         xterm -fn *18* -e sudo taskset -c 0 /usr/bin/mythtv-setup
         sudo sv start mythbackend
 	sudo chown -R mythtv.mythtv /home/mythtv
diff --git a/abs/core-testing/LinHES-system/PKGBUILD b/abs/core-testing/LinHES-system/PKGBUILD
index f4718bb..afb4b19 100644
--- a/abs/core-testing/LinHES-system/PKGBUILD
+++ b/abs/core-testing/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-system
 pkgver=1.0
-pkgrel=71
+pkgrel=72
 arch=('i686')
 MVDIR=$startdir/pkg/usr/LH
 BINDIR=$startdir/pkg/usr/bin
diff --git a/abs/core-testing/linhes-scripts/PKGBUILD b/abs/core-testing/linhes-scripts/PKGBUILD
index b997242..af152c1 100644
--- a/abs/core-testing/linhes-scripts/PKGBUILD
+++ b/abs/core-testing/linhes-scripts/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=linhes-scripts
 pkgver=1
-pkgrel=49
+pkgrel=51
 pkgdesc="Various scripts that help to make LinHES, LinHES."
 arch=('i686' 'x86_64')
 license=('GPL2')
diff --git a/abs/core-testing/linhes-scripts/upgrade_to_0.22.sh b/abs/core-testing/linhes-scripts/upgrade_to_0.22.sh
index 03b6a1a..8536a05 100644
--- a/abs/core-testing/linhes-scripts/upgrade_to_0.22.sh
+++ b/abs/core-testing/linhes-scripts/upgrade_to_0.22.sh
@@ -86,6 +86,7 @@ if grep -E "Master|Stand" /etc/systemconfig &>/dev/null
 	xterm -e mythfrontend
 	echo "Performing LinHES specific schema updates."
 	/usr/LH/bin/update_schema_021_to_022.sh
+	cat /data/database/dvd_transcode_r6.sql | mysql -u root mythconverg
 fi
 echo "All done!"
 echo -e "\033[5mThanks for choosing LinHES!\033[0m"
diff --git a/abs/core-testing/mythdb-initial/PKGBUILD b/abs/core-testing/mythdb-initial/PKGBUILD
index d683ce1..4c0bb38 100755
--- a/abs/core-testing/mythdb-initial/PKGBUILD
+++ b/abs/core-testing/mythdb-initial/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythdb-initial
 pkgver=1
-pkgrel=48
+pkgrel=50
 pkgdesc="setup the initial mythtv database for linhes"
 url=""
 license=""
@@ -10,7 +10,7 @@ conflicts=()
 replaces=()
 backup=()
 install=mythdb.install
-source=(mc.sql permissions.sql custom.sql)
+source=(mc.sql permissions.sql custom.sql dvd_transcode_r6.sql)
 md5sums=()
 arch=('i686')
 build() {
@@ -19,4 +19,5 @@ build() {
   cp mc.sql  $startdir/pkg/data/database/mc.sql.initial
   cp permissions.sql  $startdir/pkg/data/database/permissions.sql
   cp custom.sql  $startdir/pkg/data/database/custom.sql
+  cp dvd_transcode_r6.sql  $startdir/pkg/data/database/dvd_transcode_r6.sql
 }
diff --git a/abs/core-testing/mythdb-initial/dvd_transcode_r6.sql b/abs/core-testing/mythdb-initial/dvd_transcode_r6.sql
new file mode 100644
index 0000000..6088b59
--- /dev/null
+++ b/abs/core-testing/mythdb-initial/dvd_transcode_r6.sql
@@ -0,0 +1,105 @@
+-- MySQL dump 10.11
+--
+-- Host: localhost    Database: mythconverg
+-- ------------------------------------------------------
+-- Server version	5.0.75
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `dvdinput`
+--
+
+DROP TABLE IF EXISTS `dvdinput`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `dvdinput` (
+  `intid` int(10) unsigned NOT NULL default '0',
+  `hsize` int(10) unsigned default NULL,
+  `vsize` int(10) unsigned default NULL,
+  `ar_num` int(10) unsigned default NULL,
+  `ar_denom` int(10) unsigned default NULL,
+  `fr_code` int(10) unsigned default NULL,
+  `letterbox` tinyint(1) default NULL,
+  `v_format` varchar(16) default NULL,
+  PRIMARY KEY  (`intid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `dvdinput`
+--
+
+LOCK TABLES `dvdinput` WRITE;
+/*!40000 ALTER TABLE `dvdinput` DISABLE KEYS */;
+INSERT INTO `dvdinput` VALUES (1,720,480,16,9,1,1,'ntsc'),(2,720,480,16,9,1,0,'ntsc'),(3,720,480,4,3,1,1,'ntsc'),(4,720,480,4,3,1,0,'ntsc'),(5,720,576,16,9,3,1,'pal'),(6,720,576,16,9,3,0,'pal'),(7,720,576,4,3,3,1,'pal'),(8,720,576,4,3,3,0,'pal');
+/*!40000 ALTER TABLE `dvdinput` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `dvdtranscode`
+--
+
+DROP TABLE IF EXISTS `dvdtranscode`;
+SET @saved_cs_client     = @@character_set_client;
+SET character_set_client = utf8;
+CREATE TABLE `dvdtranscode` (
+  `intid` int(11) NOT NULL auto_increment,
+  `input` int(10) unsigned default NULL,
+  `name` varchar(128) NOT NULL,
+  `sync_mode` int(10) unsigned default NULL,
+  `use_yv12` tinyint(1) default NULL,
+  `cliptop` int(11) default NULL,
+  `clipbottom` int(11) default NULL,
+  `clipleft` int(11) default NULL,
+  `clipright` int(11) default NULL,
+  `f_resize_h` int(11) default NULL,
+  `f_resize_w` int(11) default NULL,
+  `hq_resize_h` int(11) default NULL,
+  `hq_resize_w` int(11) default NULL,
+  `grow_h` int(11) default NULL,
+  `grow_w` int(11) default NULL,
+  `clip2top` int(11) default NULL,
+  `clip2bottom` int(11) default NULL,
+  `clip2left` int(11) default NULL,
+  `clip2right` int(11) default NULL,
+  `codec` varchar(128) NOT NULL,
+  `codec_param` varchar(128) default NULL,
+  `bitrate` int(11) default NULL,
+  `a_sample_r` int(11) default NULL,
+  `a_bitrate` int(11) default NULL,
+  `two_pass` tinyint(1) default NULL,
+  `tc_param` varchar(128) default NULL,
+  PRIMARY KEY  (`intid`)
+) ENGINE=MyISAM AUTO_INCREMENT=12 DEFAULT CHARSET=utf8;
+SET character_set_client = @saved_cs_client;
+
+--
+-- Dumping data for table `dvdtranscode`
+--
+
+LOCK TABLES `dvdtranscode` WRITE;
+/*!40000 ALTER TABLE `dvdtranscode` DISABLE KEYS */;
+INSERT INTO `dvdtranscode` VALUES (1,1,'Good',2,1,16,16,0,0,2,0,0,0,0,0,32,32,8,8,'divx5',NULL,1618,NULL,NULL,0,NULL),(2,2,'Excellent',2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'divx5',NULL,0,NULL,NULL,1,NULL),(3,2,'Good',2,1,0,0,8,8,0,0,0,0,0,0,0,0,0,0,'divx5',NULL,1618,NULL,NULL,0,NULL),(4,2,'Medium',2,1,0,0,8,8,5,5,0,0,0,0,0,0,0,0,'divx5',NULL,1200,NULL,NULL,0,NULL),(5,3,'Good',2,1,0,0,0,0,0,0,0,0,2,0,80,80,8,8,'divx5',NULL,0,NULL,NULL,0,NULL),(6,4,'Excellent',2,1,0,0,0,0,0,0,0,0,2,0,0,0,0,0,'divx5',NULL,0,NULL,NULL,1,NULL),(7,4,'Good',2,1,0,0,8,8,0,2,0,0,0,0,0,0,0,0,'divx5',NULL,1618,NULL,NULL,0,NULL),(8,5,'Good',1,1,16,16,0,0,5,0,0,0,0,0,40,40,8,8,'divx5',NULL,1618,NULL,NULL,0,NULL),(9,6,'Good',1,1,0,0,16,16,5,0,0,0,0,0,0,0,0,0,'divx5',NULL,1618,NULL,NULL,0,NULL),(10,7,'Good',1,1,0,0,0,0,1,0,0,0,0,0,76,76,8,8,'divx5',NULL,1618,NULL,NULL,0,NULL),(11,8,'Good',1,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,'divx5',NULL,1618,NULL,NULL,0,NULL);
+/*!40000 ALTER TABLE `dvdtranscode` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2010-01-08  0:15:01