From 82638e7cf91b4fc5035d4c223345c1a51416c8f8 Mon Sep 17 00:00:00 2001 From: Cecil Date: Mon, 27 Dec 2010 18:58:03 -0800 Subject: xbmc-svn:updated to latest SVN from AUR. --- abs/extra/xbmc-svn/CHANGELOG | 110 ----------------- abs/extra/xbmc-svn/FEH.sh | 24 ++++ abs/extra/xbmc-svn/Lircmap.xml | 233 ------------------------------------ abs/extra/xbmc-svn/PKGBUILD | 147 ++++++++++++++--------- abs/extra/xbmc-svn/__changelog | 1 - abs/extra/xbmc-svn/xbmc-svn.install | 27 ++++- 6 files changed, 136 insertions(+), 406 deletions(-) delete mode 100644 abs/extra/xbmc-svn/CHANGELOG create mode 100644 abs/extra/xbmc-svn/FEH.sh delete mode 100644 abs/extra/xbmc-svn/Lircmap.xml delete mode 100644 abs/extra/xbmc-svn/__changelog diff --git a/abs/extra/xbmc-svn/CHANGELOG b/abs/extra/xbmc-svn/CHANGELOG deleted file mode 100644 index ddcbd53..0000000 --- a/abs/extra/xbmc-svn/CHANGELOG +++ /dev/null @@ -1,110 +0,0 @@ -xbmc-svn Change log: --------------------- -2nd July 2009 -21333 haggy: updated to current svn head which has media flagging support if your skin - supports it (the shipped PM3HD does already, also Aeon and MediaStream redux) - -3rd June 2009 -20896 haggy: enabled external libs for every lib supported despite python and ffmpeg - enabling external python breaks python support in xbmc due to Arch's python - compiled with UCS2 support whereas xbmc expects UCS4. Enabling external ffmpeg - disables VDPAU and we don't want that for sure. - - IMPORTANT NOTE: If compilation breaks at configure step with some message about - not being able to compute the size of int or size_t, try running makepkg as root - with 'sudo makepkg --asroot'. This is a known issue and happens only on systems - linked to nvidia's libgl which causes binaries to segfault within a fakeroot - environment. pacman 3.3 will fix this by splitting configure and installation steps. - -1st June 2009 -20818 haggy: this is the last revision before external-libs-support got patched - in. Unfortunately this will not compile with fakeroot. waiting for - pacman 3.3 which can split up configure and make install steps. - -30th May 2009 -20793 haggy: removed gcc44-fixes.patch - got merged into svn - -29th May 2009 -20755 haggy: pushed rev as requested - -27th May 2009 -20705 haggy: added a patch which fixed compilation with GCC 4.4. - -21th May 2009 -20509 haggy: xbmc got updates on goom due to the jaunty build system update. i - i wiped all goom specific hacks from the PKGBUILD and it compiled - fine, so let's see what you guys achieve. - -19th May 2009 -20449-1 richy: 1. Removed the autoreconf line as it didn't seem to help - 2. Added !makeflags - 3. Rev push :-) - -16th May 2009 -20343-1 richy: 1. added python as a depenency and removed x-server (namcap advised), - 2. added autoreconf to goom before aclocal - another pot-shot at the goom compile prob. - 3. added flax and bison to makedepends - I thought they were implicitely provided, but - some users didn't have them. - 4. Rev push to 20343 - 5. Removed the --quiet flag form SVN for now as sourcforge was timing out and - failing silently. - - Note: namcap advised a number of other changes which I ignored for now. - -15th May 2009 -20231-3 - haggy: added libsamplerate as a dependency, it is needed for the recent smoothvideo patches - -14th May 2009 -20231-2 - haggy: another shot in the dark to fix that damn goom compilation error - -13th May 2009 -20231 - haggy: smoothvideo! - -12th May 2009 -20172 - haggy: a shot in the dark: try another autoreconf inside goom and see if it helps. - -11th May 2009 -20149 - haggy: pushed rev, removed 'hitting-o-breaks...'-patch - it got fixed in svn - -9th May 2009 -20101 - haggy: an updated PM3 skin made it into xbmc. added conflicts hint to this PKGBUILD - -8th May 2009 -20059 - haggy: minor push past 9.04, removed copying the source tree to a build tree which wastes space, - takes ages and stresses the hdd for no reason. instead we now use svn to revert to a - clean build dir. - -5th May 2009 -19941 - rich: heaps more tickets closed, Mexican translation - -30th April 2009 -19841 - haggy: lots of closed tickets worth a release, removed xsession patch - -27th April 2009 -19753 - haggy: added patch for xsession file breaking installation into fakeroot. - -22nd April 2009 -19602 - richy: version bump to address problem with python scripts and plugins - -20th April 2009 -19550 - haggy: pushed rev, some .mov fixes and better i18n in xbmc - -17th April 2009 -19517 - haggy: pushed rev, re-added installfile -19516-2- richy: Added back autoreconf -vif in libdvdcss - still required for some folk (me) -19516 - haggy: pushed rev, moved patches to patchfiles, added 'safe fullscreen patch', several cleanups - -15th April 2009 -19484 - haggy: pushed rev, re-enabled MAKEFLAGS to allow a more streamlined package - -14th April 2009 -19463 - haggy: added install file -19463 - richy: moved _svn* back inside build() on Haggy's suggestion. Let's try and avoid broken releases! -19463 - richy: makedepends 'subversion' instead of 'svn' because that's what's in the guidelines -19463 - richy: changed licens from ('GPL' 'custom') to ('GPL', 'LGPL') - See: http://xbmc.org/about/ - -13th April 2009 - initial upload to AUR, tested on 32bit and 64bit. -19444 - richy: Moved _svn* outside of build so that users get the latest SVN. -19444 - richy: Added a symlink for XBMCtex to usr/bin/XBMCtex -19444 - richy: Moved libcdio into depends from opt-depends - right now it is a dependency. - diff --git a/abs/extra/xbmc-svn/FEH.sh b/abs/extra/xbmc-svn/FEH.sh new file mode 100644 index 0000000..e040a78 --- /dev/null +++ b/abs/extra/xbmc-svn/FEH.sh @@ -0,0 +1,24 @@ +#!/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/Lircmap.xml b/abs/extra/xbmc-svn/Lircmap.xml deleted file mode 100644 index 600567f..0000000 --- a/abs/extra/xbmc-svn/Lircmap.xml +++ /dev/null @@ -1,233 +0,0 @@ - - - - - - - - - - - - - Pause - Stop - Forward - Rewind - Left - Right - Up - Down - - ChanUp - ChanDown - Back - PreviousMenu - Play - More - Skip - Replay - Teletext - Home - Record - VolUp - VolDown - Mute - Power - Videos - Music - Pictures - TV - One - Two - Three - Four - Five - Six - Seven - Eight - Nine - Zero - Red - Green - Yellow - Blue - - - - Pause - Stop - Forward - Rewind - Left - Right - Up - Down - - ChanUp - ChanDown - Back - PreviousMenu - Play - More - Skip - Replay - Teletext - Home - Record - VolUp - VolDown - Mute - Power - Videos - Music - Pictures - TV - One - Two - Three - Four - Five - Six - Seven - Eight - Nine - Zero - Red - Green - Yellow - Blue - - - - PLAY - PAUSE - STOP - FORWARD - REVERSE - LEFT - RIGHT - UP - DOWN - - BACK - MENU - TITLE - INFO - SKIP+ - SKIP- - DISPLAY - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 0 - - - - PLAY - PAUSE - STOP - FORWARD - REVERSE - LEFT - RIGHT - UP - DOWN - - BACK - MENU - TITLE - INFO - SKIP+ - SKIP- - DISPLAY - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 0 - - - - Play - pause - Stop - FForward - Rewind - Vol-Rew - Vol+FF - Chan+Play - Chan-Stop - channel+ - channel- - - undo - Menu - L - Info - next - Fullscreen - Record - vol+ - vol- - Mute - Power - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 0 - - - - PLAY - PAUSE - STOP - >> - << - LEFT - RIGHT - UP - DOWN - CH_UP - CH_DOWN - - EXIT - MENU - RED - GREEN - >>| - YELLOW - RECORD - VOL_UP - VOL_DOWN - MUTE - POWER - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 0 - - diff --git a/abs/extra/xbmc-svn/PKGBUILD b/abs/extra/xbmc-svn/PKGBUILD index d7debbe..fa2be23 100644 --- a/abs/extra/xbmc-svn/PKGBUILD +++ b/abs/extra/xbmc-svn/PKGBUILD @@ -1,49 +1,55 @@ -# Contributors : Ralf Barth -# Richard Atkinson atkinsonr-at-gmail +# Maintainer: DonVla +# Contributor: BlackEagle < ike DOT devolder AT herecura DOT be > +# Contributor: Ulf Winkelvos +# Contributor: Ralf Barth +# Contributor: B - Thanks for your hints :) # # Original credits go to Edgar Hucek # for his xbmc-vdpau-vdr PKGBUILD at https://archvdr.svn.sourceforge.net/svnroot/archvdr/trunk/archvdr/xbmc-vdpau-vdr/PKGBUILD pkgname=xbmc-svn -pkgver=25089 +pkgver=35648 pkgrel=1 pkgdesc="XBMC Media Center from SVN" provides=('xbmc') -conflicts=('xbmc') +conflicts=('xbmc' 'xbmc-pulse') arch=('i686' 'x86_64') -url="http://xbmc.org" +url="http://xbmc.svn.sourceforge.net/viewvc/xbmc/trunk" license=('GPL' 'LGPL') -depends=('alsa-lib' 'curl' 'enca' 'faac' 'freetype2' 'fribidi' 'gawk' 'glew' - 'hal' 'jasper' 'libgl' 'libmad' 'libmysqlclient' 'libjpeg' - 'libxinerama' 'libxrandr' 'lzo2' 'sdl_image' 'sdl_mixer' 'sqlite3' - 'tre' 'unzip' 'libcdio' 'libsamplerate' 'python' 'avahi' 'libmad' - 'a52dec' 'libdca' 'faad2' 'libmpeg2' 'libvorbis' 'libogg' 'libmms' - 'libmpcdec' 'flac' 'wavpack' 'xorg-utils' 'smbclient' 'libvdpau') -makedepends=('subversion' 'autoconf' 'automake' 'boost' 'cmake' 'gcc' 'gperf' - 'libtool>=2.2.6a-1' 'make' 'nasm' 'patch' 'pkgconfig' 'zip' 'flex' 'bison') -optdepends=('lirc: remote controller support' - 'pmount: mount removable devices as normal user' +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') -install=("${pkgname}.install") -source=(Lircmap.xml) -noextract=() -md5sums=() -options=(makeflags) +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 + cd "${srcdir}/" + if [ -d "$_svnmod/.svn" ]; then msg "SVN tree found, reverting changes and updating to -r$pkgver" - (cd $_svnmod && svn revert -R . && svn up -r $pkgver) || return 1 + (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 || return 1 + svn co "$_svntrunk" --config-dir ./ -r "$pkgver" "$_svnmod" fi # Configure XBMC @@ -51,47 +57,76 @@ build() { # Note on external-libs: # - We cannot use external python because Arch's python was built with # UCS2 unicode support, whereas xbmc expects UCS4 support - # - We cannot use Arch's libass because it's incompatible with XBMC's - # subtitle rendering - # - We cannot use external ffmpeg because we would loose VDPAU functionality - cd "$srcdir/$_svnmod" - msg "Configuring XBMC" + 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 - ./configure --prefix=${_prefix} \ - --enable-external-liba52 \ - --enable-external-libdts \ - --enable-external-libmpeg2 \ - --enable-external-libogg \ - --enable-external-libwavpack \ - --disable-external-libass \ + + msg "Configuring XBMC" + ./configure --prefix="${_prefix}" --disable-hal \ + --enable-external-libraries \ --disable-external-ffmpeg \ --disable-external-python \ - --disable-debug || return 1 - + --enable-webserver \ + --enable-debug \ +# --disable-rtmp + # Now (finally) build msg "Running make" - make || return 1 + make ${MAKEFLAGS} + make -C lib/addons/script.module.pil + make -C lib/addons/script.module.pysqlite +} + +package() { - cd "$srcdir/$_svnmod" + cd "${srcdir}/${_svnmod}" msg "Running make install" - make prefix=${pkgdir}${_prefix} install || return 1 + 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" - # Install - install -Dm755 ${srcdir}/$_svnmod/xbmc-xrandr \ - ${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr || return 1 +# 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/" - install -Dm644 ${srcdir}/$_svnmod/tools/Linux/xbmc.desktop \ - ${pkgdir}${_prefix}/share/applications/xbmc.desktop || return 1 +# 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 - install -Dm644 ${srcdir}/$_svnmod/tools/Linux/xbmc.png \ - ${pkgdir}${_prefix}/share/pixmaps/xbmc.png || return 1 +# 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 - install -dm755 ${pkgdir}${_prefix}/share/licenses/${pkgname} - for licensef in LICENSE.GPL README.linux copying.txt; do - mv ${pkgdir}${_prefix}/share/xbmc/${licensef} \ - ${pkgdir}${_prefix}/share/licenses/${pkgname} || return 1 - 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" - # Use custom Lircmap to support StreamZap remote - cp ${srcdir}/Lircmap.xml ${pkgdir}${_prefix}/share/xbmc/system/Lircmap.xml +# strip + msg "Stripping binaries" + find "$pkgdir" -type f -exec strip {} \; >/dev/null 2>/dev/null } diff --git a/abs/extra/xbmc-svn/__changelog b/abs/extra/xbmc-svn/__changelog deleted file mode 100644 index bbf1705..0000000 --- a/abs/extra/xbmc-svn/__changelog +++ /dev/null @@ -1 +0,0 @@ -Added Lircmap.xml to PKGBUILD to support MCE2 and StreamZap remotes diff --git a/abs/extra/xbmc-svn/xbmc-svn.install b/abs/extra/xbmc-svn/xbmc-svn.install index acf409c..9d24167 100644 --- a/abs/extra/xbmc-svn/xbmc-svn.install +++ b/abs/extra/xbmc-svn/xbmc-svn.install @@ -1,13 +1,28 @@ post_install() { - echo ">> If XBMC won't start, but just segfaults, double check your X.Org config" - echo ">> so that your display depth is at least 24-bit. Eg: change " - echo ">> \"DefaultDepth 16\" under the \"Screen\" section so it says 24 instead" - echo ">> of 16." + 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 ">> 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 - /bin/true + + [[ $(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