summaryrefslogtreecommitdiffstats
path: root/abs/extra/mediaserv
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2013-02-19 21:10:18 (GMT)
committerJames Meyer <james.meyer@operamail.com>2013-02-19 21:10:18 (GMT)
commit2648e999d277eac5c3d331a3609bcc73fafbea71 (patch)
tree40951fb8e7fdbe28a0baa324ae615055203f1e2e /abs/extra/mediaserv
parentc759b5e0c4aa6fc37412b4dee2cf9ad993fd376d (diff)
parent7e6f7ca174e1af67178dc5293a312a4a733eb095 (diff)
downloadlinhes_pkgbuild-2648e999d277eac5c3d331a3609bcc73fafbea71.zip
linhes_pkgbuild-2648e999d277eac5c3d331a3609bcc73fafbea71.tar.gz
linhes_pkgbuild-2648e999d277eac5c3d331a3609bcc73fafbea71.tar.bz2
Merge branch 'testing'
# By James Meyer (1091) and others # Via James Meyer (5) and others * testing: (1148 commits) LinHES-config: during install don't kill off lirc. This keeps the remote active all the way to the finish Change version numbers to 8.0 to match the release number. LinHES-conifg LinHES-system mythdb-initial runit-scripts supplemental-web LinHES-conifig: mv_install.py for the last partition don't go all the way to the end. Gotta leave room for gpt tables. xf86-video-ati: xorg ati driver. LinHES-config: timezip.py add syncing up of parental lvl passwords and starting level with MBE. LinHES-system: correct the logic for breaking out of the wmctrl loop. As written it would break out of the inner loop..but not the 60 iteration loop. e16_theme_settings: remove slide-in prop for new windows. For whatever reason this was preventing mplayer from being positioned correctly for appletrailers. LinHES-config, mythinstall: change case of hd_pvr and serial to all lower refs #902 zilog-firmware: firmware for TX support of the hdpvr and pvr-150 In general I can't recommend anybody using these transmitters but including the firmware just in case someone really wants to linhes-udev-rules: added hdprv_lirc rule. All of these lirc rules are limited to exactly one device. If more then one device is present then only the last device in init will get the symlink runit-scripts: fix logging for igdeamon, add support to remote init script so that the blaster is always the first device in the chain. added support specificly for hd_pvr LinHES-system: add lh_system_restore and lh_system_backup. These scripts are called from the mythmenu. refs #900 iguanair: rebuild with python 2.7 LinHES-system: msg_daemon.py fix init and nasty bug related to timeout. In a nutshell timeout wouldn't work unless a msg without a timeout was called first. linhes-udev-rules: add rules for mce,streamzap,serial lirc devices. mythinstall: recompile for matching libs mythtv: latest .25-fixes and change mythbackup/restore call lh_system_$op to replace mythbackup/mythrestore. mythbackup no longer works correctly with the new windowmanager linhes-scripts: myth2mp3, myth2x264, myth2xvid: use mythutil to get cutlist LinHES-config, supplimental-web: Fix proxy numbering for Ceton infiniTV linhes-system: add additional stuff to the system backup and also introduced an exclude file. The exclude/include files are locate in /home/mythtv/backup_config/ ...
Diffstat (limited to 'abs/extra/mediaserv')
-rw-r--r--abs/extra/mediaserv/PKGBUILD33
-rw-r--r--abs/extra/mediaserv/finish8
-rw-r--r--abs/extra/mediaserv/linhes-mediaserv.tar.bz2bin17322 -> 0 bytes
-rw-r--r--abs/extra/mediaserv/mediaserv.install38
-rw-r--r--abs/extra/mediaserv/mediaserv.no_daemon.patch17
-rw-r--r--abs/extra/mediaserv/run8
6 files changed, 0 insertions, 104 deletions
diff --git a/abs/extra/mediaserv/PKGBUILD b/abs/extra/mediaserv/PKGBUILD
deleted file mode 100644
index 59eed79..0000000
--- a/abs/extra/mediaserv/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 5936 2008-07-21 20:24:16Z thomas $
-# Maintainer: Cecil Watson<knoppmyth@gmail.com>
-
-pkgname=mediaserv
-pkgver=0.05
-pkgrel=20
-pkgdesc="On-demand transcoding server for videos, targetting the Nokia Internet Tablets."
-arch=('i686' 'x86_64')
-license=('ARTISTIC')
-depends=('tablet-encode' 'perl-xml-rss')
-backup=(/myth/mediaserv/config)
-install=(mediaserv.install)
-url="http://mediautils.garage.maemo.org/tablet-encode.html"
-source=(https://garage.maemo.org/frs/download.php/2632/mediaserv-0.05.tar.gz linhes-mediaserv.tar.bz2 mediaserv.no_daemon.patch run finish)
-
-build() {
- cd ${srcdir}/mediaserv
- patch -Np1 -i ${startdir}/src/mediaserv.no_daemon.patch || return 1
- mkdir -p $startdir/pkg/usr/bin
- mkdir -p $startdir/pkg/etc/sv/mediaserv/supervise
- mkdir -p $startdir/pkg/usr/share/doc/mediaserv
- mkdir -p $startdir/pkg/myth/mediaserv
- mkdir -p $startdir/pkg/myth/mediaserv/media
- install -D -m755 mediaserv $startdir/pkg/usr/bin
- cp README.txt $startdir/pkg/usr/share/doc/mediaserv
- cp -a ${srcdir}/.mediaserv/* ${pkgdir}/myth/mediaserv
- install -D -m755 ${srcdir}/run ${srcdir}/finish $startdir/pkg/etc/sv/mediaserv
-}
-md5sums=('94c300a0e95c55dae42a61f77e4e41fe'
- 'e7b6fcc91b73939db350c4854c19e9ee'
- '68d25630786e76fa36c9e6bb29821367'
- 'd047f0fa5f1d39d864debd8a76f677e2'
- 'f2022c1cc8f04959299c97edde06d023')
diff --git a/abs/extra/mediaserv/finish b/abs/extra/mediaserv/finish
deleted file mode 100644
index f424494..0000000
--- a/abs/extra/mediaserv/finish
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Stopping mediaserv"
-#wait
-exec /usr/bin/killall mediaserv
diff --git a/abs/extra/mediaserv/linhes-mediaserv.tar.bz2 b/abs/extra/mediaserv/linhes-mediaserv.tar.bz2
deleted file mode 100644
index 6397fb7..0000000
--- a/abs/extra/mediaserv/linhes-mediaserv.tar.bz2
+++ /dev/null
Binary files differ
diff --git a/abs/extra/mediaserv/mediaserv.install b/abs/extra/mediaserv/mediaserv.install
deleted file mode 100644
index 4a9de8e..0000000
--- a/abs/extra/mediaserv/mediaserv.install
+++ /dev/null
@@ -1,38 +0,0 @@
-# arg 1: the new package version
-
-
-post_install() {
- if [ ! -e /home/mythtv/.mediaserv ]
- then
- ln -s /myth/mediaserv /home/mythtv/.mediaserv
- fi
-
- if [ ! -e /myth/mediaserv/media/tv ]
- then
- ln -s /myth/pretty /myth/mediaserv/media/tv
- fi
- if [ ! -e /myth/mediaserv/media/video ]
- then
- ln -s /myth/video /myth/mediaserv/media/video
- fi
- chown -R mythtv.mythtv /myth/mediaserv
- add_service.sh mediaserv
- sv start mediaserv
-}
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- post_install $1
-}
-
-# arg 1: the old package version
-post_remove() {
- sv stop mediaserv
- remove_service.sh mediaserv
- rm -fr /home/mythtv/.mediaserv
- rm -fr /myth/mediaserv
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/extra/mediaserv/mediaserv.no_daemon.patch b/abs/extra/mediaserv/mediaserv.no_daemon.patch
deleted file mode 100644
index b659354..0000000
--- a/abs/extra/mediaserv/mediaserv.no_daemon.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- mediaserv/mediaserv.orig 2009-06-15 03:16:53.000000000 +0000
-+++ mediaserv/mediaserv 2009-06-15 03:17:29.000000000 +0000
-@@ -608,10 +608,10 @@
- # daemonize - daemonize the parent/control app
- #
- sub daemonize {
-- my $pid = fork; # Fork off the main process
-- defined ($pid) or die "Cannot start daemon: $!";
-- print "Parent daemon running.\n" if $pid; # If we have a PID, the parent daemonized okay
-- exit if $pid; # Return control to the user
-+# my $pid = fork; # Fork off the main process
-+# defined ($pid) or die "Cannot start daemon: $!";
-+ print "Parent daemon running.\n" ; # If we have a PID, the parent daemonized okay
-+# exit if $pid; # Return control to the user
-
- # Now we're a daemonized parent process!
-
diff --git a/abs/extra/mediaserv/run b/abs/extra/mediaserv/run
deleted file mode 100644
index fbd1c97..0000000
--- a/abs/extra/mediaserv/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting mediaserv"
-exec su mythtv -c "/usr/bin/mediaserv" 2>/dev/null
-wait