From e292ab7f897ae23e1516432d92c0b4aa239e097e Mon Sep 17 00:00:00 2001 From: Cecil <knoppmyth@gmail.com> Date: Wed, 29 Dec 2010 01:03:27 -0800 Subject: mythtv:initial switch from SVN to Git (still have clean up todo). --- abs/core/mythtv/stable-0.24/mythtv/PKGBUILD | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD index 2fb4000..65fc538 100755 --- a/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD @@ -5,8 +5,8 @@ # Contributor: dorphell <dorphell@archlinux.org> pkgname=mythtv -pkgver=0.24 -pkgrel=8 +pkgver=20101229 +pkgrel=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') url="http://www.mythtv.org/" @@ -28,10 +28,9 @@ optdepends=('xmltv: to download tv listings') #replaces=('mythtv-contrib') #conflicts=('mythtv-contrib') source=('mythbackend' 'myth.sh' `echo ${patchs[@]:0}` 'mythbackend.lr' 'mythfrontend.lr' 'pretty') - +_gitroot="https://github.com/MythTV/mythtv.git" +_gitname="${pkgname}" build() { - _svntrunk="http://svn.mythtv.org/svn/branches/release-0-24-fixes" - _svnmod="${pkgname}" # get clean copy from SVN repo if [ -d "${srcdir}/${pkgname}" ] @@ -39,12 +38,13 @@ build() { cd "${srcdir}/${pkgname}" msg "Clean up previous build..." make distclean - msg "Updating from SVN..." - svn up + msg "Updating from GIT..." + git pull origin + msg "The local files are updated." else cd "${srcdir}" - msg "Checking Out from SVN..." - svn co "${_svntrunk}/${_svnmod}" + msg "Cloning from GIT..." + git clone $_gitroot $_gitname cd "${srcdir}/${pkgname}" fi -- cgit v0.12 From 354311cc3d8ce3d9dc76128c78afa0eaae285d34 Mon Sep 17 00:00:00 2001 From: Cecil <knoppmyth@gmail.com> Date: Wed, 29 Dec 2010 02:11:34 -0800 Subject: mythtv:more updates from switch to GIT. --- abs/core/mythtv/stable-0.24/mythtv/PKGBUILD | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD index 65fc538..e7c6359 100755 --- a/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD @@ -35,19 +35,21 @@ build() { # get clean copy from SVN repo if [ -d "${srcdir}/${pkgname}" ] then - cd "${srcdir}/${pkgname}" + cd "${srcdir}/${pkgname}"/mythtv msg "Clean up previous build..." - make distclean + #make distclean + cd "${srcdir}/${pkgname}" msg "Updating from GIT..." - git pull origin + #git checkout -b 0.24-fixes origin/fixes/0.24 + git pull msg "The local files are updated." else cd "${srcdir}" msg "Cloning from GIT..." git clone $_gitroot $_gitname - cd "${srcdir}/${pkgname}" + cd "${srcdir}/${pkgname}" && git checkout origin/fixes/0.24 fi - + cd "${srcdir}/${pkgname}"/mythtv # apply patches echo "--------------------------applying patches----------------------------------------------------" for i in `echo ${patchs[@]:0} ` -- cgit v0.12 From cfb9728fa1e975be5211c86b6036909528004d52 Mon Sep 17 00:00:00 2001 From: James Meyer <jams@linhes.org> Date: Wed, 29 Dec 2010 15:12:00 +0000 Subject: remove syslinux from core --- abs/core/syslinux/PKGBUILD | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 abs/core/syslinux/PKGBUILD diff --git a/abs/core/syslinux/PKGBUILD b/abs/core/syslinux/PKGBUILD deleted file mode 100644 index 406f72d..0000000 --- a/abs/core/syslinux/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $ -# Contributor: lowercase -# Maintainer: Dale Blount <dale@archlinux.org> -pkgname=syslinux -pkgver=3.60 -pkgrel=1 -arch=('i686' 'x86_64') -pkgdesc="a boot loader for the Linux operating system which operates off an MS-DOS/Windows FAT filesystem." -url="http://syslinux.org" -license=(GPL) -depends=('mtools' 'glibc') -makedepends=(nasm perl) -conflicts=() -replaces=() -backup=() -install= -source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-$pkgver.tar.bz2) -md5sums=('96e11c6baa87a937b0726b07d687cb7b') - -build() { - cd $startdir/src/$pkgname-$pkgver - make || return 1 - make SBINDIR=$startdir/pkg/usr/sbin BINDIR=$startdir/pkg/usr/bin LIBDIR=$startdir/pkg/usr/lib INCDIR=$startdir/pkg/usr/include MANDIR=$startdir/pkg/usr/share/man install - install -m755 mkdiskimage $startdir/pkg/usr/bin || return 1 -} -- cgit v0.12 From 6bc8f86e4478eed52a0d76c142224de652cad354 Mon Sep 17 00:00:00 2001 From: Cecil <knoppmyth@gmail.com> Date: Wed, 29 Dec 2010 16:31:58 -0800 Subject: mythtv:completes the change from SVN to GIT. --- abs/core/mythtv/stable-0.24/mythtv/PKGBUILD | 28 +++++++--------------- .../mythtv/stable-0.24/mythtv/git_version.patch | 12 ++++++++++ 2 files changed, 21 insertions(+), 19 deletions(-) create mode 100644 abs/core/mythtv/stable-0.24/mythtv/git_version.patch diff --git a/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD index e7c6359..0969b1d 100755 --- a/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD +++ b/abs/core/mythtv/stable-0.24/mythtv/PKGBUILD @@ -5,8 +5,8 @@ # Contributor: dorphell <dorphell@archlinux.org> pkgname=mythtv -pkgver=20101229 -pkgrel=1 +pkgver=0.24 +pkgrel=11 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') url="http://www.mythtv.org/" @@ -23,33 +23,21 @@ groups=('pvr') #options=(!strip) #MAKEFLAGS="-j6" install='mythtv.install' -patchs=('smolt_jump.patch') +patchs=('smolt_jump.patch' 'git_version.patch') optdepends=('xmltv: to download tv listings') #replaces=('mythtv-contrib') #conflicts=('mythtv-contrib') -source=('mythbackend' 'myth.sh' `echo ${patchs[@]:0}` 'mythbackend.lr' 'mythfrontend.lr' 'pretty') +source=(http://knoppmyth.net/R6/sources/mythtv-0.24-fixes.tar.bz2 + 'mythbackend' 'myth.sh' `echo ${patchs[@]:0}` 'mythbackend.lr' 'mythfrontend.lr' 'pretty') _gitroot="https://github.com/MythTV/mythtv.git" _gitname="${pkgname}" build() { - # get clean copy from SVN repo - if [ -d "${srcdir}/${pkgname}" ] - then cd "${srcdir}/${pkgname}"/mythtv - msg "Clean up previous build..." - #make distclean - cd "${srcdir}/${pkgname}" msg "Updating from GIT..." #git checkout -b 0.24-fixes origin/fixes/0.24 git pull msg "The local files are updated." - else - cd "${srcdir}" - msg "Cloning from GIT..." - git clone $_gitroot $_gitname - cd "${srcdir}/${pkgname}" && git checkout origin/fixes/0.24 - fi - cd "${srcdir}/${pkgname}"/mythtv # apply patches echo "--------------------------applying patches----------------------------------------------------" for i in `echo ${patchs[@]:0} ` @@ -80,7 +68,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}" + cd "${srcdir}/${pkgname}"/mythtv # basic install make INSTALL_ROOT="${pkgdir}" install # install contrib files @@ -107,9 +95,11 @@ package() { mkdir -p ${pkgdir}/etc/cron.hourly/ install -m0755 ${srcdir}/pretty ${pkgdir}/etc/cron.hourly/ } -md5sums=('7ef6de58240e7aad389a0b13d91b1cf6' +md5sums=('91488a6b1b05d14c5c5c601908b699e5' + '7ef6de58240e7aad389a0b13d91b1cf6' '2babd4b8e146a7538d18dcd55695b0be' 'a837de9ccc201994320071e48952b17d' + 'ca4a87383c47f51c71151c8fb50f38cc' 'f735805a80b0d1180dee01f9df1b7004' 'f407d6af23e74a49540755420f84fa58' '5469d9921b726db750b991c87d226158') diff --git a/abs/core/mythtv/stable-0.24/mythtv/git_version.patch b/abs/core/mythtv/stable-0.24/mythtv/git_version.patch new file mode 100644 index 0000000..096a644 --- /dev/null +++ b/abs/core/mythtv/stable-0.24/mythtv/git_version.patch @@ -0,0 +1,12 @@ +diff -ruaN mythtv.orig/mythtv/version.sh mythtv/mythtv/version.sh +--- version.sh 2010-12-29 22:27:10.000000000 +0000 ++++ version.sh 2010-12-29 23:36:19.000000000 +0000 +@@ -22,7 +22,7 @@ + + cd ${GITTREEDIR} + +-SOURCE_VERSION=$(git describe --dirty || echo Unknown) ++SOURCE_VERSION=$(git describe | cut -d- -f 3 || echo Unknown) + + case "${SOURCE_VERSION}" in + exported|Unknown) -- cgit v0.12 From 59010329b62fd4b51dbbea1d00ec5541fd2a81a2 Mon Sep 17 00:00:00 2001 From: Cecil <knoppmyth@gmail.com> Date: Wed, 29 Dec 2010 17:14:36 -0800 Subject: mythplugins:Switch to GIT. --- abs/core/mythtv/stable-0.24/mythplugins/PKGBUILD | 61 ++++++++---------------- 1 file changed, 20 insertions(+), 41 deletions(-) diff --git a/abs/core/mythtv/stable-0.24/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.24/mythplugins/PKGBUILD index 6970b71..bede955 100644 --- a/abs/core/mythtv/stable-0.24/mythplugins/PKGBUILD +++ b/abs/core/mythtv/stable-0.24/mythplugins/PKGBUILD @@ -11,10 +11,9 @@ pkgname=('mytharchive' 'mythnews' 'mythvideo' 'mythweather' - 'mythweb' 'mythzoneminder') pkgver=0.24 -pkgrel=8 +pkgrel=9 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') @@ -24,26 +23,17 @@ makedepends=("mythtv>=${pkgver}" 'mplayer' 'fftw' 'dvdauthor' 'libexif' 'libvisual' 'perl-xml-xpath' 'perl-image-size' 'perl-class-inspector' 'perl-datetime-format-iso8601' 'flac' 'libvorbis' 'python2' 'python-pycurl' 'python-oauth') +source=(http://knoppmyth.net/R6/sources/mythtv-0.24-fixes.tar.bz2) +_gitroot="https://github.com/MythTV/mythtv.git" +_gitname="mythtv" build() { - _svntrunk="http://svn.mythtv.org/svn/branches/release-0-24-fixes" - _svnmod="${pkgbase}" - - # get clean copy from SVN repo - if [ -d "${srcdir}/${pkgbase}" ] - then - cd "${srcdir}/${pkgbase}" - echo "Updating from SVN..." - svn up - else - cd "${srcdir}" - echo "Checking Out from SVN..." - svn co "${_svntrunk}/${_svnmod}" - fi - - cd "${srcdir}/${pkgbase}" + cd "${srcdir}/mythtv" + msg "Updating from GIT..." + git pull + msg "The local files are updated." find . -name '*.py' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' - + cd ${pkgbase} ./configure --prefix=/usr \ --enable-all @@ -55,7 +45,7 @@ package_mytharchive() { 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}/mytharchive" + cd "${srcdir}/mythtv/${pkgbase}/mytharchive" make INSTALL_ROOT="${pkgdir}" install || return 1 } @@ -63,7 +53,7 @@ package_mythbrowser() { pkgdesc="Mini web browser for MythTV" depends=("mythtv>=${pkgver}") # replaces=('mythbrowser') - cd "${srcdir}/${pkgbase}/mythbrowser" + cd "${srcdir}/mythtv/${pkgbase}/mythbrowser" make INSTALL_ROOT="${pkgdir}" install || return 1 } @@ -71,7 +61,7 @@ package_mythgallery() { pkgdesc="Image gallery plugin for MythTV" depends=("mythtv>=${pkgver}" 'libexif') # replaces=('mythgallery') - cd "${srcdir}/${pkgbase}/mythgallery" + cd "${srcdir}/mythtv/${pkgbase}/mythgallery" make INSTALL_ROOT="${pkgdir}" install || return 1 } @@ -79,7 +69,7 @@ package_mythgame() { pkgdesc="Game emulator module for MythTV" depends=("mythtv>=${pkgver}" 'zlib') # replaces=('mythgame') - cd "${srcdir}/${pkgbase}/mythgame" + cd "${srcdir}/mythtv/${pkgbase}/mythgame" make INSTALL_ROOT="${pkgdir}" install || return 1 } @@ -87,7 +77,7 @@ package_mythmusic() { pkgdesc="Music playing plugin for MythTV" depends=("mythtv>=${pkgver}" 'flac' 'libvorbis' 'libcdaudio' 'cdparanoia' 'taglib' 'libvisual') # replaces=('mythmusic') - cd "${srcdir}/${pkgbase}/mythmusic" + cd "${srcdir}/mythtv/${pkgbase}/mythmusic" make INSTALL_ROOT="${pkgdir}" install || return 1 } @@ -95,7 +85,7 @@ package_mythnetvision() { pkgdesc="MythNetvision plugin for MythTV" depends=("mythtv>=${pkgver}" 'python-pycurl' 'python-oauth') # replaces=('mythnetvision') - cd "${srcdir}/${pkgbase}/mythnetvision" + cd "${srcdir}/mythtv/${pkgbase}/mythnetvision" make INSTALL_ROOT="${pkgdir}" install || return 1 } @@ -103,7 +93,7 @@ package_mythnews() { pkgdesc="News checking plugin for MythTV" depends=("mythtv>=${pkgver}") # replaces=('mythnews') - cd "${srcdir}/${pkgbase}/mythnews" + cd "${srcdir}/mythtv/${pkgbase}/mythnews" make INSTALL_ROOT="${pkgdir}" install || return 1 } @@ -111,7 +101,7 @@ package_mythvideo() { pkgdesc="Video playback and browsing plugin for MythTV" depends=("mythtv>=${pkgver}" 'mplayer' 'perl-xml-simple') # replaces=('mythvideo') - cd "${srcdir}/${pkgbase}/mythvideo" + cd "${srcdir}/mythtv/${pkgbase}/mythvideo" make INSTALL_ROOT="${pkgdir}" install || return 1 } @@ -119,27 +109,16 @@ package_mythweather() { pkgdesc="Weather checking plugin for MythTV" depends=("mythtv>=${pkgver}" 'perl-xml-xpath' 'perl-image-size' 'perl-class-inspector' 'perl-datetime-format-iso8601') # replaces=('mythweather') - cd "${srcdir}/${pkgbase}/mythweather" + cd "${srcdir}/mythtv/${pkgbase}/mythweather" make INSTALL_ROOT="${pkgdir}" install || return 1 } -package_mythweb() { - pkgdesc="Web interface for MythTV's backend" - depends=("mythtv>=${pkgver}") - optdepends=('php-apache' - 'lighttpd') -# replaces=('mythweb') - mkdir -p ${pkgdir}/data/srv/httpd/htdocs/mythweb/{image_cache,php_sessions} - cp -r ${srcdir}/mythplugins/mythweb/* ${pkgdir}/data/srv/httpd/htdocs/mythweb || return 1 - chown -R http:http ${pkgdir}/data/srv/httpd/htdocs/mythweb - chmod g+rw ${pkgdir}/data/srv/httpd/htdocs/mythweb/{image_cache,php_sessions,data} -} - package_mythzoneminder() { pkgdesc="Allows for viewing of CCTV cameras through zoneminder" depends=("mythtv>=${pkgver}" zoneminder) # replaces=('mythzoneminder') # install=mythplugins-mythzoneminder.install - cd "${srcdir}/${pkgbase}/mythzoneminder" + cd "${srcdir}/mythtv/${pkgbase}/mythzoneminder" make INSTALL_ROOT="${pkgdir}" install || return 1 } +md5sums=('91488a6b1b05d14c5c5c601908b699e5') -- cgit v0.12 From f51695ee1b4e0a2b3fab4cb8091d81054564d14c Mon Sep 17 00:00:00 2001 From: Cecil <knoppmyth@gmail.com> Date: Thu, 30 Dec 2010 20:52:18 -0800 Subject: mplayer:Latest SVN, updates to PKGBUILD so all deps are installed. --- abs/core/mplayer/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/abs/core/mplayer/PKGBUILD b/abs/core/mplayer/PKGBUILD index 0502f46..568a217 100644 --- a/abs/core/mplayer/PKGBUILD +++ b/abs/core/mplayer/PKGBUILD @@ -1,5 +1,5 @@ pkgname=mplayer -pkgver=32620 +pkgver=32736 pkgrel=1 pkgdesc="Famous multimedia player, dev. version, without its GUI" arch=('i686' 'x86_64') @@ -9,9 +9,9 @@ depends=('libxxf86dga' 'libxv' 'libmad' 'giflib' 'cdparanoia' 'gtk2' 'sdl' 'lame' 'libtheora' 'xvidcore' 'zlib' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'x264>=20101109' 'faac' 'lirc-utils' 'ttf-dejavu' 'libmng' 'libxfont' 'libjpeg' 'rtmpdump' 'ladspa' - 'mpg123' 'libbluray-git' 'libcdio') + 'mpg123' 'libbluray-git' 'libcdio' 'libdca' 'a52dec') license=('GPL') -makedepends=('libcaca' 'unzip' 'live-media' 'libdca' 'subversion' 'nvidia-utils') +makedepends=('libcaca' 'unzip' 'live-media' 'libdca' 'subversion' 'libvdpau') conflicts=('mplayer-nogui-svn') provides=('mplayer') -- cgit v0.12 From 784ded6c1174e139a116804fb9c124ea7c10e3cb Mon Sep 17 00:00:00 2001 From: Cecil <knoppmyth@gmail.com> Date: Fri, 31 Dec 2010 01:00:54 -0800 Subject: xbmc-svn:Removed. --- abs/extra/xbmc-svn/FEH.sh | 24 ------- abs/extra/xbmc-svn/PKGBUILD | 132 ------------------------------------ abs/extra/xbmc-svn/xbmc-svn.install | 28 -------- 3 files changed, 184 deletions(-) delete mode 100644 abs/extra/xbmc-svn/FEH.sh delete mode 100644 abs/extra/xbmc-svn/PKGBUILD delete mode 100644 abs/extra/xbmc-svn/xbmc-svn.install diff --git a/abs/extra/xbmc-svn/FEH.sh b/abs/extra/xbmc-svn/FEH.sh deleted file mode 100644 index e040a78..0000000 --- a/abs/extra/xbmc-svn/FEH.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -RETVAL=0 - -if [[ -z $(glxinfo | grep "direct rendering.*Yes" | uniq) ]]; then - echo "XBMC needs hardware accelerated OpenGL rendering." - echo "Install an appropriate graphics driver." - echo - echo "Please consult XBMC Wiki for supported hardware" - echo "http://xbmc.org/wiki/?title=Supported_hardware" - echo - RETVAL=1 -fi - -if [[ -z $(xdpyinfo | grep "depth of root.*24" | uniq) ]]; then - echo "XBMC cannot run unless the" - echo "screen color depth is atleast 24 bit." - echo - echo "Please reconfigure your screen." - RETVAL=1 -fi - -exit ${RETVAL} - diff --git a/abs/extra/xbmc-svn/PKGBUILD b/abs/extra/xbmc-svn/PKGBUILD deleted file mode 100644 index fa2be23..0000000 --- a/abs/extra/xbmc-svn/PKGBUILD +++ /dev/null @@ -1,132 +0,0 @@ -# Maintainer: DonVla <donvla@users.sourceforge.net> -# Contributor: BlackEagle < ike DOT devolder AT herecura DOT be > -# Contributor: Ulf Winkelvos <ulf [at] winkelvos [dot] de> -# Contributor: Ralf Barth <archlinux dot org at haggy dot org> -# Contributor: B - Thanks for your hints :) -# -# Original credits go to Edgar Hucek <gimli at dark-green dot com> -# for his xbmc-vdpau-vdr PKGBUILD at https://archvdr.svn.sourceforge.net/svnroot/archvdr/trunk/archvdr/xbmc-vdpau-vdr/PKGBUILD - -pkgname=xbmc-svn -pkgver=35648 -pkgrel=1 -pkgdesc="XBMC Media Center from SVN" -provides=('xbmc') -conflicts=('xbmc' 'xbmc-pulse') -arch=('i686' 'x86_64') -url="http://xbmc.svn.sourceforge.net/viewvc/xbmc/trunk" -license=('GPL' 'LGPL') -depends=('bzip2' 'faac' 'faad2' 'fribidi' 'glew' 'jasper' 'libass' 'libcdio' 'libgl' 'libmad' - 'libmicrohttpd-xbmc' 'libmms' 'libmodplug' 'libmpeg2' 'libmysqlclient' 'libsamplerate' 'libxrandr' - 'libxinerama' 'libxtst' 'lzo2' 'sdl_image>=1.2.10' 'sdl_mixer' 'smbclient' 'unzip' 'wavpack' 'mesa-demos') -makedepends=('cvs' 'boost' 'cmake' 'gperf' 'nasm' 'python2' 'subversion' 'zip') -optdepends=('avahi: to use zerconf features (remote, etc...)' - 'gdb: for meaningful backtraces in case of trouble - STRONGLY RECOMMENDED' - 'libssh: support for sshfs' - 'libvdpau: accelerated video playback for nvidia cards' - 'libva: accelerated video playback for nvidia, ati/amd and some intel cards' - 'lirc: remote controller support' - 'pulseaudio: pulseaudio support' - 'udisks: automount external drives' - 'upower: used to trigger suspend functionality' - 'unrar: access compressed files without unpacking them') -options=('makeflags') -install="${pkgname}.install" -source=("FEH.sh") -md5sums=('c3e2ab79b9965f1a4a048275d5f222c4') -sha256sums=('1b391dfbaa07f81e5a5a7dfd1288bf2bdeab8dc50bbb6dbf39a80d8797dfaeb0') - -_svnmod=XBMC -_prefix=/usr - -build() { - _svntrunk=http://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk - #_svntrunk=http://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma - - cd "${srcdir}/" - if [ -d "$_svnmod/.svn" ]; then - msg "SVN tree found, reverting changes and updating to -r$pkgver" - (cd "$_svnmod" && svn revert -R . && (make distclean || :); svn up -r "$pkgver") - else - msg "Checking out SVN tree of -r$pkgver" - svn co "$_svntrunk" --config-dir ./ -r "$pkgver" "$_svnmod" - fi - - # Configure XBMC - # - # Note on external-libs: - # - We cannot use external python because Arch's python was built with - # UCS2 unicode support, whereas xbmc expects UCS4 support - cd "${srcdir}/${_svnmod}" - - # Archlinux Branding by SVN_REV - export SVN_REV="${pkgver}-ARCH" - # fix lsb_release dependency - sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp - - # remove "--as-needed" from LDFLAGS - unset LDFLAGS; LDFLAGS="-Wl,--hash-style=gnu" - - msg "Bootstrapping XBMC" - ./bootstrap - - msg "Configuring XBMC" - ./configure --prefix="${_prefix}" --disable-hal \ - --enable-external-libraries \ - --disable-external-ffmpeg \ - --disable-external-python \ - --enable-webserver \ - --enable-debug \ -# --disable-rtmp - - # Now (finally) build - msg "Running make" - make ${MAKEFLAGS} - make -C lib/addons/script.module.pil - make -C lib/addons/script.module.pysqlite -} - -package() { - - cd "${srcdir}/${_svnmod}" - msg "Running make install" - make prefix="${pkgdir}${_prefix}" install - -# Replace FEH.py with FEH.sh (and thus remove external python dependency) - install -D -m 0755 "${srcdir}/FEH.sh" "${pkgdir}${_prefix}/share/xbmc/FEH.sh" - sed -i -e 's/^python \(.*\)FEH.py \(.*\)$/\1FEH.sh \2/' "${pkgdir}${_prefix}/bin/xbmc" - -# lsb_release fix - sed -i -e 's/which lsb_release &> \/dev\/null/\[ -f \/etc\/arch-release ]/g' "${pkgdir}${_prefix}/bin/xbmc" - sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/ \/'/cat \/etc\/arch-release/g" "${pkgdir}${_prefix}/bin/xbmc" - -# .desktop files - install -D -m 0644 "${srcdir}/${_svnmod}/tools/Linux/xbmc.desktop" "${pkgdir}${_prefix}/share/applications/xbmc.desktop" - install -D -m 0644 "${srcdir}/${_svnmod}/tools/Linux/xbmc-48x48.png" "${pkgdir}${_prefix}/share/pixmaps/xbmc.png" - -# Tools - install -D -m 0755 "${srcdir}/${_svnmod}/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr" - install -D -m 0755 "${srcdir}/${_svnmod}/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/" - -# Licenses - install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${pkgname}" - for licensef in LICENSE.GPL copying.txt; do - mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${pkgname}" - done - -# Docs - install -d -m 0755 "${pkgdir}${_prefix}/share/doc/${pkgname}" - for docsf in keymapping.txt README.linux; do - mv "${pkgdir}${_prefix}/share/doc/xbmc/${docsf}" "${pkgdir}${_prefix}/share/doc/${pkgname}" - done - -# cleanup some stuff - msg "Cleanup unneeded files" - rm -rf "${pkgdir}/usr/share/xsessions" - rm -f "${pkgdir}/usr/share/xbmc/FEH.py" - rm -f "${pkgdir}/usr/share/icons/hicolor/icon-theme.cache" - -# strip - msg "Stripping binaries" - find "$pkgdir" -type f -exec strip {} \; >/dev/null 2>/dev/null -} diff --git a/abs/extra/xbmc-svn/xbmc-svn.install b/abs/extra/xbmc-svn/xbmc-svn.install deleted file mode 100644 index 9d24167..0000000 --- a/abs/extra/xbmc-svn/xbmc-svn.install +++ /dev/null @@ -1,28 +0,0 @@ -post_install() { - echo ">> If XBMC won't start, but just segfaults, double check your X.Org config." - echo ">> The display depth has to be at least 24-bit, ie" - echo ">> set \"DefaultDepth 24\" under the \"Screen\" section of your xorg.conf file." - echo ">> If you have problems or suggestions for this PKGBUILD, have a look at its" - echo ">> dedicated forum thread: http://bbs.archlinux.org/viewtopic.php?pid=559107" - echo ">> or the wiki: http://xbmc.org/wiki/?title=XBMC_on_Arch_Linux_(Unofficial)." - echo ">> Note that this is a development version of XBMC." - echo ">> If you encounter problems with XBMC don't forget to consult the official" - echo ">> xbmc forums found here: http://forum.xbmc.org " - echo ">> and report bugs to the xbmc bugtracker found here: http://trac.xbmc.org." - echo - - [[ $(type -p gtk-update-icon-cache) ]] && /usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor - [[ $(type -p update-desktop-database) ]] && /usr/bin/update-desktop-database -q usr/share/applications -} - -post_upgrade() { - [[ $(type -p gtk-update-icon-cache) ]] && /usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor - [[ $(type -p update-desktop-database) ]] && /usr/bin/update-desktop-database -q usr/share/applications -} - -post_remove() { - [[ $(type -p gtk-update-icon-cache) ]] && /usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor - [[ $(type -p update-desktop-database) ]] && /usr/bin/update-desktop-database -q usr/share/applications -} - -# vim:set ts=2 sw=2 et: -- cgit v0.12 From 8e8a41b22c1ca44dfe29e3679aaa1c612ac5e6d0 Mon Sep 17 00:00:00 2001 From: Cecil <knoppmyth@gmail.com> Date: Sat, 1 Jan 2011 15:00:33 -0800 Subject: mythweb:switch to git. --- abs/core/mythtv/stable-0.24/mythweb/PKGBUILD | 42 ++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 abs/core/mythtv/stable-0.24/mythweb/PKGBUILD diff --git a/abs/core/mythtv/stable-0.24/mythweb/PKGBUILD b/abs/core/mythtv/stable-0.24/mythweb/PKGBUILD new file mode 100644 index 0000000..59ba653 --- /dev/null +++ b/abs/core/mythtv/stable-0.24/mythweb/PKGBUILD @@ -0,0 +1,42 @@ +pkgname=mythweb +pkgver=0.24 +pkgrel=9 +pkgdesc="Web interface for MythTV's backend" +url="http://www.mythtv.org" +license="GPL" +arch=('i686' 'x86_64') + +depends=('mythtv>=0.24' 'lighttpd' 'php' 'local-website') +groups=('mythtv-extras') + +patches=() +source=('ftp://ftp.knoppmyth.net/R6/sources/mythweb-0.24-fixes.tar.bz2' `echo${patches[@]:0}`) + +DOCROOT=/data/srv/httpd/htdocs/mythweb +_gitroot="https://github.com/mythtv/mythweb.git" +_gitname="${pkgname}" +build() { + + cd $startdir/src/mythweb + git pull + + echo "--------------------------applying patches----------------------------------------------------" + for i in `echo ${patches[@]:0} ` + do + echo applying $i + echo "-----------------------------" + patch -Np0 -i ${startdir}/src/$i || return 1 + done + echo "--------------------------done applying patches-----------------------------------------------" + + [ "$CARCH" = "i686" ] && ARCH="i686" + [ "$CARCH" = "x86_64" ] && ARCH="x86-64" + + mkdir -p $startdir/pkg/$DOCROOT/{image_cache,php_sessions,data} + rsync -arp --exclude .git --delete-excluded $startdir/src/mythweb/* $startdir/pkg/$DOCROOT + rm $startdir/pkg/$DOCROOT/README + chown -R http:http $startdir/pkg/$DOCROOT + chmod g+rw $pkgdir/$DOCROOT/{image_cache,php_sessions,data} + +} +md5sums=('45703fa3899c4ee84d1b087bfcc6654e') -- cgit v0.12 From 2882a54f6f4c17462d6f4321083cba124a0667d5 Mon Sep 17 00:00:00 2001 From: Cecil <knoppmyth@gmail.com> Date: Sat, 1 Jan 2011 17:19:00 -0800 Subject: myththemes:switch to git. --- abs/core/mythtv/stable-0.24/myththemes/PKGBUILD | 29 +++++++------------------ 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/abs/core/mythtv/stable-0.24/myththemes/PKGBUILD b/abs/core/mythtv/stable-0.24/myththemes/PKGBUILD index 7c19e5a..962d674 100644 --- a/abs/core/mythtv/stable-0.24/myththemes/PKGBUILD +++ b/abs/core/mythtv/stable-0.24/myththemes/PKGBUILD @@ -5,33 +5,19 @@ pkgname=myththemes pkgver=0.24 -pkgrel=6 +pkgrel=7 pkgdesc="Themes for MythTV" arch=('any') url="http://www.mythtv.org/" license=('GPL') depends=("mythtv>=${pkgver}") -source=(`echo ${patches[@]:0}`) - +source=('ftp://ftp.knoppmyth.net/R6/sources/myththemes-0.24-fixes.tar.bz2' `echo ${patches[@]:0}`) +_gitroot="https://github.com/MythTV/myththemes.git" +_gitname="${pkgname}" build() { - _svntrunk="http://svn.mythtv.org/svn/branches/release-0-24-fixes" - _svnmod="${pkgname}" - - # get clean copy from SVN repo - if [ -d "${srcdir}/${pkgname}" ] - then - cd "${srcdir}/${pkgname}" - msg "Clean up from previous build..." - make distclean - msg "Updating from SVN..." - svn up - else - cd "${srcdir}" - msg "Checking Out from SVN..." - svn co "${_svntrunk}/${_svnmod}" - cd "${srcdir}/${pkgname}" - fi - + cd $srcdir/myththemes + git pull + rm -fr Mythbuntu # apply patches echo "--------------------------applying patches----------------------------------------------------" for i in `echo ${patchs[@]:0} ` @@ -49,3 +35,4 @@ package() { cd "${srcdir}/${pkgname}" make INSTALL_ROOT="${pkgdir}" install || return 1 } +md5sums=('a5c9475a6d29c313cd9ae77566ee277a') -- cgit v0.12 From aa74f2cfb3f029d18d4d97da4796d8a7cf4c16ab Mon Sep 17 00:00:00 2001 From: James Meyer <jams@linhes.org> Date: Sun, 2 Jan 2011 23:03:08 +0000 Subject: runit-scripts: lirc: mkdir /var/run/lirc if not present switch location of lircd to /var/run/lirc/lircd this is the new default. --- abs/core/runit-scripts/PKGBUILD | 2 +- abs/core/runit-scripts/runitscripts/services/lircd/run | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index 39368bb..6f1e24f 100755 --- a/abs/core/runit-scripts/PKGBUILD +++ b/abs/core/runit-scripts/PKGBUILD @@ -1,6 +1,6 @@ pkgname=runit-scripts pkgver=2.1.1 -pkgrel=12 +pkgrel=14 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" license="BSD" diff --git a/abs/core/runit-scripts/runitscripts/services/lircd/run b/abs/core/runit-scripts/runitscripts/services/lircd/run index 3ff8af3..e0d468e 100755 --- a/abs/core/runit-scripts/runitscripts/services/lircd/run +++ b/abs/core/runit-scripts/runitscripts/services/lircd/run @@ -31,6 +31,7 @@ else stat_runit "Starting lirc" [ -e /etc/sv/lircd/.runtime ] || mkdir -p /etc/sv/lircd/.runtime + [ -e /var/run/lirc ] || mkdir -p /var/run/lirc function dvico_detect { if [ x$Remotetype = "xdvico" ] || [ x$Remotetype = "xDvico-Dual-Digital4-rev2" ] @@ -108,7 +109,7 @@ else for i in `seq 1 $num_lirc` do - CMD="/usr/sbin/lircd -r -d /dev/lirc$i --output=/dev/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i" + CMD="/usr/sbin/lircd -r -d /dev/lirc$i --output=/var/run/lirc/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i" printhl " Device $i" #echo $CMD $CMD >>$LOG 2>>$LOG @@ -119,9 +120,9 @@ else then if [ x$Remotetype = "xdvico" ] then - LCMD="/usr/sbin/lircd -r -n -d /dev/usb/dvicoIR --driver=dvico --output /dev/lircd" + LCMD="/usr/sbin/lircd -r -n -d /dev/usb/dvicoIR --driver=dvico --output /var/run/lirc/lircd" else - LCMD="/usr/sbin/lircd -r -n -d /dev/input/irremote --driver=devinput --output /dev/lircd" + LCMD="/usr/sbin/lircd -r -n -d /dev/input/irremote --driver=devinput --output /var/run/lirc/lircd" fi if [ $num_lirc -lt 0 ] @@ -133,14 +134,14 @@ else elif [ $num_lirc -gt -1 ] then i=$((i+1)) - CMD="$LCMD --output=/dev/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i" + CMD="$LCMD --output=/var/run/lirc/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i" $CMD >> $LOG LASTCMD="--connect=localhost:876$i $LASTCMD " printhl " Device Dvico" - /usr/sbin/lircd -r -n -d /dev/lirc0 --output /dev/lircd $LASTCMD >>$LOG 2>>$LOG + /usr/sbin/lircd -r -n -d /dev/lirc0 --output /var/run/lirc/lircd $LASTCMD >>$LOG 2>>$LOG fi else - LCMD="/usr/sbin/lircd -r -n -d /dev/lirc0 --output /dev/lircd $LASTCMD" + LCMD="/usr/sbin/lircd -r -n -d /dev/lirc0 --output /var/run/lirc/lircd $LASTCMD" #echo $LCMD exec $LCMD >>$LOG 2>>$LOG fi -- cgit v0.12 From 6b7c25c3f550fba5dd38c2ad753c1f7eea1862f0 Mon Sep 17 00:00:00 2001 From: Cecil <knoppmyth@gmail.com> Date: Sun, 2 Jan 2011 16:11:29 -0800 Subject: Fixed URL for source. --- abs/extra/recode/PKGBUILD | 15 ++++++++------- abs/extra/recode/__changelog | 1 + 2 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 abs/extra/recode/__changelog diff --git a/abs/extra/recode/PKGBUILD b/abs/extra/recode/PKGBUILD index f7fd237..af65e17 100644 --- a/abs/extra/recode/PKGBUILD +++ b/abs/extra/recode/PKGBUILD @@ -3,7 +3,7 @@ pkgname=recode pkgver=3.6 -pkgrel=5 +pkgrel=6 pkgdesc="Converts files between various character sets and usages" arch=('i686' 'x86_64') url="http://www.gnu.org/software/recode/recode.html" @@ -11,16 +11,13 @@ license=('GPL' 'LGPL') depends=('glibc' 'texinfo') options=('!libtool') install=recode.install -source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz +#source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz +source=(ftp://ftp.knoppmyth.net/R6/sources/pinard-Recode-v3.6-0-g2127b34.tar.gz http://ftp.de.debian.org/debian/pool/main/r/recode/recode_3.6-15.diff.gz recode-3.6-as-if.patch recode-3.6-gettextfix.diff) -md5sums=('be3f40ad2e93dae5cd5f628264bf1877' - '95ca772e367a7ef56d3f46d724b6f86e' - 'fca7484ba332c8ad59eb02334883cd92' - 'eb602e80a24b5448604bfebeacc55304') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/pinard-Recode-2127b34 patch -Np1 -i ${srcdir}/recode-3.6-as-if.patch patch -Np1 -i ${srcdir}/recode-3.6-gettextfix.diff patch -Np1 -i ${srcdir}/recode_3.6-15.diff @@ -35,3 +32,7 @@ build() { rm ${pkgdir}/usr/share/info/dir gzip ${pkgdir}/usr/share/info/* } +md5sums=('f82e9a6ede9119268c13493c9add2809' + '95ca772e367a7ef56d3f46d724b6f86e' + 'fca7484ba332c8ad59eb02334883cd92' + 'eb602e80a24b5448604bfebeacc55304') diff --git a/abs/extra/recode/__changelog b/abs/extra/recode/__changelog new file mode 100644 index 0000000..af8fbcb --- /dev/null +++ b/abs/extra/recode/__changelog @@ -0,0 +1 @@ +1/2/11 - chw - fixed URL for source -- cgit v0.12 From 9735ec6c3a482ef7eedde158c8290cbb3a1e1f39 Mon Sep 17 00:00:00 2001 From: Cecil <knoppmyth@gmail.com> Date: Sun, 2 Jan 2011 16:48:00 -0800 Subject: xbmc:Changed dep to just mesa instead of mesa-demos. --- abs/extra/xbmc/PKGBUILD | 4 ++-- abs/extra/xbmc/__changelog | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 abs/extra/xbmc/__changelog diff --git a/abs/extra/xbmc/PKGBUILD b/abs/extra/xbmc/PKGBUILD index c8a3c44..13ca0c9 100644 --- a/abs/extra/xbmc/PKGBUILD +++ b/abs/extra/xbmc/PKGBUILD @@ -11,7 +11,7 @@ _prefix=/usr pkgname=xbmc pkgver=10.0 -pkgrel=2 +pkgrel=3 pkgdesc="XBMC Media Center" arch=('i686' 'x86_64') url="http://xbmc.org" @@ -20,7 +20,7 @@ depends=( 'bzip2' 'curl' 'enca' 'faac' 'faad2' 'fontconfig' 'fribidi' 'glew' 'jasper' 'libcdio' 'libgl' 'libmad' 'libmms' 'libmpeg2' 'libmysqlclient' 'libsamplerate' 'libxinerama' 'libxrandr' 'libxtst' 'lzo2' 'sdl_image' 'sdl_mixer' - 'smbclient' 'wavpack' 'mesa-demos' 'xorg-utils' 'libmicrohttpd' + 'smbclient' 'wavpack' 'mesa' 'xorg-utils' 'libmicrohttpd' 'libssh' 'libva' 'libmodplug' 'rtmpdump') if [ "$_ext_python" != "disable" ]; then depends=( '${depends[@]}' 'python2' ) diff --git a/abs/extra/xbmc/__changelog b/abs/extra/xbmc/__changelog new file mode 100644 index 0000000..b2533c9 --- /dev/null +++ b/abs/extra/xbmc/__changelog @@ -0,0 +1 @@ +1/2/11 - chw - change mesa-demo dep to just mesa (since we are still on 7.9). -- cgit v0.12 From 2c98861fb01578139b77030006e1f50ea8f2680c Mon Sep 17 00:00:00 2001 From: James Meyer <jams@linhes.org> Date: Mon, 3 Jan 2011 21:56:34 +0000 Subject: runit-scripts: mythbackend stop the backend from respawning to quickly. --- abs/core/runit-scripts/PKGBUILD | 2 +- .../runitscripts/services/mythbackend/finish | 36 ++++++++++++++++++++++ .../runitscripts/services/mythbackend/run | 4 +-- 3 files changed, 39 insertions(+), 3 deletions(-) create mode 100755 abs/core/runit-scripts/runitscripts/services/mythbackend/finish diff --git a/abs/core/runit-scripts/PKGBUILD b/abs/core/runit-scripts/PKGBUILD index 6f1e24f..56fbebc 100755 --- a/abs/core/runit-scripts/PKGBUILD +++ b/abs/core/runit-scripts/PKGBUILD @@ -1,6 +1,6 @@ pkgname=runit-scripts pkgver=2.1.1 -pkgrel=14 +pkgrel=17 pkgdesc="collection of startup scripts for runit" url="http://smarden.org/runit/" license="BSD" diff --git a/abs/core/runit-scripts/runitscripts/services/mythbackend/finish b/abs/core/runit-scripts/runitscripts/services/mythbackend/finish new file mode 100755 index 0000000..5258f27 --- /dev/null +++ b/abs/core/runit-scripts/runitscripts/services/mythbackend/finish @@ -0,0 +1,36 @@ +#!/bin/bash +exec 2>&1 +export TERM=linux +. /etc/rc.conf +. /etc/rc.d/functions + +function cleanup(){ + rm -f /etc/sv/mythbackend/.runtime/* + printhl " Cleaning up /etc/sv/mythbackend/.runtime/" +} + + +if [ ! -d /etc/sv/mythbackend/.runtime ] + then + mkdir -p /etc/sv/mythbackend/.runtime + fi + touch /etc/sv/mythbackend/.runtime/`date +%s` + sleep 0.2 + cdate=`date` + numfilestotal=`/usr/bin/file_time_offset.py -s0 -d/etc/sv/mythbackend/.runtime` + numfilesover10secondsold=`/usr/bin/file_time_offset.py -s10 -d/etc/sv/mythbackend/.runtime` + numfileslessthan10secondsold=$(($numfilestotal-$numfilesover10secondsold)) + if [ $numfileslessthan10secondsold -gt 4 ] + then + sv stop mythbackend + printhl " mythbackend disabled, due to many restarts." + logger " mythbackend disabled, due to many restarts." + printhl " Run \"sv start mythbackend\" to try again" + + cleanup + else + if [ $numfilestotal -gt 10 ] + then + cleanup + fi + fi \ No newline at end of file diff --git a/abs/core/runit-scripts/runitscripts/services/mythbackend/run b/abs/core/runit-scripts/runitscripts/services/mythbackend/run index 48c68d3..4bf54fb 100755 --- a/abs/core/runit-scripts/runitscripts/services/mythbackend/run +++ b/abs/core/runit-scripts/runitscripts/services/mythbackend/run @@ -12,8 +12,8 @@ if [ ! x$SystemType = xSlave_backend ] then sv start mysql > /dev/null 2>/dev/null #run mythfilldatabase - printhl " Running mythfilldatabase" - /usr/MythVantage/bin/initial_db_run & + #printhl " Running mythfilldatabase" + #/usr/MythVantage/bin/initial_db_run & fi mkfifo /tmp/mbefifo >/dev/null 2>/dev/null #echo "Starting mythbackend" -- cgit v0.12 From 1e9dea8744ac41a9ddd5356afa19ea453c6e4855 Mon Sep 17 00:00:00 2001 From: James Meyer <jams@linhes.org> Date: Mon, 3 Jan 2011 22:02:18 +0000 Subject: libmikmod: recompile to remove /usr/share/info --- abs/extra/libmikmod/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abs/extra/libmikmod/PKGBUILD b/abs/extra/libmikmod/PKGBUILD index eb124f3..129e226 100644 --- a/abs/extra/libmikmod/PKGBUILD +++ b/abs/extra/libmikmod/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=libmikmod pkgver=3.1.12 -pkgrel=1 +pkgrel=2 pkgdesc="A portable sound library" license=('GPL' 'LGPL') url="http://sourceforge.net/projects/mikmod/" -- cgit v0.12