[arch-commits] Commit in mythplugins/trunk (3 files)
Giovanni Scafora
giovanni at archlinux.org
Mon Feb 15 13:37:57 UTC 2010
Date: Monday, February 15, 2010 @ 08:37:57
Author: giovanni
Revision: 68951
upgpkg: mythplugins 23562-1
Fixed FS18326
Modified:
mythplugins/trunk/PKGBUILD
Deleted:
mythplugins/trunk/mythplugins-mythweb.install
mythplugins/trunk/mythweb.conf.apache
-----------------------------+
PKGBUILD | 54 +++++-----
mythplugins-mythweb.install | 6 -
mythweb.conf.apache | 210 ------------------------------------------
3 files changed, 25 insertions(+), 245 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-02-15 12:20:50 UTC (rev 68950)
+++ PKGBUILD 2010-02-15 13:37:57 UTC (rev 68951)
@@ -14,24 +14,21 @@
'mythplugins-mythweather'
'mythplugins-mythweb'
'mythplugins-mythzoneminder')
-pkgver=0.22
-pkgrel=4
+pkgver=23562
+pkgrel=1
arch=('i686' 'x86_64')
url="http://www.mythtv.org"
license=('GPL')
-groups=('mythplugins')
makedepends=("mythtv>=${pkgver}" 'mplayer' 'fftw' 'dvdauthor' 'libexif'
- 'python-imaging' 'libcdaudio' 'taglib' 'php-apache'
- 'perl-xml-simple')
-source=(ftp://ftp.osuosl.org/pub/mythtv/${pkgbase}-${pkgver}.tar.bz2
- mtd
- mythweb.conf.apache)
-md5sums=('09c8fa1058399a0c5db169a71561e985'
- '476c12ba074794ad7f4ae092bdf949d6'
- 'dd3c2198b160d2e602390d4721b91232')
+ 'python-imaging' 'libcdaudio' 'taglib' 'perl-xml-simple'
+ 'libvisual')
+source=(ftp://ftp.archlinux.org/other/mythtv/mythtv-plugins-${pkgver}.tar.gz
+ mtd)
+md5sums=('e140ca4da76394d9dd1fb9abb1769c57'
+ '476c12ba074794ad7f4ae092bdf949d6')
build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
+ cd "${srcdir}/${pkgbase}"
./configure --prefix=/usr \
--enable-all
@@ -43,7 +40,7 @@
pkgdesc="MythTV plugin that lets you create DVDs from or archive your recorded shows"
depends=("mythtv>=${pkgver}" 'libxmu' 'pil' 'dvdauthor')
replaces=('mytharchive')
- cd "${srcdir}/${pkgbase}-${pkgver}/mytharchive"
+ cd "${srcdir}/${pkgbase}/mytharchive"
make INSTALL_ROOT="${pkgdir}" install || return 1
}
@@ -51,7 +48,7 @@
pkgdesc="Mini web browser for MythTV"
depends=("mythtv>=${pkgver}")
replaces=('mythbrowser')
- cd "${srcdir}/${pkgbase}-${pkgver}/mythbrowser"
+ cd "${srcdir}/${pkgbase}/mythbrowser"
make INSTALL_ROOT="${pkgdir}" install || return 1
}
@@ -59,7 +56,7 @@
pkgdesc="Netflix access plugin for MythTV"
depends=("mythtv>=${pkgver}")
replaces=('mythflix')
- cd "${srcdir}/${pkgbase}-${pkgver}/mythflix"
+ cd "${srcdir}/${pkgbase}/mythflix"
make INSTALL_ROOT="${pkgdir}" install || return 1
}
@@ -67,7 +64,7 @@
pkgdesc="Image gallery plugin for MythTV"
depends=("mythtv>=${pkgver}" 'libexif')
replaces=('mythgallery')
- cd "${srcdir}/${pkgbase}-${pkgver}/mythgallery"
+ cd "${srcdir}/${pkgbase}/mythgallery"
make INSTALL_ROOT="${pkgdir}" install || return 1
}
@@ -75,7 +72,7 @@
pkgdesc="Game emulator module for MythTV"
depends=("mythtv>=${pkgver}" 'zlib')
replaces=('mythgame')
- cd "${srcdir}/${pkgbase}-${pkgver}/mythgame"
+ cd "${srcdir}/${pkgbase}/mythgame"
make INSTALL_ROOT="${pkgdir}" install || return 1
}
@@ -83,15 +80,15 @@
pkgdesc="Local movie listings via MythTV"
depends=("mythtv>=${pkgver}")
replaces=('mythmovies')
- cd "${srcdir}/${pkgbase}-${pkgver}/mythmovies"
+ cd "${srcdir}/${pkgbase}/mythmovies"
make INSTALL_ROOT="${pkgdir}" install || return 1
}
package_mythplugins-mythmusic() {
pkgdesc="Music playing plugin for MythTV"
- depends=("mythtv>=${pkgver}" 'fftw' 'flac' 'libcdaudio' 'libmad' 'taglib')
+ depends=("mythtv>=${pkgver}" 'flac' 'libcdaudio' 'cdparanoia' 'taglib' 'libvisual')
replaces=('mythmusic')
- cd "${srcdir}/${pkgbase}-${pkgver}/mythmusic"
+ cd "${srcdir}/${pkgbase}/mythmusic"
make INSTALL_ROOT="${pkgdir}" install || return 1
}
@@ -99,7 +96,7 @@
pkgdesc="News checking plugin for MythTV"
depends=("mythtv>=${pkgver}")
replaces=('mythnews')
- cd "${srcdir}/${pkgbase}-${pkgver}/mythnews"
+ cd "${srcdir}/${pkgbase}/mythnews"
make INSTALL_ROOT="${pkgdir}" install || return 1
}
@@ -107,7 +104,7 @@
pkgdesc="Video playback and browsing plugin for MythTV"
depends=("mythtv>=${pkgver}" 'mplayer' 'perl-xml-simple')
replaces=('mythvideo')
- cd "${srcdir}/${pkgbase}-${pkgver}/mythvideo"
+ cd "${srcdir}/${pkgbase}/mythvideo"
make INSTALL_ROOT="${pkgdir}" install || return 1
install -D -m755 ${srcdir}/mtd "${pkgdir}/etc/rc.d/mtd" || return 1
}
@@ -116,19 +113,18 @@
pkgdesc="Weather checking plugin for MythTV"
depends=("mythtv>=${pkgver}")
replaces=('mythweather')
- cd "${srcdir}/${pkgbase}-${pkgver}/mythweather"
+ cd "${srcdir}/${pkgbase}/mythweather"
make INSTALL_ROOT="${pkgdir}" install || return 1
}
package_mythplugins-mythweb() {
pkgdesc="Web interface for MythTV's backend"
- depends=("mythtv>=${pkgver}" 'php-apache')
+ depends=("mythtv>=${pkgver}")
+ optdepends=('php-apache'
+ 'lighttpd')
replaces=('mythweb')
- install=mythplugins-mythweb.install
mkdir -p ${pkgdir}/srv/http/mythweb/{image_cache,php_sessions}
- cp -r ${srcdir}/mythplugins-$pkgver/mythweb/* ${pkgdir}/srv/http/mythweb
- rm ${pkgdir}/srv/http/mythweb/README
- install -m644 ${srcdir}/mythweb.conf.apache ${pkgdir}/srv/http/mythweb/mythweb.conf.apache
+ cp -r ${srcdir}/mythplugins/mythweb/* ${pkgdir}/srv/http/mythweb
chown -R http:http ${pkgdir}/srv/http/mythweb
chmod g+rw ${pkgdir}/srv/http/mythweb/{image_cache,php_sessions,data}
}
@@ -138,6 +134,6 @@
depends=("mythtv>=${pkgver}")
replaces=('mythzoneminder')
install=mythplugins-mythzoneminder.install
- cd "${srcdir}/${pkgbase}-${pkgver}/mythzoneminder"
+ cd "${srcdir}/${pkgbase}/mythzoneminder"
make INSTALL_ROOT="${pkgdir}" install || return 1
}
Deleted: mythplugins-mythweb.install
===================================================================
--- mythplugins-mythweb.install 2010-02-15 12:20:50 UTC (rev 68950)
+++ mythplugins-mythweb.install 2010-02-15 13:37:57 UTC (rev 68951)
@@ -1,6 +0,0 @@
-post_install() {
- echo "You must create a symlink from /home/httpd/html/mythweb/video_dir"
- echo "to your MythTV recordings directory. Don't forget to change the"
- echo "permissions so that the webserver can read those files and create"
- echo "thumbnails."
-}
Deleted: mythweb.conf.apache
===================================================================
--- mythweb.conf.apache 2010-02-15 12:20:50 UTC (rev 68950)
+++ mythweb.conf.apache 2010-02-15 13:37:57 UTC (rev 68951)
@@ -1,210 +0,0 @@
-#
-# Apache configuration directives for MythWeb. Please read INSTALL for setup
-# requirements and troubleshooting, along with the comments in this file.
-#
-
-############################################################################
-# If you intend to use authentication for MythWeb (see below), you will
-# probably also want to uncomment the following rules, which disable
-# authentication for MythWeb's download URLs so you can properly stream
-# to media players that don't work with authenticated servers.
-#
-# <LocationMatch .*/pl/stream/[0-9]+/[0-9]+>
-# Allow from all
-# </LocationMatch>
-#
-# <LocationMatch .*/music/stream.php>
-# Allow from all
-# </LocationMatch>
-
-
-#
-# CHANGE THESE PATHS TO MATCH YOUR MYTHWEB INSTALLATION DIRECTORY! e.g.
-#
-# /var/www
-# /home/www/htdocs
-# /var/www/html/mythweb
-# /srv/www/htdocs/mythweb
-#
- <Directory "/srv/http/mythweb/data">
- Options -All +FollowSymLinks +IncludesNoExec
- </Directory>
- <Directory "/srv/http/mythweb" >
-
- ############################################################################
- # I *strongly* urge you to turn on authentication for MythWeb. It is disabled
- # by default because it requires you to set up your own password file. Please
- # see the man page for htdigest and then configure the following four directives
- # to suit your authentication needs.
- #
- # AuthType Digest
- # AuthName "MythTV"
- # AuthUserFile /var/www/htdigest
- # Require valid-user
- # BrowserMatch "MSIE" AuthDigestEnableQueryStringHack=On
- # Order allow,deny
- # Satisfy any
- #
- # * If you're running Apache earlier than 2.2, you will need to use
- # the AuthDigestFile command instead of AuthUserFile (3rd line above).
- #
- ############################################################################
- # Some special instructions for the MythWeb controller files
- #
- <Files mythweb.*>
-
- #
- # Use the following environment settings to tell MythWeb where you want it to
- # look to connect to the database, the name of the database to connect to, and
- # the authentication info to use to connect. The defaults will usually work
- # fine unless you've changed mythtv's mysql.txt file, or are running MythWeb on
- # a different server from your main backend. Make sure you have mod_env enabled.
- #
- setenv db_server "localhost"
- setenv db_name "mythconverg"
- setenv db_login "mythtv"
- setenv db_password "mythtv"
-
- #
- # By default, MythWeb uses the hostname program to look up the hostname of the
- # machine it runs on. If this reports incorrect data, or you run MythWeb on a
- # machine without the hostname program, set this to your current hostname.
- #
- # setenv hostname "my_mythbox"
- #
-
- # By default, php will always search the current directory for include files,
- # but if you wish to install these directories outside of the current path
- # (eg. for security reasons), set this variable to the directory that
- # contains the directories like languages and templates. eg.
- #
- # setenv include_path "/usr/share/mythweb"
-
- # If you want MythWeb to email php/database errors (and a backtrace) to you,
- # uncomment and set the email address below.
- #
- # setenv error_email "mythweb_errors at example.com"
- #
-
- # If your local file system is something other than UTF-8, set this variable
- # so that the music and video portions of MythWeb can provide proper links
- # to your downloadable files.
- #
- # setenv fs_encoding "ISO-8859-1"
-
- </Files>
-
- ############################################################################
- # The following settings relate to PHP config.
- #
-
- <Files *.php>
-
- # These settings are intended for apache 2.x. If your version of apache
- # doesn't support php_value, or things like memory_limit aren't working
- # as expected, then use these settings as examples for your own php.ini
- # files.
- php_value safe_mode 0
- php_value register_globals 0
- php_value magic_quotes_gpc 0
- php_value file_uploads 0
- php_value allow_url_fopen On
-
- php_value zlib.output_handler Off
- php_value output_handler NULL
-
- # If you have a large number of channels, you may need to increase this
- # value to prevent PHP from running out of memory.
- php_value memory_limit 64M
-
- # Note: php_flag does not work in older versions of php
- php_flag output_handler "NULL"
-
- </Files>
-
- ############################################################################
- # The settings below relate specifically to mod_rewrite and the rewrite
- # engine used to make the MythWeb user experience a little easier to deal
- # with by simplifying the URLs needed to access the various sections. Do
- # not touch these settings unless you really know what you're doing..
- #
-
- # Turn on the rewrite engine
- RewriteEngine on
-
- # If MythWeb is installed outside of the document root (eg. using Alias) then
- # you will need to set this directive to the base URL that MythWeb is visible
- # from externally. If you do not, the web server will return 'not found'.
- # RewriteBase /mythweb
-
- # Skip out early if we've already been through rewrites,
- # or if this is a /css/, /js/ or /cache/ directory request.
- RewriteRule ^(css|data|images|js|themes|skins|README|INSTALL|[a-z_]+\.(php|pl))(/|$) - [L]
-
- # Redirect /pl/ requests to the perl cgi handler.
- RewriteRule ^(pl(/.*)?)$ mythweb.pl/$1 [QSA,L]
-
- # Redirect most of the remaining URL requests to the main mythweb script.
- # It will then handle any requests given to it.
- RewriteRule ^(.+)$ mythweb.php/$1 [QSA,L]
-
- # If you're experiencing trouble with the previous two lines in your copy of
- # apache, you could instead use something like:
- # RewriteRule ^(pl(/.*)?)$ mythweb.pl?PATH_INFO=/$1 [L,QSA]
- # RewriteRule ^(.+)$ mythweb.php?PATH_INFO=/$1 [L,QSA]
-
- # Catch anything else that comes through and send it to mythweb.php with no parameters.
- RewriteRule ^(.*)$ mythweb.php [QSA,L]
-
- ############################################################################
- # You really shouldn't need to edit anything below this line, so please
- # don't unless you know what you're doing.
- #
-
- # Allow .htaccess to override whatever it wants from the server config.
- AllowOverride All
-
- # Allow browsers to follow symlinks that point outside of the web document
- # tree. This is how we access music, videos, etc.
- Options FollowSymLinks
-
- # MythTV now uses the correct file suffix for mpeg files, so all .nuv files
- # should actually be NuppleVideo. However, apache probably doesn't know what
- # those are, so we should tell it.
- AddType video/nuppelvideo .nuv
-
- # Specify the MIME type for favicon.ico in case the server configuration
- # doesn't or in case the server configuration uses the IANA-approved MIME type
- # (image/vnd.microsoft.icon)--which most browsers won't recognize.
- AddType image/x-icon .ico
-
- # Enable mod_deflate. This works MUCH more reliably than PHP's built-in
- # gzip/Zlib compressors. It is disabled here because many distros seem not
- # to enable mod_deflate by default, but I strongly recommend that you
- # enable this section.
- #
- # BrowserMatch ^Mozilla/4 gzip-only-text/html
- # BrowserMatch ^Mozilla/4\.0[678] no-gzip
- # BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
- #
- # AddOutputFilterByType DEFLATE text/html
- # AddOutputFilterByType DEFLATE text/css
- # AddOutputFilterByType DEFLATE application/x-javascript
-
- # This is helpful for mod_deflate -- it prevents proxies from changing
- # the user agent to/from this server, which can prevent compression from
- # being enabled. It is disabled here because many distros seem not to
- # enable mod_headers by default, but I recommend that you enable it.
- #
- # Header append Vary User-Agent env=!dont-vary
-
- # Set up the perl handler so we can stream properly. Do not use mod_perl
- # because it has a tendency to hold onto child processes, which causes
- # problems if the browser closes on an in-progress stream.
- #
- <Files *.pl>
- SetHandler cgi-script
- Options +ExecCGI
- </Files>
-
- </Directory>
More information about the arch-commits
mailing list