diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-19 20:37:04 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-19 20:37:04 -0300 |
commit | a379247a5f187c1608664530e9ff85663eff3201 (patch) | |
tree | 3a49e87e7419c4aca35d1f4f2e591d12c3821c78 /extra/vlc | |
parent | 1bf114d00280c9cfb2075d30830fdf86adb30951 (diff) | |
parent | 81ee1980feda43043eaebae2c596ae116a21f6e5 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/cuetools/PKGBUILD
community/ekg2/PKGBUILD
community/libcss/PKGBUILD
community/libwapcaplet/PKGBUILD
community/lxrandr/PKGBUILD
community/menu-cache/PKGBUILD
community/mumble/PKGBUILD
community/ngircd/PKGBUILD
community/oidentd/PKGBUILD
community/openbox/PKGBUILD
community/preload/PKGBUILD
community/xdg-user-dirs/PKGBUILD
extra/gdome2/PKGBUILD
extra/libdiscid/PKGBUILD
extra/pymad/PKGBUILD
extra/qhull/PKGBUILD
extra/speech-dispatcher/PKGBUILD
multilib/lib32-gmp/PKGBUILD
testing/xorg-server/PKGBUILD
Diffstat (limited to 'extra/vlc')
-rw-r--r-- | extra/vlc/PKGBUILD | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 62d7cc846..882b93468 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 149284 2012-02-06 17:33:43Z ibiru $ +# $Id: PKGBUILD 150609 2012-02-18 22:53:43Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc -pkgver=1.1.13 -pkgrel=6 +pkgver=2.0.0 +pkgrel=1 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" @@ -16,7 +16,7 @@ depends=('a52dec' 'fluidsynth' 'libmtp' 'libdvbpsi' 'libxpm' 'libcdio' 'taglib' 'sysfsutils' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' 'libshout' 'libmad' 'fribidi' 'libmpeg2' 'libmodplug' 'xcb-util-keysyms' 'ttf-freefont' 'libxv' 'libass' 'xdg-utils' 'desktop-file-utils') -makedepends=('avahi' 'pkgconfig' 'live-media' 'libnotify' +makedepends=('avahi' 'pkg-config' 'live-media' 'libnotify' 'flac' 'libtheora' 'alsa-lib' 'jack' 'kdelibs' 'udev' 'libraw1394' 'libdc1394' 'libavc1394' 'libva' 'libpulse' 'lirc-utils' 'gnutls' 'libcaca') @@ -47,25 +47,17 @@ optdepends=('avahi: for service discovery using bonjour protocol' } conflicts=('vlc-plugin') replaces=('vlc-plugin') -backup=('usr/share/vlc/http/.hosts' - 'usr/share/vlc/http/dialogs/.hosts' - 'usr/share/vlc/lua/http/.hosts' +backup=('usr/share/vlc/lua/http/.hosts' 'usr/share/vlc/lua/http/dialogs/.hosts') options=('!libtool') install=vlc.install -source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2" - 'vlc-1.1.13-skin2_theme_loader.patch' - 'vlc-1.1.13-youtube.patch') -md5sums=('9678fb7a04808b6e0de63746d35e4bb1' - 'f7c2ea18da9570d633f5fd834a1f72c8' - '26dbd3574219daf4babc2f127a3229bc') +source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz") +md5sums=('8806bff2ea9c76791123d444a92f708c') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/vlc-1.1.13-skin2_theme_loader.patch" - patch -Np1 -i "${srcdir}/vlc-1.1.13-youtube.patch" - sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c + sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c if [ "$CARCH" = "mips64el" ]; then ./configure --prefix=/usr \ @@ -85,19 +77,17 @@ build() { ./configure --prefix=/usr \ --disable-rpath \ --enable-faad \ - --enable-v4l \ - --enable-snapshot \ --enable-dbus-control \ --enable-nls \ --enable-lirc \ --enable-pvr \ --enable-ncurses \ - --with-live555-tree=/usr/lib/live \ --enable-upnp \ --enable-realrtsp fi make } + package() { cd "${srcdir}/${pkgname}-${pkgver}" |